npm - @warlock.js/core - Versions diffs - 5.28.0 → 5.30.0 - Mend

@warlock.js/core 5.28.0 → 5.30.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (1396) hide show

package/esm/http/uploaded-file.mjs.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"uploaded-file.mjs","names":[],"sources":["../../../../../../../core/src/http/uploaded-file.ts"],"sourcesContent":["import type { MultipartFile } from \"@fastify/multipart\";\nimport { Random } from \"@mongez/reinforcements\";\nimport dayjs from \"dayjs\";\nimport path from \"path\";\nimport { Image, type ImageFormat, type ImageTransformOptions } from \"../image\";\nimport { storage, type ScopedStorage, type StorageDriverName, type StorageFile } from \"../storage\";\nimport { sanitizePath } from \"../utils/paths\";\nimport { uploadsConfig } from \"./uploads-config\";\nimport type {\n FileNamingStrategy,\n ImageTransformCallback,\n PrefixConfig,\n SaveAsOptions,\n SaveOptions,\n UploadedFileImageOptions,\n} from \"./uploads-types\";\n\ntype UploadedFileMetadata = {\n name: string;\n mimeType: string;\n extension: string;\n size: number;\n width?: number;\n height?: number;\n};\n\n/*\n What an `UploadedFile` looks like on the wire.\n \n Every member is knowable without reading the file, which is what lets\n * {@link UploadedFile.toJSON} be synchronous — see the note there. `size` is\n * the one exception and it is optional for exactly that reason: present when\n * the file has already been buffered, absent otherwise, never guessed.\n /\nexport type UploadedFileJson = {\n name: string;\n mimeType: string;\n extension: string;\n isImage: boolean;\n isVideo: boolean;\n isAudio: boolean;\n size?: number;\n};\n\n/\n Options for validating file before saving\n /\nexport type FileValidationOptions = {\n /\n List of allowed MIME types\n \n @example [\"image/jpeg\", \"image/png\", \"image/webp\"]\n /\n allowedMimeTypes?: string[];\n\n /\n List of allowed file extensions (without dot)\n \n @example [\"jpg\", \"jpeg\", \"png\", \"webp\"]\n /\n allowedExtensions?: string[];\n\n /\n Maximum file size in bytes\n \n @example 5 * 1024 * 1024 // 5MB\n /\n maxSize?: number;\n};\n\n/\n UploadedFile - Handles multipart file uploads with storage and image integration\n \n Provides a fluent API for validating, transforming, and saving uploaded files\n * to various storage drivers (local, S3, R2, etc.).\n \n @example\n * ```typescript\n * // Simple save with random name\n * const file = await uploadedFile.save(\"avatars\");\n \n // Original name with date prefix\n * const file = await uploadedFile.save(\"avatars\", {\n * name: \"original\",\n * prefix: { format: \"yyyy/mm/dd\", as: \"directory\" }\n * });\n \n // With image transformations\n * const file = await uploadedFile\n * .resize(800, 600)\n * .quality(85)\n * .format(\"webp\")\n * .save(\"avatars\");\n \n // Different storage driver\n * const file = await uploadedFile.use(\"s3\").save(\"avatars\");\n * ```\n /\nexport class UploadedFile {\n /\n File buffered content\n * @internal\n /\n protected bufferedFileContent?: Buffer;\n\n /\n Upload file hash (SHA-256)\n \n Populated after file is saved.\n /\n public hash = \"\";\n\n /\n Selected storage driver\n * @internal\n /\n protected _storage: ScopedStorage = storage;\n\n /\n Saved StorageFile reference\n * @internal\n /\n protected _storageFile?: StorageFile;\n\n /\n Queued image options (high-level API)\n * @internal\n /\n protected _imageOptions: UploadedFileImageOptions = {};\n\n /\n Full transform options or callback\n * @internal\n /\n protected _transformConfig?: ImageTransformOptions \| ImageTransformCallback;\n\n /\n Create a new UploadedFile instance\n \n @param fileData - Multipart file data from Fastify\n * @throws Error if file data is invalid\n /\n public constructor(protected readonly fileData: MultipartFile) {\n if (!fileData?.filename) {\n throw new Error(\"Invalid file data: filename is required\");\n }\n }\n\n // ============================================================\n // File Properties\n // ============================================================\n\n /\n Get file name (sanitized)\n \n Returns the original filename with special characters removed/replaced.\n /\n public get name(): string {\n return sanitizePath(this.fileData.filename);\n }\n\n /\n Get file MIME type\n \n @example \"image/jpeg\", \"application/pdf\"\n /\n public get mimeType(): string {\n return this.fileData.mimetype;\n }\n\n /\n Get file extension (lowercase, without dot)\n \n @example \"jpg\", \"png\", \"pdf\"\n /\n public get extension(): string {\n return path.extname(this.fileData.filename).replace(\".\", \"\").toLowerCase();\n }\n\n /\n Get file metadata\n /\n public async metadata(): Promise<UploadedFileMetadata> {\n const data: UploadedFileMetadata = {\n name: this.name,\n mimeType: this.mimeType,\n extension: this.extension,\n size: await this.size(),\n };\n\n if (this.isImage) {\n const dimensions = await this.dimensions();\n data.width = dimensions.width;\n data.height = dimensions.height;\n }\n\n return data;\n }\n\n /\n Get file size in bytes\n \n Buffers the file content if not already buffered.\n /\n public async size(): Promise<number> {\n const file = await this.buffer();\n return file.length;\n }\n\n /\n Get file buffer\n \n Caches the buffer after first call for efficiency.\n /\n public async buffer(): Promise<Buffer> {\n if (this.bufferedFileContent) {\n return this.bufferedFileContent;\n }\n\n this.bufferedFileContent = await this.fileData.toBuffer();\n return this.bufferedFileContent;\n }\n\n // ============================================================\n // File Type Checks\n // ============================================================\n\n /\n Check if file is an image based on MIME type\n /\n public get isImage(): boolean {\n return this.mimeType.startsWith(\"image\");\n }\n\n /\n Check if file is a video based on MIME type\n /\n public get isVideo(): boolean {\n return this.mimeType.startsWith(\"video\");\n }\n\n /\n Check if file is an audio based on MIME type\n /\n public get isAudio(): boolean {\n return this.mimeType.startsWith(\"audio\");\n }\n\n // ============================================================\n // Storage Driver Selection\n // ============================================================\n\n /\n Select a specific storage driver for this upload\n \n Returns this instance for chaining. The driver is used\n * when `save()` or `saveAs()` is called.\n \n @param driver - Driver name from storage configuration\n * @returns This instance for chaining\n \n @example\n * ```typescript\n * await file.use(\"s3\").save(\"avatars\");\n * await file.use(\"r2\").save(\"cdn/images\");\n * ```\n /\n public use(driver: StorageDriverName): this {\n this._storage = storage.use(driver) as ScopedStorage;\n return this;\n }\n\n // ============================================================\n // High-Level Image Transform API\n // ============================================================\n\n /\n Resize the image before saving\n \n Only applies to image files. Non-image files ignore this.\n \n @param width - Target width in pixels\n * @param height - Optional target height (maintains aspect ratio if omitted)\n * @returns This instance for chaining\n \n @example\n * ```typescript\n * await file.resize(800).save(\"thumbnails\");\n * await file.resize(400, 400).save(\"avatars\");\n * ```\n /\n public resize(width: number, height?: number): this {\n this._imageOptions.resize = { width, height };\n return this;\n }\n\n /\n Set image output quality\n \n Quality affects file size and visual fidelity.\n * Only applies to formats that support quality (JPEG, WebP, AVIF).\n \n @param value - Quality value (1-100)\n * @returns This instance for chaining\n \n @example\n * ```typescript\n * await file.quality(85).save(\"images\");\n * ```\n /\n public quality(value: number): this {\n if (value < 1 \|\| value > 100) {\n throw new Error(\"Quality must be between 1 and 100\");\n }\n this._imageOptions.quality = value;\n return this;\n }\n\n /\n Convert image to a specific format\n \n Changes the output format and updates the file extension accordingly.\n \n @param format - Target image format (jpeg, png, webp, avif, etc.)\n * @returns This instance for chaining\n \n @example\n * ```typescript\n * await file.format(\"webp\").save(\"images\");\n * await file.resize(800).format(\"avif\").quality(80).save(\"optimized\");\n * ```\n /\n public format(format: ImageFormat): this {\n this._imageOptions.format = format;\n return this;\n }\n\n /\n Rotate the image\n \n @param degrees - Rotation angle in degrees (positive = clockwise)\n * @returns This instance for chaining\n \n @example\n * ```typescript\n * await file.rotate(90).save(\"rotated\");\n * ```\n /\n public rotate(degrees: number): this {\n this._imageOptions.rotate = degrees;\n return this;\n }\n\n /\n Apply blur effect to the image\n \n @param sigma - Blur intensity (default: 3, minimum: 0.3)\n * @returns This instance for chaining\n \n @example\n * ```typescript\n * await file.blur(5).save(\"blurred\");\n * ```\n /\n public blur(sigma = 3): this {\n if (sigma < 0.3) {\n throw new Error(\"Blur sigma must be at least 0.3\");\n }\n this._imageOptions.blur = sigma;\n return this;\n }\n\n /\n Convert image to grayscale (black and white)\n \n @returns This instance for chaining\n \n @example\n * ```typescript\n * await file.grayscale().save(\"bw-images\");\n * ```\n /\n public grayscale(): this {\n this._imageOptions.grayscale = true;\n return this;\n }\n\n // ============================================================\n // Full Transform Control\n // ============================================================\n\n /\n Apply full image transformations\n \n Provides complete control over image processing. Can be used with:\n * - An options object for predefined transforms\n * - A callback function for chained operations\n \n @param config - Transform options or callback function\n * @returns This instance for chaining\n \n @example\n * ```typescript\n * // Using options object\n * await file.transform({\n * resize: { width: 800, fit: \"inside\" },\n * quality: 85\n * }).save(\"images\");\n \n // Using callback for full control\n * await file.transform(img =>\n * img.resize({ width: 800 })\n * .watermark(\"logo.png\", { gravity: \"southeast\" })\n * .sharpen()\n * ).save(\"products\");\n * ```\n /\n public transform(config: ImageTransformOptions \| ImageTransformCallback): this {\n this._transformConfig = config;\n return this;\n }\n\n /\n Get an Image instance for advanced manipulation\n \n Returns an Image instance from the file buffer for manual processing.\n * Use this when you need operations not covered by the fluent API.\n \n @returns Promise resolving to Image instance\n \n @example\n * ```typescript\n * const img = await file.toImage();\n * await img\n * .resize({ width: 800 })\n * .watermark(\"logo.png\", { gravity: \"southeast\" })\n * .save(\"path/to/output.jpg\");\n * ```\n /\n public async toImage(): Promise<Image> {\n return new Image(await this.buffer());\n }\n\n // ============================================================\n // Image Metadata\n // ============================================================\n\n /\n Get file width and height (only for images)\n \n @returns Dimensions object, or empty object if not an image\n /\n public async dimensions(): Promise<{ width?: number; height?: number }> {\n if (!this.isImage) {\n return {};\n }\n\n return new Image(await this.buffer()).dimensions();\n }\n\n // ============================================================\n // Validation\n // ============================================================\n\n /\n Validate file against the given options\n \n @param options - Validation rules\n * @throws Error if validation fails\n \n @example\n * ```typescript\n * await file.validate({\n * allowedMimeTypes: [\"image/jpeg\", \"image/png\"],\n * maxSize: 5 * 1024 * 1024 // 5MB\n * });\n * ```\n /\n public async validate(options: FileValidationOptions): Promise<void> {\n const { allowedMimeTypes, allowedExtensions, maxSize } = options;\n\n if (allowedMimeTypes && !allowedMimeTypes.includes(this.mimeType)) {\n throw new Error(\n `Invalid file type: ${this.mimeType}. Allowed types: ${allowedMimeTypes.join(\", \")}`,\n );\n }\n\n if (allowedExtensions && !allowedExtensions.includes(this.extension)) {\n throw new Error(\n `Invalid file extension: ${this.extension}. Allowed extensions: ${allowedExtensions.join(\", \")}`,\n );\n }\n\n if (maxSize) {\n const fileSize = await this.size();\n if (fileSize > maxSize) {\n throw new Error(`File too large: ${fileSize} bytes. Maximum allowed: ${maxSize} bytes`);\n }\n }\n }\n\n // ============================================================\n // Save Operations\n // ============================================================\n\n /\n Save the file to a directory with automatic naming\n * Keep in mind to use only relative path to the root of storage\n * If you are using local driver\n * Uses the configured naming strategy and prefix options to generate\n * the final path. Returns a StorageFile for accessing file metadata.\n \n @param directory - Target directory path\n * @param options - Save options (name, prefix, driver, validate)\n * @returns StorageFile instance with file metadata and operations\n \n @example\n * ```typescript\n * // Random name (default)\n * await file.save(\"avatars\");\n * // → avatars/x7k9m2p4.jpg\n \n // Original name\n * await file.save(\"avatars\", { name: \"original\" });\n * // → avatars/photo.jpg\n \n // With date directory\n * await file.save(\"avatars\", {\n * prefix: { format: \"yyyy/mm/dd\", as: \"directory\" }\n * });\n * // → avatars/2025/12/21/x7k9m2p4.jpg\n \n // Original name with datetime prefix\n * await file.save(\"avatars\", { name: \"original\", prefix: true });\n * // → avatars/21-12-2025-16-45-30-photo.jpg\n * ```\n /\n public async save(directory: string, options?: SaveOptions): Promise<StorageFile> {\n // Validate if requested\n if (options?.validate) {\n await this.validate(options.validate);\n }\n\n // Resolve filename and prefix\n const filename = this.resolveFilename(options);\n const prefix = this.resolvePrefix(options?.prefix);\n const location = this.buildLocation(directory, prefix, filename);\n\n return this.saveToLocation(location, options?.driver);\n }\n\n /\n Save the file to an explicit path\n \n Unlike `save()`, this method uses the exact path you provide.\n * No automatic naming or prefix is applied.\n \n @param location - Full file path (directory + filename)\n * @param options - Save options (driver, validate)\n * @returns StorageFile instance with file metadata\n \n @example\n * ```typescript\n * await file.saveAs(\"avatars/profile-123.png\");\n * await file.saveAs(\"products/2025/featured-image.webp\");\n * ```\n /\n public async saveAs(location: string, options?: SaveAsOptions): Promise<StorageFile> {\n // Validate if requested\n if (options?.validate) {\n await this.validate(options.validate);\n }\n\n return this.saveToLocation(location, options?.driver);\n }\n\n /\n Get the StorageFile reference if file has been saved\n \n Returns undefined if file hasn't been saved yet.\n /\n public get storageFile(): StorageFile \| undefined {\n return this._storageFile;\n }\n\n // ============================================================\n // Internal Helpers\n // ============================================================\n\n /\n Execute save to the specified location\n * @internal\n /\n protected async saveToLocation(\n location: string,\n driver?: StorageDriverName,\n ): Promise<StorageFile> {\n // Get file content (apply transforms if image)\n const content = await this.getProcessedContent();\n\n // Select storage\n const storageInstance = this.resolveStorage(driver);\n\n // Determine final location (adjust extension if format changed)\n const finalLocation = this.adjustLocationForFormat(location);\n\n // Save to storage\n this._storageFile = await storageInstance.put(content, finalLocation, {\n mimeType: this.getFinalMimeType(),\n });\n\n // Store hash from StorageFile\n const info = await this._storageFile.data();\n this.hash = info.hash \|\| \"\";\n\n return this._storageFile;\n }\n\n /\n Get processed content (with transforms applied if applicable)\n * @internal\n /\n protected async getProcessedContent(): Promise<Buffer> {\n const content = await this.buffer();\n\n // If not an image or no transforms, return as-is\n if (!this.isImage \|\| !this.hasTransforms()) {\n return content;\n }\n\n // Create Image and apply transforms\n let img = new Image(content);\n\n // Apply transform callback or options\n if (typeof this._transformConfig === \"function\") {\n img = this._transformConfig(img);\n } else if (this._transformConfig) {\n img = img.apply(this._transformConfig);\n }\n\n // Apply high-level options on top\n img = this.applyImageOptions(img);\n\n return img.toBuffer();\n }\n\n /\n Apply high-level image options\n * @internal\n /\n protected applyImageOptions(img: Image): Image {\n const opts = this._imageOptions;\n\n if (opts.resize) {\n img = img.resize({ width: opts.resize.width, height: opts.resize.height });\n }\n\n if (opts.rotate !== undefined) {\n img = img.rotate(opts.rotate);\n }\n\n if (opts.blur !== undefined) {\n img = img.blur(opts.blur);\n }\n\n if (opts.grayscale) {\n img = img.grayscale();\n }\n\n if (opts.quality !== undefined) {\n img = img.quality(opts.quality);\n }\n\n if (opts.format) {\n img = img.format(opts.format);\n }\n\n return img;\n }\n\n /\n Check if any transforms are queued\n * @internal\n /\n protected hasTransforms(): boolean {\n return this._transformConfig !== undefined \|\| Object.keys(this._imageOptions).length > 0;\n }\n\n /\n Resolve storage instance to use\n * @internal\n /\n protected resolveStorage(driver?: StorageDriverName): ScopedStorage \| typeof storage {\n if (driver) {\n return storage.use(driver) as ScopedStorage;\n }\n\n return this._storage \|\| storage;\n }\n\n /\n Resolve the filename based on options and config\n * @internal\n /\n protected resolveFilename(options?: SaveOptions): string {\n const namingStrategy: FileNamingStrategy = options?.name ?? uploadsConfig(\"name\") ?? \"random\";\n let baseName: string;\n\n if (namingStrategy === \"original\") {\n baseName = path.basename(this.name, path.extname(this.name));\n } else if (namingStrategy === \"random\") {\n const length = uploadsConfig(\"randomLength\");\n baseName = Random.string(length);\n } else {\n // Custom name - strip extension if provided, we'll add it\n baseName = path.basename(namingStrategy, path.extname(namingStrategy));\n }\n\n // Get extension (may be changed by format transform)\n const ext = this.getFinalExtension();\n\n return `${baseName}.${ext}`;\n }\n\n /\n Resolve prefix based on options and config\n * @internal\n /\n protected resolvePrefix(prefix?: PrefixConfig): string {\n // No prefix\n if (prefix === false \|\| prefix === undefined) {\n const configPrefix = uploadsConfig(\"prefix\");\n if (!configPrefix) {\n return \"\";\n }\n // Use config prefix if no explicit prefix provided\n prefix = configPrefix;\n }\n\n // Boolean true = use default format\n if (prefix === true) {\n const format = uploadsConfig(\"defaultPrefixFormat\")!;\n return this.formatDatePrefix(format, \"file\");\n }\n\n // String = static prefix\n if (typeof prefix === \"string\") {\n return prefix;\n }\n\n // PrefixOptions object\n const parts: string[] = [];\n\n // Add date format if specified\n if (prefix.format) {\n parts.push(this.formatDate(prefix.format));\n }\n\n // Add random string if specified\n if (prefix.randomLength) {\n parts.push(Random.string(prefix.randomLength));\n }\n\n const combined = parts.join(\"-\");\n const as = prefix.as ?? \"file\";\n\n if (as === \"directory\") {\n return combined ? `${combined}/` : \"\";\n }\n\n return combined ? `${combined}-` : \"\";\n }\n\n /\n Format a date prefix with the given format\n * @internal\n /\n protected formatDatePrefix(format: string, as: \"file\" \| \"directory\"): string {\n const formatted = this.formatDate(format);\n return as === \"directory\" ? `${formatted}/` : `${formatted}-`;\n }\n\n /\n Format current date using token-based format string\n * @internal\n /\n protected formatDate(format: string): string {\n return dayjs().format(format);\n }\n\n /\n Build final location from directory, prefix, and filename\n * @internal\n /\n protected buildLocation(directory: string, prefix: string, filename: string): string {\n // Clean up directory (remove trailing slash)\n const dir = directory.replace(/\\/$/, \"\");\n\n // If prefix ends with /, it's a directory\n if (prefix.endsWith(\"/\")) {\n return `${dir}/${prefix}${filename}`;\n }\n\n // Otherwise prefix is part of filename\n return `${dir}/${prefix}${filename}`;\n }\n\n /\n Get final extension (accounting for format changes)\n * @internal\n /\n protected getFinalExtension(): string {\n if (this._imageOptions.format) {\n // Map formats to extensions\n const format = this._imageOptions.format;\n\n if (format === \"jpeg\") return \"jpg\";\n\n return format;\n }\n\n return this.extension;\n }\n\n /\n Get final MIME type (accounting for format changes)\n * @internal\n /\n protected getFinalMimeType(): string {\n if (this._imageOptions.format) {\n const format = this._imageOptions.format;\n\n if (format === \"jpeg\" \|\| format === \"jpg\") return \"image/jpeg\";\n\n return `image/${format}`;\n }\n\n return this.mimeType;\n }\n\n /\n Adjust location to use correct extension if format changed\n * @internal\n /\n protected adjustLocationForFormat(location: string): string {\n if (!this._imageOptions.format) {\n return location;\n }\n\n const ext = this.getFinalExtension();\n const currentExt = path.extname(location);\n\n if (currentExt) {\n return location.replace(currentExt, `.${ext}`);\n }\n\n return `${location}.${ext}`;\n }\n\n // ============================================================\n // Serialization\n // ============================================================\n\n /\n Convert to JSON representation.\n \n Synchronous, and that is the whole point. `toJSON` is not an ordinary\n * method name — it is the hook `JSON.stringify` calls, and `JSON.stringify`\n * does not await. While this was `async`, every implicit serialization of an\n * upload produced `{}`: no base64, no size, not even the filename.\n \n Two call sites in core awaited it and worked (`http/response.ts:304`,\n * `utils/to-json.ts:9`). The ones that could not were the ones that mattered:\n * `cascade`'s model serializer calls `toJSON()` without awaiting, and\n * `Resource.toJSON()` is itself synchronous. Those paths were silently\n * broken. See canon `cd60b894`.\n \n What is NOT here, and why. `base64` forced the async — `buffer()` is\n * async — and it also put the entire file, inflated by a third, into any\n * response that happened to carry an upload. It is opt-in now via\n * {@link UploadedFile.toBase64}. `dimensions` costs an image decode; ask for\n * it with {@link UploadedFile.dimensions} when you want it.\n \n `size` is reported only when the file has already been read. Reading it\n * here would make the method async again, and guessing would be worse than\n * omitting: a wrong number is believed, an absent one is asked about. In\n * practice validation or `save()` has usually buffered the file long before\n * anything serializes it.\n /\n public toJSON(): UploadedFileJson {\n return {\n name: this.name,\n mimeType: this.mimeType,\n extension: this.extension,\n isImage: this.isImage,\n isVideo: this.isVideo,\n isAudio: this.isAudio,\n size: this.bufferedFileContent?.length,\n };\n }\n\n /\n The file's contents as base64.\n \n Explicit because it is expensive: it reads the whole file into memory and\n * grows it by a third. This used to happen on every serialization.\n */\n public async toBase64(): Promise<string> {\n return (await this.buffer()).toString(\"base64\");\n }\n}\n"],"mappings":"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"}
1	+ {"version":3,"file":"uploaded-file.mjs","names":[],"sources":["../../../../../../../../packages/core/src/http/uploaded-file.ts"],"sourcesContent":["import type { MultipartFile } from \"@fastify/multipart\";\nimport { Random } from \"@mongez/reinforcements\";\nimport dayjs from \"dayjs\";\nimport path from \"path\";\nimport { Image, type ImageFormat, type ImageTransformOptions } from \"../image\";\nimport { storage, type ScopedStorage, type StorageDriverName, type StorageFile } from \"../storage\";\nimport { sanitizePath } from \"../utils/paths\";\nimport { uploadsConfig } from \"./uploads-config\";\nimport type {\n FileNamingStrategy,\n ImageTransformCallback,\n PrefixConfig,\n SaveAsOptions,\n SaveOptions,\n UploadedFileImageOptions,\n} from \"./uploads-types\";\n\ntype UploadedFileMetadata = {\n name: string;\n mimeType: string;\n extension: string;\n size: number;\n width?: number;\n height?: number;\n};\n\n/*\n What an `UploadedFile` looks like on the wire.\n \n Every member is knowable without reading the file, which is what lets\n * {@link UploadedFile.toJSON} be synchronous — see the note there. `size` is\n * the one exception and it is optional for exactly that reason: present when\n * the file has already been buffered, absent otherwise, never guessed.\n /\nexport type UploadedFileJson = {\n name: string;\n mimeType: string;\n extension: string;\n isImage: boolean;\n isVideo: boolean;\n isAudio: boolean;\n size?: number;\n};\n\n/\n Options for validating file before saving\n /\nexport type FileValidationOptions = {\n /\n List of allowed MIME types\n \n @example [\"image/jpeg\", \"image/png\", \"image/webp\"]\n /\n allowedMimeTypes?: string[];\n\n /\n List of allowed file extensions (without dot)\n \n @example [\"jpg\", \"jpeg\", \"png\", \"webp\"]\n /\n allowedExtensions?: string[];\n\n /\n Maximum file size in bytes\n \n @example 5 * 1024 * 1024 // 5MB\n /\n maxSize?: number;\n};\n\n/\n UploadedFile - Handles multipart file uploads with storage and image integration\n \n Provides a fluent API for validating, transforming, and saving uploaded files\n * to various storage drivers (local, S3, R2, etc.).\n \n @example\n * ```typescript\n * // Simple save with random name\n * const file = await uploadedFile.save(\"avatars\");\n \n // Original name with date prefix\n * const file = await uploadedFile.save(\"avatars\", {\n * name: \"original\",\n * prefix: { format: \"yyyy/mm/dd\", as: \"directory\" }\n * });\n \n // With image transformations\n * const file = await uploadedFile\n * .resize(800, 600)\n * .quality(85)\n * .format(\"webp\")\n * .save(\"avatars\");\n \n // Different storage driver\n * const file = await uploadedFile.use(\"s3\").save(\"avatars\");\n * ```\n /\nexport class UploadedFile {\n /\n File buffered content\n * @internal\n /\n protected bufferedFileContent?: Buffer;\n\n /\n Upload file hash (SHA-256)\n \n Populated after file is saved.\n /\n public hash = \"\";\n\n /\n Selected storage driver\n * @internal\n /\n protected _storage: ScopedStorage = storage;\n\n /\n Saved StorageFile reference\n * @internal\n /\n protected _storageFile?: StorageFile;\n\n /\n Queued image options (high-level API)\n * @internal\n /\n protected _imageOptions: UploadedFileImageOptions = {};\n\n /\n Full transform options or callback\n * @internal\n /\n protected _transformConfig?: ImageTransformOptions \| ImageTransformCallback;\n\n /\n Create a new UploadedFile instance\n \n @param fileData - Multipart file data from Fastify\n * @throws Error if file data is invalid\n /\n public constructor(protected readonly fileData: MultipartFile) {\n if (!fileData?.filename) {\n throw new Error(\"Invalid file data: filename is required\");\n }\n }\n\n // ============================================================\n // File Properties\n // ============================================================\n\n /\n Get file name (sanitized)\n \n Returns the original filename with special characters removed/replaced.\n /\n public get name(): string {\n return sanitizePath(this.fileData.filename);\n }\n\n /\n Get file MIME type\n \n @example \"image/jpeg\", \"application/pdf\"\n /\n public get mimeType(): string {\n return this.fileData.mimetype;\n }\n\n /\n Get file extension (lowercase, without dot)\n \n @example \"jpg\", \"png\", \"pdf\"\n /\n public get extension(): string {\n return path.extname(this.fileData.filename).replace(\".\", \"\").toLowerCase();\n }\n\n /\n Get file metadata\n /\n public async metadata(): Promise<UploadedFileMetadata> {\n const data: UploadedFileMetadata = {\n name: this.name,\n mimeType: this.mimeType,\n extension: this.extension,\n size: await this.size(),\n };\n\n if (this.isImage) {\n const dimensions = await this.dimensions();\n data.width = dimensions.width;\n data.height = dimensions.height;\n }\n\n return data;\n }\n\n /\n Get file size in bytes\n \n Buffers the file content if not already buffered.\n /\n public async size(): Promise<number> {\n const file = await this.buffer();\n return file.length;\n }\n\n /\n Get file buffer\n \n Caches the buffer after first call for efficiency.\n /\n public async buffer(): Promise<Buffer> {\n if (this.bufferedFileContent) {\n return this.bufferedFileContent;\n }\n\n this.bufferedFileContent = await this.fileData.toBuffer();\n return this.bufferedFileContent;\n }\n\n // ============================================================\n // File Type Checks\n // ============================================================\n\n /\n Check if file is an image based on MIME type\n /\n public get isImage(): boolean {\n return this.mimeType.startsWith(\"image\");\n }\n\n /\n Check if file is a video based on MIME type\n /\n public get isVideo(): boolean {\n return this.mimeType.startsWith(\"video\");\n }\n\n /\n Check if file is an audio based on MIME type\n /\n public get isAudio(): boolean {\n return this.mimeType.startsWith(\"audio\");\n }\n\n // ============================================================\n // Storage Driver Selection\n // ============================================================\n\n /\n Select a specific storage driver for this upload\n \n Returns this instance for chaining. The driver is used\n * when `save()` or `saveAs()` is called.\n \n @param driver - Driver name from storage configuration\n * @returns This instance for chaining\n \n @example\n * ```typescript\n * await file.use(\"s3\").save(\"avatars\");\n * await file.use(\"r2\").save(\"cdn/images\");\n * ```\n /\n public use(driver: StorageDriverName): this {\n this._storage = storage.use(driver) as ScopedStorage;\n return this;\n }\n\n // ============================================================\n // High-Level Image Transform API\n // ============================================================\n\n /\n Resize the image before saving\n \n Only applies to image files. Non-image files ignore this.\n \n @param width - Target width in pixels\n * @param height - Optional target height (maintains aspect ratio if omitted)\n * @returns This instance for chaining\n \n @example\n * ```typescript\n * await file.resize(800).save(\"thumbnails\");\n * await file.resize(400, 400).save(\"avatars\");\n * ```\n /\n public resize(width: number, height?: number): this {\n this._imageOptions.resize = { width, height };\n return this;\n }\n\n /\n Set image output quality\n \n Quality affects file size and visual fidelity.\n * Only applies to formats that support quality (JPEG, WebP, AVIF).\n \n @param value - Quality value (1-100)\n * @returns This instance for chaining\n \n @example\n * ```typescript\n * await file.quality(85).save(\"images\");\n * ```\n /\n public quality(value: number): this {\n if (value < 1 \|\| value > 100) {\n throw new Error(\"Quality must be between 1 and 100\");\n }\n this._imageOptions.quality = value;\n return this;\n }\n\n /\n Convert image to a specific format\n \n Changes the output format and updates the file extension accordingly.\n \n @param format - Target image format (jpeg, png, webp, avif, etc.)\n * @returns This instance for chaining\n \n @example\n * ```typescript\n * await file.format(\"webp\").save(\"images\");\n * await file.resize(800).format(\"avif\").quality(80).save(\"optimized\");\n * ```\n /\n public format(format: ImageFormat): this {\n this._imageOptions.format = format;\n return this;\n }\n\n /\n Rotate the image\n \n @param degrees - Rotation angle in degrees (positive = clockwise)\n * @returns This instance for chaining\n \n @example\n * ```typescript\n * await file.rotate(90).save(\"rotated\");\n * ```\n /\n public rotate(degrees: number): this {\n this._imageOptions.rotate = degrees;\n return this;\n }\n\n /\n Apply blur effect to the image\n \n @param sigma - Blur intensity (default: 3, minimum: 0.3)\n * @returns This instance for chaining\n \n @example\n * ```typescript\n * await file.blur(5).save(\"blurred\");\n * ```\n /\n public blur(sigma = 3): this {\n if (sigma < 0.3) {\n throw new Error(\"Blur sigma must be at least 0.3\");\n }\n this._imageOptions.blur = sigma;\n return this;\n }\n\n /\n Convert image to grayscale (black and white)\n \n @returns This instance for chaining\n \n @example\n * ```typescript\n * await file.grayscale().save(\"bw-images\");\n * ```\n /\n public grayscale(): this {\n this._imageOptions.grayscale = true;\n return this;\n }\n\n // ============================================================\n // Full Transform Control\n // ============================================================\n\n /\n Apply full image transformations\n \n Provides complete control over image processing. Can be used with:\n * - An options object for predefined transforms\n * - A callback function for chained operations\n \n @param config - Transform options or callback function\n * @returns This instance for chaining\n \n @example\n * ```typescript\n * // Using options object\n * await file.transform({\n * resize: { width: 800, fit: \"inside\" },\n * quality: 85\n * }).save(\"images\");\n \n // Using callback for full control\n * await file.transform(img =>\n * img.resize({ width: 800 })\n * .watermark(\"logo.png\", { gravity: \"southeast\" })\n * .sharpen()\n * ).save(\"products\");\n * ```\n /\n public transform(config: ImageTransformOptions \| ImageTransformCallback): this {\n this._transformConfig = config;\n return this;\n }\n\n /\n Get an Image instance for advanced manipulation\n \n Returns an Image instance from the file buffer for manual processing.\n * Use this when you need operations not covered by the fluent API.\n \n @returns Promise resolving to Image instance\n \n @example\n * ```typescript\n * const img = await file.toImage();\n * await img\n * .resize({ width: 800 })\n * .watermark(\"logo.png\", { gravity: \"southeast\" })\n * .save(\"path/to/output.jpg\");\n * ```\n /\n public async toImage(): Promise<Image> {\n return new Image(await this.buffer());\n }\n\n // ============================================================\n // Image Metadata\n // ============================================================\n\n /\n Get file width and height (only for images)\n \n @returns Dimensions object, or empty object if not an image\n /\n public async dimensions(): Promise<{ width?: number; height?: number }> {\n if (!this.isImage) {\n return {};\n }\n\n return new Image(await this.buffer()).dimensions();\n }\n\n // ============================================================\n // Validation\n // ============================================================\n\n /\n Validate file against the given options\n \n @param options - Validation rules\n * @throws Error if validation fails\n \n @example\n * ```typescript\n * await file.validate({\n * allowedMimeTypes: [\"image/jpeg\", \"image/png\"],\n * maxSize: 5 * 1024 * 1024 // 5MB\n * });\n * ```\n /\n public async validate(options: FileValidationOptions): Promise<void> {\n const { allowedMimeTypes, allowedExtensions, maxSize } = options;\n\n if (allowedMimeTypes && !allowedMimeTypes.includes(this.mimeType)) {\n throw new Error(\n `Invalid file type: ${this.mimeType}. Allowed types: ${allowedMimeTypes.join(\", \")}`,\n );\n }\n\n if (allowedExtensions && !allowedExtensions.includes(this.extension)) {\n throw new Error(\n `Invalid file extension: ${this.extension}. Allowed extensions: ${allowedExtensions.join(\", \")}`,\n );\n }\n\n if (maxSize) {\n const fileSize = await this.size();\n if (fileSize > maxSize) {\n throw new Error(`File too large: ${fileSize} bytes. Maximum allowed: ${maxSize} bytes`);\n }\n }\n }\n\n // ============================================================\n // Save Operations\n // ============================================================\n\n /\n Save the file to a directory with automatic naming\n * Keep in mind to use only relative path to the root of storage\n * If you are using local driver\n * Uses the configured naming strategy and prefix options to generate\n * the final path. Returns a StorageFile for accessing file metadata.\n \n @param directory - Target directory path\n * @param options - Save options (name, prefix, driver, validate)\n * @returns StorageFile instance with file metadata and operations\n \n @example\n * ```typescript\n * // Random name (default)\n * await file.save(\"avatars\");\n * // → avatars/x7k9m2p4.jpg\n \n // Original name\n * await file.save(\"avatars\", { name: \"original\" });\n * // → avatars/photo.jpg\n \n // With date directory\n * await file.save(\"avatars\", {\n * prefix: { format: \"yyyy/mm/dd\", as: \"directory\" }\n * });\n * // → avatars/2025/12/21/x7k9m2p4.jpg\n \n // Original name with datetime prefix\n * await file.save(\"avatars\", { name: \"original\", prefix: true });\n * // → avatars/21-12-2025-16-45-30-photo.jpg\n * ```\n /\n public async save(directory: string, options?: SaveOptions): Promise<StorageFile> {\n // Validate if requested\n if (options?.validate) {\n await this.validate(options.validate);\n }\n\n // Resolve filename and prefix\n const filename = this.resolveFilename(options);\n const prefix = this.resolvePrefix(options?.prefix);\n const location = this.buildLocation(directory, prefix, filename);\n\n return this.saveToLocation(location, options?.driver);\n }\n\n /\n Save the file to an explicit path\n \n Unlike `save()`, this method uses the exact path you provide.\n * No automatic naming or prefix is applied.\n \n @param location - Full file path (directory + filename)\n * @param options - Save options (driver, validate)\n * @returns StorageFile instance with file metadata\n \n @example\n * ```typescript\n * await file.saveAs(\"avatars/profile-123.png\");\n * await file.saveAs(\"products/2025/featured-image.webp\");\n * ```\n /\n public async saveAs(location: string, options?: SaveAsOptions): Promise<StorageFile> {\n // Validate if requested\n if (options?.validate) {\n await this.validate(options.validate);\n }\n\n return this.saveToLocation(location, options?.driver);\n }\n\n /\n Get the StorageFile reference if file has been saved\n \n Returns undefined if file hasn't been saved yet.\n /\n public get storageFile(): StorageFile \| undefined {\n return this._storageFile;\n }\n\n // ============================================================\n // Internal Helpers\n // ============================================================\n\n /\n Execute save to the specified location\n * @internal\n /\n protected async saveToLocation(\n location: string,\n driver?: StorageDriverName,\n ): Promise<StorageFile> {\n // Get file content (apply transforms if image)\n const content = await this.getProcessedContent();\n\n // Select storage\n const storageInstance = this.resolveStorage(driver);\n\n // Determine final location (adjust extension if format changed)\n const finalLocation = this.adjustLocationForFormat(location);\n\n // Save to storage\n this._storageFile = await storageInstance.put(content, finalLocation, {\n mimeType: this.getFinalMimeType(),\n });\n\n // Store hash from StorageFile\n const info = await this._storageFile.data();\n this.hash = info.hash \|\| \"\";\n\n return this._storageFile;\n }\n\n /\n Get processed content (with transforms applied if applicable)\n * @internal\n /\n protected async getProcessedContent(): Promise<Buffer> {\n const content = await this.buffer();\n\n // If not an image or no transforms, return as-is\n if (!this.isImage \|\| !this.hasTransforms()) {\n return content;\n }\n\n // Create Image and apply transforms\n let img = new Image(content);\n\n // Apply transform callback or options\n if (typeof this._transformConfig === \"function\") {\n img = this._transformConfig(img);\n } else if (this._transformConfig) {\n img = img.apply(this._transformConfig);\n }\n\n // Apply high-level options on top\n img = this.applyImageOptions(img);\n\n return img.toBuffer();\n }\n\n /\n Apply high-level image options\n * @internal\n /\n protected applyImageOptions(img: Image): Image {\n const opts = this._imageOptions;\n\n if (opts.resize) {\n img = img.resize({ width: opts.resize.width, height: opts.resize.height });\n }\n\n if (opts.rotate !== undefined) {\n img = img.rotate(opts.rotate);\n }\n\n if (opts.blur !== undefined) {\n img = img.blur(opts.blur);\n }\n\n if (opts.grayscale) {\n img = img.grayscale();\n }\n\n if (opts.quality !== undefined) {\n img = img.quality(opts.quality);\n }\n\n if (opts.format) {\n img = img.format(opts.format);\n }\n\n return img;\n }\n\n /\n Check if any transforms are queued\n * @internal\n /\n protected hasTransforms(): boolean {\n return this._transformConfig !== undefined \|\| Object.keys(this._imageOptions).length > 0;\n }\n\n /\n Resolve storage instance to use\n * @internal\n /\n protected resolveStorage(driver?: StorageDriverName): ScopedStorage \| typeof storage {\n if (driver) {\n return storage.use(driver) as ScopedStorage;\n }\n\n return this._storage \|\| storage;\n }\n\n /\n Resolve the filename based on options and config\n * @internal\n /\n protected resolveFilename(options?: SaveOptions): string {\n const namingStrategy: FileNamingStrategy = options?.name ?? uploadsConfig(\"name\") ?? \"random\";\n let baseName: string;\n\n if (namingStrategy === \"original\") {\n baseName = path.basename(this.name, path.extname(this.name));\n } else if (namingStrategy === \"random\") {\n const length = uploadsConfig(\"randomLength\");\n baseName = Random.string(length);\n } else {\n // Custom name - strip extension if provided, we'll add it\n baseName = path.basename(namingStrategy, path.extname(namingStrategy));\n }\n\n // Get extension (may be changed by format transform)\n const ext = this.getFinalExtension();\n\n return `${baseName}.${ext}`;\n }\n\n /\n Resolve prefix based on options and config\n * @internal\n /\n protected resolvePrefix(prefix?: PrefixConfig): string {\n // No prefix\n if (prefix === false \|\| prefix === undefined) {\n const configPrefix = uploadsConfig(\"prefix\");\n if (!configPrefix) {\n return \"\";\n }\n // Use config prefix if no explicit prefix provided\n prefix = configPrefix;\n }\n\n // Boolean true = use default format\n if (prefix === true) {\n const format = uploadsConfig(\"defaultPrefixFormat\")!;\n return this.formatDatePrefix(format, \"file\");\n }\n\n // String = static prefix\n if (typeof prefix === \"string\") {\n return prefix;\n }\n\n // PrefixOptions object\n const parts: string[] = [];\n\n // Add date format if specified\n if (prefix.format) {\n parts.push(this.formatDate(prefix.format));\n }\n\n // Add random string if specified\n if (prefix.randomLength) {\n parts.push(Random.string(prefix.randomLength));\n }\n\n const combined = parts.join(\"-\");\n const as = prefix.as ?? \"file\";\n\n if (as === \"directory\") {\n return combined ? `${combined}/` : \"\";\n }\n\n return combined ? `${combined}-` : \"\";\n }\n\n /\n Format a date prefix with the given format\n * @internal\n /\n protected formatDatePrefix(format: string, as: \"file\" \| \"directory\"): string {\n const formatted = this.formatDate(format);\n return as === \"directory\" ? `${formatted}/` : `${formatted}-`;\n }\n\n /\n Format current date using token-based format string\n * @internal\n /\n protected formatDate(format: string): string {\n return dayjs().format(format);\n }\n\n /\n Build final location from directory, prefix, and filename\n * @internal\n /\n protected buildLocation(directory: string, prefix: string, filename: string): string {\n // Clean up directory (remove trailing slash)\n const dir = directory.replace(/\\/$/, \"\");\n\n // If prefix ends with /, it's a directory\n if (prefix.endsWith(\"/\")) {\n return `${dir}/${prefix}${filename}`;\n }\n\n // Otherwise prefix is part of filename\n return `${dir}/${prefix}${filename}`;\n }\n\n /\n Get final extension (accounting for format changes)\n * @internal\n /\n protected getFinalExtension(): string {\n if (this._imageOptions.format) {\n // Map formats to extensions\n const format = this._imageOptions.format;\n\n if (format === \"jpeg\") return \"jpg\";\n\n return format;\n }\n\n return this.extension;\n }\n\n /\n Get final MIME type (accounting for format changes)\n * @internal\n /\n protected getFinalMimeType(): string {\n if (this._imageOptions.format) {\n const format = this._imageOptions.format;\n\n if (format === \"jpeg\" \|\| format === \"jpg\") return \"image/jpeg\";\n\n return `image/${format}`;\n }\n\n return this.mimeType;\n }\n\n /\n Adjust location to use correct extension if format changed\n * @internal\n /\n protected adjustLocationForFormat(location: string): string {\n if (!this._imageOptions.format) {\n return location;\n }\n\n const ext = this.getFinalExtension();\n const currentExt = path.extname(location);\n\n if (currentExt) {\n return location.replace(currentExt, `.${ext}`);\n }\n\n return `${location}.${ext}`;\n }\n\n // ============================================================\n // Serialization\n // ============================================================\n\n /\n Convert to JSON representation.\n \n Synchronous, and that is the whole point. `toJSON` is not an ordinary\n * method name — it is the hook `JSON.stringify` calls, and `JSON.stringify`\n * does not await. While this was `async`, every implicit serialization of an\n * upload produced `{}`: no base64, no size, not even the filename.\n \n Two call sites in core awaited it and worked (`http/response.ts:304`,\n * `utils/to-json.ts:9`). The ones that could not were the ones that mattered:\n * `cascade`'s model serializer calls `toJSON()` without awaiting, and\n * `Resource.toJSON()` is itself synchronous. Those paths were silently\n * broken. See canon `cd60b894`.\n \n What is NOT here, and why. `base64` forced the async — `buffer()` is\n * async — and it also put the entire file, inflated by a third, into any\n * response that happened to carry an upload. It is opt-in now via\n * {@link UploadedFile.toBase64}. `dimensions` costs an image decode; ask for\n * it with {@link UploadedFile.dimensions} when you want it.\n \n `size` is reported only when the file has already been read. Reading it\n * here would make the method async again, and guessing would be worse than\n * omitting: a wrong number is believed, an absent one is asked about. In\n * practice validation or `save()` has usually buffered the file long before\n * anything serializes it.\n /\n public toJSON(): UploadedFileJson {\n return {\n name: this.name,\n mimeType: this.mimeType,\n extension: this.extension,\n isImage: this.isImage,\n isVideo: this.isVideo,\n isAudio: this.isAudio,\n size: this.bufferedFileContent?.length,\n };\n }\n\n /\n The file's contents as base64.\n \n Explicit because it is expensive: it reads the whole file into memory and\n * grows it by a third. This used to happen on every serialization.\n */\n public async toBase64(): Promise<string> {\n return (await this.buffer()).toString(\"base64\");\n }\n}\n"],"mappings":"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"}

