payload 3.89.0-internal.95c9cba → 3.90.0

package/dist/uploads/getFileTypeIdentity.spec.js

@@ -0,0 +1,43 @@
+import { describe, expect, it } from 'vitest';
+import { getSanitizedUploadFilename, isXmlMimeType } from './getFileTypeIdentity.js';
+describe('getSanitizedUploadFilename', ()=>{
+    it('should use the output extension while preserving the sanitized source basename', ()=>{
+        expect(getSanitizedUploadFilename('incoming/image.jpg', 'png')).toBe('image.png');
+    });
+});
+describe('isXmlMimeType', ()=>{
+    it.each([
+        [
+            'application/xml',
+            true
+        ],
+        [
+            'text/xml',
+            true
+        ],
+        [
+            'application/atom+xml',
+            true
+        ],
+        [
+            'image/svg+xml',
+            true
+        ],
+        [
+            'APPLICATION/XML',
+            true
+        ],
+        [
+            ' Application/Atom+Xml; Charset=UTF-8 ',
+            true
+        ],
+        [
+            'text/plain',
+            false
+        ]
+    ])('should classify %s as %s', (mimeType, expected)=>{
+        expect(isXmlMimeType(mimeType)).toBe(expected);
+    });
+});
+
+//# sourceMappingURL=getFileTypeIdentity.spec.js.map

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

@@ -0,0 +1 @@
+{"version":3,"sources":["../../src/uploads/getFileTypeIdentity.spec.ts"],"sourcesContent":["import { describe, expect, it } from 'vitest'\n\nimport { getSanitizedUploadFilename, isXmlMimeType } from './getFileTypeIdentity.js'\n\ndescribe('getSanitizedUploadFilename', () => {\n  it('should use the output extension while preserving the sanitized source basename', () => {\n    expect(getSanitizedUploadFilename('incoming/image.jpg', 'png')).toBe('image.png')\n  })\n})\n\ndescribe('isXmlMimeType', () => {\n  it.each([\n    ['application/xml', true],\n    ['text/xml', true],\n    ['application/atom+xml', true],\n    ['image/svg+xml', true],\n    ['APPLICATION/XML', true],\n    [' Application/Atom+Xml; Charset=UTF-8 ', true],\n    ['text/plain', false],\n  ])('should classify %s as %s', (mimeType, expected) => {\n    expect(isXmlMimeType(mimeType)).toBe(expected)\n  })\n})\n"],"names":["describe","expect","it","getSanitizedUploadFilename","isXmlMimeType","toBe","each","mimeType","expected"],"mappings":"AAAA,SAASA,QAAQ,EAAEC,MAAM,EAAEC,EAAE,QAAQ,SAAQ;AAE7C,SAASC,0BAA0B,EAAEC,aAAa,QAAQ,2BAA0B;AAEpFJ,SAAS,8BAA8B;IACrCE,GAAG,kFAAkF;QACnFD,OAAOE,2BAA2B,sBAAsB,QAAQE,IAAI,CAAC;IACvE;AACF;AAEAL,SAAS,iBAAiB;IACxBE,GAAGI,IAAI,CAAC;QACN;YAAC;YAAmB;SAAK;QACzB;YAAC;YAAY;SAAK;QAClB;YAAC;YAAwB;SAAK;QAC9B;YAAC;YAAiB;SAAK;QACvB;YAAC;YAAmB;SAAK;QACzB;YAAC;YAAyC;SAAK;QAC/C;YAAC;YAAc;SAAM;KACtB,EAAE,4BAA4B,CAACC,UAAUC;QACxCP,OAAOG,cAAcG,WAAWF,IAAI,CAACG;IACvC;AACF"}

package/dist/uploads/isProcessableImage.d.ts

@@ -0,0 +1,2 @@
+export declare function isProcessableImage(mimeType: string): boolean;
+//# sourceMappingURL=isProcessableImage.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"isProcessableImage.d.ts","sourceRoot":"","sources":["../../src/uploads/isProcessableImage.ts"],"names":[],"mappings":"AAGA,wBAAgB,kBAAkB,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAE5D"}

package/dist/uploads/isProcessableImage.js

@@ -0,0 +1,7 @@
+import { canResizeImage } from './canResizeImage.js';
+import { isImage } from './isImage.js';
+export function isProcessableImage(mimeType) {
+    return isImage(mimeType) || canResizeImage(mimeType);
+}
+
+//# sourceMappingURL=isProcessableImage.js.map

package/dist/uploads/isProcessableImage.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../src/uploads/isProcessableImage.ts"],"sourcesContent":["import { canResizeImage } from './canResizeImage.js'\nimport { isImage } from './isImage.js'\n\nexport function isProcessableImage(mimeType: string): boolean {\n  return isImage(mimeType) || canResizeImage(mimeType)\n}\n"],"names":["canResizeImage","isImage","isProcessableImage","mimeType"],"mappings":"AAAA,SAASA,cAAc,QAAQ,sBAAqB;AACpD,SAASC,OAAO,QAAQ,eAAc;AAEtC,OAAO,SAASC,mBAAmBC,QAAgB;IACjD,OAAOF,QAAQE,aAAaH,eAAeG;AAC7C"}

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

