payload 4.0.0-internal.4cbdd50 → 4.0.0-internal.4e1f822

package/dist/uploads/getFileFromUploadInstructions.spec.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../src/uploads/getFileFromUploadInstructions.spec.ts"],"sourcesContent":["import type { PayloadRequest } from '../types/index.js'\nimport type { UploadInstructions } from './types.js'\n\nimport { randomUUID } from 'node:crypto'\nimport fs from 'node:fs'\nimport os from 'node:os'\nimport path from 'node:path'\nimport { afterEach, describe, expect, it, vi } from 'vitest'\n\nimport { HEADER_PROBE_BYTE_LENGTH } from './getFileContentRequirement.js'\nimport { getFileFromUploadInstructions } from './getFileFromUploadInstructions.js'\n\n// A minimal valid 1x1 transparent PNG, small enough that a header-only fetch gets all of it.\nconst MINIMAL_PNG = Buffer.from(\n  'iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAAAAAA6fptVAAAACklEQVR4nGMAAQAABQABDQottAAAAABJRU5ErkJggg==',\n  'base64',\n)\n\nconst createReq = (\n  handlers: Array<(...args: any[]) => any>,\n  uploadConfigOverrides: Record<string, unknown> = { mimeTypes: ['video/*'] },\n): PayloadRequest =>\n  ({\n    payload: {\n      collections: {\n        media: {\n          config: {\n            upload: {\n              disableLocalStorage: true,\n              handlers,\n              ...uploadConfigOverrides,\n            },\n          },\n        },\n      },\n      config: {\n        upload: {},\n      },\n      logger: {\n        error: vi.fn(),\n      },\n    },\n    headers: new Headers(),\n  }) as unknown as PayloadRequest\n\nconst createUploadReferenceFile = (\n  overrides: Partial<UploadInstructions['file']> = {},\n): UploadInstructions['file'] =>\n  ({\n    filename: 'video.mp4',\n    mimeType: 'video/mp4',\n    size: 18,\n    uploadReference: { key: 'media/video.mp4' },\n    ...overrides,\n  }) as UploadInstructions['file']\n\ndescribe('getFileFromUploadInstructions', () => {\n  const tempFilesToClean: string[] = []\n\n  afterEach(() => {\n    for (const filePath of tempFilesToClean) {\n      fs.rmSync(filePath, { force: true })\n    }\n    tempFilesToClean.length = 0\n    vi.clearAllMocks()\n  })\n\n  it('streams the fetched file to a temp file instead of buffering it in memory', async () => {\n    const handler = vi.fn(\n      async () =>\n        new Response('some file contents', {\n          headers: { 'Content-Type': 'video/mp4' },\n          status: 200,\n        }),\n    )\n\n    const req = createReq([handler])\n    const uploadReferenceFile = createUploadReferenceFile()\n\n    const file = await getFileFromUploadInstructions({\n      collectionSlug: 'media',\n      file: uploadReferenceFile,\n      req,\n    })\n\n    expect(file.tempFilePath).toBeTruthy()\n    tempFilesToClean.push(file.tempFilePath!)\n\n    expect(file.data.length).toBe(0)\n    expect(fs.readFileSync(file.tempFilePath!, 'utf8')).toBe('some file contents')\n    expect(file.uploadReference).toBe(uploadReferenceFile.uploadReference)\n    expect(file.mimetype).toBe('video/mp4')\n  })\n\n  it('writes the temp file under the configured tempFileDir', async () => {\n    const customTempDir = path.join(os.tmpdir(), `payload-test-temp-dir-${Date.now()}`)\n    const handler = vi.fn(async () => new Response('x', { status: 200 }))\n    const req = createReq([handler])\n    req.payload.config.upload = { tempFileDir: customTempDir }\n\n    const file = await getFileFromUploadInstructions({\n      collectionSlug: 'media',\n      file: createUploadReferenceFile({ filename: 'x.bin', mimeType: 'application/octet-stream' }),\n      req,\n    })\n\n    tempFilesToClean.push(file.tempFilePath!)\n    expect(path.dirname(file.tempFilePath!)).toBe(customTempDir)\n\n    fs.rmSync(customTempDir, { force: true, recursive: true })\n  })\n\n  it('throws when no handler returns a response with a body', async () => {\n    const handler = vi.fn(async () => new Response(null, { status: 204 }))\n    const req = createReq([handler])\n\n    await expect(\n      getFileFromUploadInstructions({\n        collectionSlug: 'media',\n        file: createUploadReferenceFile(),\n        req,\n      }),\n    ).rejects.toThrow()\n  })\n\n  it('skips fetching entirely when nothing downstream needs the file content', async () => {\n    const handler = vi.fn(async () => new Response('unused', { status: 200 }))\n    const req = createReq([handler], {})\n\n    const file = await getFileFromUploadInstructions({\n      collectionSlug: 'media',\n      file: createUploadReferenceFile(),\n      req,\n    })\n\n    expect(handler).not.toHaveBeenCalled()\n    expect(file.tempFilePath).toBeUndefined()\n    expect(file.data.length).toBe(0)\n    expect(file.size).toBe(18)\n    expect(file.mimetype).toBe('video/mp4')\n  })\n\n  it('fetches only a bounded header for an image with no configured adjustments', async () => {\n    const handler = vi.fn(async (handlerReq: PayloadRequest) => {\n      expect(handlerReq.headers.get('range')).toBe(`bytes=0-${HEADER_PROBE_BYTE_LENGTH - 1}`)\n      return new Response(MINIMAL_PNG, { headers: { 'Content-Type': 'image/png' }, status: 206 })\n    })\n\n    const req = createReq([handler], {})\n\n    const file = await getFileFromUploadInstructions({\n      collectionSlug: 'media',\n      file: createUploadReferenceFile({\n        filename: 'photo.png',\n        mimeType: 'image/png',\n        size: MINIMAL_PNG.length,\n      }),\n      req,\n    })\n\n    expect(handler).toHaveBeenCalledTimes(1)\n    expect(file.tempFilePath).toBeUndefined()\n    expect(file.data.equals(MINIMAL_PNG)).toBe(true)\n    expect(file.mimetype).toBe('image/png')\n  })\n\n  it('fetches the full file for an image with no configured adjustments when the request includes a crop edit', async () => {\n    const handler = vi.fn(async (handlerReq: PayloadRequest) => {\n      expect(handlerReq.headers.get('range')).toBeNull()\n      return new Response(MINIMAL_PNG, { headers: { 'Content-Type': 'image/png' }, status: 200 })\n    })\n\n    const req = createReq([handler], {})\n    req.query = { uploadEdits: { crop: { height: 10, unit: 'px', width: 10, x: 0, y: 0 } } }\n\n    const file = await getFileFromUploadInstructions({\n      collectionSlug: 'media',\n      file: createUploadReferenceFile({\n        filename: 'photo.png',\n        mimeType: 'image/png',\n        size: MINIMAL_PNG.length,\n      }),\n      req,\n    })\n\n    expect(handler).toHaveBeenCalledTimes(1)\n    expect(file.tempFilePath).toBeTruthy()\n    tempFilesToClean.push(file.tempFilePath!)\n    expect(file.data.length).toBe(0)\n    expect(fs.readFileSync(file.tempFilePath!)).toEqual(MINIMAL_PNG)\n  })\n\n  it('stops reading once it has enough bytes to probe dimensions, even if the handler ignores the range hint', async () => {\n    const totalSize = HEADER_PROBE_BYTE_LENGTH * 4\n    let cancelled = false\n    let bytesProduced = 0\n\n    const stream = new ReadableStream({\n      cancel() {\n        cancelled = true\n      },\n      pull(controller) {\n        if (bytesProduced === 0) {\n          controller.enqueue(MINIMAL_PNG)\n          bytesProduced += MINIMAL_PNG.length\n          return\n        }\n        if (bytesProduced >= totalSize) {\n          controller.close()\n          return\n        }\n        const chunkSize = Math.min(64 * 1024, totalSize - bytesProduced)\n        controller.enqueue(new Uint8Array(chunkSize))\n        bytesProduced += chunkSize\n      },\n    })\n\n    const handler = vi.fn(\n      async () => new Response(stream, { headers: { 'Content-Type': 'image/png' }, status: 200 }),\n    )\n    const req = createReq([handler], {})\n\n    const file = await getFileFromUploadInstructions({\n      collectionSlug: 'media',\n      file: createUploadReferenceFile({\n        filename: 'photo.png',\n        mimeType: 'image/png',\n        size: totalSize,\n      }),\n      req,\n    })\n\n    expect(file.tempFilePath).toBeUndefined()\n    expect(file.data.length).toBeLessThanOrEqual(HEADER_PROBE_BYTE_LENGTH)\n    expect(cancelled).toBe(true)\n  })\n\n  it('preserves native Request accessors like signal on the request passed to a range-scoped handler', async () => {\n    const abortController = new AbortController()\n    const baseRequest = new Request('http://localhost/api/media', {\n      signal: abortController.signal,\n    })\n\n    let observedSignal: AbortSignal | null | undefined\n\n    const handler = vi.fn(async (handlerReq: PayloadRequest) => {\n      observedSignal = handlerReq.signal\n      return new Response(MINIMAL_PNG, { headers: { 'Content-Type': 'image/png' }, status: 206 })\n    })\n\n    const req = Object.assign(baseRequest, {\n      payload: {\n        collections: {\n          media: {\n            config: {\n              upload: {\n                disableLocalStorage: true,\n                handlers: [handler],\n              },\n            },\n          },\n        },\n        config: {\n          upload: {},\n        },\n        logger: {\n          error: vi.fn(),\n        },\n      },\n    }) as unknown as PayloadRequest\n\n    const file = await getFileFromUploadInstructions({\n      collectionSlug: 'media',\n      file: createUploadReferenceFile({\n        filename: 'photo.png',\n        mimeType: 'image/png',\n        size: MINIMAL_PNG.length,\n      }),\n      req,\n    })\n\n    // req.signal is the Request's own internal signal, which follows the one passed into the\n    // constructor rather than being the same object - reading it without throwing, and it\n    // reflecting an abort, is what proves the accessor still works on the scoped request.\n    expect(observedSignal).toBeInstanceOf(AbortSignal)\n    expect(observedSignal?.aborted).toBe(false)\n    abortController.abort()\n    expect(observedSignal?.aborted).toBe(true)\n    expect(file.data.equals(MINIMAL_PNG)).toBe(true)\n  })\n\n  it('removes the partial temp file if the response stream fails partway through', async () => {\n    const customTempDir = path.join(os.tmpdir(), `payload-test-stream-failure-${randomUUID()}`)\n    const streamError = new Error('stream boom')\n\n    const stream = new ReadableStream({\n      pull(controller) {\n        controller.enqueue(new Uint8Array([1, 2, 3]))\n        controller.error(streamError)\n      },\n    })\n\n    const handler = vi.fn(\n      async () => new Response(stream, { headers: { 'Content-Type': 'video/mp4' }, status: 200 }),\n    )\n\n    const req = createReq([handler])\n    req.payload.config.upload = { tempFileDir: customTempDir }\n\n    await expect(\n      getFileFromUploadInstructions({\n        collectionSlug: 'media',\n        file: createUploadReferenceFile(),\n        req,\n      }),\n    ).rejects.toThrow('stream boom')\n\n    const filesLeftBehind = await fs.promises.readdir(customTempDir).catch(() => [])\n    expect(filesLeftBehind).toEqual([])\n\n    await fs.promises.rm(customTempDir, { force: true, recursive: true })\n  })\n\n  it('falls back to a full fetch when the header is not enough to determine image dimensions', async () => {\n    const garbage = Buffer.from('not a real image')\n    let callCount = 0\n\n    const handler = vi.fn(async (handlerReq: PayloadRequest) => {\n      callCount += 1\n      if (handlerReq.headers.get('range')) {\n        return new Response(garbage, { headers: { 'Content-Type': 'image/png' }, status: 206 })\n      }\n      return new Response('full-image-bytes-stand-in', {\n        headers: { 'Content-Type': 'image/png' },\n        status: 200,\n      })\n    })\n\n    const req = createReq([handler], {})\n\n    const file = await getFileFromUploadInstructions({\n      collectionSlug: 'media',\n      file: createUploadReferenceFile({ filename: 'photo.png', mimeType: 'image/png', size: 26 }),\n      req,\n    })\n\n    expect(callCount).toBe(2)\n    expect(file.tempFilePath).toBeTruthy()\n    tempFilesToClean.push(file.tempFilePath!)\n    expect(fs.readFileSync(file.tempFilePath!, 'utf8')).toBe('full-image-bytes-stand-in')\n  })\n})\n"],"names":["randomUUID","fs","os","path","afterEach","describe","expect","it","vi","HEADER_PROBE_BYTE_LENGTH","getFileFromUploadInstructions","MINIMAL_PNG","Buffer","from","createReq","handlers","uploadConfigOverrides","mimeTypes","payload","collections","media","config","upload","disableLocalStorage","logger","error","fn","headers","Headers","createUploadReferenceFile","overrides","filename","mimeType","size","uploadReference","key","tempFilesToClean","filePath","rmSync","force","length","clearAllMocks","handler","Response","status","req","uploadReferenceFile","file","collectionSlug","tempFilePath","toBeTruthy","push","data","toBe","readFileSync","mimetype","customTempDir","join","tmpdir","Date","now","tempFileDir","dirname","recursive","rejects","toThrow","not","toHaveBeenCalled","toBeUndefined","handlerReq","get","toHaveBeenCalledTimes","equals","toBeNull","query","uploadEdits","crop","height","unit","width","x","y","toEqual","totalSize","cancelled","bytesProduced","stream","ReadableStream","cancel","pull","controller","enqueue","close","chunkSize","Math","min","Uint8Array","toBeLessThanOrEqual","abortController","AbortController","baseRequest","Request","signal","observedSignal","Object","assign","toBeInstanceOf","AbortSignal","aborted","abort","streamError","Error","filesLeftBehind","promises","readdir","catch","rm","garbage","callCount"],"mappings":"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"}