package/esm/http/uploads/detect-image-format.mjs CHANGED Viewed

@@ -1,4 +1,4 @@
-//#region ../core/src/http/uploads/detect-image-format.ts
+//#region ../../packages/core/src/http/uploads/detect-image-format.ts
 /**
 * Bytes `detectImageFormat` needs to see
 */

package/esm/http/uploads/detect-image-format.mjs.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"detect-image-format.mjs","names":[],"sources":["~~../../../../../../../../~~core/src/http/uploads/detect-image-format.ts"],"sourcesContent":["import type { DetectedImageFormat, VariantSourceFormat } from \"./image-variant-types\";\n\n/*\n Bytes `detectImageFormat` needs to see\n /\nexport const IMAGE_SIGNATURE_BYTES = 512;\n\nfunction startsWith(buffer: Buffer, signature: number[], offset = 0): boolean {\n return signature.every((byte, index) => buffer[offset + index] === byte);\n}\n\nfunction ascii(buffer: Buffer, start: number, end: number): string {\n return buffer.subarray(start, end).toString(\"latin1\");\n}\n\n/\n Detect an image format from its magic bytes, never from the file name.\n \n Recognises the variant sources (jpeg, png, webp, still avif) and the formats\n * that are refused but worth naming (gif, svg). An animated avif sequence\n * (`avis` brand) is not reported as avif.\n \n @returns the format, or `undefined` for anything else\n /\nexport function detectImageFormat(buffer: Buffer): DetectedImageFormat \| undefined {\n if (startsWith(buffer, [0xff, 0xd8, 0xff])) return \"jpeg\";\n\n if (startsWith(buffer, [0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a])) return \"png\";\n\n if (ascii(buffer, 0, 4) === \"RIFF\" && ascii(buffer, 8, 12) === \"WEBP\") return \"webp\";\n\n if (ascii(buffer, 0, 6) === \"GIF87a\" \|\| ascii(buffer, 0, 6) === \"GIF89a\") return \"gif\";\n\n if (ascii(buffer, 4, 8) === \"ftyp\" && ascii(buffer, 8, 12) === \"avif\") return \"avif\";\n\n const head = buffer\n .subarray(0, IMAGE_SIGNATURE_BYTES)\n .toString(\"utf8\")\n .replace(/^/, \"\")\n .trimStart()\n .toLowerCase();\n\n if (head.startsWith(\"<svg\") \|\| (head.startsWith(\"<?xml\") && head.includes(\"<svg\"))) return \"svg\";\n\n return undefined;\n}\n\nconst VARIANT_SOURCE_FORMATS: readonly DetectedImageFormat[] = [\"jpeg\", \"png\", \"webp\", \"avif\"];\n\n/\n Whether a detected format can be the source of a variant. gif is refused\n * (animation is ambiguous) and svg is refused (not a raster).\n */\nexport function isVariantSourceFormat(\n format: DetectedImageFormat \| undefined,\n): format is VariantSourceFormat {\n return format !== undefined && VARIANT_SOURCE_FORMATS.includes(format);\n}\n"],"mappings":";;;;AAKA,MAAa,wBAAwB;AAErC,SAAS,WAAW,QAAgB,WAAqB,SAAS,GAAY;CAC5E,OAAO,UAAU,OAAO,MAAM,UAAU,OAAO,SAAS,WAAW,IAAI;AACzE;AAEA,SAAS,MAAM,QAAgB,OAAe,KAAqB;CACjE,OAAO,OAAO,SAAS,OAAO,GAAG,CAAC,CAAC,SAAS,QAAQ;AACtD;;;;;;;;;;AAWA,SAAgB,kBAAkB,QAAiD;CACjF,IAAI,WAAW,QAAQ;EAAC;EAAM;EAAM;CAAI,CAAC,GAAG,OAAO;CAEnD,IAAI,WAAW,QAAQ;EAAC;EAAM;EAAM;EAAM;EAAM;EAAM;EAAM;EAAM;CAAI,CAAC,GAAG,OAAO;CAEjF,IAAI,MAAM,QAAQ,GAAG,CAAC,MAAM,UAAU,MAAM,QAAQ,GAAG,EAAE,MAAM,QAAQ,OAAO;CAE9E,IAAI,MAAM,QAAQ,GAAG,CAAC,MAAM,YAAY,MAAM,QAAQ,GAAG,CAAC,MAAM,UAAU,OAAO;CAEjF,IAAI,MAAM,QAAQ,GAAG,CAAC,MAAM,UAAU,MAAM,QAAQ,GAAG,EAAE,MAAM,QAAQ,OAAO;CAE9E,MAAM,OAAO,OACV,SAAS,MAAwB,CAAC,CAClC,SAAS,MAAM,CAAC,CAChB,QAAQ,MAAM,EAAE,CAAC,CACjB,UAAU,CAAC,CACX,YAAY;CAEf,IAAI,KAAK,WAAW,MAAM,KAAM,KAAK,WAAW,OAAO,KAAK,KAAK,SAAS,MAAM,GAAI,OAAO;AAG7F;AAEA,MAAM,yBAAyD;CAAC;CAAQ;CAAO;CAAQ;AAAM;;;;;AAM7F,SAAgB,sBACd,QAC+B;CAC/B,OAAO,WAAW,UAAa,uBAAuB,SAAS,MAAM;AACvE"}
1	+ {"version":3,"file":"detect-image-format.mjs","names":[],"sources":["../../../../../../../../../packages/core/src/http/uploads/detect-image-format.ts"],"sourcesContent":["import type { DetectedImageFormat, VariantSourceFormat } from \"./image-variant-types\";\n\n/*\n Bytes `detectImageFormat` needs to see\n /\nexport const IMAGE_SIGNATURE_BYTES = 512;\n\nfunction startsWith(buffer: Buffer, signature: number[], offset = 0): boolean {\n return signature.every((byte, index) => buffer[offset + index] === byte);\n}\n\nfunction ascii(buffer: Buffer, start: number, end: number): string {\n return buffer.subarray(start, end).toString(\"latin1\");\n}\n\n/\n Detect an image format from its magic bytes, never from the file name.\n \n Recognises the variant sources (jpeg, png, webp, still avif) and the formats\n * that are refused but worth naming (gif, svg). An animated avif sequence\n * (`avis` brand) is not reported as avif.\n \n @returns the format, or `undefined` for anything else\n /\nexport function detectImageFormat(buffer: Buffer): DetectedImageFormat \| undefined {\n if (startsWith(buffer, [0xff, 0xd8, 0xff])) return \"jpeg\";\n\n if (startsWith(buffer, [0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a])) return \"png\";\n\n if (ascii(buffer, 0, 4) === \"RIFF\" && ascii(buffer, 8, 12) === \"WEBP\") return \"webp\";\n\n if (ascii(buffer, 0, 6) === \"GIF87a\" \|\| ascii(buffer, 0, 6) === \"GIF89a\") return \"gif\";\n\n if (ascii(buffer, 4, 8) === \"ftyp\" && ascii(buffer, 8, 12) === \"avif\") return \"avif\";\n\n const head = buffer\n .subarray(0, IMAGE_SIGNATURE_BYTES)\n .toString(\"utf8\")\n .replace(/^/, \"\")\n .trimStart()\n .toLowerCase();\n\n if (head.startsWith(\"<svg\") \|\| (head.startsWith(\"<?xml\") && head.includes(\"<svg\"))) return \"svg\";\n\n return undefined;\n}\n\nconst VARIANT_SOURCE_FORMATS: readonly DetectedImageFormat[] = [\"jpeg\", \"png\", \"webp\", \"avif\"];\n\n/\n Whether a detected format can be the source of a variant. gif is refused\n * (animation is ambiguous) and svg is refused (not a raster).\n */\nexport function isVariantSourceFormat(\n format: DetectedImageFormat \| undefined,\n): format is VariantSourceFormat {\n return format !== undefined && VARIANT_SOURCE_FORMATS.includes(format);\n}\n"],"mappings":";;;;AAKA,MAAa,wBAAwB;AAErC,SAAS,WAAW,QAAgB,WAAqB,SAAS,GAAY;CAC5E,OAAO,UAAU,OAAO,MAAM,UAAU,OAAO,SAAS,WAAW,IAAI;AACzE;AAEA,SAAS,MAAM,QAAgB,OAAe,KAAqB;CACjE,OAAO,OAAO,SAAS,OAAO,GAAG,CAAC,CAAC,SAAS,QAAQ;AACtD;;;;;;;;;;AAWA,SAAgB,kBAAkB,QAAiD;CACjF,IAAI,WAAW,QAAQ;EAAC;EAAM;EAAM;CAAI,CAAC,GAAG,OAAO;CAEnD,IAAI,WAAW,QAAQ;EAAC;EAAM;EAAM;EAAM;EAAM;EAAM;EAAM;EAAM;CAAI,CAAC,GAAG,OAAO;CAEjF,IAAI,MAAM,QAAQ,GAAG,CAAC,MAAM,UAAU,MAAM,QAAQ,GAAG,EAAE,MAAM,QAAQ,OAAO;CAE9E,IAAI,MAAM,QAAQ,GAAG,CAAC,MAAM,YAAY,MAAM,QAAQ,GAAG,CAAC,MAAM,UAAU,OAAO;CAEjF,IAAI,MAAM,QAAQ,GAAG,CAAC,MAAM,UAAU,MAAM,QAAQ,GAAG,EAAE,MAAM,QAAQ,OAAO;CAE9E,MAAM,OAAO,OACV,SAAS,MAAwB,CAAC,CAClC,SAAS,MAAM,CAAC,CAChB,QAAQ,MAAM,EAAE,CAAC,CACjB,UAAU,CAAC,CACX,YAAY;CAEf,IAAI,KAAK,WAAW,MAAM,KAAM,KAAK,WAAW,OAAO,KAAK,KAAK,SAAS,MAAM,GAAI,OAAO;AAG7F;AAEA,MAAM,yBAAyD;CAAC;CAAQ;CAAO;CAAQ;AAAM;;;;;AAM7F,SAAgB,sBACd,QAC+B;CAC/B,OAAO,WAAW,UAAa,uBAAuB,SAAS,MAAM;AACvE"}