@@ -1 +1 @@
-{"version":3,"file":"safeFetch.d.ts","sourceRoot":"","sources":["../../src/uploads/safeFetch.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,MAAM,EAAE,MAAM,KAAK,CAAA;AAE5B,OAAO,EAAS,KAAK,IAAI,WAAW,EAAE,MAAM,QAAQ,CAAA;AAEpD;;GAEG;AACH,eAAO,MAAM,yBAAyB;;CAErC,CAAA;AAgDD;;;;;;GAMG;AACH,eAAO,MAAM,SAAS,4FAAoD,OAAO,CAAC,QAAQ,CA4CzF,CAAA"}
+{"version":3,"file":"safeFetch.d.ts","sourceRoot":"","sources":["../../src/uploads/safeFetch.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,MAAM,EAAE,MAAM,KAAK,CAAA;AAE5B,OAAO,EAAS,KAAK,IAAI,WAAW,EAAE,MAAM,QAAQ,CAAA;AAEpD;;GAEG;AACH,eAAO,MAAM,yBAAyB;;CAErC,CAAA;AAuDD;;;;;;GAMG;AACH,eAAO,MAAM,SAAS,4FAAoD,OAAO,CAAC,QAAQ,CA4CzF,CAAA"}

package/dist/uploads/safeFetch.js

@@ -6,6 +6,7 @@ import { Agent, fetch as undiciFetch } from 'undici';
  */ export const _internal_safeFetchGlobal = {
     lookup
 };
+const buildBlockedFetchError = (hostname)=>new Error(`Blocked unsafe attempt to ${hostname}. This host resolves to a private or internal address. ` + `If this is a trusted destination, allowlist it via the upload collection's "skipSafeFetch" option ` + `(https://payloadcms.com/docs/upload/overview#skip-safe-fetch).`);
 const isSafeIp = (ip)=>{
     try {
         if (!ip) {
@@ -39,7 +40,7 @@ const ssrfFilterInterceptor = (hostname, options, callback)=>{
                 ];
             }
             if (ips.some((ip)=>!isSafeIp(ip))) {
-                callback(new Error(`Blocked unsafe attempt to ${hostname}`), address, family);
+                callback(buildBlockedFetchError(hostname), address, family);
                 return;
             }
             callback(null, address, family);
@@ -68,7 +69,7 @@ const safeDispatcher = new Agent({
         }
         if (ipaddr.isValid(hostname)) {
             if (!isSafeIp(hostname)) {
-                throw new Error(`Blocked unsafe attempt to ${hostname}`);
+                throw buildBlockedFetchError(hostname);
             }
         }
         return await undiciFetch(url, {

package/dist/uploads/safeFetch.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/uploads/safeFetch.ts"],"sourcesContent":["import type { LookupFunction } from 'net'\n\nimport { lookup } from 'dns'\nimport ipaddr from 'ipaddr.js'\nimport { Agent, fetch as undiciFetch } from 'undici'\n\n/**\n * @internal this is used to mock the IP `lookup` function in integration tests\n */\nexport const _internal_safeFetchGlobal = {\n  lookup,\n}\n\nconst isSafeIp = (ip: string) => {\n  try {\n    if (!ip) {\n      return false\n    }\n\n    if (!ipaddr.isValid(ip)) {\n      return false\n    }\n\n    const parsedIpAddress = ipaddr.parse(ip)\n    const range = parsedIpAddress.range()\n    if (range !== 'unicast') {\n      return false // Private IP Range\n    }\n  } catch (ignore) {\n    return false\n  }\n  return true\n}\n\nconst ssrfFilterInterceptor: LookupFunction = (hostname, options, callback) => {\n  _internal_safeFetchGlobal.lookup(hostname, options, (err, address, family) => {\n    if (err) {\n      callback(err, address, family)\n    } else {\n      let ips = [] as string[]\n      if (Array.isArray(address)) {\n        ips = address.map((a) => a.address)\n      } else {\n        ips = [address]\n      }\n\n      if (ips.some((ip) => !isSafeIp(ip))) {\n        callback(new Error(`Blocked unsafe attempt to ${hostname}`), address, family)\n        return\n      }\n\n      callback(null, address, family)\n    }\n  })\n}\n\nconst safeDispatcher = new Agent({\n  connect: { lookup: ssrfFilterInterceptor },\n})\n/**\n * A \"safe\" version of undici's fetch that prevents SSRF attacks.\n *\n * - Utilizes a custom dispatcher that filters out requests to unsafe IP addresses.\n * - Validates domain names by resolving them to IP addresses and checking if they're safe.\n * - Undici was used because it supported interceptors as well as \"credentials: include\". Native fetch\n */\nexport const safeFetch = async (...args: Parameters<typeof undiciFetch>): Promise<Response> => {\n  const [unverifiedUrl, options] = args\n\n  try {\n    const url = new URL(unverifiedUrl)\n\n    let hostname = url.hostname\n\n    // Strip brackets from IPv6 addresses (e.g., \"[::1]\" => \"::1\")\n    if (hostname.startsWith('[') && hostname.endsWith(']')) {\n      hostname = hostname.slice(1, -1)\n    }\n\n    if (ipaddr.isValid(hostname)) {\n      if (!isSafeIp(hostname)) {\n        throw new Error(`Blocked unsafe attempt to ${hostname}`)\n      }\n    }\n    return (await undiciFetch(url, {\n      ...options,\n      dispatcher: safeDispatcher,\n      redirect: 'manual', // Prevent automatic redirects\n    })) as unknown as Response\n  } catch (error) {\n    if (error instanceof Error) {\n      if (error.cause instanceof Error && error.cause.message.includes('unsafe')) {\n        // Errors thrown from within interceptors always have 'fetch error' as the message\n        // The desired message we want to bubble up is in the cause\n        throw new Error(error.cause.message)\n      } else {\n        let stringifiedUrl: string | undefined = undefined\n        if (typeof unverifiedUrl === 'string') {\n          stringifiedUrl = unverifiedUrl\n        } else if (unverifiedUrl instanceof URL) {\n          stringifiedUrl = unverifiedUrl.toString()\n        } else if (unverifiedUrl instanceof Request) {\n          stringifiedUrl = unverifiedUrl.url\n        }\n\n        throw new Error(`Failed to fetch from ${stringifiedUrl}, ${error.message}`)\n      }\n    }\n    throw error\n  }\n}\n"],"names":["lookup","ipaddr","Agent","fetch","undiciFetch","_internal_safeFetchGlobal","isSafeIp","ip","isValid","parsedIpAddress","parse","range","ignore","ssrfFilterInterceptor","hostname","options","callback","err","address","family","ips","Array","isArray","map","a","some","Error","safeDispatcher","connect","safeFetch","args","unverifiedUrl","url","URL","startsWith","endsWith","slice","dispatcher","redirect","error","cause","message","includes","stringifiedUrl","undefined","toString","Request"],"mappings":"AAEA,SAASA,MAAM,QAAQ,MAAK;AAC5B,OAAOC,YAAY,YAAW;AAC9B,SAASC,KAAK,EAAEC,SAASC,WAAW,QAAQ,SAAQ;AAEpD;;CAEC,GACD,OAAO,MAAMC,4BAA4B;IACvCL;AACF,EAAC;AAED,MAAMM,WAAW,CAACC;IAChB,IAAI;QACF,IAAI,CAACA,IAAI;YACP,OAAO;QACT;QAEA,IAAI,CAACN,OAAOO,OAAO,CAACD,KAAK;YACvB,OAAO;QACT;QAEA,MAAME,kBAAkBR,OAAOS,KAAK,CAACH;QACrC,MAAMI,QAAQF,gBAAgBE,KAAK;QACnC,IAAIA,UAAU,WAAW;YACvB,OAAO,MAAM,mBAAmB;;QAClC;IACF,EAAE,OAAOC,QAAQ;QACf,OAAO;IACT;IACA,OAAO;AACT;AAEA,MAAMC,wBAAwC,CAACC,UAAUC,SAASC;IAChEX,0BAA0BL,MAAM,CAACc,UAAUC,SAAS,CAACE,KAAKC,SAASC;QACjE,IAAIF,KAAK;YACPD,SAASC,KAAKC,SAASC;QACzB,OAAO;YACL,IAAIC,MAAM,EAAE;YACZ,IAAIC,MAAMC,OAAO,CAACJ,UAAU;gBAC1BE,MAAMF,QAAQK,GAAG,CAAC,CAACC,IAAMA,EAAEN,OAAO;YACpC,OAAO;gBACLE,MAAM;oBAACF;iBAAQ;YACjB;YAEA,IAAIE,IAAIK,IAAI,CAAC,CAAClB,KAAO,CAACD,SAASC,MAAM;gBACnCS,SAAS,IAAIU,MAAM,CAAC,0BAA0B,EAAEZ,UAAU,GAAGI,SAASC;gBACtE;YACF;YAEAH,SAAS,MAAME,SAASC;QAC1B;IACF;AACF;AAEA,MAAMQ,iBAAiB,IAAIzB,MAAM;IAC/B0B,SAAS;QAAE5B,QAAQa;IAAsB;AAC3C;AACA;;;;;;CAMC,GACD,OAAO,MAAMgB,YAAY,OAAO,GAAGC;IACjC,MAAM,CAACC,eAAehB,QAAQ,GAAGe;IAEjC,IAAI;QACF,MAAME,MAAM,IAAIC,IAAIF;QAEpB,IAAIjB,WAAWkB,IAAIlB,QAAQ;QAE3B,8DAA8D;QAC9D,IAAIA,SAASoB,UAAU,CAAC,QAAQpB,SAASqB,QAAQ,CAAC,MAAM;YACtDrB,WAAWA,SAASsB,KAAK,CAAC,GAAG,CAAC;QAChC;QAEA,IAAInC,OAAOO,OAAO,CAACM,WAAW;YAC5B,IAAI,CAACR,SAASQ,WAAW;gBACvB,MAAM,IAAIY,MAAM,CAAC,0BAA0B,EAAEZ,UAAU;YACzD;QACF;QACA,OAAQ,MAAMV,YAAY4B,KAAK;YAC7B,GAAGjB,OAAO;YACVsB,YAAYV;YACZW,UAAU;QACZ;IACF,EAAE,OAAOC,OAAO;QACd,IAAIA,iBAAiBb,OAAO;YAC1B,IAAIa,MAAMC,KAAK,YAAYd,SAASa,MAAMC,KAAK,CAACC,OAAO,CAACC,QAAQ,CAAC,WAAW;gBAC1E,kFAAkF;gBAClF,2DAA2D;gBAC3D,MAAM,IAAIhB,MAAMa,MAAMC,KAAK,CAACC,OAAO;YACrC,OAAO;gBACL,IAAIE,iBAAqCC;gBACzC,IAAI,OAAOb,kBAAkB,UAAU;oBACrCY,iBAAiBZ;gBACnB,OAAO,IAAIA,yBAAyBE,KAAK;oBACvCU,iBAAiBZ,cAAcc,QAAQ;gBACzC,OAAO,IAAId,yBAAyBe,SAAS;oBAC3CH,iBAAiBZ,cAAcC,GAAG;gBACpC;gBAEA,MAAM,IAAIN,MAAM,CAAC,qBAAqB,EAAEiB,eAAe,EAAE,EAAEJ,MAAME,OAAO,EAAE;YAC5E;QACF;QACA,MAAMF;IACR;AACF,EAAC"}
+{"version":3,"sources":["../../src/uploads/safeFetch.ts"],"sourcesContent":["import type { LookupFunction } from 'net'\n\nimport { lookup } from 'dns'\nimport ipaddr from 'ipaddr.js'\nimport { Agent, fetch as undiciFetch } from 'undici'\n\n/**\n * @internal this is used to mock the IP `lookup` function in integration tests\n */\nexport const _internal_safeFetchGlobal = {\n  lookup,\n}\n\nconst buildBlockedFetchError = (hostname: string): Error =>\n  new Error(\n    `Blocked unsafe attempt to ${hostname}. This host resolves to a private or internal address. ` +\n      `If this is a trusted destination, allowlist it via the upload collection's \"skipSafeFetch\" option ` +\n      `(https://payloadcms.com/docs/upload/overview#skip-safe-fetch).`,\n  )\n\nconst isSafeIp = (ip: string) => {\n  try {\n    if (!ip) {\n      return false\n    }\n\n    if (!ipaddr.isValid(ip)) {\n      return false\n    }\n\n    const parsedIpAddress = ipaddr.parse(ip)\n    const range = parsedIpAddress.range()\n    if (range !== 'unicast') {\n      return false // Private IP Range\n    }\n  } catch (ignore) {\n    return false\n  }\n  return true\n}\n\nconst ssrfFilterInterceptor: LookupFunction = (hostname, options, callback) => {\n  _internal_safeFetchGlobal.lookup(hostname, options, (err, address, family) => {\n    if (err) {\n      callback(err, address, family)\n    } else {\n      let ips = [] as string[]\n      if (Array.isArray(address)) {\n        ips = address.map((a) => a.address)\n      } else {\n        ips = [address]\n      }\n\n      if (ips.some((ip) => !isSafeIp(ip))) {\n        callback(buildBlockedFetchError(hostname), address, family)\n        return\n      }\n\n      callback(null, address, family)\n    }\n  })\n}\n\nconst safeDispatcher = new Agent({\n  connect: { lookup: ssrfFilterInterceptor },\n})\n/**\n * A \"safe\" version of undici's fetch that prevents SSRF attacks.\n *\n * - Utilizes a custom dispatcher that filters out requests to unsafe IP addresses.\n * - Validates domain names by resolving them to IP addresses and checking if they're safe.\n * - Undici was used because it supported interceptors as well as \"credentials: include\". Native fetch\n */\nexport const safeFetch = async (...args: Parameters<typeof undiciFetch>): Promise<Response> => {\n  const [unverifiedUrl, options] = args\n\n  try {\n    const url = new URL(unverifiedUrl)\n\n    let hostname = url.hostname\n\n    // Strip brackets from IPv6 addresses (e.g., \"[::1]\" => \"::1\")\n    if (hostname.startsWith('[') && hostname.endsWith(']')) {\n      hostname = hostname.slice(1, -1)\n    }\n\n    if (ipaddr.isValid(hostname)) {\n      if (!isSafeIp(hostname)) {\n        throw buildBlockedFetchError(hostname)\n      }\n    }\n    return (await undiciFetch(url, {\n      ...options,\n      dispatcher: safeDispatcher,\n      redirect: 'manual', // Prevent automatic redirects\n    })) as unknown as Response\n  } catch (error) {\n    if (error instanceof Error) {\n      if (error.cause instanceof Error && error.cause.message.includes('unsafe')) {\n        // Errors thrown from within interceptors always have 'fetch error' as the message\n        // The desired message we want to bubble up is in the cause\n        throw new Error(error.cause.message)\n      } else {\n        let stringifiedUrl: string | undefined = undefined\n        if (typeof unverifiedUrl === 'string') {\n          stringifiedUrl = unverifiedUrl\n        } else if (unverifiedUrl instanceof URL) {\n          stringifiedUrl = unverifiedUrl.toString()\n        } else if (unverifiedUrl instanceof Request) {\n          stringifiedUrl = unverifiedUrl.url\n        }\n\n        throw new Error(`Failed to fetch from ${stringifiedUrl}, ${error.message}`)\n      }\n    }\n    throw error\n  }\n}\n"],"names":["lookup","ipaddr","Agent","fetch","undiciFetch","_internal_safeFetchGlobal","buildBlockedFetchError","hostname","Error","isSafeIp","ip","isValid","parsedIpAddress","parse","range","ignore","ssrfFilterInterceptor","options","callback","err","address","family","ips","Array","isArray","map","a","some","safeDispatcher","connect","safeFetch","args","unverifiedUrl","url","URL","startsWith","endsWith","slice","dispatcher","redirect","error","cause","message","includes","stringifiedUrl","undefined","toString","Request"],"mappings":"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"}

package/dist/uploads/sanitizeUploadData.d.ts

@@ -0,0 +1,26 @@
+import type { FlattenedField } from '../fields/config/types.js';
+type Operation = 'create' | 'update';
+export type ExternalUploadSource = {
+    filename: string;
+    url: string;
+};
+type UploadDataOptions = {
+    locale?: string;
+    localizedProperties?: Set<string>;
+};
+export declare const getExternalUploadSource: (data: unknown) => ExternalUploadSource | undefined;
+export declare const getUploadDestination: ({ data, file, }: {
+    data: unknown;
+    file: {
+        clientUploadContext?: unknown;
+    } | null | undefined;
+}) => {
+    objectKey?: string;
+    prefix?: string;
+};
+export declare const getLocalizedUploadProperties: (fields: FlattenedField[]) => Set<string>;
+export declare const sanitizeUploadData: <T>(data: T, operation: Operation) => T;
+export declare const mergeUploadDataWithDocument: <T>(data: T, document: unknown, options?: UploadDataOptions) => T;
+export declare const restoreUploadDataFromDocument: <T>(data: T, document: unknown, options?: UploadDataOptions) => T;
+export {};
+//# sourceMappingURL=sanitizeUploadData.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"sanitizeUploadData.d.ts","sourceRoot":"","sources":["../../src/uploads/sanitizeUploadData.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAA;AAI/D,KAAK,SAAS,GAAG,QAAQ,GAAG,QAAQ,CAAA;AAEpC,MAAM,MAAM,oBAAoB,GAAG;IACjC,QAAQ,EAAE,MAAM,CAAA;IAChB,GAAG,EAAE,MAAM,CAAA;CACZ,CAAA;AAED,KAAK,iBAAiB,GAAG;IACvB,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,mBAAmB,CAAC,EAAE,GAAG,CAAC,MAAM,CAAC,CAAA;CAClC,CAAA;AAQD,eAAO,MAAM,uBAAuB,SAAU,OAAO,KAAG,oBAAoB,GAAG,SAS9E,CAAA;AAKD,eAAO,MAAM,oBAAoB,oBAG9B;IACD,IAAI,EAAE,OAAO,CAAA;IACb,IAAI,EAAE;QAAE,mBAAmB,CAAC,EAAE,OAAO,CAAA;KAAE,GAAG,IAAI,GAAG,SAAS,CAAA;CAC3D,KAAG;IAAE,SAAS,CAAC,EAAE,MAAM,CAAC;IAAC,MAAM,CAAC,EAAE,MAAM,CAAA;CAoBxC,CAAA;AAcD,eAAO,MAAM,4BAA4B,WAAY,cAAc,EAAE,KAAG,GAAG,CAAC,MAAM,CAUjF,CAAA;AAqBD,eAAO,MAAM,kBAAkB,GAAI,CAAC,QAAQ,CAAC,aAAa,SAAS,KAAG,CA4BrE,CAAA;AAQD,eAAO,MAAM,2BAA2B,GAAI,CAAC,QACrC,CAAC,YACG,OAAO,YACR,iBAAiB,KACzB,CA8BF,CAAA;AAiBD,eAAO,MAAM,6BAA6B,GAAI,CAAC,QACvC,CAAC,YACG,OAAO,YACR,iBAAiB,KACzB,CAeF,CAAA"}

package/dist/uploads/sanitizeUploadData.js

@@ -0,0 +1,159 @@
+import path from 'path';
+import { APIError } from '../errors/APIError.js';
+const hasOwnProperty = (value, key)=>Object.prototype.hasOwnProperty.call(value, key);
+const isRecord = (value)=>typeof value === 'object' && value !== null && !Array.isArray(value);
+export const getExternalUploadSource = (data)=>{
+    if (!isRecord(data) || typeof data.filename !== 'string' || typeof data.url !== 'string') {
+        return undefined;
+    }
+    return {
+        filename: data.filename,
+        url: data.url
+    };
+};
+// Resolves the server-owned upload destination for a document write. For client uploads the prefix
+// and key segment come from the verified upload context; for server uploads the prefix falls back
+// to the submitted document data and there is no key segment.
+export const getUploadDestination = ({ data, file })=>{
+    if (!file) {
+        return {};
+    }
+    const submittedPrefix = isRecord(data) && typeof data.prefix === 'string' ? data.prefix : undefined;
+    const { clientUploadContext } = file;
+    if (!isRecord(clientUploadContext)) {
+        return {
+            prefix: submittedPrefix
+        };
+    }
+    return {
+        objectKey: typeof clientUploadContext._objectKey === 'string' ? clientUploadContext._objectKey : undefined,
+        prefix: typeof clientUploadContext.prefix === 'string' ? clientUploadContext.prefix : undefined
+    };
+};
+const getDocumentProperty = (document, property, { locale, localizedProperties })=>{
+    const value = document[property];
+    return locale && localizedProperties?.has(property) && isRecord(value) ? value[locale] : value;
+};
+// Accepts flattened fields so localized identity fields declared inside presentational
+// containers (row/collapsible/unnamed tabs) are still detected — those live at the document
+// root data level but are nested in the config tree, so walking `fields` alone would miss them.
+export const getLocalizedUploadProperties = (fields)=>{
+    const localizedProperties = new Set();
+    for (const field of fields){
+        if ('name' in field && field.localized) {
+            localizedProperties.add(field.name);
+        }
+    }
+    return localizedProperties;
+};
+// The submitted filename is stripped by sanitizeUploadData regardless, so this only exists to
+// reject path-traversal attempts loudly (400) instead of silently dropping them. Non-string
+// values are ignored here because they are removed by the caller anyway.
+const validateFilename = (filename)=>{
+    if (typeof filename !== 'string') {
+        return;
+    }
+    const pathSegments = filename.replace(/\\/g, '/').split('/');
+    if (path.posix.isAbsolute(filename) || path.win32.isAbsolute(filename) || pathSegments.includes('..')) {
+        throw new APIError('Invalid filename.', 400);
+    }
+};
+export const sanitizeUploadData = (data, operation)=>{
+    if (!isRecord(data)) {
+        return data;
+    }
+    validateFilename(data.filename);
+    if (isRecord(data.sizes)) {
+        for (const sizeData of Object.values(data.sizes)){
+            if (isRecord(sizeData)) {
+                validateFilename(sizeData.filename);
+            }
+        }
+    }
+    const sanitizedData = {
+        ...data
+    };
+    delete sanitizedData.filename;
+    delete sanitizedData.sizes;
+    delete sanitizedData.url;
+    // Server-owned; never accepted from the caller.
+    delete sanitizedData._objectKey;
+    // On update, `prefix` is restored from the stored document (file identity); kept on create.
+    if (operation === 'update') {
+        delete sanitizedData.prefix;
+    }
+    return sanitizedData;
+};
+// Restores only the identity fields that select/serve a stored object (`filename`, `prefix`,
+// `url`, `sizes`). Other generated-but-derived fields (`thumbnailURL`, `filesize`, `height`,
+// `width`, `mimeType`, `focalX`/`focalY`) are intentionally left as submitted: `focalX`/`focalY`
+// are user-editable crop input, and the rest are regenerated by generateFileData when a file is
+// written. Compare with restoreUploadDataFromDocument (version restore), which re-binds the full
+// tuple below.
+export const mergeUploadDataWithDocument = (data, document, options = {})=>{
+    if (!isRecord(data) || !isRecord(document)) {
+        return data;
+    }
+    const mergedData = {
+        ...data
+    };
+    for (const property of [
+        '_objectKey',
+        'filename',
+        'prefix',
+        'url'
+    ]){
+        if (!hasOwnProperty(data, property) && hasOwnProperty(document, property)) {
+            mergedData[property] = getDocumentProperty(document, property, options);
+        }
+    }
+    const documentSizes = getDocumentProperty(document, 'sizes', options);
+    if (!hasOwnProperty(data, 'sizes') && hasOwnProperty(document, 'sizes')) {
+        mergedData.sizes = documentSizes;
+    } else if (isRecord(data.sizes) && isRecord(documentSizes)) {
+        const mergedSizes = {
+            ...documentSizes
+        };
+        for (const [sizeName, sizeData] of Object.entries(data.sizes)){
+            const documentSize = documentSizes[sizeName];
+            mergedSizes[sizeName] = isRecord(sizeData) && isRecord(documentSize) ? {
+                ...documentSize,
+                ...sizeData
+            } : sizeData;
+        }
+        mergedData.sizes = mergedSizes;
+    }
+    return mergedData;
+};
+const uploadDerivedProperties = [
+    '_objectKey',
+    'filename',
+    'filesize',
+    'focalX',
+    'focalY',
+    'height',
+    'mimeType',
+    'prefix',
+    'sizes',
+    'thumbnailURL',
+    'url',
+    'width'
+];
+export const restoreUploadDataFromDocument = (data, document, options = {})=>{
+    if (!isRecord(data) || !isRecord(document)) {
+        return data;
+    }
+    const restoredData = {
+        ...data
+    };
+    for (const property of uploadDerivedProperties){
+        if (hasOwnProperty(document, property)) {
+            restoredData[property] = getDocumentProperty(document, property, options);
+        } else {
+            delete restoredData[property];
+        }
+    }
+    return restoredData;
+};
+
+//# sourceMappingURL=sanitizeUploadData.js.map

package/dist/uploads/sanitizeUploadData.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../src/uploads/sanitizeUploadData.ts"],"sourcesContent":["import path from 'path'\n\nimport type { FlattenedField } from '../fields/config/types.js'\n\nimport { APIError } from '../errors/APIError.js'\n\ntype Operation = 'create' | 'update'\n\nexport type ExternalUploadSource = {\n  filename: string\n  url: string\n}\n\ntype UploadDataOptions = {\n  locale?: string\n  localizedProperties?: Set<string>\n}\n\nconst hasOwnProperty = (value: Record<string, unknown>, key: string): boolean =>\n  Object.prototype.hasOwnProperty.call(value, key)\n\nconst isRecord = (value: unknown): value is Record<string, unknown> =>\n  typeof value === 'object' && value !== null && !Array.isArray(value)\n\nexport const getExternalUploadSource = (data: unknown): ExternalUploadSource | undefined => {\n  if (!isRecord(data) || typeof data.filename !== 'string' || typeof data.url !== 'string') {\n    return undefined\n  }\n\n  return {\n    filename: data.filename,\n    url: data.url,\n  }\n}\n\n// Resolves the server-owned upload destination for a document write. For client uploads the prefix\n// and key segment come from the verified upload context; for server uploads the prefix falls back\n// to the submitted document data and there is no key segment.\nexport const getUploadDestination = ({\n  data,\n  file,\n}: {\n  data: unknown\n  file: { clientUploadContext?: unknown } | null | undefined\n}): { objectKey?: string; prefix?: string } => {\n  if (!file) {\n    return {}\n  }\n\n  const submittedPrefix =\n    isRecord(data) && typeof data.prefix === 'string' ? data.prefix : undefined\n  const { clientUploadContext } = file\n\n  if (!isRecord(clientUploadContext)) {\n    return { prefix: submittedPrefix }\n  }\n\n  return {\n    objectKey:\n      typeof clientUploadContext._objectKey === 'string'\n        ? clientUploadContext._objectKey\n        : undefined,\n    prefix: typeof clientUploadContext.prefix === 'string' ? clientUploadContext.prefix : undefined,\n  }\n}\n\nconst getDocumentProperty = (\n  document: Record<string, unknown>,\n  property: string,\n  { locale, localizedProperties }: UploadDataOptions,\n): unknown => {\n  const value = document[property]\n  return locale && localizedProperties?.has(property) && isRecord(value) ? value[locale] : value\n}\n\n// Accepts flattened fields so localized identity fields declared inside presentational\n// containers (row/collapsible/unnamed tabs) are still detected — those live at the document\n// root data level but are nested in the config tree, so walking `fields` alone would miss them.\nexport const getLocalizedUploadProperties = (fields: FlattenedField[]): Set<string> => {\n  const localizedProperties = new Set<string>()\n\n  for (const field of fields) {\n    if ('name' in field && (field as { localized?: boolean }).localized) {\n      localizedProperties.add(field.name)\n    }\n  }\n\n  return localizedProperties\n}\n\n// The submitted filename is stripped by sanitizeUploadData regardless, so this only exists to\n// reject path-traversal attempts loudly (400) instead of silently dropping them. Non-string\n// values are ignored here because they are removed by the caller anyway.\nconst validateFilename = (filename: unknown): void => {\n  if (typeof filename !== 'string') {\n    return\n  }\n\n  const pathSegments = filename.replace(/\\\\/g, '/').split('/')\n\n  if (\n    path.posix.isAbsolute(filename) ||\n    path.win32.isAbsolute(filename) ||\n    pathSegments.includes('..')\n  ) {\n    throw new APIError('Invalid filename.', 400)\n  }\n}\n\nexport const sanitizeUploadData = <T>(data: T, operation: Operation): T => {\n  if (!isRecord(data)) {\n    return data\n  }\n\n  validateFilename(data.filename)\n\n  if (isRecord(data.sizes)) {\n    for (const sizeData of Object.values(data.sizes)) {\n      if (isRecord(sizeData)) {\n        validateFilename(sizeData.filename)\n      }\n    }\n  }\n\n  const sanitizedData: Record<string, unknown> = { ...data }\n  delete sanitizedData.filename\n  delete sanitizedData.sizes\n  delete sanitizedData.url\n  // Server-owned; never accepted from the caller.\n  delete sanitizedData._objectKey\n\n  // On update, `prefix` is restored from the stored document (file identity); kept on create.\n  if (operation === 'update') {\n    delete sanitizedData.prefix\n  }\n\n  return sanitizedData as T\n}\n\n// Restores only the identity fields that select/serve a stored object (`filename`, `prefix`,\n// `url`, `sizes`). Other generated-but-derived fields (`thumbnailURL`, `filesize`, `height`,\n// `width`, `mimeType`, `focalX`/`focalY`) are intentionally left as submitted: `focalX`/`focalY`\n// are user-editable crop input, and the rest are regenerated by generateFileData when a file is\n// written. Compare with restoreUploadDataFromDocument (version restore), which re-binds the full\n// tuple below.\nexport const mergeUploadDataWithDocument = <T>(\n  data: T,\n  document: unknown,\n  options: UploadDataOptions = {},\n): T => {\n  if (!isRecord(data) || !isRecord(document)) {\n    return data\n  }\n\n  const mergedData: Record<string, unknown> = { ...data }\n\n  for (const property of ['_objectKey', 'filename', 'prefix', 'url']) {\n    if (!hasOwnProperty(data, property) && hasOwnProperty(document, property)) {\n      mergedData[property] = getDocumentProperty(document, property, options)\n    }\n  }\n\n  const documentSizes = getDocumentProperty(document, 'sizes', options)\n  if (!hasOwnProperty(data, 'sizes') && hasOwnProperty(document, 'sizes')) {\n    mergedData.sizes = documentSizes\n  } else if (isRecord(data.sizes) && isRecord(documentSizes)) {\n    const mergedSizes: Record<string, unknown> = { ...documentSizes }\n\n    for (const [sizeName, sizeData] of Object.entries(data.sizes)) {\n      const documentSize = documentSizes[sizeName]\n\n      mergedSizes[sizeName] =\n        isRecord(sizeData) && isRecord(documentSize) ? { ...documentSize, ...sizeData } : sizeData\n    }\n\n    mergedData.sizes = mergedSizes\n  }\n\n  return mergedData as T\n}\n\nconst uploadDerivedProperties = [\n  '_objectKey',\n  'filename',\n  'filesize',\n  'focalX',\n  'focalY',\n  'height',\n  'mimeType',\n  'prefix',\n  'sizes',\n  'thumbnailURL',\n  'url',\n  'width',\n] as const\n\nexport const restoreUploadDataFromDocument = <T>(\n  data: T,\n  document: unknown,\n  options: UploadDataOptions = {},\n): T => {\n  if (!isRecord(data) || !isRecord(document)) {\n    return data\n  }\n\n  const restoredData: Record<string, unknown> = { ...data }\n  for (const property of uploadDerivedProperties) {\n    if (hasOwnProperty(document, property)) {\n      restoredData[property] = getDocumentProperty(document, property, options)\n    } else {\n      delete restoredData[property]\n    }\n  }\n\n  return restoredData as T\n}\n"],"names":["path","APIError","hasOwnProperty","value","key","Object","prototype","call","isRecord","Array","isArray","getExternalUploadSource","data","filename","url","undefined","getUploadDestination","file","submittedPrefix","prefix","clientUploadContext","objectKey","_objectKey","getDocumentProperty","document","property","locale","localizedProperties","has","getLocalizedUploadProperties","fields","Set","field","localized","add","name","validateFilename","pathSegments","replace","split","posix","isAbsolute","win32","includes","sanitizeUploadData","operation","sizes","sizeData","values","sanitizedData","mergeUploadDataWithDocument","options","mergedData","documentSizes","mergedSizes","sizeName","entries","documentSize","uploadDerivedProperties","restoreUploadDataFromDocument","restoredData"],"mappings":"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"}

package/dist/uploads/sanitizeUploadData.spec.js

@@ -0,0 +1,255 @@
+import { describe, expect, it } from 'vitest';
+import { getExternalUploadSource, getLocalizedUploadProperties, getUploadDestination, mergeUploadDataWithDocument, restoreUploadDataFromDocument, sanitizeUploadData } from './sanitizeUploadData.js';
+import { flattenAllFields } from '../utilities/flattenAllFields.js';
+describe('sanitizeUploadData', ()=>{
+    it('should preserve only the temporary external upload source', ()=>{
+        expect(getExternalUploadSource({
+            alt: 'Alternative text',
+            filename: 'remote.png',
+            sizes: {
+                thumbnail: {
+                    filename: 'submitted-thumbnail.png'
+                }
+            },
+            url: 'https://example.com/remote.png'
+        })).toEqual({
+            filename: 'remote.png',
+            url: 'https://example.com/remote.png'
+        });
+    });
+    it('should remove submitted generated file data on update', ()=>{
+        expect(sanitizeUploadData({
+            alt: 'Updated alternative text',
+            filename: 'submitted.png',
+            prefix: 'articles',
+            sizes: {
+                thumbnail: {
+                    filename: 'submitted-thumbnail.png',
+                    height: 100,
+                    width: 100
+                }
+            },
+            url: '/api/media/file/submitted.png'
+        }, 'update')).toEqual({
+            alt: 'Updated alternative text'
+        });
+    });
+    it('should preserve a submitted prefix on create', ()=>{
+        expect(sanitizeUploadData({
+            filename: 'submitted.png',
+            prefix: 'articles'
+        }, 'create')).toEqual({
+            prefix: 'articles'
+        });
+    });
+    it('should use a submitted prefix when writing a new file', ()=>{
+        expect(getUploadDestination({
+            data: {
+                prefix: 'articles'
+            },
+            file: {}
+        })).toEqual({
+            prefix: 'articles'
+        });
+    });
+    it('should use the destination bound to a client upload context', ()=>{
+        expect(getUploadDestination({
+            data: {
+                prefix: 'submitted'
+            },
+            file: {
+                clientUploadContext: {
+                    _objectKey: 'abc123',
+                    prefix: 'provider'
+                }
+            }
+        })).toEqual({
+            objectKey: 'abc123',
+            prefix: 'provider'
+        });
+        expect(getUploadDestination({
+            data: {
+                prefix: 'submitted'
+            },
+            file: {
+                clientUploadContext: {
+                    key: 'provider/file.png'
+                }
+            }
+        })).toEqual({});
+    });
+    it('should not preserve a submitted prefix without a new file', ()=>{
+        expect(getUploadDestination({
+            data: {
+                prefix: 'articles'
+            },
+            file: undefined
+        })).toEqual({});
+    });
+    it.each([
+        {
+            filename: '../submitted.png'
+        },
+        {
+            filename: '/submitted.png'
+        },
+        {
+            filename: 'C:\\submitted.png'
+        },
+        {
+            filename: '\\\\server\\submitted.png'
+        },
+        {
+            filename: 'images/../submitted.png'
+        },
+        {
+            sizes: {
+                thumbnail: {
+                    filename: '..\\submitted-thumbnail.png'
+                }
+            }
+        }
+    ])('should reject an invalid submitted filename', (data)=>{
+        expect(()=>sanitizeUploadData(data, 'update')).toThrow('Invalid filename.');
+    });
+});
+describe('mergeUploadDataWithDocument', ()=>{
+    it('should add stored generated file data to an update', ()=>{
+        expect(mergeUploadDataWithDocument({
+            alt: 'Updated alternative text'
+        }, {
+            filename: 'stored.png',
+            prefix: 'articles',
+            sizes: {
+                thumbnail: {
+                    filename: 'stored-thumbnail.png',
+                    height: 100,
+                    width: 100
+                }
+            },
+            url: '/api/media/file/stored.png'
+        })).toEqual({
+            alt: 'Updated alternative text',
+            filename: 'stored.png',
+            prefix: 'articles',
+            sizes: {
+                thumbnail: {
+                    filename: 'stored-thumbnail.png',
+                    height: 100,
+                    width: 100
+                }
+            },
+            url: '/api/media/file/stored.png'
+        });
+    });
+    it('should preserve generated file data supplied by a trusted hook', ()=>{
+        expect(mergeUploadDataWithDocument({
+            filename: 'hook.png',
+            prefix: 'hook-prefix',
+            sizes: {
+                thumbnail: {
+                    filename: 'hook-thumbnail.png'
+                }
+            },
+            url: '/api/media/file/hook.png'
+        }, {
+            filename: 'stored.png',
+            prefix: 'stored-prefix',
+            sizes: {
+                thumbnail: {
+                    filename: 'stored-thumbnail.png',
+                    height: 100,
+                    width: 100
+                }
+            },
+            url: '/api/media/file/stored.png'
+        })).toEqual({
+            filename: 'hook.png',
+            prefix: 'hook-prefix',
+            sizes: {
+                thumbnail: {
+                    filename: 'hook-thumbnail.png',
+                    height: 100,
+                    width: 100
+                }
+            },
+            url: '/api/media/file/hook.png'
+        });
+    });
+    it('should merge the selected value for localized generated file data', ()=>{
+        expect(mergeUploadDataWithDocument({
+            alt: 'Updated alternative text'
+        }, {
+            prefix: {
+                en: 'current-prefix',
+                es: 'prefijo-actual'
+            }
+        }, {
+            locale: 'en',
+            localizedProperties: new Set([
+                'prefix'
+            ])
+        })).toEqual({
+            alt: 'Updated alternative text',
+            prefix: 'current-prefix'
+        });
+    });
+});
+describe('getLocalizedUploadProperties', ()=>{
+    it('should identify localized flattened fields', ()=>{
+        expect(getLocalizedUploadProperties(flattenAllFields({
+            fields: [
+                {
+                    fields: [
+                        {
+                            localized: true,
+                            name: 'prefix',
+                            type: 'text'
+                        },
+                        {
+                            name: 'url',
+                            type: 'text'
+                        }
+                    ],
+                    type: 'row'
+                }
+            ]
+        }))).toEqual(new Set([
+            'prefix'
+        ]));
+    });
+});
+describe('restoreUploadDataFromDocument', ()=>{
+    it('should replace the complete generated file tuple and preserve missing values', ()=>{
+        expect(restoreUploadDataFromDocument({
+            filename: 'version.png',
+            focalX: 10,
+            thumbnailURL: '/version-thumbnail.png'
+        }, {
+            filename: 'current.png',
+            thumbnailURL: null
+        })).toEqual({
+            filename: 'current.png',
+            thumbnailURL: null
+        });
+    });
+    it('should restore the selected value for localized generated file data', ()=>{
+        expect(restoreUploadDataFromDocument({
+            prefix: 'version-prefix'
+        }, {
+            prefix: {
+                en: 'current-prefix',
+                es: 'prefijo-actual'
+            }
+        }, {
+            locale: 'en',
+            localizedProperties: new Set([
+                'prefix'
+            ])
+        })).toEqual({
+            prefix: 'current-prefix'
+        });
+    });
+});
+
+//# sourceMappingURL=sanitizeUploadData.spec.js.map

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

@@ -0,0 +1 @@
+{"version":3,"sources":["../../src/uploads/sanitizeUploadData.spec.ts"],"sourcesContent":["import { describe, expect, it } from 'vitest'\n\nimport {\n  getExternalUploadSource,\n  getLocalizedUploadProperties,\n  getUploadDestination,\n  mergeUploadDataWithDocument,\n  restoreUploadDataFromDocument,\n  sanitizeUploadData,\n} from './sanitizeUploadData.js'\nimport { flattenAllFields } from '../utilities/flattenAllFields.js'\n\ndescribe('sanitizeUploadData', () => {\n  it('should preserve only the temporary external upload source', () => {\n    expect(\n      getExternalUploadSource({\n        alt: 'Alternative text',\n        filename: 'remote.png',\n        sizes: { thumbnail: { filename: 'submitted-thumbnail.png' } },\n        url: 'https://example.com/remote.png',\n      }),\n    ).toEqual({\n      filename: 'remote.png',\n      url: 'https://example.com/remote.png',\n    })\n  })\n\n  it('should remove submitted generated file data on update', () => {\n    expect(\n      sanitizeUploadData(\n        {\n          alt: 'Updated alternative text',\n          filename: 'submitted.png',\n          prefix: 'articles',\n          sizes: {\n            thumbnail: {\n              filename: 'submitted-thumbnail.png',\n              height: 100,\n              width: 100,\n            },\n          },\n          url: '/api/media/file/submitted.png',\n        },\n        'update',\n      ),\n    ).toEqual({\n      alt: 'Updated alternative text',\n    })\n  })\n\n  it('should preserve a submitted prefix on create', () => {\n    expect(\n      sanitizeUploadData(\n        {\n          filename: 'submitted.png',\n          prefix: 'articles',\n        },\n        'create',\n      ),\n    ).toEqual({\n      prefix: 'articles',\n    })\n  })\n\n  it('should use a submitted prefix when writing a new file', () => {\n    expect(getUploadDestination({ data: { prefix: 'articles' }, file: {} })).toEqual({\n      prefix: 'articles',\n    })\n  })\n\n  it('should use the destination bound to a client upload context', () => {\n    expect(\n      getUploadDestination({\n        data: { prefix: 'submitted' },\n        file: { clientUploadContext: { _objectKey: 'abc123', prefix: 'provider' } },\n      }),\n    ).toEqual({ objectKey: 'abc123', prefix: 'provider' })\n    expect(\n      getUploadDestination({\n        data: { prefix: 'submitted' },\n        file: { clientUploadContext: { key: 'provider/file.png' } },\n      }),\n    ).toEqual({})\n  })\n\n  it('should not preserve a submitted prefix without a new file', () => {\n    expect(getUploadDestination({ data: { prefix: 'articles' }, file: undefined })).toEqual({})\n  })\n\n  it.each([\n    { filename: '../submitted.png' },\n    { filename: '/submitted.png' },\n    { filename: 'C:\\\\submitted.png' },\n    { filename: '\\\\\\\\server\\\\submitted.png' },\n    { filename: 'images/../submitted.png' },\n    { sizes: { thumbnail: { filename: '..\\\\submitted-thumbnail.png' } } },\n  ])('should reject an invalid submitted filename', (data) => {\n    expect(() => sanitizeUploadData(data, 'update')).toThrow('Invalid filename.')\n  })\n})\n\ndescribe('mergeUploadDataWithDocument', () => {\n  it('should add stored generated file data to an update', () => {\n    expect(\n      mergeUploadDataWithDocument(\n        { alt: 'Updated alternative text' },\n        {\n          filename: 'stored.png',\n          prefix: 'articles',\n          sizes: {\n            thumbnail: {\n              filename: 'stored-thumbnail.png',\n              height: 100,\n              width: 100,\n            },\n          },\n          url: '/api/media/file/stored.png',\n        },\n      ),\n    ).toEqual({\n      alt: 'Updated alternative text',\n      filename: 'stored.png',\n      prefix: 'articles',\n      sizes: {\n        thumbnail: {\n          filename: 'stored-thumbnail.png',\n          height: 100,\n          width: 100,\n        },\n      },\n      url: '/api/media/file/stored.png',\n    })\n  })\n\n  it('should preserve generated file data supplied by a trusted hook', () => {\n    expect(\n      mergeUploadDataWithDocument(\n        {\n          filename: 'hook.png',\n          prefix: 'hook-prefix',\n          sizes: { thumbnail: { filename: 'hook-thumbnail.png' } },\n          url: '/api/media/file/hook.png',\n        },\n        {\n          filename: 'stored.png',\n          prefix: 'stored-prefix',\n          sizes: {\n            thumbnail: { filename: 'stored-thumbnail.png', height: 100, width: 100 },\n          },\n          url: '/api/media/file/stored.png',\n        },\n      ),\n    ).toEqual({\n      filename: 'hook.png',\n      prefix: 'hook-prefix',\n      sizes: {\n        thumbnail: { filename: 'hook-thumbnail.png', height: 100, width: 100 },\n      },\n      url: '/api/media/file/hook.png',\n    })\n  })\n\n  it('should merge the selected value for localized generated file data', () => {\n    expect(\n      mergeUploadDataWithDocument(\n        { alt: 'Updated alternative text' },\n        { prefix: { en: 'current-prefix', es: 'prefijo-actual' } },\n        { locale: 'en', localizedProperties: new Set(['prefix']) },\n      ),\n    ).toEqual({ alt: 'Updated alternative text', prefix: 'current-prefix' })\n  })\n})\n\ndescribe('getLocalizedUploadProperties', () => {\n  it('should identify localized flattened fields', () => {\n    expect(\n      getLocalizedUploadProperties(\n        flattenAllFields({\n          fields: [\n            {\n              fields: [\n                { localized: true, name: 'prefix', type: 'text' },\n                { name: 'url', type: 'text' },\n              ],\n              type: 'row',\n            },\n          ],\n        }),\n      ),\n    ).toEqual(new Set(['prefix']))\n  })\n})\n\ndescribe('restoreUploadDataFromDocument', () => {\n  it('should replace the complete generated file tuple and preserve missing values', () => {\n    expect(\n      restoreUploadDataFromDocument(\n        { filename: 'version.png', focalX: 10, thumbnailURL: '/version-thumbnail.png' },\n        { filename: 'current.png', thumbnailURL: null },\n      ),\n    ).toEqual({ filename: 'current.png', thumbnailURL: null })\n  })\n\n  it('should restore the selected value for localized generated file data', () => {\n    expect(\n      restoreUploadDataFromDocument(\n        { prefix: 'version-prefix' },\n        { prefix: { en: 'current-prefix', es: 'prefijo-actual' } },\n        { locale: 'en', localizedProperties: new Set(['prefix']) },\n      ),\n    ).toEqual({ prefix: 'current-prefix' })\n  })\n})\n"],"names":["describe","expect","it","getExternalUploadSource","getLocalizedUploadProperties","getUploadDestination","mergeUploadDataWithDocument","restoreUploadDataFromDocument","sanitizeUploadData","flattenAllFields","alt","filename","sizes","thumbnail","url","toEqual","prefix","height","width","data","file","clientUploadContext","_objectKey","objectKey","key","undefined","each","toThrow","en","es","locale","localizedProperties","Set","fields","localized","name","type","focalX","thumbnailURL"],"mappings":"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"}