Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changeset/fluffy-pants-divide.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'astro': patch
---

Fixes TypeScript autocompletion for `getImage()` to suggest all available predefined options.
5 changes: 5 additions & 0 deletions .changeset/frank-clouds-guess.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'astro': patch
---

Fixes a type error in `getImage()` options that allowed passing both `widths` and `densities` at the same time.
26 changes: 12 additions & 14 deletions packages/astro/src/assets/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -84,28 +84,26 @@ export type SrcSetValue = UnresolvedSrcSetValue & {
export type UnresolvedImageTransform = Simplify<
OmitPreservingIndexSignature<ImageTransform, 'src'> & {
src: ImageMetadata | string | Promise<{ default: ImageMetadata }>;
inferSize?: boolean;
inferSize?: boolean | undefined;
}
> & {
[isESMImport]?: never;
};

type Undefinable<T> = 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<ImageSharedProps<object>> &
Astro.CustomImageProps & {
src: ImageMetadata | string;
width?: number | undefined;
height?: number | undefined;
[key: string]: any;
}
>;

export interface GetImageResult {
rawOptions: ImageTransform;
Expand Down
Loading