package/esm/http/uploads/generate-image-variant.mjs CHANGED Viewed

@@ -2,7 +2,7 @@ import path from "node:path";
 import { randomBytes } from "node:crypto";
 import fs from "node:fs/promises";
-//#region ../core/src/http/uploads/generate-image-variant.ts
+//#region ../../packages/core/src/http/uploads/generate-image-variant.ts
 async function fileExists(target) {
 	try {
 		await fs.access(target);

package/esm/http/uploads/generate-image-variant.mjs.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"generate-image-variant.mjs","names":[],"sources":["~~../../../../../../../../~~core/src/http/uploads/generate-image-variant.ts"],"sourcesContent":["import { randomBytes } from \"node:crypto\";\nimport fs from \"node:fs/promises\";\nimport path from \"node:path\";\nimport type { Image } from \"../../image\";\nimport type { ImageVariantDefinition } from \"../uploads-types\";\nimport type { VariantOutputFormat } from \"./image-variant-types\";\n\n/*\n Inputs of one derivative generation\n /\nexport type GenerateImageVariantOptions = {\n image: Image;\n variant: ImageVariantDefinition;\n format: VariantOutputFormat;\n targetPath: string;\n};\n\nasync function fileExists(target: string): Promise<boolean> {\n try {\n await fs.access(target);\n\n return true;\n } catch {\n return false;\n }\n}\n\n/\n Render a derivative and write it atomically.\n \n The image is written to `<target>.tmp-<random>` and then renamed onto the\n * target, so a reader sees no file or a complete one, never a partial one. On\n * any failure the temp file is removed before the error is rethrown.\n */\nexport async function generateImageVariant({\n image,\n variant,\n format,\n targetPath,\n}: GenerateImageVariantOptions): Promise<void> {\n image.resize({\n width: variant.width,\n height: variant.height,\n fit: variant.fit,\n withoutEnlargement: variant.enlarge !== true,\n });\n image.format(format);\n\n if (variant.quality !== undefined) {\n image.quality(variant.quality);\n }\n\n await fs.mkdir(path.dirname(targetPath), { recursive: true });\n\n const temporaryPath = `${targetPath}.tmp-${randomBytes(8).toString(\"hex\")}`;\n\n try {\n await image.save(temporaryPath);\n\n try {\n await fs.rename(temporaryPath, targetPath);\n } catch (error) {\n // Another process won the race and its file is being read (win32 refuses\n // to replace an open file). Same key, same bytes: theirs will do.\n if (!(await fileExists(targetPath))) throw error;\n }\n } finally {\n await fs.rm(temporaryPath, { force: true });\n }\n}\n"],"mappings":";;;;;AAiBA,eAAe,WAAW,QAAkC;CAC1D,IAAI;EACF,MAAM,GAAG,OAAO,MAAM;EAEtB,OAAO;CACT,QAAQ;EACN,OAAO;CACT;AACF;;;;;;;;AASA,eAAsB,qBAAqB,EACzC,OACA,SACA,QACA,cAC6C;CAC7C,MAAM,OAAO;EACX,OAAO,QAAQ;EACf,QAAQ,QAAQ;EAChB,KAAK,QAAQ;EACb,oBAAoB,QAAQ,YAAY;CAC1C,CAAC;CACD,MAAM,OAAO,MAAM;CAEnB,IAAI,QAAQ,YAAY,QACtB,MAAM,QAAQ,QAAQ,OAAO;CAG/B,MAAM,GAAG,MAAM,KAAK,QAAQ,UAAU,GAAG,EAAE,WAAW,KAAK,CAAC;CAE5D,MAAM,gBAAgB,GAAG,WAAW,OAAO,YAAY,CAAC,CAAC,CAAC,SAAS,KAAK;CAExE,IAAI;EACF,MAAM,MAAM,KAAK,aAAa;EAE9B,IAAI;GACF,MAAM,GAAG,OAAO,eAAe,UAAU;EAC3C,SAAS,OAAO;GAGd,IAAI,CAAE,MAAM,WAAW,UAAU,GAAI,MAAM;EAC7C;CACF,UAAU;EACR,MAAM,GAAG,GAAG,eAAe,EAAE,OAAO,KAAK,CAAC;CAC5C;AACF"}
1	+ {"version":3,"file":"generate-image-variant.mjs","names":[],"sources":["../../../../../../../../../packages/core/src/http/uploads/generate-image-variant.ts"],"sourcesContent":["import { randomBytes } from \"node:crypto\";\nimport fs from \"node:fs/promises\";\nimport path from \"node:path\";\nimport type { Image } from \"../../image\";\nimport type { ImageVariantDefinition } from \"../uploads-types\";\nimport type { VariantOutputFormat } from \"./image-variant-types\";\n\n/*\n Inputs of one derivative generation\n /\nexport type GenerateImageVariantOptions = {\n image: Image;\n variant: ImageVariantDefinition;\n format: VariantOutputFormat;\n targetPath: string;\n};\n\nasync function fileExists(target: string): Promise<boolean> {\n try {\n await fs.access(target);\n\n return true;\n } catch {\n return false;\n }\n}\n\n/\n Render a derivative and write it atomically.\n \n The image is written to `<target>.tmp-<random>` and then renamed onto the\n * target, so a reader sees no file or a complete one, never a partial one. On\n * any failure the temp file is removed before the error is rethrown.\n */\nexport async function generateImageVariant({\n image,\n variant,\n format,\n targetPath,\n}: GenerateImageVariantOptions): Promise<void> {\n image.resize({\n width: variant.width,\n height: variant.height,\n fit: variant.fit,\n withoutEnlargement: variant.enlarge !== true,\n });\n image.format(format);\n\n if (variant.quality !== undefined) {\n image.quality(variant.quality);\n }\n\n await fs.mkdir(path.dirname(targetPath), { recursive: true });\n\n const temporaryPath = `${targetPath}.tmp-${randomBytes(8).toString(\"hex\")}`;\n\n try {\n await image.save(temporaryPath);\n\n try {\n await fs.rename(temporaryPath, targetPath);\n } catch (error) {\n // Another process won the race and its file is being read (win32 refuses\n // to replace an open file). Same key, same bytes: theirs will do.\n if (!(await fileExists(targetPath))) throw error;\n }\n } finally {\n await fs.rm(temporaryPath, { force: true });\n }\n}\n"],"mappings":";;;;;AAiBA,eAAe,WAAW,QAAkC;CAC1D,IAAI;EACF,MAAM,GAAG,OAAO,MAAM;EAEtB,OAAO;CACT,QAAQ;EACN,OAAO;CACT;AACF;;;;;;;;AASA,eAAsB,qBAAqB,EACzC,OACA,SACA,QACA,cAC6C;CAC7C,MAAM,OAAO;EACX,OAAO,QAAQ;EACf,QAAQ,QAAQ;EAChB,KAAK,QAAQ;EACb,oBAAoB,QAAQ,YAAY;CAC1C,CAAC;CACD,MAAM,OAAO,MAAM;CAEnB,IAAI,QAAQ,YAAY,QACtB,MAAM,QAAQ,QAAQ,OAAO;CAG/B,MAAM,GAAG,MAAM,KAAK,QAAQ,UAAU,GAAG,EAAE,WAAW,KAAK,CAAC;CAE5D,MAAM,gBAAgB,GAAG,WAAW,OAAO,YAAY,CAAC,CAAC,CAAC,SAAS,KAAK;CAExE,IAAI;EACF,MAAM,MAAM,KAAK,aAAa;EAE9B,IAAI;GACF,MAAM,GAAG,OAAO,eAAe,UAAU;EAC3C,SAAS,OAAO;GAGd,IAAI,CAAE,MAAM,WAAW,UAAU,GAAI,MAAM;EAC7C;CACF,UAAU;EACR,MAAM,GAAG,GAAG,eAAe,EAAE,OAAO,KAAK,CAAC;CAC5C;AACF"}

package/esm/http/uploads/generate-image-variants.d.mts CHANGED Viewed

@@ -1,6 +1,6 @@
 import { GeneratedImageDescriptor } from "./image-variant-types.mjs";
-//#region ../core/src/http/uploads/generate-image-variants.d.ts
+//#region ../../packages/core/src/http/uploads/generate-image-variants.d.ts
 /**
  * Options for `generateImageVariants`
  */

package/esm/http/uploads/generate-image-variants.d.mts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"generate-image-variants.d.mts","names":[],"sources":["~~../../../../../../../../~~core/src/http/uploads/generate-image-variants.ts"],"mappings":";;;;;~~AAsBA~~;KAAY,4BAAA;;;AAKF;AA8EV;EA9EE,QAAQ;AAAA;;;;;;;;;;;;AAiFyB;;;;;;;;;;;;;;;;;;;;;iBAHb,qBAAA,CACpB,YAAA,UACA,OAAA,GAAS,4BAAA,GACR,OAAA,CAAQ,wBAAA"}
1	+ {"version":3,"file":"generate-image-variants.d.mts","names":[],"sources":["../../../../../../../../../packages/core/src/http/uploads/generate-image-variants.ts"],"mappings":";;;;;AAiCA;KAAY,4BAAA;;;AAKF;AA8EV;EA9EE,QAAQ;AAAA;;;;;;;;;;;;AAiFyB;;;;;;;;;;;;;;;;;;;;;iBAHb,qBAAA,CACpB,YAAA,UACA,OAAA,GAAS,4BAAA,GACR,OAAA,CAAQ,wBAAA"}