package/dist/uploads/getFileTypeFallback.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"getFileTypeFallback.d.ts","sourceRoot":"","sources":["../../src/uploads/getFileTypeFallback.ts"],"names":[],"mappings":"AAAA,KAAK,UAAU,GAAG;IAChB,GAAG,EAAE,MAAM,CAAA;IACX,IAAI,EAAE,MAAM,CAAA;CACb,CAAA;AAiBD,eAAO,MAAM,mBAAmB,GAAI,MAAM,MAAM,KAAG,UAOlD,CAAA"}
+{"version":3,"file":"getFileTypeFallback.d.ts","sourceRoot":"","sources":["../../src/uploads/getFileTypeFallback.ts"],"names":[],"mappings":"AAAA,KAAK,UAAU,GAAG;IAChB,GAAG,EAAE,MAAM,CAAA;IACX,IAAI,EAAE,MAAM,CAAA;CACb,CAAA;AAiBD,eAAO,MAAM,mBAAmB,SAAU,MAAM,KAAG,UAOlD,CAAA"}

package/dist/uploads/getImageSize.d.ts

@@ -1,4 +1,15 @@
+import type { SharpDependency } from '../config/types.js';
 import type { PayloadRequest } from '../types/index.js';
 import type { ProbedImageSize } from './types.js';
-export declare function getImageSize(file: PayloadRequest['file']): Promise<ProbedImageSize>;
+type Args = {
+    file: PayloadRequest['file'];
+    /**
+     * The configured `sharp` instance, when available. Preferred for reading
+     * dimensions because it covers every format sharp can process. Falls back to
+     * the dependency-free probe when sharp is not configured.
+     */
+    sharp?: SharpDependency;
+};
+export declare function getImageSize({ file, sharp }: Args): Promise<ProbedImageSize>;
+export {};
 //# sourceMappingURL=getImageSize.d.ts.map

