[ci] format
This commit is contained in:
parent
89d76753a0
commit
d2f68345f9
7 changed files with 59 additions and 38 deletions
|
@ -1,6 +1,13 @@
|
|||
import slash from 'slash';
|
||||
import { ROUTE_PATTERN } from './constants.js';
|
||||
import { ImageAttributes, ImageMetadata, ImageService, isSSRService, OutputFormat, TransformOptions } from './types.js';
|
||||
import {
|
||||
ImageAttributes,
|
||||
ImageMetadata,
|
||||
ImageService,
|
||||
isSSRService,
|
||||
OutputFormat,
|
||||
TransformOptions,
|
||||
} from './types.js';
|
||||
import { parseAspectRatio } from './utils.js';
|
||||
|
||||
export interface GetImageTransform extends Omit<TransformOptions, 'src'> {
|
||||
|
@ -18,7 +25,9 @@ function resolveSize(transform: TransformOptions): TransformOptions {
|
|||
}
|
||||
|
||||
if (!transform.aspectRatio) {
|
||||
throw new Error(`"aspectRatio" must be included if only "${transform.width ? "width": "height"}" is provided`)
|
||||
throw new Error(
|
||||
`"aspectRatio" must be included if only "${transform.width ? 'width' : 'height'}" is provided`
|
||||
);
|
||||
}
|
||||
|
||||
let aspectRatio: number;
|
||||
|
@ -36,14 +45,14 @@ function resolveSize(transform: TransformOptions): TransformOptions {
|
|||
return {
|
||||
...transform,
|
||||
width: transform.width,
|
||||
height: Math.round(transform.width / aspectRatio)
|
||||
height: Math.round(transform.width / aspectRatio),
|
||||
} as TransformOptions;
|
||||
} else if (transform.height) {
|
||||
// only height was provided, calculate width
|
||||
return {
|
||||
...transform,
|
||||
width: Math.round(transform.height * aspectRatio),
|
||||
height: transform.height
|
||||
height: transform.height,
|
||||
};
|
||||
}
|
||||
|
||||
|
@ -57,9 +66,7 @@ async function resolveTransform(input: GetImageTransform): Promise<TransformOpti
|
|||
}
|
||||
|
||||
// resolve the metadata promise, usually when the ESM import is inlined
|
||||
const metadata = 'then' in input.src
|
||||
? (await input.src).default
|
||||
: input.src;
|
||||
const metadata = 'then' in input.src ? (await input.src).default : input.src;
|
||||
|
||||
let { width, height, aspectRatio, format = metadata.format, ...rest } = input;
|
||||
|
||||
|
@ -84,7 +91,7 @@ async function resolveTransform(input: GetImageTransform): Promise<TransformOpti
|
|||
height,
|
||||
aspectRatio,
|
||||
format: format as OutputFormat,
|
||||
}
|
||||
};
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
@ -1,7 +1,13 @@
|
|||
import { lookup } from 'mrmime';
|
||||
import { extname } from 'path';
|
||||
import { getImage } from './get-image.js';
|
||||
import { ImageAttributes, ImageMetadata, ImageService, OutputFormat, TransformOptions } from './types.js';
|
||||
import {
|
||||
ImageAttributes,
|
||||
ImageMetadata,
|
||||
ImageService,
|
||||
OutputFormat,
|
||||
TransformOptions,
|
||||
} from './types.js';
|
||||
import { parseAspectRatio } from './utils.js';
|
||||
|
||||
export interface GetPictureParams {
|
||||
|
@ -14,7 +20,7 @@ export interface GetPictureParams {
|
|||
|
||||
export interface GetPictureResult {
|
||||
image: ImageAttributes;
|
||||
sources: { type: string; srcset: string; }[];
|
||||
sources: { type: string; srcset: string }[];
|
||||
}
|
||||
|
||||
async function resolveAspectRatio({ src, aspectRatio }: GetPictureParams) {
|
||||
|
@ -49,14 +55,21 @@ export async function getPicture(params: GetPictureParams): Promise<GetPictureRe
|
|||
}
|
||||
|
||||
async function getSource(format: OutputFormat) {
|
||||
const imgs = await Promise.all(widths.map(async (width) => {
|
||||
const img = await getImage(loader, { src, format, width, height: Math.round(width / aspectRatio!) });
|
||||
const imgs = await Promise.all(
|
||||
widths.map(async (width) => {
|
||||
const img = await getImage(loader, {
|
||||
src,
|
||||
format,
|
||||
width,
|
||||
height: Math.round(width / aspectRatio!),
|
||||
});
|
||||
return `${img.src} ${width}w`;
|
||||
}))
|
||||
})
|
||||
);
|
||||
|
||||
return {
|
||||
type: lookup(format) || format,
|
||||
srcset: imgs.join(',')
|
||||
srcset: imgs.join(','),
|
||||
};
|
||||
}
|
||||
|
||||
|
@ -67,13 +80,13 @@ export async function getPicture(params: GetPictureParams): Promise<GetPictureRe
|
|||
src,
|
||||
width: Math.max(...widths),
|
||||
aspectRatio,
|
||||
format: allFormats[allFormats.length - 1]
|
||||
format: allFormats[allFormats.length - 1],
|
||||
});
|
||||
|
||||
const sources = await Promise.all(allFormats.map(format => getSource(format)));
|
||||
const sources = await Promise.all(allFormats.map((format) => getSource(format)));
|
||||
|
||||
return {
|
||||
sources,
|
||||
image
|
||||
}
|
||||
image,
|
||||
};
|
||||
}
|
||||
|
|
|
@ -3,8 +3,6 @@ import fs from 'fs/promises';
|
|||
import path from 'path';
|
||||
import { fileURLToPath } from 'url';
|
||||
import { OUTPUT_DIR, PKG_NAME, ROUTE_PATTERN } from './constants.js';
|
||||
export * from './get-image.js';
|
||||
export * from './get-picture.js';
|
||||
import { IntegrationOptions, TransformOptions } from './types.js';
|
||||
import {
|
||||
ensureDir,
|
||||
|
@ -14,6 +12,8 @@ import {
|
|||
propsToFilename,
|
||||
} from './utils.js';
|
||||
import { createPlugin } from './vite-plugin-astro-image.js';
|
||||
export * from './get-image.js';
|
||||
export * from './get-picture.js';
|
||||
|
||||
const createIntegration = (options: IntegrationOptions = {}): AstroIntegration => {
|
||||
const resolvedOptions = {
|
||||
|
|
|
@ -83,7 +83,8 @@ export interface HostedImageService<T extends TransformOptions = TransformOption
|
|||
getImageAttributes(transform: T): Promise<ImageAttributes>;
|
||||
}
|
||||
|
||||
export interface SSRImageService<T extends TransformOptions = TransformOptions> extends HostedImageService<T> {
|
||||
export interface SSRImageService<T extends TransformOptions = TransformOptions>
|
||||
extends HostedImageService<T> {
|
||||
/**
|
||||
* Gets tthe HTML attributes needed for the server rendered `<img />` element.
|
||||
*/
|
||||
|
|
Loading…
Add table
Reference in a new issue