package/esm/http/uploads/generate-image-variants.mjs CHANGED Viewed

@@ -1,19 +1,20 @@
 import { HttpError } from "../errors/errors.mjs";
+import { uploadsConfig } from "../uploads-config.mjs";
+import { variantCacheKey, variantCachePath, variantGenerationTag, variantSourceDirectory, variantSourceKey } from "./variant-cache-key.mjs";
+import { pruneStaleVariantGenerationsIfCurrent, retryOnVanishedDirectory, warnIfVariantCacheIsPublic } from "./image-variant-cache.mjs";
 import { storage } from "../../storage/storage.mjs";
 import "../../storage/index.mjs";
 import { Image } from "../../image/image.mjs";
 import "../../image/index.mjs";
-import { uploadsConfig } from "../uploads-config.mjs";
 import { generateImageVariant } from "./generate-image-variant.mjs";
 import { ImageVariantsConfigError } from "./image-variants-config-error.mjs";
 import { loadVariantSource } from "./load-variant-source.mjs";
 import { resolveImageVariantsConfig } from "./resolve-image-variants-config.mjs";
 import { resolveVariantCandidate } from "./resolve-variant-candidate.mjs";
-import { variantCacheKey, variantCachePath } from "./variant-cache-key.mjs";
 import { variantGenerations } from "./variant-generations.mjs";
 import fs from "node:fs/promises";