package/dist/uploads/getImageSize.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"getImageSize.d.ts","sourceRoot":"","sources":["../../src/uploads/getImageSize.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAA;AACvD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,YAAY,CAAA;AAIjD,wBAAsB,YAAY,CAAC,IAAI,EAAE,cAAc,CAAC,MAAM,CAAC,GAAG,OAAO,CAAC,eAAe,CAAC,CAmBzF"}
+{"version":3,"file":"getImageSize.d.ts","sourceRoot":"","sources":["../../src/uploads/getImageSize.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAA;AACzD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAA;AACvD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,YAAY,CAAA;AAIjD,KAAK,IAAI,GAAG;IACV,IAAI,EAAE,cAAc,CAAC,MAAM,CAAC,CAAA;IAC5B;;;;OAIG;IACH,KAAK,CAAC,EAAE,eAAe,CAAA;CACxB,CAAA;AAED,wBAAsB,YAAY,CAAC,EAAE,IAAI,EAAE,KAAK,EAAE,EAAE,IAAI,GAAG,OAAO,CAAC,eAAe,CAAC,CAqBlF"}

package/dist/uploads/getImageSize.js

@@ -1,23 +1,25 @@
-import fs from 'fs/promises';
-import { imageSize } from 'image-size';
-import { imageSizeFromFile } from 'image-size/fromFile';
-import { temporaryFileTask } from './tempFile.js';
-export async function getImageSize(file) {
-    if (file?.tempFilePath) {
-        return imageSizeFromFile(file.tempFilePath);
+import { probeImageSize, probeImageSizeFromPath } from './probeImageSize.js';
+export async function getImageSize({ file, sharp }) {
+    // `tempFilePath` may be an empty string when the file is held in memory
+    const tempFilePath = file?.tempFilePath || undefined;
+    if (sharp) {
+        try {
+            const { height, width } = await sharp(tempFilePath ?? file.data).metadata();
+            if (width && height) {
+                return {
+                    height,
+                    width
+                };
+            }
+        } catch  {
+        // sharp decodes the full image and rejects truncated/header-only files
+        // that the byte-level probe can still measure, so fall through to it
+        }
     }
-    // Tiff file do not support buffers or streams, so we must write to file first
-    // then retrieve dimensions. https://github.com/image-size/image-size/issues/103
-    if (file?.mimetype === 'image/tiff') {
-        const dimensions = await temporaryFileTask(async (filepath)=>{
-            await fs.writeFile(filepath, file.data);
-            return imageSizeFromFile(filepath);
-        }, {
-            extension: 'tiff'
-        });
-        return dimensions;
+    if (tempFilePath) {
+        return probeImageSizeFromPath(tempFilePath);
     }
-    return imageSize(file.data);
+    return probeImageSize(file.data);
 }
 
 //# sourceMappingURL=getImageSize.js.map

package/dist/uploads/getImageSize.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/uploads/getImageSize.ts"],"sourcesContent":["import fs from 'fs/promises'\nimport { imageSize } from 'image-size'\nimport { imageSizeFromFile } from 'image-size/fromFile'\n\nimport type { PayloadRequest } from '../types/index.js'\nimport type { ProbedImageSize } from './types.js'\n\nimport { temporaryFileTask } from './tempFile.js'\n\nexport async function getImageSize(file: PayloadRequest['file']): Promise<ProbedImageSize> {\n  if (file?.tempFilePath) {\n    return imageSizeFromFile(file.tempFilePath)\n  }\n\n  // Tiff file do not support buffers or streams, so we must write to file first\n  // then retrieve dimensions. https://github.com/image-size/image-size/issues/103\n  if (file?.mimetype === 'image/tiff') {\n    const dimensions = await temporaryFileTask(\n      async (filepath: string) => {\n        await fs.writeFile(filepath, file.data)\n        return imageSizeFromFile(filepath)\n      },\n      { extension: 'tiff' },\n    )\n    return dimensions\n  }\n\n  return imageSize(file!.data)\n}\n"],"names":["fs","imageSize","imageSizeFromFile","temporaryFileTask","getImageSize","file","tempFilePath","mimetype","dimensions","filepath","writeFile","data","extension"],"mappings":"AAAA,OAAOA,QAAQ,cAAa;AAC5B,SAASC,SAAS,QAAQ,aAAY;AACtC,SAASC,iBAAiB,QAAQ,sBAAqB;AAKvD,SAASC,iBAAiB,QAAQ,gBAAe;AAEjD,OAAO,eAAeC,aAAaC,IAA4B;IAC7D,IAAIA,MAAMC,cAAc;QACtB,OAAOJ,kBAAkBG,KAAKC,YAAY;IAC5C;IAEA,8EAA8E;IAC9E,gFAAgF;IAChF,IAAID,MAAME,aAAa,cAAc;QACnC,MAAMC,aAAa,MAAML,kBACvB,OAAOM;YACL,MAAMT,GAAGU,SAAS,CAACD,UAAUJ,KAAKM,IAAI;YACtC,OAAOT,kBAAkBO;QAC3B,GACA;YAAEG,WAAW;QAAO;QAEtB,OAAOJ;IACT;IAEA,OAAOP,UAAUI,KAAMM,IAAI;AAC7B"}
+{"version":3,"sources":["../../src/uploads/getImageSize.ts"],"sourcesContent":["import type { SharpDependency } from '../config/types.js'\nimport type { PayloadRequest } from '../types/index.js'\nimport type { ProbedImageSize } from './types.js'\n\nimport { probeImageSize, probeImageSizeFromPath } from './probeImageSize.js'\n\ntype Args = {\n  file: PayloadRequest['file']\n  /**\n   * The configured `sharp` instance, when available. Preferred for reading\n   * dimensions because it covers every format sharp can process. Falls back to\n   * the dependency-free probe when sharp is not configured.\n   */\n  sharp?: SharpDependency\n}\n\nexport async function getImageSize({ file, sharp }: Args): Promise<ProbedImageSize> {\n  // `tempFilePath` may be an empty string when the file is held in memory\n  const tempFilePath = file?.tempFilePath || undefined\n\n  if (sharp) {\n    try {\n      const { height, width } = await sharp(tempFilePath ?? file!.data).metadata()\n      if (width && height) {\n        return { height, width }\n      }\n    } catch {\n      // sharp decodes the full image and rejects truncated/header-only files\n      // that the byte-level probe can still measure, so fall through to it\n    }\n  }\n\n  if (tempFilePath) {\n    return probeImageSizeFromPath(tempFilePath)\n  }\n\n  return probeImageSize(file!.data)\n}\n"],"names":["probeImageSize","probeImageSizeFromPath","getImageSize","file","sharp","tempFilePath","undefined","height","width","data","metadata"],"mappings":"AAIA,SAASA,cAAc,EAAEC,sBAAsB,QAAQ,sBAAqB;AAY5E,OAAO,eAAeC,aAAa,EAAEC,IAAI,EAAEC,KAAK,EAAQ;IACtD,wEAAwE;IACxE,MAAMC,eAAeF,MAAME,gBAAgBC;IAE3C,IAAIF,OAAO;QACT,IAAI;YACF,MAAM,EAAEG,MAAM,EAAEC,KAAK,EAAE,GAAG,MAAMJ,MAAMC,gBAAgBF,KAAMM,IAAI,EAAEC,QAAQ;YAC1E,IAAIF,SAASD,QAAQ;gBACnB,OAAO;oBAAEA;oBAAQC;gBAAM;YACzB;QACF,EAAE,OAAM;QACN,uEAAuE;QACvE,qEAAqE;QACvE;IACF;IAEA,IAAIH,cAAc;QAChB,OAAOJ,uBAAuBI;IAChC;IAEA,OAAOL,eAAeG,KAAMM,IAAI;AAClC"}

package/dist/uploads/getImageSize.spec.js

@@ -0,0 +1,298 @@
+import { mkdtempSync, readFileSync, rmSync, writeFileSync } from 'fs';
+import os from 'os';
+import path from 'path';
+import sharp from 'sharp';
+import { fileURLToPath } from 'url';
+import { afterAll, afterEach, describe, expect, it, vi } from 'vitest';
+import { getImageSize } from './getImageSize.js';
+// Tracks bytes actually read off disk so the streaming test below can assert
+// that a large file's tail is never pulled into memory
+const counters = vi.hoisted(()=>({
+        bytesReadFromDisk: 0
+    }));
+vi.mock('fs', async (importOriginal)=>{
+    const actual = await importOriginal();
+    return {
+        ...actual,
+        createReadStream: (...args)=>{
+            const stream = actual.createReadStream(...args);
+            stream.on('data', (chunk)=>{
+                counters.bytesReadFromDisk += chunk.length;
+            });
+            return stream;
+        }
+    };
+});
+const dirname = path.dirname(fileURLToPath(import.meta.url));
+const fixturesDir = path.resolve(dirname, '../../../../test/uploads');
+// Minimal JPEG XL bare-codestream encoder (bit-packed, little-endian, LSB
+// first). See probeImageSize.spec.ts for the full JXL parsing test suite;
+// this only needs to produce a valid header for the sharp-fallback tests below
+const encodeJXLCodestream = (width, height)=>{
+    const bits = [];
+    const pushBits = (value, length)=>{
+        for(let i = 0; i < length; i++){
+            bits.push(value >> i & 1);
+        }
+    };
+    const pushDimension = (value)=>{
+        const n = value - 1;
+        const sizeClasses = [
+            9,
+            13,
+            18,
+            30
+        ];
+        const classIndex = sizeClasses.findIndex((extraBits)=>n < 2 ** extraBits);
+        pushBits(classIndex, 2);
+        pushBits(n, sizeClasses[classIndex]);
+    };
+    pushBits(0, 1); // isSmallImage = false
+    pushDimension(height);
+    pushBits(0, 3); // widthMode = 0 (explicit dimension)
+    pushDimension(width);
+    const body = Buffer.alloc(Math.ceil(bits.length / 8));
+    bits.forEach((bit, i)=>{
+        if (bit) {
+            body[Math.floor(i / 8)] |= 1 << i % 8;
+        }
+    });
+    return Buffer.concat([
+        Buffer.from([
+            0xff,
+            0x0a
+        ]),
+        body
+    ]);
+};
+const fileFor = (name)=>{
+    const data = readFileSync(path.join(fixturesDir, name));
+    // In-memory uploads carry an empty `tempFilePath`, which must fall back to `data`
+    return {
+        data,
+        mimetype: 'image/test',
+        name,
+        size: data.length,
+        tempFilePath: ''
+    };
+};
+describe('getImageSize', ()=>{
+    const cases = [
+        {
+            file: 'test-image.png',
+            height: 800,
+            width: 800
+        },
+        {
+            file: 'test-image.jpg',
+            height: 800,
+            width: 800
+        },
+        {
+            file: 'non-animated.webp',
+            height: 420,
+            width: 900
+        },
+        {
+            file: 'test-image-avif.avif',
+            height: 800,
+            width: 800
+        },
+        {
+            file: 'image.svg',
+            height: 260,
+            width: 260
+        }
+    ];
+    it.each(cases)('should read $file dimensions via sharp', async ({ file, height, width })=>{
+        expect(await getImageSize({
+            file: fileFor(file),
+            sharp
+        })).toEqual({
+            height,
+            width
+        });
+    });
+    it.each(cases)('should read $file dimensions via the probe fallback', async ({ file, height, width })=>{
+        expect(await getImageSize({
+            file: fileFor(file)
+        })).toEqual({
+            height,
+            width
+        });
+    });
+    it('should fall back to the probe when sharp cannot decode a header-only image', async ()=>{
+        // A 1x1 PNG truncated after IHDR: the header is readable but there is no
+        // pixel data, so sharp throws while the probe still measures it.
+        const data = Buffer.from('89504e470d0a1a0a0000000d49484452000000010000000108060000001f15c489', 'hex');
+        const file = {
+            data,
+            mimetype: 'image/png',
+            name: 'truncated.png',
+            size: data.length,
+            tempFilePath: ''
+        };
+        expect(await getImageSize({
+            file,
+            sharp
+        })).toEqual({
+            height: 1,
+            width: 1
+        });
+        expect(await getImageSize({
+            file
+        })).toEqual({
+            height: 1,
+            width: 1
+        });
+    });
+    it('should read TIFF dimensions from a tempFilePath without a temp-file workaround', async ()=>{
+        const tempFilePath = path.join(fixturesDir, 'test-image.tiff');
+        const file = {
+            mimetype: 'image/tiff',
+            name: 'test-image.tiff',
+            tempFilePath
+        };
+        expect(await getImageSize({
+            file,
+            sharp
+        })).toEqual({
+            height: 100,
+            width: 200
+        });
+        expect(await getImageSize({
+            file
+        })).toEqual({
+            height: 100,
+            width: 200
+        });
+    });
+    describe('sharp cannot decode JPEG XL', ()=>{
+        const tempDir = mkdtempSync(path.join(os.tmpdir(), 'payload-get-image-size-jxl-'));
+        afterAll(()=>{
+            rmSync(tempDir, {
+                recursive: true,
+                force: true
+            });
+        });
+        it('should fall back to the probe for an in-memory JPEG XL buffer', async ()=>{
+            // `isImage('image/jxl')` is true, so `generateFileData` always calls
+            // `getImageSize` with `sharp` for JXL uploads; sharp rejects the format
+            // (libvips has no JXL codec) and the probe must take over
+            const data = encodeJXLCodestream(1920, 1080);
+            const file = {
+                data,
+                mimetype: 'image/jxl',
+                name: 'test.jxl',
+                size: data.length,
+                tempFilePath: ''
+            };
+            expect(await getImageSize({
+                file,
+                sharp
+            })).toEqual({
+                height: 1080,
+                width: 1920
+            });
+        });
+        it('should fall back to the probe for a JPEG XL tempFilePath', async ()=>{
+            const tempFilePath = path.join(tempDir, 'test.jxl');
+            writeFileSync(tempFilePath, encodeJXLCodestream(640, 480));
+            const file = {
+                mimetype: 'image/jxl',
+                name: 'test.jxl',
+                tempFilePath
+            };
+            expect(await getImageSize({
+                file,
+                sharp
+            })).toEqual({
+                height: 480,
+                width: 640
+            });
+        });
+    });
+    describe('streaming from tempFilePath', ()=>{
+        const tempDir = mkdtempSync(path.join(os.tmpdir(), 'payload-get-image-size-'));
+        afterEach(()=>{
+            counters.bytesReadFromDisk = 0;
+        });
+        afterAll(()=>{
+            rmSync(tempDir, {
+                recursive: true,
+                force: true
+            });
+        });
+        it('should not read a whole large PNG into memory when probing via tempFilePath', async ()=>{
+            // image-dimensions only reads the PNG signature (bytes 0-7) and the
+            // width/height fields (bytes 16-23); everything else here is filler
+            const header = Buffer.alloc(24);
+            header.write('\x89PNG\r\n\x1a\n', 0, 'binary');
+            header.writeUInt32BE(1920, 16);
+            header.writeUInt32BE(1080, 20);
+            const largeFileSize = 3 * 1024 * 1024;
+            const largeFile = Buffer.concat([
+                header,
+                Buffer.alloc(largeFileSize)
+            ]);
+            const tempFilePath = path.join(tempDir, 'large.png');
+            writeFileSync(tempFilePath, largeFile);
+            const file = {
+                mimetype: 'image/png',
+                name: 'large.png',
+                tempFilePath
+            };
+            expect(await getImageSize({
+                file
+            })).toEqual({
+                height: 1080,
+                width: 1920
+            });
+            // Confirms the read actually went through `createReadStream` rather
+            // than skipping it entirely (which would trivially satisfy "< 500KB")
+            expect(counters.bytesReadFromDisk).toBeGreaterThan(0);
+            expect(counters.bytesReadFromDisk).toBeLessThan(500 * 1024);
+            expect(counters.bytesReadFromDisk).toBeLessThan(largeFile.length);
+        });
+        it.each(cases.filter(({ file })=>file !== 'image.svg'))('should read $file dimensions via imageDimensionsFromStream when streamed from a tempFilePath', async ({ file, height, width })=>{
+            const tempFilePath = path.join(tempDir, file);
+            writeFileSync(tempFilePath, readFileSync(path.join(fixturesDir, file)));
+            const streamedFile = {
+                mimetype: 'image/test',
+                name: file,
+                tempFilePath
+            };
+            expect(await getImageSize({
+                file: streamedFile
+            })).toEqual({
+                height,
+                width
+            });
+        });
+        it('should read GIF dimensions when streamed from a tempFilePath', async ()=>{
+            // No GIF fixture lives in this directory; `image-dimensions` only needs
+            // the 6-byte signature plus the 4-byte width/height fields that follow it
+            const header = Buffer.concat([
+                Buffer.from('GIF89a', 'ascii'),
+                Buffer.alloc(4)
+            ]);
+            header.writeUInt16LE(64, 6);
+            header.writeUInt16LE(48, 8);
+            const tempFilePath = path.join(tempDir, 'test.gif');
+            writeFileSync(tempFilePath, header);
+            const file = {
+                mimetype: 'image/gif',
+                name: 'test.gif',
+                tempFilePath
+            };
+            expect(await getImageSize({
+                file
+            })).toEqual({
+                height: 48,
+                width: 64
+            });
+        });
+    });
+});
+
+//# sourceMappingURL=getImageSize.spec.js.map

package/dist/uploads/getImageSize.spec.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../src/uploads/getImageSize.spec.ts"],"sourcesContent":["import { mkdtempSync, readFileSync, rmSync, writeFileSync } from 'fs'\nimport os from 'os'\nimport path from 'path'\nimport sharp from 'sharp'\nimport { fileURLToPath } from 'url'\nimport { afterAll, afterEach, describe, expect, it, vi } from 'vitest'\n\nimport type { PayloadRequest } from '../types/index.js'\n\nimport { getImageSize } from './getImageSize.js'\n\n// Tracks bytes actually read off disk so the streaming test below can assert\n// that a large file's tail is never pulled into memory\nconst counters = vi.hoisted(() => ({ bytesReadFromDisk: 0 }))\n\nvi.mock('fs', async (importOriginal) => {\n  const actual = await importOriginal<typeof import('fs')>()\n  return {\n    ...actual,\n    createReadStream: (...args: Parameters<typeof actual.createReadStream>) => {\n      const stream = actual.createReadStream(...args)\n      stream.on('data', (chunk: Buffer) => {\n        counters.bytesReadFromDisk += chunk.length\n      })\n      return stream\n    },\n  }\n})\n\nconst dirname = path.dirname(fileURLToPath(import.meta.url))\nconst fixturesDir = path.resolve(dirname, '../../../../test/uploads')\n\n// Minimal JPEG XL bare-codestream encoder (bit-packed, little-endian, LSB\n// first). See probeImageSize.spec.ts for the full JXL parsing test suite;\n// this only needs to produce a valid header for the sharp-fallback tests below\nconst encodeJXLCodestream = (width: number, height: number): Buffer => {\n  const bits: number[] = []\n  const pushBits = (value: number, length: number) => {\n    for (let i = 0; i < length; i++) {\n      bits.push((value >> i) & 1)\n    }\n  }\n  const pushDimension = (value: number) => {\n    const n = value - 1\n    const sizeClasses = [9, 13, 18, 30]\n    const classIndex = sizeClasses.findIndex((extraBits) => n < 2 ** extraBits)\n    pushBits(classIndex, 2)\n    pushBits(n, sizeClasses[classIndex]!)\n  }\n\n  pushBits(0, 1) // isSmallImage = false\n  pushDimension(height)\n  pushBits(0, 3) // widthMode = 0 (explicit dimension)\n  pushDimension(width)\n\n  const body = Buffer.alloc(Math.ceil(bits.length / 8))\n  bits.forEach((bit, i) => {\n    if (bit) {\n      body[Math.floor(i / 8)]! |= 1 << i % 8\n    }\n  })\n\n  return Buffer.concat([Buffer.from([0xff, 0x0a]), body])\n}\n\nconst fileFor = (name: string): PayloadRequest['file'] => {\n  const data = readFileSync(path.join(fixturesDir, name))\n  // In-memory uploads carry an empty `tempFilePath`, which must fall back to `data`\n  return {\n    data,\n    mimetype: 'image/test',\n    name,\n    size: data.length,\n    tempFilePath: '',\n  } as PayloadRequest['file']\n}\n\ndescribe('getImageSize', () => {\n  const cases: Array<{ file: string; height: number; width: number }> = [\n    { file: 'test-image.png', height: 800, width: 800 },\n    { file: 'test-image.jpg', height: 800, width: 800 },\n    { file: 'non-animated.webp', height: 420, width: 900 },\n    { file: 'test-image-avif.avif', height: 800, width: 800 },\n    { file: 'image.svg', height: 260, width: 260 },\n  ]\n\n  it.each(cases)('should read $file dimensions via sharp', async ({ file, height, width }) => {\n    expect(await getImageSize({ file: fileFor(file), sharp })).toEqual({ height, width })\n  })\n\n  it.each(cases)(\n    'should read $file dimensions via the probe fallback',\n    async ({ file, height, width }) => {\n      expect(await getImageSize({ file: fileFor(file) })).toEqual({ height, width })\n    },\n  )\n\n  it('should fall back to the probe when sharp cannot decode a header-only image', async () => {\n    // A 1x1 PNG truncated after IHDR: the header is readable but there is no\n    // pixel data, so sharp throws while the probe still measures it.\n    const data = Buffer.from(\n      '89504e470d0a1a0a0000000d49484452000000010000000108060000001f15c489',\n      'hex',\n    )\n    const file = {\n      data,\n      mimetype: 'image/png',\n      name: 'truncated.png',\n      size: data.length,\n      tempFilePath: '',\n    } as PayloadRequest['file']\n\n    expect(await getImageSize({ file, sharp })).toEqual({ height: 1, width: 1 })\n    expect(await getImageSize({ file })).toEqual({ height: 1, width: 1 })\n  })\n\n  it('should read TIFF dimensions from a tempFilePath without a temp-file workaround', async () => {\n    const tempFilePath = path.join(fixturesDir, 'test-image.tiff')\n    const file = {\n      mimetype: 'image/tiff',\n      name: 'test-image.tiff',\n      tempFilePath,\n    } as PayloadRequest['file']\n\n    expect(await getImageSize({ file, sharp })).toEqual({ height: 100, width: 200 })\n    expect(await getImageSize({ file })).toEqual({ height: 100, width: 200 })\n  })\n\n  describe('sharp cannot decode JPEG XL', () => {\n    const tempDir = mkdtempSync(path.join(os.tmpdir(), 'payload-get-image-size-jxl-'))\n\n    afterAll(() => {\n      rmSync(tempDir, { recursive: true, force: true })\n    })\n\n    it('should fall back to the probe for an in-memory JPEG XL buffer', async () => {\n      // `isImage('image/jxl')` is true, so `generateFileData` always calls\n      // `getImageSize` with `sharp` for JXL uploads; sharp rejects the format\n      // (libvips has no JXL codec) and the probe must take over\n      const data = encodeJXLCodestream(1920, 1080)\n      const file = {\n        data,\n        mimetype: 'image/jxl',\n        name: 'test.jxl',\n        size: data.length,\n        tempFilePath: '',\n      } as PayloadRequest['file']\n\n      expect(await getImageSize({ file, sharp })).toEqual({ height: 1080, width: 1920 })\n    })\n\n    it('should fall back to the probe for a JPEG XL tempFilePath', async () => {\n      const tempFilePath = path.join(tempDir, 'test.jxl')\n      writeFileSync(tempFilePath, encodeJXLCodestream(640, 480))\n\n      const file = {\n        mimetype: 'image/jxl',\n        name: 'test.jxl',\n        tempFilePath,\n      } as PayloadRequest['file']\n\n      expect(await getImageSize({ file, sharp })).toEqual({ height: 480, width: 640 })\n    })\n  })\n\n  describe('streaming from tempFilePath', () => {\n    const tempDir = mkdtempSync(path.join(os.tmpdir(), 'payload-get-image-size-'))\n\n    afterEach(() => {\n      counters.bytesReadFromDisk = 0\n    })\n\n    afterAll(() => {\n      rmSync(tempDir, { recursive: true, force: true })\n    })\n\n    it('should not read a whole large PNG into memory when probing via tempFilePath', async () => {\n      // image-dimensions only reads the PNG signature (bytes 0-7) and the\n      // width/height fields (bytes 16-23); everything else here is filler\n      const header = Buffer.alloc(24)\n      header.write('\\x89PNG\\r\\n\\x1a\\n', 0, 'binary')\n      header.writeUInt32BE(1920, 16)\n      header.writeUInt32BE(1080, 20)\n      const largeFileSize = 3 * 1024 * 1024\n      const largeFile = Buffer.concat([header, Buffer.alloc(largeFileSize)])\n\n      const tempFilePath = path.join(tempDir, 'large.png')\n      writeFileSync(tempFilePath, largeFile)\n\n      const file = {\n        mimetype: 'image/png',\n        name: 'large.png',\n        tempFilePath,\n      } as PayloadRequest['file']\n\n      expect(await getImageSize({ file })).toEqual({ height: 1080, width: 1920 })\n      // Confirms the read actually went through `createReadStream` rather\n      // than skipping it entirely (which would trivially satisfy \"< 500KB\")\n      expect(counters.bytesReadFromDisk).toBeGreaterThan(0)\n      expect(counters.bytesReadFromDisk).toBeLessThan(500 * 1024)\n      expect(counters.bytesReadFromDisk).toBeLessThan(largeFile.length)\n    })\n\n    it.each(cases.filter(({ file }) => file !== 'image.svg'))(\n      'should read $file dimensions via imageDimensionsFromStream when streamed from a tempFilePath',\n      async ({ file, height, width }) => {\n        const tempFilePath = path.join(tempDir, file)\n        writeFileSync(tempFilePath, readFileSync(path.join(fixturesDir, file)))\n\n        const streamedFile = {\n          mimetype: 'image/test',\n          name: file,\n          tempFilePath,\n        } as PayloadRequest['file']\n\n        expect(await getImageSize({ file: streamedFile })).toEqual({ height, width })\n      },\n    )\n\n    it('should read GIF dimensions when streamed from a tempFilePath', async () => {\n      // No GIF fixture lives in this directory; `image-dimensions` only needs\n      // the 6-byte signature plus the 4-byte width/height fields that follow it\n      const header = Buffer.concat([Buffer.from('GIF89a', 'ascii'), Buffer.alloc(4)])\n      header.writeUInt16LE(64, 6)\n      header.writeUInt16LE(48, 8)\n\n      const tempFilePath = path.join(tempDir, 'test.gif')\n      writeFileSync(tempFilePath, header)\n\n      const file = {\n        mimetype: 'image/gif',\n        name: 'test.gif',\n        tempFilePath,\n      } as PayloadRequest['file']\n\n      expect(await getImageSize({ file })).toEqual({ height: 48, width: 64 })\n    })\n  })\n})\n"],"names":["mkdtempSync","readFileSync","rmSync","writeFileSync","os","path","sharp","fileURLToPath","afterAll","afterEach","describe","expect","it","vi","getImageSize","counters","hoisted","bytesReadFromDisk","mock","importOriginal","actual","createReadStream","args","stream","on","chunk","length","dirname","url","fixturesDir","resolve","encodeJXLCodestream","width","height","bits","pushBits","value","i","push","pushDimension","n","sizeClasses","classIndex","findIndex","extraBits","body","Buffer","alloc","Math","ceil","forEach","bit","floor","concat","from","fileFor","name","data","join","mimetype","size","tempFilePath","cases","file","each","toEqual","tempDir","tmpdir","recursive","force","header","write","writeUInt32BE","largeFileSize","largeFile","toBeGreaterThan","toBeLessThan","filter","streamedFile","writeUInt16LE"],"mappings":"AAAA,SAASA,WAAW,EAAEC,YAAY,EAAEC,MAAM,EAAEC,aAAa,QAAQ,KAAI;AACrE,OAAOC,QAAQ,KAAI;AACnB,OAAOC,UAAU,OAAM;AACvB,OAAOC,WAAW,QAAO;AACzB,SAASC,aAAa,QAAQ,MAAK;AACnC,SAASC,QAAQ,EAAEC,SAAS,EAAEC,QAAQ,EAAEC,MAAM,EAAEC,EAAE,EAAEC,EAAE,QAAQ,SAAQ;AAItE,SAASC,YAAY,QAAQ,oBAAmB;AAEhD,6EAA6E;AAC7E,uDAAuD;AACvD,MAAMC,WAAWF,GAAGG,OAAO,CAAC,IAAO,CAAA;QAAEC,mBAAmB;IAAE,CAAA;AAE1DJ,GAAGK,IAAI,CAAC,MAAM,OAAOC;IACnB,MAAMC,SAAS,MAAMD;IACrB,OAAO;QACL,GAAGC,MAAM;QACTC,kBAAkB,CAAC,GAAGC;YACpB,MAAMC,SAASH,OAAOC,gBAAgB,IAAIC;YAC1CC,OAAOC,EAAE,CAAC,QAAQ,CAACC;gBACjBV,SAASE,iBAAiB,IAAIQ,MAAMC,MAAM;YAC5C;YACA,OAAOH;QACT;IACF;AACF;AAEA,MAAMI,UAAUtB,KAAKsB,OAAO,CAACpB,cAAc,YAAYqB,GAAG;AAC1D,MAAMC,cAAcxB,KAAKyB,OAAO,CAACH,SAAS;AAE1C,0EAA0E;AAC1E,0EAA0E;AAC1E,+EAA+E;AAC/E,MAAMI,sBAAsB,CAACC,OAAeC;IAC1C,MAAMC,OAAiB,EAAE;IACzB,MAAMC,WAAW,CAACC,OAAeV;QAC/B,IAAK,IAAIW,IAAI,GAAGA,IAAIX,QAAQW,IAAK;YAC/BH,KAAKI,IAAI,CAAC,AAACF,SAASC,IAAK;QAC3B;IACF;IACA,MAAME,gBAAgB,CAACH;QACrB,MAAMI,IAAIJ,QAAQ;QAClB,MAAMK,cAAc;YAAC;YAAG;YAAI;YAAI;SAAG;QACnC,MAAMC,aAAaD,YAAYE,SAAS,CAAC,CAACC,YAAcJ,IAAI,KAAKI;QACjET,SAASO,YAAY;QACrBP,SAASK,GAAGC,WAAW,CAACC,WAAW;IACrC;IAEAP,SAAS,GAAG,IAAG,uBAAuB;IACtCI,cAAcN;IACdE,SAAS,GAAG,IAAG,qCAAqC;IACpDI,cAAcP;IAEd,MAAMa,OAAOC,OAAOC,KAAK,CAACC,KAAKC,IAAI,CAACf,KAAKR,MAAM,GAAG;IAClDQ,KAAKgB,OAAO,CAAC,CAACC,KAAKd;QACjB,IAAIc,KAAK;YACPN,IAAI,CAACG,KAAKI,KAAK,CAACf,IAAI,GAAG,IAAK,KAAKA,IAAI;QACvC;IACF;IAEA,OAAOS,OAAOO,MAAM,CAAC;QAACP,OAAOQ,IAAI,CAAC;YAAC;YAAM;SAAK;QAAGT;KAAK;AACxD;AAEA,MAAMU,UAAU,CAACC;IACf,MAAMC,OAAOxD,aAAaI,KAAKqD,IAAI,CAAC7B,aAAa2B;IACjD,kFAAkF;IAClF,OAAO;QACLC;QACAE,UAAU;QACVH;QACAI,MAAMH,KAAK/B,MAAM;QACjBmC,cAAc;IAChB;AACF;AAEAnD,SAAS,gBAAgB;IACvB,MAAMoD,QAAgE;QACpE;YAAEC,MAAM;YAAkB9B,QAAQ;YAAKD,OAAO;QAAI;QAClD;YAAE+B,MAAM;YAAkB9B,QAAQ;YAAKD,OAAO;QAAI;QAClD;YAAE+B,MAAM;YAAqB9B,QAAQ;YAAKD,OAAO;QAAI;QACrD;YAAE+B,MAAM;YAAwB9B,QAAQ;YAAKD,OAAO;QAAI;QACxD;YAAE+B,MAAM;YAAa9B,QAAQ;YAAKD,OAAO;QAAI;KAC9C;IAEDpB,GAAGoD,IAAI,CAACF,OAAO,0CAA0C,OAAO,EAAEC,IAAI,EAAE9B,MAAM,EAAED,KAAK,EAAE;QACrFrB,OAAO,MAAMG,aAAa;YAAEiD,MAAMR,QAAQQ;YAAOzD;QAAM,IAAI2D,OAAO,CAAC;YAAEhC;YAAQD;QAAM;IACrF;IAEApB,GAAGoD,IAAI,CAACF,OACN,uDACA,OAAO,EAAEC,IAAI,EAAE9B,MAAM,EAAED,KAAK,EAAE;QAC5BrB,OAAO,MAAMG,aAAa;YAAEiD,MAAMR,QAAQQ;QAAM,IAAIE,OAAO,CAAC;YAAEhC;YAAQD;QAAM;IAC9E;IAGFpB,GAAG,8EAA8E;QAC/E,yEAAyE;QACzE,iEAAiE;QACjE,MAAM6C,OAAOX,OAAOQ,IAAI,CACtB,sEACA;QAEF,MAAMS,OAAO;YACXN;YACAE,UAAU;YACVH,MAAM;YACNI,MAAMH,KAAK/B,MAAM;YACjBmC,cAAc;QAChB;QAEAlD,OAAO,MAAMG,aAAa;YAAEiD;YAAMzD;QAAM,IAAI2D,OAAO,CAAC;YAAEhC,QAAQ;YAAGD,OAAO;QAAE;QAC1ErB,OAAO,MAAMG,aAAa;YAAEiD;QAAK,IAAIE,OAAO,CAAC;YAAEhC,QAAQ;YAAGD,OAAO;QAAE;IACrE;IAEApB,GAAG,kFAAkF;QACnF,MAAMiD,eAAexD,KAAKqD,IAAI,CAAC7B,aAAa;QAC5C,MAAMkC,OAAO;YACXJ,UAAU;YACVH,MAAM;YACNK;QACF;QAEAlD,OAAO,MAAMG,aAAa;YAAEiD;YAAMzD;QAAM,IAAI2D,OAAO,CAAC;YAAEhC,QAAQ;YAAKD,OAAO;QAAI;QAC9ErB,OAAO,MAAMG,aAAa;YAAEiD;QAAK,IAAIE,OAAO,CAAC;YAAEhC,QAAQ;YAAKD,OAAO;QAAI;IACzE;IAEAtB,SAAS,+BAA+B;QACtC,MAAMwD,UAAUlE,YAAYK,KAAKqD,IAAI,CAACtD,GAAG+D,MAAM,IAAI;QAEnD3D,SAAS;YACPN,OAAOgE,SAAS;gBAAEE,WAAW;gBAAMC,OAAO;YAAK;QACjD;QAEAzD,GAAG,iEAAiE;YAClE,qEAAqE;YACrE,wEAAwE;YACxE,0DAA0D;YAC1D,MAAM6C,OAAO1B,oBAAoB,MAAM;YACvC,MAAMgC,OAAO;gBACXN;gBACAE,UAAU;gBACVH,MAAM;gBACNI,MAAMH,KAAK/B,MAAM;gBACjBmC,cAAc;YAChB;YAEAlD,OAAO,MAAMG,aAAa;gBAAEiD;gBAAMzD;YAAM,IAAI2D,OAAO,CAAC;gBAAEhC,QAAQ;gBAAMD,OAAO;YAAK;QAClF;QAEApB,GAAG,4DAA4D;YAC7D,MAAMiD,eAAexD,KAAKqD,IAAI,CAACQ,SAAS;YACxC/D,cAAc0D,cAAc9B,oBAAoB,KAAK;YAErD,MAAMgC,OAAO;gBACXJ,UAAU;gBACVH,MAAM;gBACNK;YACF;YAEAlD,OAAO,MAAMG,aAAa;gBAAEiD;gBAAMzD;YAAM,IAAI2D,OAAO,CAAC;gBAAEhC,QAAQ;gBAAKD,OAAO;YAAI;QAChF;IACF;IAEAtB,SAAS,+BAA+B;QACtC,MAAMwD,UAAUlE,YAAYK,KAAKqD,IAAI,CAACtD,GAAG+D,MAAM,IAAI;QAEnD1D,UAAU;YACRM,SAASE,iBAAiB,GAAG;QAC/B;QAEAT,SAAS;YACPN,OAAOgE,SAAS;gBAAEE,WAAW;gBAAMC,OAAO;YAAK;QACjD;QAEAzD,GAAG,+EAA+E;YAChF,oEAAoE;YACpE,oEAAoE;YACpE,MAAM0D,SAASxB,OAAOC,KAAK,CAAC;YAC5BuB,OAAOC,KAAK,CAAC,qBAAqB,GAAG;YACrCD,OAAOE,aAAa,CAAC,MAAM;YAC3BF,OAAOE,aAAa,CAAC,MAAM;YAC3B,MAAMC,gBAAgB,IAAI,OAAO;YACjC,MAAMC,YAAY5B,OAAOO,MAAM,CAAC;gBAACiB;gBAAQxB,OAAOC,KAAK,CAAC0B;aAAe;YAErE,MAAMZ,eAAexD,KAAKqD,IAAI,CAACQ,SAAS;YACxC/D,cAAc0D,cAAca;YAE5B,MAAMX,OAAO;gBACXJ,UAAU;gBACVH,MAAM;gBACNK;YACF;YAEAlD,OAAO,MAAMG,aAAa;gBAAEiD;YAAK,IAAIE,OAAO,CAAC;gBAAEhC,QAAQ;gBAAMD,OAAO;YAAK;YACzE,oEAAoE;YACpE,sEAAsE;YACtErB,OAAOI,SAASE,iBAAiB,EAAE0D,eAAe,CAAC;YACnDhE,OAAOI,SAASE,iBAAiB,EAAE2D,YAAY,CAAC,MAAM;YACtDjE,OAAOI,SAASE,iBAAiB,EAAE2D,YAAY,CAACF,UAAUhD,MAAM;QAClE;QAEAd,GAAGoD,IAAI,CAACF,MAAMe,MAAM,CAAC,CAAC,EAAEd,IAAI,EAAE,GAAKA,SAAS,cAC1C,gGACA,OAAO,EAAEA,IAAI,EAAE9B,MAAM,EAAED,KAAK,EAAE;YAC5B,MAAM6B,eAAexD,KAAKqD,IAAI,CAACQ,SAASH;YACxC5D,cAAc0D,cAAc5D,aAAaI,KAAKqD,IAAI,CAAC7B,aAAakC;YAEhE,MAAMe,eAAe;gBACnBnB,UAAU;gBACVH,MAAMO;gBACNF;YACF;YAEAlD,OAAO,MAAMG,aAAa;gBAAEiD,MAAMe;YAAa,IAAIb,OAAO,CAAC;gBAAEhC;gBAAQD;YAAM;QAC7E;QAGFpB,GAAG,gEAAgE;YACjE,wEAAwE;YACxE,0EAA0E;YAC1E,MAAM0D,SAASxB,OAAOO,MAAM,CAAC;gBAACP,OAAOQ,IAAI,CAAC,UAAU;gBAAUR,OAAOC,KAAK,CAAC;aAAG;YAC9EuB,OAAOS,aAAa,CAAC,IAAI;YACzBT,OAAOS,aAAa,CAAC,IAAI;YAEzB,MAAMlB,eAAexD,KAAKqD,IAAI,CAACQ,SAAS;YACxC/D,cAAc0D,cAAcS;YAE5B,MAAMP,OAAO;gBACXJ,UAAU;gBACVH,MAAM;gBACNK;YACF;YAEAlD,OAAO,MAAMG,aAAa;gBAAEiD;YAAK,IAAIE,OAAO,CAAC;gBAAEhC,QAAQ;gBAAID,OAAO;YAAG;QACvE;IACF;AACF"}

package/dist/uploads/getSafeFilename.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"getSafeFilename.d.ts","sourceRoot":"","sources":["../../src/uploads/getSafeFilename.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAA;AAKvD;;;;;;GAMG;AACH,eAAO,MAAM,aAAa,GAAI,MAAM,MAAM,KAAG,MAe5C,CAAA;AAED,KAAK,IAAI,GAAG;IACV,cAAc,EAAE,MAAM,CAAA;IACtB,eAAe,EAAE,MAAM,CAAA;IACvB,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,GAAG,EAAE,cAAc,CAAA;IACnB;;;;OAIG;IACH,UAAU,CAAC,EAAE,MAAM,CAAA;CACpB,CAAA;AAED;;;;;;;;;;;;;;;;;;;;GAoBG;AACH,wBAAsB,eAAe,CAAC,EACpC,cAAc,EACd,eAAe,EACf,MAAM,EACN,GAAG,EACH,UAAU,GACX,EAAE,IAAI,GAAG,OAAO,CAAC,MAAM,CAAC,CAiBxB"}
+{"version":3,"file":"getSafeFilename.d.ts","sourceRoot":"","sources":["../../src/uploads/getSafeFilename.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAA;AAKvD;;;;;;GAMG;AACH,eAAO,MAAM,aAAa,SAAU,MAAM,KAAG,MAe5C,CAAA;AAED,KAAK,IAAI,GAAG;IACV,cAAc,EAAE,MAAM,CAAA;IACtB,eAAe,EAAE,MAAM,CAAA;IACvB,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,GAAG,EAAE,cAAc,CAAA;IACnB;;;;OAIG;IACH,UAAU,CAAC,EAAE,MAAM,CAAA;CACpB,CAAA;AAED;;;;;;;;;;;;;;;;;;;;GAoBG;AACH,wBAAsB,eAAe,CAAC,EACpC,cAAc,EACd,eAAe,EACf,MAAM,EACN,GAAG,EACH,UAAU,GACX,EAAE,IAAI,GAAG,OAAO,CAAC,MAAM,CAAC,CAiBxB"}

package/dist/uploads/image-resizing/createImageSize.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"createImageSize.d.ts","sourceRoot":"","sources":["../../../src/uploads/image-resizing/createImageSize.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AAEH,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAA;AAE3C,KAAK,gBAAgB,GAAG;IACtB,QAAQ,CAAC,EAAE,QAAQ,CAAC,UAAU,CAAC,CAAA;IAC/B,QAAQ,CAAC,EAAE,QAAQ,CAAC,UAAU,CAAC,CAAA;IAC/B,MAAM,CAAC,EAAE,QAAQ,CAAC,QAAQ,CAAC,CAAA;IAC3B,QAAQ,CAAC,EAAE,QAAQ,CAAC,UAAU,CAAC,CAAA;IAC/B,GAAG,CAAC,EAAE,QAAQ,CAAC,KAAK,CAAC,CAAA;IACrB,KAAK,CAAC,EAAE,QAAQ,CAAC,OAAO,CAAC,CAAA;CAC1B,CAAA;AACD,eAAO,MAAM,eAAe,GAAI,uDAO7B,gBAAgB,KAAG,QASrB,CAAA"}
+{"version":3,"file":"createImageSize.d.ts","sourceRoot":"","sources":["../../../src/uploads/image-resizing/createImageSize.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AAEH,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAA;AAE3C,KAAK,gBAAgB,GAAG;IACtB,QAAQ,CAAC,EAAE,QAAQ,CAAC,UAAU,CAAC,CAAA;IAC/B,QAAQ,CAAC,EAAE,QAAQ,CAAC,UAAU,CAAC,CAAA;IAC/B,MAAM,CAAC,EAAE,QAAQ,CAAC,QAAQ,CAAC,CAAA;IAC3B,QAAQ,CAAC,EAAE,QAAQ,CAAC,UAAU,CAAC,CAAA;IAC/B,GAAG,CAAC,EAAE,QAAQ,CAAC,KAAK,CAAC,CAAA;IACrB,KAAK,CAAC,EAAE,QAAQ,CAAC,OAAO,CAAC,CAAA;CAC1B,CAAA;AACD,eAAO,MAAM,eAAe,0DAOzB,gBAAgB,KAAG,QASrB,CAAA"}

package/dist/uploads/image-resizing/createImageSizes.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"createImageSizes.d.ts","sourceRoot":"","sources":["../../../src/uploads/image-resizing/createImageSizes.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,mCAAmC,CAAA;AAClF,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAA;AAC5D,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAA;AAC1D,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,gCAAgC,CAAA;AAClE,OAAO,KAAK,EAAY,SAAS,EAAE,UAAU,EAAE,UAAU,EAAE,eAAe,EAAE,MAAM,aAAa,CAAA;AAW/F;;;;;;;;;;;;;GAaG;AAEH,KAAK,UAAU,GAAG;IAChB,MAAM,EAAE,yBAAyB,CAAA;IACjC,UAAU,EAAE,eAAe,CAAA;IAC3B,IAAI,EAAE,cAAc,CAAC,MAAM,CAAC,CAAA;IAC5B,UAAU,CAAC,EAAE,UAAU,CAAA;IACvB,QAAQ,EAAE,MAAM,CAAA;IAChB,GAAG,EAAE,cAAc,CAAA;IACnB,aAAa,EAAE,MAAM,CAAA;IACrB,KAAK,CAAC,EAAE,eAAe,CAAA;IACvB,UAAU,EAAE,MAAM,CAAA;IAClB,YAAY,CAAC,EAAE,YAAY,CAAA;CAC5B,CAAA;AAED,sEAAsE;AACtE,KAAK,gBAAgB,GAAG;IACtB,QAAQ,EAAE,SAAS,CAAA;IACnB,WAAW,EAAE,UAAU,EAAE,CAAA;CAC1B,CAAA;AAED,wBAAsB,gBAAgB,CAAC,EACrC,MAAM,EACN,UAAU,EACV,IAAI,EACJ,UAAU,EACV,QAAQ,EACR,GAAG,EACH,aAAa,EACb,KAAK,EACL,UAAU,EACV,YAAY,GACb,EAAE,UAAU,GAAG,OAAO,CAAC,gBAAgB,CAAC,CAyOxC"}
+{"version":3,"file":"createImageSizes.d.ts","sourceRoot":"","sources":["../../../src/uploads/image-resizing/createImageSizes.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,mCAAmC,CAAA;AAClF,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAA;AAC5D,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAA;AAC1D,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,gCAAgC,CAAA;AAClE,OAAO,KAAK,EAAY,SAAS,EAAE,UAAU,EAAE,UAAU,EAAE,eAAe,EAAE,MAAM,aAAa,CAAA;AAY/F;;;;;;;;;;;;;GAaG;AAEH,KAAK,UAAU,GAAG;IAChB,MAAM,EAAE,yBAAyB,CAAA;IACjC,UAAU,EAAE,eAAe,CAAA;IAC3B,IAAI,EAAE,cAAc,CAAC,MAAM,CAAC,CAAA;IAC5B,UAAU,CAAC,EAAE,UAAU,CAAA;IACvB,QAAQ,EAAE,MAAM,CAAA;IAChB,GAAG,EAAE,cAAc,CAAA;IACnB,aAAa,EAAE,MAAM,CAAA;IACrB,KAAK,CAAC,EAAE,eAAe,CAAA;IACvB,UAAU,EAAE,MAAM,CAAA;IAClB,YAAY,CAAC,EAAE,YAAY,CAAA;CAC5B,CAAA;AAED,sEAAsE;AACtE,KAAK,gBAAgB,GAAG;IACtB,QAAQ,EAAE,SAAS,CAAA;IACnB,WAAW,EAAE,UAAU,EAAE,CAAA;CAC1B,CAAA;AAED,wBAAsB,gBAAgB,CAAC,EACrC,MAAM,EACN,UAAU,EACV,IAAI,EACJ,UAAU,EACV,QAAQ,EACR,GAAG,EACH,aAAa,EACb,KAAK,EACL,UAAU,EACV,YAAY,GACb,EAAE,UAAU,GAAG,OAAO,CAAC,gBAAgB,CAAC,CAyOxC"}

package/dist/uploads/image-resizing/createImageSizes.js

@@ -1,6 +1,7 @@
 import { fileTypeFromBuffer } from 'file-type';
 import fs from 'fs/promises';
 import { fileExists } from '../fileExists.js';
+import { isAnimatedImage } from '../isAnimatedImage.js';
 import { optionallyAppendMetadata } from '../optionallyAppendMetadata.js';
 import { createImageSize } from './createImageSize.js';
 import { extractHeightFromImage } from './extractHeightFromImage.js';
@@ -17,11 +18,7 @@ export async function createImageSizes({ config, dimensions, file, focalPoint, m
         };
     }
     // Determine if the file is animated
-    const fileIsAnimatedType = [
-        'image/avif',
-        'image/gif',
-        'image/webp'
-    ].includes(file.mimetype);
+    const fileIsAnimatedType = isAnimatedImage(file.mimetype);
     const sharpOptions = {};
     if (fileIsAnimatedType) {
         sharpOptions.animated = true;

package/dist/uploads/image-resizing/createImageSizes.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/uploads/image-resizing/createImageSizes.ts"],"sourcesContent":["import type { Sharp, SharpOptions } from 'sharp'\n\nimport { fileTypeFromBuffer } from 'file-type'\nimport fs from 'fs/promises'\n\nimport type { SanitizedCollectionConfig } from '../../collections/config/types.js'\nimport type { SharpDependency } from '../../config/types.js'\nimport type { PayloadRequest } from '../../types/index.js'\nimport type { WithMetadata } from '../optionallyAppendMetadata.js'\nimport type { FileSize, FileSizes, FileToSave, FocalPoint, ProbedImageSize } from '../types.js'\n\nimport { fileExists } from '../fileExists.js'\nimport { optionallyAppendMetadata } from '../optionallyAppendMetadata.js'\nimport { createImageSize } from './createImageSize.js'\nimport { extractHeightFromImage } from './extractHeightFromImage.js'\nimport { generateImageSizeFilename } from './generateImageSizeFilename.js'\nimport { getImageResizeAction } from './getImageResizeAction.js'\nimport { parseFilename } from './parseFilename.js'\nimport { sanitizeResizeConfig } from './sanitizeResizeConfig.js'\n\n/**\n * For the provided image sizes, handle the resizing and the transforms\n * (format, trim, etc.) of each requested image size and return the result object.\n * This only handles the image sizes. The transforms of the original image\n * are handled in {@link ./generateFileData.ts}.\n *\n * The image will be resized according to the provided\n * resize config. If no image sizes are requested, the resolved data will be empty.\n * For every image that does not need to be resized, a result object with `null`\n * parameters will be returned.\n *\n * @param resizeConfig - the resize config\n * @returns the result of the resize operation(s)\n */\n\ntype ResizeArgs = {\n  config: SanitizedCollectionConfig\n  dimensions: ProbedImageSize\n  file: PayloadRequest['file']\n  focalPoint?: FocalPoint\n  mimeType: string\n  req: PayloadRequest\n  savedFilename: string\n  sharp?: SharpDependency\n  staticPath: string\n  withMetadata?: WithMetadata\n}\n\n/** Result from resizing and transforming the requested image sizes */\ntype ImageSizesResult = {\n  sizeData: FileSizes\n  sizesToSave: FileToSave[]\n}\n\nexport async function createImageSizes({\n  config,\n  dimensions,\n  file,\n  focalPoint,\n  mimeType,\n  req,\n  savedFilename,\n  sharp,\n  staticPath,\n  withMetadata,\n}: ResizeArgs): Promise<ImageSizesResult> {\n  const { imageSizes } = config.upload\n\n  if (!imageSizes || !sharp) {\n    return {\n      sizeData: {},\n      sizesToSave: [],\n    }\n  }\n\n  // Determine if the file is animated\n  const fileIsAnimatedType = ['image/avif', 'image/gif', 'image/webp'].includes(file!.mimetype)\n  const sharpOptions: SharpOptions = {}\n\n  if (fileIsAnimatedType) {\n    sharpOptions.animated = true\n  }\n\n  const sharpBase: Sharp | undefined = sharp(\n    file!.tempFilePath || file!.data,\n    sharpOptions,\n  ).rotate() // pass rotate() to auto-rotate based on EXIF data. https://github.com/payloadcms/payload/pull/3081\n  const originalImageMeta = await sharpBase.metadata()\n\n  let adjustedDimensions = { ...dimensions }\n\n  // Images with an exif orientation of 5, 6, 7, or 8 are auto-rotated by sharp\n  // Need to adjust the dimensions to match the original image\n  if ([5, 6, 7, 8].includes(originalImageMeta.orientation!)) {\n    adjustedDimensions = {\n      ...dimensions,\n      height: dimensions.width,\n      width: dimensions.height,\n    }\n  }\n\n  const resizeImageMeta = {\n    height: originalImageMeta.height,\n    width: originalImageMeta.width,\n  }\n\n  const sizes = {} as Record<string, FileSize>\n  const imageSizeFiles: FileToSave[] = []\n\n  await Promise.all(\n    imageSizes.map(async (imageResizeConfig): Promise<void> => {\n      imageResizeConfig = sanitizeResizeConfig(imageResizeConfig)\n\n      const resizeAction = getImageResizeAction({\n        dimensions,\n        hasFocalPoint: Boolean(focalPoint),\n        imageResizeConfig,\n      })\n\n      if (resizeAction === 'omit') {\n        sizes[imageResizeConfig.name] = createImageSize({})\n        return\n      }\n\n      const imageToResize = sharpBase.clone()\n      let resized = imageToResize\n\n      if (resizeAction === 'resizeWithFocalPoint') {\n        let { height: resizeHeight, width: resizeWidth } = imageResizeConfig\n\n        const originalAspectRatio = adjustedDimensions.width / adjustedDimensions.height\n\n        // Calculate resizeWidth based on original aspect ratio if it's undefined\n        if (resizeHeight && !resizeWidth) {\n          resizeWidth = Math.round(resizeHeight * originalAspectRatio)\n        }\n\n        // Calculate resizeHeight based on original aspect ratio if it's undefined\n        if (resizeWidth && !resizeHeight) {\n          resizeHeight = Math.round(resizeWidth / originalAspectRatio)\n        }\n\n        if (!resizeHeight) {\n          resizeHeight = resizeImageMeta.height\n        }\n        if (!resizeWidth) {\n          resizeWidth = resizeImageMeta.width\n        }\n\n        const resizeAspectRatio = resizeWidth! / resizeHeight!\n        const prioritizeHeight = resizeAspectRatio < originalAspectRatio\n        // Scales the image before extracting from it\n        resized = imageToResize.resize({\n          fastShrinkOnLoad: false,\n          height: prioritizeHeight ? resizeHeight : undefined,\n          width: prioritizeHeight ? undefined : resizeWidth,\n        })\n\n        const metadataAppendedFile = await optionallyAppendMetadata({\n          req,\n          sharpFile: resized,\n          withMetadata: withMetadata!,\n        })\n\n        // Must read from buffer, resized.metadata will return the original image metadata\n        const { info } = await metadataAppendedFile.toBuffer({ resolveWithObject: true })\n\n        resizeImageMeta.height = extractHeightFromImage({\n          ...originalImageMeta,\n          height: info.height,\n        })\n        resizeImageMeta.width = info.width\n\n        const halfResizeX = resizeWidth! / 2\n        const xFocalCenter = resizeImageMeta.width * (focalPoint!.x / 100)\n        const calculatedRightPixelBound = xFocalCenter + halfResizeX\n        let leftBound = xFocalCenter - halfResizeX\n\n        // if the right bound is greater than the image width, adjust the left bound\n        // keeping focus on the right\n        if (calculatedRightPixelBound > resizeImageMeta.width) {\n          leftBound = resizeImageMeta.width - resizeWidth!\n        }\n\n        // if the left bound is less than 0, adjust the left bound to 0\n        // keeping the focus on the left\n        if (leftBound < 0) {\n          leftBound = 0\n        }\n\n        const halfResizeY = resizeHeight! / 2\n        const yFocalCenter = resizeImageMeta.height * (focalPoint!.y / 100)\n        const calculatedBottomPixelBound = yFocalCenter + halfResizeY\n        let topBound = yFocalCenter - halfResizeY\n\n        // if the bottom bound is greater than the image height, adjust the top bound\n        // keeping the image as far right as possible\n        if (calculatedBottomPixelBound > resizeImageMeta.height) {\n          topBound = resizeImageMeta.height - resizeHeight!\n        }\n\n        // if the top bound is less than 0, adjust the top bound to 0\n        // keeping the image focus near the top\n        if (topBound < 0) {\n          topBound = 0\n        }\n\n        resized = resized.extract({\n          height: resizeHeight!,\n          left: Math.floor(leftBound),\n          top: Math.floor(topBound),\n          width: resizeWidth!,\n        })\n      } else {\n        resized = imageToResize.resize(imageResizeConfig)\n      }\n\n      if (imageResizeConfig.formatOptions) {\n        resized = resized.toFormat(\n          imageResizeConfig.formatOptions.format,\n          imageResizeConfig.formatOptions.options,\n        )\n      }\n\n      if (imageResizeConfig.trimOptions) {\n        resized = resized.trim(imageResizeConfig.trimOptions)\n      }\n\n      const metadataAppendedFile = await optionallyAppendMetadata({\n        req,\n        sharpFile: resized,\n        withMetadata: withMetadata!,\n      })\n\n      const { data: bufferData, info: bufferInfo } = await metadataAppendedFile.toBuffer({\n        resolveWithObject: true,\n      })\n\n      const { name, ext } = parseFilename(savedFilename)\n\n      if (req.payloadUploadSizes) {\n        req.payloadUploadSizes[imageResizeConfig.name] = bufferData\n      }\n\n      const mimeInfo = await fileTypeFromBuffer(bufferData)\n\n      const imageNameWithDimensions = imageResizeConfig.generateImageName\n        ? imageResizeConfig.generateImageName({\n            extension: mimeInfo?.ext || ext,\n            height: extractHeightFromImage({\n              ...originalImageMeta,\n              height: bufferInfo.height,\n            }),\n            originalName: name,\n            sizeName: imageResizeConfig.name,\n            width: bufferInfo.width,\n          })\n        : generateImageSizeFilename({\n            extension: mimeInfo?.ext || ext,\n            height: extractHeightFromImage({\n              ...originalImageMeta,\n              height: bufferInfo.height,\n            }),\n            outputImageName: name,\n            width: bufferInfo.width,\n          })\n\n      const imagePath = `${staticPath}/${imageNameWithDimensions}`\n\n      if (await fileExists(imagePath)) {\n        try {\n          await fs.unlink(imagePath)\n        } catch {\n          // Ignore unlink errors\n        }\n      }\n\n      const { height, size, width } = bufferInfo\n      sizes[imageResizeConfig.name] = createImageSize({\n        filename: imageNameWithDimensions,\n        filesize: size,\n        height:\n          fileIsAnimatedType && originalImageMeta.pages ? height / originalImageMeta.pages : height,\n        mimeType: mimeInfo?.mime || mimeType,\n        width,\n      })\n\n      imageSizeFiles.push({\n        buffer: bufferData,\n        path: imagePath,\n      })\n    }),\n  )\n\n  return {\n    sizeData: sizes,\n    sizesToSave: imageSizeFiles,\n  }\n}\n"],"names":["fileTypeFromBuffer","fs","fileExists","optionallyAppendMetadata","createImageSize","extractHeightFromImage","generateImageSizeFilename","getImageResizeAction","parseFilename","sanitizeResizeConfig","createImageSizes","config","dimensions","file","focalPoint","mimeType","req","savedFilename","sharp","staticPath","withMetadata","imageSizes","upload","sizeData","sizesToSave","fileIsAnimatedType","includes","mimetype","sharpOptions","animated","sharpBase","tempFilePath","data","rotate","originalImageMeta","metadata","adjustedDimensions","orientation","height","width","resizeImageMeta","sizes","imageSizeFiles","Promise","all","map","imageResizeConfig","resizeAction","hasFocalPoint","Boolean","name","imageToResize","clone","resized","resizeHeight","resizeWidth","originalAspectRatio","Math","round","resizeAspectRatio","prioritizeHeight","resize","fastShrinkOnLoad","undefined","metadataAppendedFile","sharpFile","info","toBuffer","resolveWithObject","halfResizeX","xFocalCenter","x","calculatedRightPixelBound","leftBound","halfResizeY","yFocalCenter","y","calculatedBottomPixelBound","topBound","extract","left","floor","top","formatOptions","toFormat","format","options","trimOptions","trim","bufferData","bufferInfo","ext","payloadUploadSizes","mimeInfo","imageNameWithDimensions","generateImageName","extension","originalName","sizeName","outputImageName","imagePath","unlink","size","filename","filesize","pages","mime","push","buffer","path"],"mappings":"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"}
+{"version":3,"sources":["../../../src/uploads/image-resizing/createImageSizes.ts"],"sourcesContent":["import type { Sharp, SharpOptions } from 'sharp'\n\nimport { fileTypeFromBuffer } from 'file-type'\nimport fs from 'fs/promises'\n\nimport type { SanitizedCollectionConfig } from '../../collections/config/types.js'\nimport type { SharpDependency } from '../../config/types.js'\nimport type { PayloadRequest } from '../../types/index.js'\nimport type { WithMetadata } from '../optionallyAppendMetadata.js'\nimport type { FileSize, FileSizes, FileToSave, FocalPoint, ProbedImageSize } from '../types.js'\n\nimport { fileExists } from '../fileExists.js'\nimport { isAnimatedImage } from '../isAnimatedImage.js'\nimport { optionallyAppendMetadata } from '../optionallyAppendMetadata.js'\nimport { createImageSize } from './createImageSize.js'\nimport { extractHeightFromImage } from './extractHeightFromImage.js'\nimport { generateImageSizeFilename } from './generateImageSizeFilename.js'\nimport { getImageResizeAction } from './getImageResizeAction.js'\nimport { parseFilename } from './parseFilename.js'\nimport { sanitizeResizeConfig } from './sanitizeResizeConfig.js'\n\n/**\n * For the provided image sizes, handle the resizing and the transforms\n * (format, trim, etc.) of each requested image size and return the result object.\n * This only handles the image sizes. The transforms of the original image\n * are handled in {@link ./generateFileData.ts}.\n *\n * The image will be resized according to the provided\n * resize config. If no image sizes are requested, the resolved data will be empty.\n * For every image that does not need to be resized, a result object with `null`\n * parameters will be returned.\n *\n * @param resizeConfig - the resize config\n * @returns the result of the resize operation(s)\n */\n\ntype ResizeArgs = {\n  config: SanitizedCollectionConfig\n  dimensions: ProbedImageSize\n  file: PayloadRequest['file']\n  focalPoint?: FocalPoint\n  mimeType: string\n  req: PayloadRequest\n  savedFilename: string\n  sharp?: SharpDependency\n  staticPath: string\n  withMetadata?: WithMetadata\n}\n\n/** Result from resizing and transforming the requested image sizes */\ntype ImageSizesResult = {\n  sizeData: FileSizes\n  sizesToSave: FileToSave[]\n}\n\nexport async function createImageSizes({\n  config,\n  dimensions,\n  file,\n  focalPoint,\n  mimeType,\n  req,\n  savedFilename,\n  sharp,\n  staticPath,\n  withMetadata,\n}: ResizeArgs): Promise<ImageSizesResult> {\n  const { imageSizes } = config.upload\n\n  if (!imageSizes || !sharp) {\n    return {\n      sizeData: {},\n      sizesToSave: [],\n    }\n  }\n\n  // Determine if the file is animated\n  const fileIsAnimatedType = isAnimatedImage(file!.mimetype)\n  const sharpOptions: SharpOptions = {}\n\n  if (fileIsAnimatedType) {\n    sharpOptions.animated = true\n  }\n\n  const sharpBase: Sharp | undefined = sharp(\n    file!.tempFilePath || file!.data,\n    sharpOptions,\n  ).rotate() // pass rotate() to auto-rotate based on EXIF data. https://github.com/payloadcms/payload/pull/3081\n  const originalImageMeta = await sharpBase.metadata()\n\n  let adjustedDimensions = { ...dimensions }\n\n  // Images with an exif orientation of 5, 6, 7, or 8 are auto-rotated by sharp\n  // Need to adjust the dimensions to match the original image\n  if ([5, 6, 7, 8].includes(originalImageMeta.orientation!)) {\n    adjustedDimensions = {\n      ...dimensions,\n      height: dimensions.width,\n      width: dimensions.height,\n    }\n  }\n\n  const resizeImageMeta = {\n    height: originalImageMeta.height,\n    width: originalImageMeta.width,\n  }\n\n  const sizes = {} as Record<string, FileSize>\n  const imageSizeFiles: FileToSave[] = []\n\n  await Promise.all(\n    imageSizes.map(async (imageResizeConfig): Promise<void> => {\n      imageResizeConfig = sanitizeResizeConfig(imageResizeConfig)\n\n      const resizeAction = getImageResizeAction({\n        dimensions,\n        hasFocalPoint: Boolean(focalPoint),\n        imageResizeConfig,\n      })\n\n      if (resizeAction === 'omit') {\n        sizes[imageResizeConfig.name] = createImageSize({})\n        return\n      }\n\n      const imageToResize = sharpBase.clone()\n      let resized = imageToResize\n\n      if (resizeAction === 'resizeWithFocalPoint') {\n        let { height: resizeHeight, width: resizeWidth } = imageResizeConfig\n\n        const originalAspectRatio = adjustedDimensions.width / adjustedDimensions.height\n\n        // Calculate resizeWidth based on original aspect ratio if it's undefined\n        if (resizeHeight && !resizeWidth) {\n          resizeWidth = Math.round(resizeHeight * originalAspectRatio)\n        }\n\n        // Calculate resizeHeight based on original aspect ratio if it's undefined\n        if (resizeWidth && !resizeHeight) {\n          resizeHeight = Math.round(resizeWidth / originalAspectRatio)\n        }\n\n        if (!resizeHeight) {\n          resizeHeight = resizeImageMeta.height\n        }\n        if (!resizeWidth) {\n          resizeWidth = resizeImageMeta.width\n        }\n\n        const resizeAspectRatio = resizeWidth! / resizeHeight!\n        const prioritizeHeight = resizeAspectRatio < originalAspectRatio\n        // Scales the image before extracting from it\n        resized = imageToResize.resize({\n          fastShrinkOnLoad: false,\n          height: prioritizeHeight ? resizeHeight : undefined,\n          width: prioritizeHeight ? undefined : resizeWidth,\n        })\n\n        const metadataAppendedFile = await optionallyAppendMetadata({\n          req,\n          sharpFile: resized,\n          withMetadata: withMetadata!,\n        })\n\n        // Must read from buffer, resized.metadata will return the original image metadata\n        const { info } = await metadataAppendedFile.toBuffer({ resolveWithObject: true })\n\n        resizeImageMeta.height = extractHeightFromImage({\n          ...originalImageMeta,\n          height: info.height,\n        })\n        resizeImageMeta.width = info.width\n\n        const halfResizeX = resizeWidth! / 2\n        const xFocalCenter = resizeImageMeta.width * (focalPoint!.x / 100)\n        const calculatedRightPixelBound = xFocalCenter + halfResizeX\n        let leftBound = xFocalCenter - halfResizeX\n\n        // if the right bound is greater than the image width, adjust the left bound\n        // keeping focus on the right\n        if (calculatedRightPixelBound > resizeImageMeta.width) {\n          leftBound = resizeImageMeta.width - resizeWidth!\n        }\n\n        // if the left bound is less than 0, adjust the left bound to 0\n        // keeping the focus on the left\n        if (leftBound < 0) {\n          leftBound = 0\n        }\n\n        const halfResizeY = resizeHeight! / 2\n        const yFocalCenter = resizeImageMeta.height * (focalPoint!.y / 100)\n        const calculatedBottomPixelBound = yFocalCenter + halfResizeY\n        let topBound = yFocalCenter - halfResizeY\n\n        // if the bottom bound is greater than the image height, adjust the top bound\n        // keeping the image as far right as possible\n        if (calculatedBottomPixelBound > resizeImageMeta.height) {\n          topBound = resizeImageMeta.height - resizeHeight!\n        }\n\n        // if the top bound is less than 0, adjust the top bound to 0\n        // keeping the image focus near the top\n        if (topBound < 0) {\n          topBound = 0\n        }\n\n        resized = resized.extract({\n          height: resizeHeight!,\n          left: Math.floor(leftBound),\n          top: Math.floor(topBound),\n          width: resizeWidth!,\n        })\n      } else {\n        resized = imageToResize.resize(imageResizeConfig)\n      }\n\n      if (imageResizeConfig.formatOptions) {\n        resized = resized.toFormat(\n          imageResizeConfig.formatOptions.format,\n          imageResizeConfig.formatOptions.options,\n        )\n      }\n\n      if (imageResizeConfig.trimOptions) {\n        resized = resized.trim(imageResizeConfig.trimOptions)\n      }\n\n      const metadataAppendedFile = await optionallyAppendMetadata({\n        req,\n        sharpFile: resized,\n        withMetadata: withMetadata!,\n      })\n\n      const { data: bufferData, info: bufferInfo } = await metadataAppendedFile.toBuffer({\n        resolveWithObject: true,\n      })\n\n      const { name, ext } = parseFilename(savedFilename)\n\n      if (req.payloadUploadSizes) {\n        req.payloadUploadSizes[imageResizeConfig.name] = bufferData\n      }\n\n      const mimeInfo = await fileTypeFromBuffer(bufferData)\n\n      const imageNameWithDimensions = imageResizeConfig.generateImageName\n        ? imageResizeConfig.generateImageName({\n            extension: mimeInfo?.ext || ext,\n            height: extractHeightFromImage({\n              ...originalImageMeta,\n              height: bufferInfo.height,\n            }),\n            originalName: name,\n            sizeName: imageResizeConfig.name,\n            width: bufferInfo.width,\n          })\n        : generateImageSizeFilename({\n            extension: mimeInfo?.ext || ext,\n            height: extractHeightFromImage({\n              ...originalImageMeta,\n              height: bufferInfo.height,\n            }),\n            outputImageName: name,\n            width: bufferInfo.width,\n          })\n\n      const imagePath = `${staticPath}/${imageNameWithDimensions}`\n\n      if (await fileExists(imagePath)) {\n        try {\n          await fs.unlink(imagePath)\n        } catch {\n          // Ignore unlink errors\n        }\n      }\n\n      const { height, size, width } = bufferInfo\n      sizes[imageResizeConfig.name] = createImageSize({\n        filename: imageNameWithDimensions,\n        filesize: size,\n        height:\n          fileIsAnimatedType && originalImageMeta.pages ? height / originalImageMeta.pages : height,\n        mimeType: mimeInfo?.mime || mimeType,\n        width,\n      })\n\n      imageSizeFiles.push({\n        buffer: bufferData,\n        path: imagePath,\n      })\n    }),\n  )\n\n  return {\n    sizeData: sizes,\n    sizesToSave: imageSizeFiles,\n  }\n}\n"],"names":["fileTypeFromBuffer","fs","fileExists","isAnimatedImage","optionallyAppendMetadata","createImageSize","extractHeightFromImage","generateImageSizeFilename","getImageResizeAction","parseFilename","sanitizeResizeConfig","createImageSizes","config","dimensions","file","focalPoint","mimeType","req","savedFilename","sharp","staticPath","withMetadata","imageSizes","upload","sizeData","sizesToSave","fileIsAnimatedType","mimetype","sharpOptions","animated","sharpBase","tempFilePath","data","rotate","originalImageMeta","metadata","adjustedDimensions","includes","orientation","height","width","resizeImageMeta","sizes","imageSizeFiles","Promise","all","map","imageResizeConfig","resizeAction","hasFocalPoint","Boolean","name","imageToResize","clone","resized","resizeHeight","resizeWidth","originalAspectRatio","Math","round","resizeAspectRatio","prioritizeHeight","resize","fastShrinkOnLoad","undefined","metadataAppendedFile","sharpFile","info","toBuffer","resolveWithObject","halfResizeX","xFocalCenter","x","calculatedRightPixelBound","leftBound","halfResizeY","yFocalCenter","y","calculatedBottomPixelBound","topBound","extract","left","floor","top","formatOptions","toFormat","format","options","trimOptions","trim","bufferData","bufferInfo","ext","payloadUploadSizes","mimeInfo","imageNameWithDimensions","generateImageName","extension","originalName","sizeName","outputImageName","imagePath","unlink","size","filename","filesize","pages","mime","push","buffer","path"],"mappings":"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"}