diff --git a/.changeset/fluffy-pants-divide.md b/.changeset/fluffy-pants-divide.md new file mode 100644 index 000000000000..d1d200db2533 --- /dev/null +++ b/.changeset/fluffy-pants-divide.md @@ -0,0 +1,5 @@ +--- +'astro': patch +--- + +Fixes TypeScript autocompletion for `getImage()` to suggest all available predefined options. diff --git a/.changeset/frank-clouds-guess.md b/.changeset/frank-clouds-guess.md new file mode 100644 index 000000000000..77b8a8de378c --- /dev/null +++ b/.changeset/frank-clouds-guess.md @@ -0,0 +1,5 @@ +--- +'astro': patch +--- + +Fixes a type error in `getImage()` options that allowed passing both `widths` and `densities` at the same time. diff --git a/packages/astro/src/assets/types.ts b/packages/astro/src/assets/types.ts index 0ee8e474bcc8..67ce7e16bcd5 100644 --- a/packages/astro/src/assets/types.ts +++ b/packages/astro/src/assets/types.ts @@ -84,28 +84,26 @@ export type SrcSetValue = UnresolvedSrcSetValue & { export type UnresolvedImageTransform = Simplify< OmitPreservingIndexSignature & { src: ImageMetadata | string | Promise<{ default: ImageMetadata }>; - inferSize?: boolean; + inferSize?: boolean | undefined; } > & { [isESMImport]?: never; }; +type Undefinable = T extends object ? { [K in keyof T]?: T[K] | undefined } : T; + /** * Options accepted by the image transformation service. */ -export type ImageTransform = { - src: ImageMetadata | string; - width?: number | undefined; - widths?: number[] | undefined; - densities?: (number | `${number}x`)[] | undefined; - height?: number | undefined; - quality?: ImageQuality | undefined; - format?: ImageOutputFormat | undefined; - fit?: ImageFit | undefined; - position?: string | undefined; - background?: string | undefined; - [key: string]: any; -} & Astro.CustomImageProps; +export type ImageTransform = Simplify< + Undefinable> & + Astro.CustomImageProps & { + src: ImageMetadata | string; + width?: number | undefined; + height?: number | undefined; + [key: string]: any; + } +>; export interface GetImageResult { rawOptions: ImageTransform;