-//#region ../core/src/http/uploads/generate-image-variants.ts
+//#region ../../packages/core/src/http/uploads/generate-image-variants.ts
 async function exists(target) {
 	try {
 		await fs.access(target);
@@ -91,6 +92,7 @@ async function generateImageVariants(relativePath, options = {}) {
 		expectedFormat: sourceFormat
 	});
 	const { width: sourceWidth, height: sourceHeight } = await image.metadata();
+	warnIfVariantCacheIsPublic(images.cacheDirectory);
 	const src = `/uploads/${encodeUploadsPath(source.relativePath)}`;
 	const variants = {};
 	for (const name of names) {
@@ -106,15 +108,21 @@ async function generateImageVariants(relativePath, options = {}) {
 				variant,
 				format
 			});
-			const target = variantCachePath(images.cacheDirectory, hash, format);
-			if (!await exists(target)) await variantGenerations.run(hash, async () => {
+			const sourceKey = variantSourceKey(source.root, source.relativePath);
+			const generation = variantGenerationTag(stats.size, stats.mtimeMs);
+			const target = variantCachePath(images.cacheDirectory, {
+				sourceKey,
+				generation
+			}, hash, format);
+			if (!await exists(target)) await variantGenerations.run(target, async () => {
 				if (await exists(target)) return;
-				await generateImageVariant({
+				await retryOnVanishedDirectory(() => generateImageVariant({
 					image: image.clone(),
 					variant,
 					format,
 					targetPath: target
-				});
+				}));
+				await pruneStaleVariantGenerationsIfCurrent(source.absolutePath, variantSourceDirectory(images.cacheDirectory, sourceKey), generation);
 			});
 			if (dimensions === void 0) dimensions = await readDerivativeDimensions(target);
 		}

package/esm/http/uploads/generate-image-variants.mjs.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"generate-image-variants.mjs","names":[],"sources":["../../../../../../../../core/src/http/uploads/generate-image-variants.ts"],"sourcesContent":["import fs from \"node:fs/promises\";\nimport { Image } from \"../../image\";\nimport { storage } from \"../../storage\";\nimport { HttpError } from \"../errors\";\nimport { uploadsConfig } from \"../uploads-config\";\nimport type { ImageVariantOutputFormat } from \"../uploads-types\";\nimport { generateImageVariant } from \"./generate-image-variant\";\nimport { ImageVariantsConfigError } from \"./image-variants-config-error\";\nimport type {\n GeneratedImageDescriptor,\n GeneratedImageVariant,\n VariantOutputFormat,\n} from \"./image-variant-types\";\nimport { loadVariantSource } from \"./load-variant-source\";\nimport { resolveImageVariantsConfig } from \"./resolve-image-variants-config\";\nimport { resolveVariantCandidate } from \"./resolve-variant-candidate\";\nimport { variantCacheKey, variantCachePath } from \"./variant-cache-key\";\nimport { variantGenerations } from \"./variant-generations\";\n\n/*\n Options for `generateImageVariants`\n /\nexport type GenerateImageVariantsOptions = {\n /\n Limit generation to these variant names, instead of every variant in\n * `uploads.images.variants`.\n /\n variants?: readonly string[];\n};\n\nasync function exists(target: string): Promise<boolean> {\n try {\n await fs.access(target);\n\n return true;\n } catch {\n return false;\n }\n}\n\nfunction encodeUploadsPath(relativePath: string): string {\n return relativePath.split(\"/\").map(encodeURIComponent).join(\"/\");\n}\n\nfunction variantUrl(src: string, name: string, format?: VariantOutputFormat): string {\n const query = format\n ? `variant=${encodeURIComponent(name)}&format=${format}`\n : `variant=${encodeURIComponent(name)}`;\n\n return `${src}?${query}`;\n}\n\nasync function readDerivativeDimensions(\n target: string,\n): Promise<{ width: number; height: number }> {\n const derivative = new Image(await fs.readFile(target));\n const { width, height } = await derivative.metadata();\n\n return { width: width ?? 0, height: height ?? 0 };\n}\n\n/\n Every distinct format a variant is rendered in: the source format plus\n * whatever `uploads.images.formats` adds, with duplicates dropped so a format\n * that is both the source format and an allowed format is generated once.\n /\nfunction outputFormatsFor(\n sourceFormat: VariantOutputFormat,\n configuredFormats: readonly ImageVariantOutputFormat[],\n): VariantOutputFormat[] {\n return [...new Set<VariantOutputFormat>([sourceFormat, ...configuredFormats])];\n}\n\n/\n Render every configured variant of one uploaded image, right after it is\n * saved.\n \n Uses the exact same normalized config (`uploads.images`), cache key and\n * derivative path as `uploadedFileController`, so a variant generated here is\n * already on disk the first time `GET /uploads/<path>?variant=<name>` is\n * requested — no second render. `variantGenerations` (the single-flight used\n * by the route) is reused, so a concurrent request for a variant this call is\n * still generating joins the same run instead of starting a second one.\n \n The returned descriptor is plain JSON, safe to store next to the record\n * that owns the image, or to carry through loader data. On local storage the\n * `url`/`urls` already point at `uploadedFileController`; an app serving\n * uploads from object storage or a CDN should not proxy the remote files\n * through this route at all — store the descriptor once generation runs\n * against the same bucket the CDN serves from, or resolve its URLs through a\n * custom `ImageLoader` on the client instead.\n \n @param relativePath - path of the saved upload, relative to the storage root\n * @param options.variants - limit generation to these variant names\n * @throws ImageVariantsConfigError when there is no local storage root, or\n * `uploads.images` is not configured — both are server misconfiguration, not\n * a bad request\n * @throws HttpError(400) when a name in `options.variants` is not declared in\n * `uploads.images.variants`\n * @throws HttpError(404) when `relativePath` does not resolve to a file\n * inside the storage root\n * @throws HttpError(413) when the source is over `maxSourceBytes` or\n * `maxSourcePixels`\n * @throws HttpError(415) when the source is not jpeg, png, webp or avif\n /\nexport async function generateImageVariants(\n relativePath: string,\n options: GenerateImageVariantsOptions = {},\n): Promise<GeneratedImageDescriptor> {\n const storageRoot = storage.root();\n\n if (!storageRoot \|\| storageRoot === \".\") {\n throw new ImageVariantsConfigError(\n \"generateImageVariants needs a local storage driver with a root.\",\n );\n }\n\n const images = resolveImageVariantsConfig(uploadsConfig(\"images\"), storageRoot);\n\n if (!images) {\n throw new ImageVariantsConfigError(\"uploads.images is not configured.\");\n }\n\n const names = options.variants ?? Object.keys(images.variants);\n\n for (const name of names) {\n if (!Object.prototype.hasOwnProperty.call(images.variants, name)) {\n throw new HttpError(400, `Unknown variant \"${name}\".`);\n }\n }\n\n const candidate = await resolveVariantCandidate(relativePath, storageRoot, images);\n\n if (!candidate) {\n throw new HttpError(404, \"File Not Found\");\n }\n\n const { source, stats, sourceFormat } = candidate;\n\n const image = await loadVariantSource(source.absolutePath, {\n maxSourceBytes: images.maxSourceBytes,\n maxSourcePixels: images.maxSourcePixels,\n expectedFormat: sourceFormat,\n });\n\n const { width: sourceWidth, height: sourceHeight } = await image.metadata();\n const src = `/uploads/${encodeUploadsPath(source.relativePath)}`;\n const variants: Record<string, GeneratedImageVariant> = {};\n\n for (const name of names) {\n const variant = images.variants[name];\n if (variant === undefined) {\n throw new HttpError(400, `Unknown variant \"${name}\".`);\n }\n const formats = outputFormatsFor(sourceFormat, images.formats);\n let dimensions: { width: number; height: number } \| undefined;\n\n for (const format of formats) {\n const hash = variantCacheKey({\n relativePath: source.relativePath,\n sourceSize: stats.size,\n sourceMtimeMs: stats.mtimeMs,\n variant,\n format,\n });\n const target = variantCachePath(images.cacheDirectory, hash, format);\n\n if (!(await exists(target))) {\n await variantGenerations.run(hash, async () => {\n if (await exists(target)) return;\n\n await generateImageVariant({ image: image.clone(), variant, format, targetPath: target });\n });\n }\n\n if (dimensions === undefined) {\n dimensions = await readDerivativeDimensions(target);\n }\n }\n\n const urls: Partial<Record<ImageVariantOutputFormat, string>> = {};\n\n for (const format of images.formats) {\n urls[format] = variantUrl(src, name, format);\n }\n\n variants[name] = {\n width: dimensions?.width ?? variant.width,\n height:\n dimensions?.height ??\n variant.height ??\n Math.round(variant.width ((sourceHeight ?? 1) / (sourceWidth ?? 1))),\n url: variantUrl(src, name),\n ...(Object.keys(urls).length > 0 ? { urls } : {}),\n };\n }\n\n return {\n src,\n width: sourceWidth ?? 0,\n height: sourceHeight ?? 0,\n variants,\n ...(images.formats.length > 0 ? { formats: images.formats } : {}),\n };\n}\n"],"mappings":"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"}
1	+ {"version":3,"file":"generate-image-variants.mjs","names":[],"sources":["../../../../../../../../../packages/core/src/http/uploads/generate-image-variants.ts"],"sourcesContent":["import fs from \"node:fs/promises\";\nimport { Image } from \"../../image\";\nimport { storage } from \"../../storage\";\nimport { HttpError } from \"../errors\";\nimport { uploadsConfig } from \"../uploads-config\";\nimport type { ImageVariantOutputFormat } from \"../uploads-types\";\nimport { generateImageVariant } from \"./generate-image-variant\";\nimport {\n pruneStaleVariantGenerationsIfCurrent,\n retryOnVanishedDirectory,\n warnIfVariantCacheIsPublic,\n} from \"./image-variant-cache\";\nimport { ImageVariantsConfigError } from \"./image-variants-config-error\";\nimport type {\n GeneratedImageDescriptor,\n GeneratedImageVariant,\n VariantOutputFormat,\n} from \"./image-variant-types\";\nimport { loadVariantSource } from \"./load-variant-source\";\nimport { resolveImageVariantsConfig } from \"./resolve-image-variants-config\";\nimport { resolveVariantCandidate } from \"./resolve-variant-candidate\";\nimport {\n variantCacheKey,\n variantCachePath,\n variantGenerationTag,\n variantSourceDirectory,\n variantSourceKey,\n} from \"./variant-cache-key\";\nimport { variantGenerations } from \"./variant-generations\";\n\n/*\n Options for `generateImageVariants`\n /\nexport type GenerateImageVariantsOptions = {\n /\n Limit generation to these variant names, instead of every variant in\n * `uploads.images.variants`.\n /\n variants?: readonly string[];\n};\n\nasync function exists(target: string): Promise<boolean> {\n try {\n await fs.access(target);\n\n return true;\n } catch {\n return false;\n }\n}\n\nfunction encodeUploadsPath(relativePath: string): string {\n return relativePath.split(\"/\").map(encodeURIComponent).join(\"/\");\n}\n\nfunction variantUrl(src: string, name: string, format?: VariantOutputFormat): string {\n const query = format\n ? `variant=${encodeURIComponent(name)}&format=${format}`\n : `variant=${encodeURIComponent(name)}`;\n\n return `${src}?${query}`;\n}\n\nasync function readDerivativeDimensions(\n target: string,\n): Promise<{ width: number; height: number }> {\n const derivative = new Image(await fs.readFile(target));\n const { width, height } = await derivative.metadata();\n\n return { width: width ?? 0, height: height ?? 0 };\n}\n\n/\n Every distinct format a variant is rendered in: the source format plus\n * whatever `uploads.images.formats` adds, with duplicates dropped so a format\n * that is both the source format and an allowed format is generated once.\n /\nfunction outputFormatsFor(\n sourceFormat: VariantOutputFormat,\n configuredFormats: readonly ImageVariantOutputFormat[],\n): VariantOutputFormat[] {\n return [...new Set<VariantOutputFormat>([sourceFormat, ...configuredFormats])];\n}\n\n/\n Render every configured variant of one uploaded image, right after it is\n * saved.\n \n Uses the exact same normalized config (`uploads.images`), cache key and\n * derivative path as `uploadedFileController`, so a variant generated here is\n * already on disk the first time `GET /uploads/<path>?variant=<name>` is\n * requested — no second render. `variantGenerations` (the single-flight used\n * by the route) is reused, so a concurrent request for a variant this call is\n * still generating joins the same run instead of starting a second one.\n \n The returned descriptor is plain JSON, safe to store next to the record\n * that owns the image, or to carry through loader data. On local storage the\n * `url`/`urls` already point at `uploadedFileController`; an app serving\n * uploads from object storage or a CDN should not proxy the remote files\n * through this route at all — store the descriptor once generation runs\n * against the same bucket the CDN serves from, or resolve its URLs through a\n * custom `ImageLoader` on the client instead.\n \n @param relativePath - path of the saved upload, relative to the storage root\n * @param options.variants - limit generation to these variant names\n * @throws ImageVariantsConfigError when there is no local storage root, or\n * `uploads.images` is not configured — both are server misconfiguration, not\n * a bad request\n * @throws HttpError(400) when a name in `options.variants` is not declared in\n * `uploads.images.variants`\n * @throws HttpError(404) when `relativePath` does not resolve to a file\n * inside the storage root\n * @throws HttpError(413) when the source is over `maxSourceBytes` or\n * `maxSourcePixels`\n * @throws HttpError(415) when the source is not jpeg, png, webp or avif\n /\nexport async function generateImageVariants(\n relativePath: string,\n options: GenerateImageVariantsOptions = {},\n): Promise<GeneratedImageDescriptor> {\n const storageRoot = storage.root();\n\n if (!storageRoot \|\| storageRoot === \".\") {\n throw new ImageVariantsConfigError(\n \"generateImageVariants needs a local storage driver with a root.\",\n );\n }\n\n const images = resolveImageVariantsConfig(uploadsConfig(\"images\"), storageRoot);\n\n if (!images) {\n throw new ImageVariantsConfigError(\"uploads.images is not configured.\");\n }\n\n const names = options.variants ?? Object.keys(images.variants);\n\n for (const name of names) {\n if (!Object.prototype.hasOwnProperty.call(images.variants, name)) {\n throw new HttpError(400, `Unknown variant \"${name}\".`);\n }\n }\n\n const candidate = await resolveVariantCandidate(relativePath, storageRoot, images);\n\n if (!candidate) {\n throw new HttpError(404, \"File Not Found\");\n }\n\n const { source, stats, sourceFormat } = candidate;\n\n const image = await loadVariantSource(source.absolutePath, {\n maxSourceBytes: images.maxSourceBytes,\n maxSourcePixels: images.maxSourcePixels,\n expectedFormat: sourceFormat,\n });\n\n const { width: sourceWidth, height: sourceHeight } = await image.metadata();\n warnIfVariantCacheIsPublic(images.cacheDirectory);\n\n const src = `/uploads/${encodeUploadsPath(source.relativePath)}`;\n const variants: Record<string, GeneratedImageVariant> = {};\n\n for (const name of names) {\n const variant = images.variants[name];\n if (variant === undefined) {\n throw new HttpError(400, `Unknown variant \"${name}\".`);\n }\n const formats = outputFormatsFor(sourceFormat, images.formats);\n let dimensions: { width: number; height: number } \| undefined;\n\n for (const format of formats) {\n const hash = variantCacheKey({\n relativePath: source.relativePath,\n sourceSize: stats.size,\n sourceMtimeMs: stats.mtimeMs,\n variant,\n format,\n });\n const sourceKey = variantSourceKey(source.root, source.relativePath);\n const generation = variantGenerationTag(stats.size, stats.mtimeMs);\n const target = variantCachePath(\n images.cacheDirectory,\n { sourceKey, generation },\n hash,\n format,\n );\n\n if (!(await exists(target))) {\n // keyed on the target, which includes the disk root (see resolveImageVariant)\n await variantGenerations.run(target, async () => {\n if (await exists(target)) return;\n\n await retryOnVanishedDirectory(() =>\n generateImageVariant({ image: image.clone(), variant, format, targetPath: target }),\n );\n await pruneStaleVariantGenerationsIfCurrent(\n source.absolutePath,\n variantSourceDirectory(images.cacheDirectory, sourceKey),\n generation,\n );\n });\n }\n\n if (dimensions === undefined) {\n dimensions = await readDerivativeDimensions(target);\n }\n }\n\n const urls: Partial<Record<ImageVariantOutputFormat, string>> = {};\n\n for (const format of images.formats) {\n urls[format] = variantUrl(src, name, format);\n }\n\n variants[name] = {\n width: dimensions?.width ?? variant.width,\n height:\n dimensions?.height ??\n variant.height ??\n Math.round(variant.width ((sourceHeight ?? 1) / (sourceWidth ?? 1))),\n url: variantUrl(src, name),\n ...(Object.keys(urls).length > 0 ? { urls } : {}),\n };\n }\n\n return {\n src,\n width: sourceWidth ?? 0,\n height: sourceHeight ?? 0,\n variants,\n ...(images.formats.length > 0 ? { formats: images.formats } : {}),\n };\n}\n"],"mappings":"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"}

package/esm/http/uploads/image-variant-cache.mjs ADDED Viewed

@@ -0,0 +1,143 @@
+import { rootPath } from "../../utils/paths.mjs";
+import { uploadsConfig } from "../uploads-config.mjs";
+import { isPathInside } from "./is-path-inside.mjs";
+import { variantGenerationTag, variantSourceDirectory, variantSourceKey } from "./variant-cache-key.mjs";
+import config from "@mongez/config";
+import { log } from "@warlock.js/logger";
+import path from "node:path";
+import fs from "node:fs/promises";
+//#region ../../packages/core/src/http/uploads/image-variant-cache.ts
+async function realpathOrSelf(target) {
+	try {
+		return await fs.realpath(target);
+	} catch {
+		return target;
+	}
+}
+/**
+* The derivative cache directory for a local disk: `uploads.images.cacheDirectory`
+* when the app sets one (shared by every disk; derivatives are keyed by the
+* disk's real root, so they never collide), otherwise
+* `<diskRoot>/.cache/image-variants`. The same rule as
+* `resolveImageVariantsConfig`.
+*/
+function variantCacheDirectoryFor(diskRoot) {
+	const configured = uploadsConfig("images")?.cacheDirectory;
+	return configured ? path.resolve(configured) : path.join(path.resolve(diskRoot), ".cache", "image-variants");
+}
+/**
+* The directory holding every derivative of one file on a local disk, or
+* `undefined` when the file is not inside the disk root. The file does not
+* need to exist any more: only its parent directory is resolved through
+* symlinks, exactly as `resolveUploadPath` resolved it when the derivative
+* was made.
+*/
+async function variantSourceDirectoryForFile(diskRoot, absolutePath) {
+	const realRoot = await realpathOrSelf(path.resolve(diskRoot));
+	const realParent = await realpathOrSelf(path.dirname(path.resolve(absolutePath)));
+	const realPath = path.join(realParent, path.basename(absolutePath));
+	if (!isPathInside(realPath, realRoot)) return void 0;
+	const relativePath = path.relative(realRoot, realPath).split(path.sep).join("/");
+	return variantSourceDirectory(variantCacheDirectoryFor(diskRoot), variantSourceKey(realRoot, relativePath));
+}
+/**
+* Remove every cached derivative of one file on a local disk.
+*
+* @returns `true` when a cache directory for the file existed and was removed
+*/
+async function purgeImageVariantsOfFile(diskRoot, absolutePath) {
+	const directory = await variantSourceDirectoryForFile(diskRoot, absolutePath);
+	if (!directory) return false;
+	try {
+		await fs.access(directory);
+	} catch {
+		return false;
+	}
+	await fs.rm(directory, {
+		recursive: true,
+		force: true
+	});
+	return true;
+}
+/**
+* Remove derivatives made from older versions of a source (a different size
+* or mtime), keeping only the `keep` generation. Called after a derivative of
+* the current version has been written, so a source rewritten in place does
+* not leave its old derivatives behind.
+*/
+async function pruneStaleVariantGenerations(sourceDirectory, keep) {
+	let entries;
+	try {
+		entries = await fs.readdir(sourceDirectory);
+	} catch {
+		return;
+	}
+	await Promise.all(entries.filter((entry) => entry !== keep).map((entry) => fs.rm(path.join(sourceDirectory, entry), {
+		recursive: true,
+		force: true
+	})));
+}
+/**
+* {@link pruneStaleVariantGenerations}, but only while `keep` is still the
+* source's current generation.
+*
+* A request that read the source before it was rewritten renders an old
+* generation; if it pruned afterwards it would delete the derivatives of the
+* newer version another request had just written. Re-reading the source's
+* size and mtime right before pruning keeps a stale request from doing that.
+*/
+async function pruneStaleVariantGenerationsIfCurrent(sourceAbsolutePath, sourceDirectory, keep) {
+	let current;
+	try {
+		const stats = await fs.stat(sourceAbsolutePath);
+		current = variantGenerationTag(stats.size, stats.mtimeMs);
+	} catch {
+		return;
+	}
+	if (current !== keep) return;
+	await pruneStaleVariantGenerations(sourceDirectory, keep);
+}
+/**
+* True for "no such file or directory"
+*/
+function isMissingFileError(error) {
+	return error?.code === "ENOENT";
+}
+/**
+* Run a derivative write, once more if it fails because its directory
+* vanished: a concurrent request for a newer version of the source may prune
+* the generation directory between `mkdir` and the atomic rename.
+*/
+async function retryOnVanishedDirectory(write) {
+	try {
+		await write();
+	} catch (error) {
+		if (!isMissingFileError(error)) throw error;
+		await write();
+	}
+}
+let warnedPublicCache = false;
+/**
+* Warn once when the derivative cache sits inside the public folder.
+*
+* A configured `uploads.images.cacheDirectory` is shared by every local disk,
+* so derivatives of a private disk land beside public ones. Inside
+* `public/` (or `storage.publicRoot`) they are served to anyone, bypassing
+* whatever guards the private disk's own route. The paths are hashes, but
+* they are derived from the disk root and the file path, which are not
+* secret.
+*/
+function warnIfVariantCacheIsPublic(cacheDirectory) {
+	if (warnedPublicCache) return;
+	const configured = config.get("storage.publicRoot", rootPath("public"));
+	const publicRoots = (Array.isArray(configured) ? configured : [configured]).filter((root) => typeof root === "string" && root.length > 0).map((root) => path.resolve(root));
+	const resolved = path.resolve(cacheDirectory);
+	if (!publicRoots.some((root) => resolved === root || isPathInside(resolved, root))) return;
+	warnedPublicCache = true;
+	log.warn("uploads", "image-variants", `The image variant cache (${resolved}) is inside the public folder, so every cached derivative, private disks included, is publicly served. Move uploads.images.cacheDirectory outside public/.`);
+}
+//#endregion
+export { isMissingFileError, pruneStaleVariantGenerationsIfCurrent, purgeImageVariantsOfFile, retryOnVanishedDirectory, variantCacheDirectoryFor, warnIfVariantCacheIsPublic };
+//# sourceMappingURL=image-variant-cache.mjs.map

package/esm/http/uploads/image-variant-cache.mjs.map ADDED Viewed

@@ -0,0 +1 @@

+ {"version":3,"file":"image-variant-cache.mjs","names":[],"sources":["../../../../../../../../../packages/core/src/http/uploads/image-variant-cache.ts"],"sourcesContent":["import config from \"@mongez/config\";\nimport { log } from \"@warlock.js/logger\";\nimport fs from \"node:fs/promises\";\nimport path from \"node:path\";\nimport { rootPath } from \"../../utils/paths\";\nimport { uploadsConfig } from \"../uploads-config\";\nimport { isPathInside } from \"./is-path-inside\";\nimport {\n variantGenerationTag,\n variantSourceDirectory,\n variantSourceKey,\n} from \"./variant-cache-key\";\n\n/*\n * Cache housekeeping for image derivatives. Deliberately free of any\n * `storage` import: the local storage driver calls into this module when it\n * deletes or moves a file, and storage must not import back into the HTTP\n * layer that already imports storage.\n */\n\nasync function realpathOrSelf(target: string): Promise<string> {\n try {\n return await fs.realpath(target);\n } catch {\n return target;\n }\n}\n\n/**\n * The derivative cache directory for a local disk: `uploads.images.cacheDirectory`\n * when the app sets one (shared by every disk; derivatives are keyed by the\n * disk's real root, so they never collide), otherwise\n * `<diskRoot>/.cache/image-variants`. The same rule as\n * `resolveImageVariantsConfig`.\n */\nexport function variantCacheDirectoryFor(diskRoot: string): string {\n const configured = uploadsConfig(\"images\")?.cacheDirectory;\n\n return configured\n ? path.resolve(configured)\n : path.join(path.resolve(diskRoot), \".cache\", \"image-variants\");\n}\n\n/**\n * The directory holding every derivative of one file on a local disk, or\n * `undefined` when the file is not inside the disk root. The file does not\n * need to exist any more: only its parent directory is resolved through\n * symlinks, exactly as `resolveUploadPath` resolved it when the derivative\n * was made.\n */\nexport async function variantSourceDirectoryForFile(\n diskRoot: string,\n absolutePath: string,\n): Promise<string | undefined> {\n const realRoot = await realpathOrSelf(path.resolve(diskRoot));\n const realParent = await realpathOrSelf(path.dirname(path.resolve(absolutePath)));\n const realPath = path.join(realParent, path.basename(absolutePath));\n\n if (!isPathInside(realPath, realRoot)) return undefined;\n\n const relativePath = path.relative(realRoot, realPath).split(path.sep).join(\"/\");\n\n return variantSourceDirectory(\n variantCacheDirectoryFor(diskRoot),\n variantSourceKey(realRoot, relativePath),\n );\n}\n\n/**\n * Remove every cached derivative of one file on a local disk.\n *\n * @returns `true` when a cache directory for the file existed and was removed\n */\nexport async function purgeImageVariantsOfFile(\n diskRoot: string,\n absolutePath: string,\n): Promise<boolean> {\n const directory = await variantSourceDirectoryForFile(diskRoot, absolutePath);\n\n if (!directory) return false;\n\n try {\n await fs.access(directory);\n } catch {\n return false;\n }\n\n await fs.rm(directory, { recursive: true, force: true });\n\n return true;\n}\n\n/**\n * Remove derivatives made from older versions of a source (a different size\n * or mtime), keeping only the `keep` generation. Called after a derivative of\n * the current version has been written, so a source rewritten in place does\n * not leave its old derivatives behind.\n */\nexport async function pruneStaleVariantGenerations(\n sourceDirectory: string,\n keep: string,\n): Promise<void> {\n let entries: string[];\n\n try {\n entries = await fs.readdir(sourceDirectory);\n } catch {\n return;\n }\n\n await Promise.all(\n entries\n .filter((entry) => entry !== keep)\n .map((entry) => fs.rm(path.join(sourceDirectory, entry), { recursive: true, force: true })),\n );\n}\n\n/**\n * {@link pruneStaleVariantGenerations}, but only while `keep` is still the\n * source's current generation.\n *\n * A request that read the source before it was rewritten renders an old\n * generation; if it pruned afterwards it would delete the derivatives of the\n * newer version another request had just written. Re-reading the source's\n * size and mtime right before pruning keeps a stale request from doing that.\n */\nexport async function pruneStaleVariantGenerationsIfCurrent(\n sourceAbsolutePath: string,\n sourceDirectory: string,\n keep: string,\n): Promise<void> {\n let current: string;\n\n try {\n const stats = await fs.stat(sourceAbsolutePath);\n current = variantGenerationTag(stats.size, stats.mtimeMs);\n } catch {\n // the source is gone; its derivatives are purged by the delete itself\n return;\n }\n\n if (current !== keep) return;\n\n await pruneStaleVariantGenerations(sourceDirectory, keep);\n}\n\n/**\n * True for \"no such file or directory\"\n */\nexport function isMissingFileError(error: unknown): boolean {\n return (error as NodeJS.ErrnoException | undefined)?.code === \"ENOENT\";\n}\n\n/**\n * Run a derivative write, once more if it fails because its directory\n * vanished: a concurrent request for a newer version of the source may prune\n * the generation directory between `mkdir` and the atomic rename.\n */\nexport async function retryOnVanishedDirectory(write: () => Promise<void>): Promise<void> {\n try {\n await write();\n } catch (error) {\n if (!isMissingFileError(error)) throw error;\n\n await write();\n }\n}\n\nlet warnedPublicCache = false;\n\n/**\n * Warn once when the derivative cache sits inside the public folder.\n *\n * A configured `uploads.images.cacheDirectory` is shared by every local disk,\n * so derivatives of a private disk land beside public ones. Inside\n * `public/` (or `storage.publicRoot`) they are served to anyone, bypassing\n * whatever guards the private disk's own route. The paths are hashes, but\n * they are derived from the disk root and the file path, which are not\n * secret.\n */\nexport function warnIfVariantCacheIsPublic(cacheDirectory: string): void {\n if (warnedPublicCache) return;\n\n const configured = config.get(\"storage.publicRoot\", rootPath(\"public\")) as unknown;\n const publicRoots = (Array.isArray(configured) ? configured : [configured])\n .filter((root): root is string => typeof root === \"string\" && root.length > 0)\n .map((root) => path.resolve(root));\n const resolved = path.resolve(cacheDirectory);\n\n if (!publicRoots.some((root) => resolved === root || isPathInside(resolved, root))) return;\n\n warnedPublicCache = true;\n log.warn(\n \"uploads\",\n \"image-variants\",\n `The image variant cache (${resolved}) is inside the public folder, so every cached derivative, private disks included, is publicly served. Move uploads.images.cacheDirectory outside public/.`,\n );\n}\n\n/**\n * Forget that the public-cache warning was shown (tests).\n */\nexport function resetVariantCacheWarnings(): void {\n warnedPublicCache = false;\n}\n"],"mappings":";;;;;;;;;;AAoBA,eAAe,eAAe,QAAiC;CAC7D,IAAI;EACF,OAAO,MAAM,GAAG,SAAS,MAAM;CACjC,QAAQ;EACN,OAAO;CACT;AACF;;;;;;;;AASA,SAAgB,yBAAyB,UAA0B;CACjE,MAAM,aAAa,cAAc,QAAQ,CAAC,EAAE;CAE5C,OAAO,aACH,KAAK,QAAQ,UAAU,IACvB,KAAK,KAAK,KAAK,QAAQ,QAAQ,GAAG,UAAU,gBAAgB;AAClE;;;;;;;;AASA,eAAsB,8BACpB,UACA,cAC6B;CAC7B,MAAM,WAAW,MAAM,eAAe,KAAK,QAAQ,QAAQ,CAAC;CAC5D,MAAM,aAAa,MAAM,eAAe,KAAK,QAAQ,KAAK,QAAQ,YAAY,CAAC,CAAC;CAChF,MAAM,WAAW,KAAK,KAAK,YAAY,KAAK,SAAS,YAAY,CAAC;CAElE,IAAI,CAAC,aAAa,UAAU,QAAQ,GAAG,OAAO;CAE9C,MAAM,eAAe,KAAK,SAAS,UAAU,QAAQ,CAAC,CAAC,MAAM,KAAK,GAAG,CAAC,CAAC,KAAK,GAAG;CAE/E,OAAO,uBACL,yBAAyB,QAAQ,GACjC,iBAAiB,UAAU,YAAY,CACzC;AACF;;;;;;AAOA,eAAsB,yBACpB,UACA,cACkB;CAClB,MAAM,YAAY,MAAM,8BAA8B,UAAU,YAAY;CAE5E,IAAI,CAAC,WAAW,OAAO;CAEvB,IAAI;EACF,MAAM,GAAG,OAAO,SAAS;CAC3B,QAAQ;EACN,OAAO;CACT;CAEA,MAAM,GAAG,GAAG,WAAW;EAAE,WAAW;EAAM,OAAO;CAAK,CAAC;CAEvD,OAAO;AACT;;;;;;;AAQA,eAAsB,6BACpB,iBACA,MACe;CACf,IAAI;CAEJ,IAAI;EACF,UAAU,MAAM,GAAG,QAAQ,eAAe;CAC5C,QAAQ;EACN;CACF;CAEA,MAAM,QAAQ,IACZ,QACG,QAAQ,UAAU,UAAU,IAAI,CAAC,CACjC,KAAK,UAAU,GAAG,GAAG,KAAK,KAAK,iBAAiB,KAAK,GAAG;EAAE,WAAW;EAAM,OAAO;CAAK,CAAC,CAAC,CAC9F;AACF;;;;;;;;;;AAWA,eAAsB,sCACpB,oBACA,iBACA,MACe;CACf,IAAI;CAEJ,IAAI;EACF,MAAM,QAAQ,MAAM,GAAG,KAAK,kBAAkB;EAC9C,UAAU,qBAAqB,MAAM,MAAM,MAAM,OAAO;CAC1D,QAAQ;EAEN;CACF;CAEA,IAAI,YAAY,MAAM;CAEtB,MAAM,6BAA6B,iBAAiB,IAAI;AAC1D;;;;AAKA,SAAgB,mBAAmB,OAAyB;CAC1D,OAAQ,OAA6C,SAAS;AAChE;;;;;;AAOA,eAAsB,yBAAyB,OAA2C;CACxF,IAAI;EACF,MAAM,MAAM;CACd,SAAS,OAAO;EACd,IAAI,CAAC,mBAAmB,KAAK,GAAG,MAAM;EAEtC,MAAM,MAAM;CACd;AACF;AAEA,IAAI,oBAAoB;;;;;;;;;;;AAYxB,SAAgB,2BAA2B,gBAA8B;CACvE,IAAI,mBAAmB;CAEvB,MAAM,aAAa,OAAO,IAAI,sBAAsB,SAAS,QAAQ,CAAC;CACtE,MAAM,eAAe,MAAM,QAAQ,UAAU,IAAI,aAAa,CAAC,UAAU,EAAC,CACvE,QAAQ,SAAyB,OAAO,SAAS,YAAY,KAAK,SAAS,CAAC,CAAC,CAC7E,KAAK,SAAS,KAAK,QAAQ,IAAI,CAAC;CACnC,MAAM,WAAW,KAAK,QAAQ,cAAc;CAE5C,IAAI,CAAC,YAAY,MAAM,SAAS,aAAa,QAAQ,aAAa,UAAU,IAAI,CAAC,GAAG;CAEpF,oBAAoB;CACpB,IAAI,KACF,WACA,kBACA,4BAA4B,SAAS,2JACvC;AACF"}

package/esm/http/uploads/image-variant-types.d.mts CHANGED Viewed

@@ -1,6 +1,6 @@
 import { ImageVariantDefinition, ImageVariantOutputFormat } from "../uploads-types.mjs";
-//#region ../core/src/http/uploads/image-variant-types.d.ts
+//#region ../../packages/core/src/http/uploads/image-variant-types.d.ts
 /**
  * The `uploads.images` config after validation, with every default applied
  */

package/esm/http/uploads/image-variant-types.d.mts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"image-variant-types.d.mts","names":[],"sources":["~~../../../../../../../../~~core/src/http/uploads/image-variant-types.ts"],"mappings":";;;;;AAKA;KAAY,2BAAA;EACV,QAAA,EAAU,QAAA,CAAS,MAAA,SAAe,sBAAA;EAClC,OAAA,WAAkB,wBAAA;EAClB,cAAA;EACA,eAAA;EACA,cAAA;AAAA;;;;KAMU,mBAAA;;;;KAKA,mBAAA,GAAsB,mBAAmB;;;;KAKzC,mBAAA,GAAsB,mBAAmB;AAVrD;;;AAAA,KAeY,iBAAA;EACN,IAAA;AAAA;EACA,IAAA;EAAiB,OAAA;EAAiB,MAAA;AAAA;EAClC,IAAA;EAAiB,MAAA;AAAA;;AAR8B;AAKrD;;;;;;KAaY,qBAAA;EAX4B;;;EAetC,KAAA;EAd2B;AAU7B;;EASE,MAAA;EAUsB;;;EALtB,GAAA;EAKc;;;EAAd,IAAA,GAAO,OAAA,CAAQ,MAAA,CAAO,wBAAA;AAAA;;;;;KAOZ,wBAAA;EAAA;;;EAIV,GAAA;EAemB;;;EAVnB,KAAA;EAe2C;;;EAV3C,MAAA;EAKA;;;EAAA,QAAA,EAAU,QAAA,CAAS,MAAA,SAAe,qBAAA;EAKlC;;;EAAA,OAAA,YAAmB,wBAAA;AAAA"}
1	+ {"version":3,"file":"image-variant-types.d.mts","names":[],"sources":["../../../../../../../../../packages/core/src/http/uploads/image-variant-types.ts"],"mappings":";;;;;AAKA;KAAY,2BAAA;EACV,QAAA,EAAU,QAAA,CAAS,MAAA,SAAe,sBAAA;EAClC,OAAA,WAAkB,wBAAA;EAClB,cAAA;EACA,eAAA;EACA,cAAA;AAAA;;;;KAMU,mBAAA;;;;KAKA,mBAAA,GAAsB,mBAAmB;;;;KAKzC,mBAAA,GAAsB,mBAAmB;AAVrD;;;AAAA,KAeY,iBAAA;EACN,IAAA;AAAA;EACA,IAAA;EAAiB,OAAA;EAAiB,MAAA;AAAA;EAClC,IAAA;EAAiB,MAAA;AAAA;;AAR8B;AAKrD;;;;;;KAaY,qBAAA;EAX4B;;;EAetC,KAAA;EAd2B;AAU7B;;EASE,MAAA;EAUsB;;;EALtB,GAAA;EAKc;;;EAAd,IAAA,GAAO,OAAA,CAAQ,MAAA,CAAO,wBAAA;AAAA;;;;;KAOZ,wBAAA;EAAA;;;EAIV,GAAA;EAemB;;;EAVnB,KAAA;EAe2C;;;EAV3C,MAAA;EAKA;;;EAAA,QAAA,EAAU,QAAA,CAAS,MAAA,SAAe,qBAAA;EAKlC;;;EAAA,OAAA,YAAmB,wBAAA;AAAA"}

package/esm/http/uploads/image-variants-config-error.d.mts CHANGED Viewed

@@ -1,4 +1,4 @@
-//#region ../core/src/http/uploads/image-variants-config-error.d.ts
+//#region ../../packages/core/src/http/uploads/image-variants-config-error.d.ts
 /**
  * Thrown when the `uploads.images` configuration is invalid.
  *

package/esm/http/uploads/image-variants-config-error.d.mts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"image-variants-config-error.d.mts","names":[],"sources":["~~../../../../../../../../~~core/src/http/uploads/image-variants-config-error.ts"],"mappings":";;AAMA;;;;;cAAa,wBAAA,SAAiC,KAAK;cAC9B,OAAA;AAAA"}
1	+ {"version":3,"file":"image-variants-config-error.d.mts","names":[],"sources":["../../../../../../../../../packages/core/src/http/uploads/image-variants-config-error.ts"],"mappings":";;AAMA;;;;;cAAa,wBAAA,SAAiC,KAAK;cAC9B,OAAA;AAAA"}

package/esm/http/uploads/image-variants-config-error.mjs CHANGED Viewed

@@ -1,4 +1,4 @@
-//#region ../core/src/http/uploads/image-variants-config-error.ts
+//#region ../../packages/core/src/http/uploads/image-variants-config-error.ts
 /**
 * Thrown when the `uploads.images` configuration is invalid.
 *

package/esm/http/uploads/image-variants-config-error.mjs.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"image-variants-config-error.mjs","names":[],"sources":["~~../../../../../../../../~~core/src/http/uploads/image-variants-config-error.ts"],"sourcesContent":["/*\n Thrown when the `uploads.images` configuration is invalid.\n \n Raised the first time a variant is requested, so a bad config fails loudly\n * on the first image instead of producing unbounded or surprising derivatives.\n */\nexport class ImageVariantsConfigError extends Error {\n public constructor(message: string) {\n super(`Invalid uploads.images configuration: ${message}`);\n\n this.name = \"ImageVariantsConfigError\";\n }\n}\n"],"mappings":";;;;;;;AAMA,IAAa,2BAAb,cAA8C,MAAM;CAClD,AAAO,YAAY,SAAiB;EAClC,MAAM,yCAAyC,SAAS;EAExD,KAAK,OAAO;CACd;AACF"}
1	+ {"version":3,"file":"image-variants-config-error.mjs","names":[],"sources":["../../../../../../../../../packages/core/src/http/uploads/image-variants-config-error.ts"],"sourcesContent":["/*\n Thrown when the `uploads.images` configuration is invalid.\n \n Raised the first time a variant is requested, so a bad config fails loudly\n * on the first image instead of producing unbounded or surprising derivatives.\n */\nexport class ImageVariantsConfigError extends Error {\n public constructor(message: string) {\n super(`Invalid uploads.images configuration: ${message}`);\n\n this.name = \"ImageVariantsConfigError\";\n }\n}\n"],"mappings":";;;;;;;AAMA,IAAa,2BAAb,cAA8C,MAAM;CAClD,AAAO,YAAY,SAAiB;EAClC,MAAM,yCAAyC,SAAS;EAExD,KAAK,OAAO;CACd;AACF"}

package/esm/http/uploads/index.d.mts CHANGED Viewed

@@ -1,4 +1,6 @@
 import { DetectedImageFormat, GeneratedImageDescriptor, GeneratedImageVariant, ResolvedImageVariantsConfig, UploadedFileQuery, VariantOutputFormat, VariantSourceFormat } from "./image-variant-types.mjs";
 import { GenerateImageVariantsOptions, generateImageVariants } from "./generate-image-variants.mjs";
 import { ImageVariantsConfigError } from "./image-variants-config-error.mjs";
-import { uploadedFileController } from "./uploaded-file.controller.mjs";
+import { PurgeImageVariantsOptions, purgeImageVariants } from "./purge-image-variants.mjs";
+import { ResolveImageVariantInput, ResolvedImageVariant, resolveImageVariant } from "./resolve-image-variant.mjs";
+import { UploadedFileControllerOptions, createUploadedFileController, uploadedFileController } from "./uploaded-file.controller.mjs";

package/esm/http/uploads/index.mjs CHANGED Viewed

@@ -1,5 +1,7 @@
 import { ImageVariantsConfigError } from "./image-variants-config-error.mjs";
 import { generateImageVariants } from "./generate-image-variants.mjs";
-import { uploadedFileController } from "./uploaded-file.controller.mjs";
+import { purgeImageVariants } from "./purge-image-variants.mjs";
+import { resolveImageVariant } from "./resolve-image-variant.mjs";
+import { createUploadedFileController, uploadedFileController } from "./uploaded-file.controller.mjs";
 export {  };

package/esm/http/uploads/is-path-inside.mjs CHANGED Viewed

@@ -1,6 +1,6 @@
 import path from "node:path";
-//#region ../core/src/http/uploads/is-path-inside.ts
+//#region ../../packages/core/src/http/uploads/is-path-inside.ts
 /**
 * Whether `candidate` is strictly inside `directory` (never equal to it).
 *

package/esm/http/uploads/is-path-inside.mjs.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"is-path-inside.mjs","names":[],"sources":["~~../../../../../../../../~~core/src/http/uploads/is-path-inside.ts"],"sourcesContent":["import path from \"node:path\";\n\n/*\n Whether `candidate` is strictly inside `directory` (never equal to it).\n \n Both paths must already be absolute and resolved. The check compares against\n * `directory + path.sep`, so a sibling sharing the directory's name as a prefix\n * (`/srv/storage-evil` next to `/srv/storage`) is outside. On win32 the\n * comparison is case-insensitive, matching the filesystem.\n /\nexport function isPathInside(candidate: string, directory: string): boolean {\n const prefix = directory.endsWith(path.sep) ? directory : directory + path.sep;\n\n if (process.platform === \"win32\") {\n return candidate.toLowerCase().startsWith(prefix.toLowerCase());\n }\n\n return candidate.startsWith(prefix);\n}\n\n/\n Whether `candidate` is `directory` itself or anything inside it\n */\nexport function isPathWithin(candidate: string, directory: string): boolean {\n const same =\n process.platform === \"win32\"\n ? candidate.toLowerCase() === directory.toLowerCase()\n : candidate === directory;\n\n return same \|\| isPathInside(candidate, directory);\n}\n"],"mappings":";;;;;;;;;;;AAUA,SAAgB,aAAa,WAAmB,WAA4B;CAC1E,MAAM,SAAS,UAAU,SAAS,KAAK,GAAG,IAAI,YAAY,YAAY,KAAK;CAE3E,IAAI,QAAQ,aAAa,SACvB,OAAO,UAAU,YAAY,CAAC,CAAC,WAAW,OAAO,YAAY,CAAC;CAGhE,OAAO,UAAU,WAAW,MAAM;AACpC;;;;AAKA,SAAgB,aAAa,WAAmB,WAA4B;CAM1E,QAJE,QAAQ,aAAa,UACjB,UAAU,YAAY,MAAM,UAAU,YAAY,IAClD,cAAc,cAEL,aAAa,WAAW,SAAS;AAClD"}
1	+ {"version":3,"file":"is-path-inside.mjs","names":[],"sources":["../../../../../../../../../packages/core/src/http/uploads/is-path-inside.ts"],"sourcesContent":["import path from \"node:path\";\n\n/*\n Whether `candidate` is strictly inside `directory` (never equal to it).\n \n Both paths must already be absolute and resolved. The check compares against\n * `directory + path.sep`, so a sibling sharing the directory's name as a prefix\n * (`/srv/storage-evil` next to `/srv/storage`) is outside. On win32 the\n * comparison is case-insensitive, matching the filesystem.\n /\nexport function isPathInside(candidate: string, directory: string): boolean {\n const prefix = directory.endsWith(path.sep) ? directory : directory + path.sep;\n\n if (process.platform === \"win32\") {\n return candidate.toLowerCase().startsWith(prefix.toLowerCase());\n }\n\n return candidate.startsWith(prefix);\n}\n\n/\n Whether `candidate` is `directory` itself or anything inside it\n */\nexport function isPathWithin(candidate: string, directory: string): boolean {\n const same =\n process.platform === \"win32\"\n ? candidate.toLowerCase() === directory.toLowerCase()\n : candidate === directory;\n\n return same \|\| isPathInside(candidate, directory);\n}\n"],"mappings":";;;;;;;;;;;AAUA,SAAgB,aAAa,WAAmB,WAA4B;CAC1E,MAAM,SAAS,UAAU,SAAS,KAAK,GAAG,IAAI,YAAY,YAAY,KAAK;CAE3E,IAAI,QAAQ,aAAa,SACvB,OAAO,UAAU,YAAY,CAAC,CAAC,WAAW,OAAO,YAAY,CAAC;CAGhE,OAAO,UAAU,WAAW,MAAM;AACpC;;;;AAKA,SAAgB,aAAa,WAAmB,WAA4B;CAM1E,QAJE,QAAQ,aAAa,UACjB,UAAU,YAAY,MAAM,UAAU,YAAY,IAClD,cAAc,cAEL,aAAa,WAAW,SAAS;AAClD"}

package/esm/http/uploads/load-variant-source.mjs CHANGED Viewed

@@ -4,7 +4,7 @@ import "../../image/index.mjs";
 import { detectImageFormat } from "./detect-image-format.mjs";
 import fs from "node:fs/promises";
-//#region ../core/src/http/uploads/load-variant-source.ts
+//#region ../../packages/core/src/http/uploads/load-variant-source.ts
 /**
 * Read a variant source in full and check it before it is decoded.
 *