payload 3.0.0-beta.10 → 3.0.0-beta.101

package/dist/types/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/types/index.ts"],"sourcesContent":["import type { I18n, TFunction } from '@payloadcms/translations'\nimport type DataLoader from 'dataloader'\n\nimport type { User } from '../auth/types.js'\nimport type { TypeWithID, TypeWithTimestamps } from '../collections/config/types.js'\nimport type payload from '../index.js'\nimport type { GeneratedTypes } from '../index.js'\nimport type { validOperators } from './constants.js'\nexport type { Payload as Payload } from '../index.js'\n\nexport type UploadEdits = {\n  crop?: {\n    height?: number\n    width?: number\n    x?: number\n    y?: number\n  }\n  focalPoint?: {\n    x?: number\n    y?: number\n  }\n}\n\nexport type CustomPayloadRequest<U = unknown> = {\n  context: RequestContext\n  /** Data from the request body */\n  data?: Record<string, unknown>\n  /** The locale that should be used for a field when it is not translated to the requested locale */\n  fallbackLocale?: string\n  /**\n   * The files that were uploaded during this request\n   */\n  file?: {\n    data: Buffer\n    mimetype: string\n    name: string\n    size: number\n    tempFilePath?: string\n  }\n  i18n: I18n\n  /**\n   * The requested locale if specified\n   * Only available for localized collections\n   */\n  locale?: GeneratedTypes['locale']\n  /**\n   * The payload object\n   */\n  payload: typeof payload\n  /**\n   * The context in which the request is being made\n   */\n  payloadAPI: 'GraphQL' | 'REST' | 'local'\n  /** Optimized document loader */\n  payloadDataLoader?: DataLoader<string, TypeWithID>\n  /** Resized versions of the image that was uploaded during this request */\n  payloadUploadSizes?: Record<string, Buffer>\n  /** Query params on the request */\n  query: Record<string, unknown>\n  /** The route parameters\n   * @example\n   * /:collection/:id -> /posts/123\n   * { collection: 'posts', id: '123' }\n   */\n  routeParams?: Record<string, unknown>\n  /** Translate function - duplicate of i18n.t */\n  t: TFunction\n  /**\n   * Identifier for the database transaction for interactions in a single, all-or-nothing operation.\n   */\n  transactionID?: number | string\n  /**\n   * Used to ensure consistency when multiple operations try to create a transaction concurrently on the same request\n   */\n  transactionIDPromise?: Promise<void>\n  /** The signed in user */\n  user: (U & GeneratedTypes['user']) | null\n} & Pick<\n  URL,\n  'hash' | 'host' | 'href' | 'origin' | 'pathname' | 'port' | 'protocol' | 'search' | 'searchParams'\n>\nexport type PayloadRequest<U = unknown> = Partial<Request> &\n  Required<Pick<Request, 'headers'>> &\n  CustomPayloadRequest<U>\nexport interface RequestContext {\n  [key: string]: unknown\n}\n\nexport type Operator = (typeof validOperators)[number]\n\nexport type WhereField = {\n  [key in Operator]?: unknown\n}\n\nexport type Where = {\n  [key: string]: Where[] | WhereField\n  and?: Where[]\n  or?: Where[]\n}\n\n// eslint-disable-next-line @typescript-eslint/no-explicit-any\nexport type Document = any\n\nexport type Operation = 'create' | 'delete' | 'read' | 'update'\nexport type VersionOperations = 'readVersions'\nexport type AuthOperations = 'unlock'\nexport type AllOperations = AuthOperations | Operation | VersionOperations\n\nexport function docHasTimestamps(doc: any): doc is TypeWithTimestamps {\n  return doc?.createdAt && doc?.updatedAt\n}\n"],"names":["docHasTimestamps","doc","createdAt","updatedAt"],"rangeMappings":";;","mappings":"AA4GA,OAAO,SAASA,iBAAiBC,GAAQ;IACvC,OAAOA,KAAKC,aAAaD,KAAKE;AAChC"}
+{"version":3,"sources":["../../src/types/index.ts"],"sourcesContent":["import type { I18n, TFunction } from '@payloadcms/translations'\nimport type DataLoader from 'dataloader'\n\nimport type { TypeWithID, TypeWithTimestamps } from '../collections/config/types.js'\nimport type payload from '../index.js'\nimport type { TypedLocale, TypedUser } from '../index.js'\nimport type { validOperators } from './constants.js'\nexport type { Payload as Payload } from '../index.js'\n\nexport type CustomPayloadRequestProperties = {\n  context: RequestContext\n  /** The locale that should be used for a field when it is not translated to the requested locale */\n  fallbackLocale?: string\n  i18n: I18n\n  /**\n   * The requested locale if specified\n   * Only available for localized collections\n   */\n  locale?: TypedLocale\n  /**\n   * The payload object\n   */\n  payload: typeof payload\n  /**\n   * The context in which the request is being made\n   */\n  payloadAPI: 'GraphQL' | 'local' | 'REST'\n  /** Optimized document loader */\n  payloadDataLoader?: DataLoader<string, TypeWithID>\n  /** Resized versions of the image that was uploaded during this request */\n  payloadUploadSizes?: Record<string, Buffer>\n  /** Query params on the request */\n  query: Record<string, unknown>\n  /** Any response headers that are required to be set when a response is sent */\n  responseHeaders?: Headers\n  /** The route parameters\n   * @example\n   * /:collection/:id -> /posts/123\n   * { collection: 'posts', id: '123' }\n   */\n  routeParams?: Record<string, unknown>\n  /** Translate function - duplicate of i18n.t */\n  t: TFunction\n  /**\n   * Identifier for the database transaction for interactions in a single, all-or-nothing operation.\n   * Can also be used to ensure consistency when multiple operations try to create a transaction concurrently on the same request.\n   */\n  transactionID?: number | Promise<number | string> | string\n  /**\n   * Used to ensure consistency when multiple operations try to create a transaction concurrently on the same request\n   */\n  transactionIDPromise?: Promise<void>\n  /** The signed-in user */\n  user: null | TypedUser\n} & Pick<\n  URL,\n  'hash' | 'host' | 'href' | 'origin' | 'pathname' | 'port' | 'protocol' | 'search' | 'searchParams'\n>\ntype PayloadRequestData = {\n  /**\n   * Data from the request body\n   *\n   * Within Payload operations, i.e. hooks, data will be there\n   * BUT in custom endpoints it will not be, you will need to\n   * use either:\n   *  1. `const data = await req.json()`\n   *\n   *  2. import { addDataAndFileToRequest } from '@payloadcms/next/utilities'\n   *    `await addDataAndFileToRequest(req)`\n   * */\n  data?: JsonObject\n  /** The file on the request, same rules apply as the `data` property */\n  file?: {\n    data: Buffer\n    mimetype: string\n    name: string\n    size: number\n    tempFilePath?: string\n  }\n}\nexport type PayloadRequest = CustomPayloadRequestProperties &\n  Partial<Request> &\n  PayloadRequestData &\n  Required<Pick<Request, 'headers'>>\n\nexport interface RequestContext {\n  [key: string]: unknown\n}\n\nexport type Operator = (typeof validOperators)[number]\n\n// Makes it so things like passing new Date() will error\nexport type JsonValue = JsonArray | JsonObject | unknown //Date | JsonArray | JsonObject | boolean | null | number | string // TODO: Evaluate proper, strong type for this\n\nexport interface JsonArray extends Array<JsonValue> {}\n\nexport interface JsonObject {\n  [key: string]: any\n}\n\nexport type WhereField = {\n  // any json-serializable value\n  [key in Operator]?: JsonValue\n}\n\nexport type Where = {\n  [key: string]: Where[] | WhereField\n  and?: Where[]\n  or?: Where[]\n}\n\n// eslint-disable-next-line @typescript-eslint/no-explicit-any\nexport type Document = any\n\nexport type Operation = 'create' | 'delete' | 'read' | 'update'\nexport type VersionOperations = 'readVersions'\nexport type AuthOperations = 'unlock'\nexport type AllOperations = AuthOperations | Operation | VersionOperations\n\nexport function docHasTimestamps(doc: any): doc is TypeWithTimestamps {\n  return doc?.createdAt && doc?.updatedAt\n}\n\nexport type IfAny<T, Y, N> = 0 extends 1 & T ? Y : N // This is a commonly used trick to detect 'any'\nexport type IsAny<T> = IfAny<T, true, false>\nexport type ReplaceAny<T, DefaultType> = IsAny<T> extends true ? DefaultType : T\n"],"names":["docHasTimestamps","doc","createdAt","updatedAt"],"mappings":"AAuHA,OAAO,SAASA,iBAAiBC,GAAQ;IACvC,OAAOA,KAAKC,aAAaD,KAAKE;AAChC"}

package/dist/uploads/canResizeImage.d.ts

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

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

@@ -1 +1 @@
-{"version":3,"file":"canResizeImage.d.ts","sourceRoot":"","sources":["../../src/uploads/canResizeImage.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,OAAO,UAAU,cAAc,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAEhE"}
+{"version":3,"file":"canResizeImage.d.ts","sourceRoot":"","sources":["../../src/uploads/canResizeImage.ts"],"names":[],"mappings":"AAAA,wBAAgB,cAAc,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAExD"}

package/dist/uploads/canResizeImage.js

@@ -1,4 +1,4 @@
-export default function canResizeImage(mimeType) {
+export function canResizeImage(mimeType) {
     return [
         'image/jpeg',
         'image/png',

package/dist/uploads/canResizeImage.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/uploads/canResizeImage.ts"],"sourcesContent":["export default function canResizeImage(mimeType: string): boolean {\n  return ['image/jpeg', 'image/png', 'image/gif', 'image/webp', 'image/tiff'].indexOf(mimeType) > -1\n}\n"],"names":["canResizeImage","mimeType","indexOf"],"rangeMappings":";;;;;;;;","mappings":"AAAA,eAAe,SAASA,eAAeC,QAAgB;IACrD,OAAO;QAAC;QAAc;QAAa;QAAa;QAAc;KAAa,CAACC,OAAO,CAACD,YAAY,CAAC;AACnG"}
+{"version":3,"sources":["../../src/uploads/canResizeImage.ts"],"sourcesContent":["export function canResizeImage(mimeType: string): boolean {\n  return ['image/jpeg', 'image/png', 'image/gif', 'image/webp', 'image/tiff'].indexOf(mimeType) > -1\n}\n"],"names":["canResizeImage","mimeType","indexOf"],"mappings":"AAAA,OAAO,SAASA,eAAeC,QAAgB;IAC7C,OAAO;QAAC;QAAc;QAAa;QAAa;QAAc;KAAa,CAACC,OAAO,CAACD,YAAY,CAAC;AACnG"}

package/dist/uploads/cropImage.d.ts

@@ -1,8 +1,24 @@
+import type { SanitizedConfig } from '../config/types.js';
+import type { PayloadRequest } from '../types/index.js';
+import type { WithMetadata } from './optionallyAppendMetadata.js';
+import type { UploadEdits } from './types.js';
 export declare const percentToPixel: (value: any, dimension: any) => number;
-export default function cropImage({ cropData, dimensions, file, sharp }: {
-    cropData: any;
-    dimensions: any;
-    file: any;
-    sharp: any;
-}): Promise<any>;
+type CropImageArgs = {
+    cropData: UploadEdits['crop'];
+    dimensions: {
+        height: number;
+        width: number;
+    };
+    file: PayloadRequest['file'];
+    heightInPixels: number;
+    req?: PayloadRequest;
+    sharp: SanitizedConfig['sharp'];
+    widthInPixels: number;
+    withMetadata?: WithMetadata;
+};
+export declare function cropImage({ cropData, dimensions, file, heightInPixels, req, sharp, widthInPixels, withMetadata, }: CropImageArgs): Promise<{
+    data: Buffer;
+    info: import("sharp").OutputInfo;
+}>;
+export {};
 //# sourceMappingURL=cropImage.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"cropImage.d.ts","sourceRoot":"","sources":["../../src/uploads/cropImage.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,cAAc,wCAE1B,CAAA;AAED,wBAA8B,SAAS,CAAC,EAAE,QAAQ,EAAE,UAAU,EAAE,IAAI,EAAE,KAAK,EAAE;;;;;CAAA,gBAoB5E"}
+{"version":3,"file":"cropImage.d.ts","sourceRoot":"","sources":["../../src/uploads/cropImage.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAA;AACzD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAA;AACvD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,+BAA+B,CAAA;AACjE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,YAAY,CAAA;AAI7C,eAAO,MAAM,cAAc,wCAE1B,CAAA;AAED,KAAK,aAAa,GAAG;IACnB,QAAQ,EAAE,WAAW,CAAC,MAAM,CAAC,CAAA;IAC7B,UAAU,EAAE;QAAE,MAAM,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,CAAA;IAC7C,IAAI,EAAE,cAAc,CAAC,MAAM,CAAC,CAAA;IAC5B,cAAc,EAAE,MAAM,CAAA;IACtB,GAAG,CAAC,EAAE,cAAc,CAAA;IACpB,KAAK,EAAE,eAAe,CAAC,OAAO,CAAC,CAAA;IAC/B,aAAa,EAAE,MAAM,CAAA;IACrB,YAAY,CAAC,EAAE,YAAY,CAAA;CAC5B,CAAA;AACD,wBAAsB,SAAS,CAAC,EAC9B,QAAQ,EACR,UAAU,EACV,IAAI,EACJ,cAAc,EACd,GAAG,EACH,KAAK,EACL,aAAa,EACb,YAAY,GACb,EAAE,aAAa;;;GAkCf"}

package/dist/uploads/cropImage.js

@@ -1,16 +1,31 @@
+import { optionallyAppendMetadata } from './optionallyAppendMetadata.js';
 export const percentToPixel = (value, dimension)=>{
     return Math.floor(parseFloat(value) / 100 * dimension);
 };
-export default async function cropImage({ cropData, dimensions, file, sharp }) {
+export async function cropImage({ cropData, dimensions, file, heightInPixels, req, sharp, widthInPixels, withMetadata }) {
     try {
-        const { height, width, x, y } = cropData;
+        const { x, y } = cropData;
+        const fileIsAnimatedType = [
+            'image/avif',
+            'image/gif',
+            'image/webp'
+        ].includes(file.mimetype);
+        const sharpOptions = {};
+        if (fileIsAnimatedType) {
+            sharpOptions.animated = true;
+        }
         const formattedCropData = {
-            height: percentToPixel(height, dimensions.height),
+            height: Number(heightInPixels),
             left: percentToPixel(x, dimensions.width),
             top: percentToPixel(y, dimensions.height),
-            width: percentToPixel(width, dimensions.width)
+            width: Number(widthInPixels)
         };
-        const cropped = sharp(file.tempFilePath || file.data).extract(formattedCropData);
+        let cropped = sharp(file.tempFilePath || file.data, sharpOptions).extract(formattedCropData);
+        cropped = await optionallyAppendMetadata({
+            req,
+            sharpFile: cropped,
+            withMetadata
+        });
         return await cropped.toBuffer({
             resolveWithObject: true
         });

package/dist/uploads/cropImage.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/uploads/cropImage.ts"],"sourcesContent":["export const percentToPixel = (value, dimension) => {\n  return Math.floor((parseFloat(value) / 100) * dimension)\n}\n\nexport default async function cropImage({ cropData, dimensions, file, sharp }) {\n  try {\n    const { height, width, x, y } = cropData\n\n    const formattedCropData = {\n      height: percentToPixel(height, dimensions.height),\n      left: percentToPixel(x, dimensions.width),\n      top: percentToPixel(y, dimensions.height),\n      width: percentToPixel(width, dimensions.width),\n    }\n\n    const cropped = sharp(file.tempFilePath || file.data).extract(formattedCropData)\n\n    return await cropped.toBuffer({\n      resolveWithObject: true,\n    })\n  } catch (error) {\n    console.error(`Error cropping image:`, error)\n    throw error\n  }\n}\n"],"names":["percentToPixel","value","dimension","Math","floor","parseFloat","cropImage","cropData","dimensions","file","sharp","height","width","x","y","formattedCropData","left","top","cropped","tempFilePath","data","extract","toBuffer","resolveWithObject","error","console"],"rangeMappings":";;;;;;;;;;;;;;;;;;;;","mappings":"AAAA,OAAO,MAAMA,iBAAiB,CAACC,OAAOC;IACpC,OAAOC,KAAKC,KAAK,CAAC,AAACC,WAAWJ,SAAS,MAAOC;AAChD,EAAC;AAED,eAAe,eAAeI,UAAU,EAAEC,QAAQ,EAAEC,UAAU,EAAEC,IAAI,EAAEC,KAAK,EAAE;IAC3E,IAAI;QACF,MAAM,EAAEC,MAAM,EAAEC,KAAK,EAAEC,CAAC,EAAEC,CAAC,EAAE,GAAGP;QAEhC,MAAMQ,oBAAoB;YACxBJ,QAAQX,eAAeW,QAAQH,WAAWG,MAAM;YAChDK,MAAMhB,eAAea,GAAGL,WAAWI,KAAK;YACxCK,KAAKjB,eAAec,GAAGN,WAAWG,MAAM;YACxCC,OAAOZ,eAAeY,OAAOJ,WAAWI,KAAK;QAC/C;QAEA,MAAMM,UAAUR,MAAMD,KAAKU,YAAY,IAAIV,KAAKW,IAAI,EAAEC,OAAO,CAACN;QAE9D,OAAO,MAAMG,QAAQI,QAAQ,CAAC;YAC5BC,mBAAmB;QACrB;IACF,EAAE,OAAOC,OAAO;QACdC,QAAQD,KAAK,CAAC,CAAC,qBAAqB,CAAC,EAAEA;QACvC,MAAMA;IACR;AACF"}
+{"version":3,"sources":["../../src/uploads/cropImage.ts"],"sourcesContent":["import type { SharpOptions } from 'sharp'\n\nimport type { SanitizedConfig } from '../config/types.js'\nimport type { PayloadRequest } from '../types/index.js'\nimport type { WithMetadata } from './optionallyAppendMetadata.js'\nimport type { UploadEdits } from './types.js'\n\nimport { optionallyAppendMetadata } from './optionallyAppendMetadata.js'\n\nexport const percentToPixel = (value, dimension) => {\n  return Math.floor((parseFloat(value) / 100) * dimension)\n}\n\ntype CropImageArgs = {\n  cropData: UploadEdits['crop']\n  dimensions: { height: number; width: number }\n  file: PayloadRequest['file']\n  heightInPixels: number\n  req?: PayloadRequest\n  sharp: SanitizedConfig['sharp']\n  widthInPixels: number\n  withMetadata?: WithMetadata\n}\nexport async function cropImage({\n  cropData,\n  dimensions,\n  file,\n  heightInPixels,\n  req,\n  sharp,\n  widthInPixels,\n  withMetadata,\n}: CropImageArgs) {\n  try {\n    const { x, y } = cropData\n\n    const fileIsAnimatedType = ['image/avif', 'image/gif', 'image/webp'].includes(file.mimetype)\n\n    const sharpOptions: SharpOptions = {}\n\n    if (fileIsAnimatedType) {\n      sharpOptions.animated = true\n    }\n\n    const formattedCropData = {\n      height: Number(heightInPixels),\n      left: percentToPixel(x, dimensions.width),\n      top: percentToPixel(y, dimensions.height),\n      width: Number(widthInPixels),\n    }\n\n    let cropped = sharp(file.tempFilePath || file.data, sharpOptions).extract(formattedCropData)\n\n    cropped = await optionallyAppendMetadata({\n      req,\n      sharpFile: cropped,\n      withMetadata,\n    })\n\n    return await cropped.toBuffer({\n      resolveWithObject: true,\n    })\n  } catch (error) {\n    console.error(`Error cropping image:`, error)\n    throw error\n  }\n}\n"],"names":["optionallyAppendMetadata","percentToPixel","value","dimension","Math","floor","parseFloat","cropImage","cropData","dimensions","file","heightInPixels","req","sharp","widthInPixels","withMetadata","x","y","fileIsAnimatedType","includes","mimetype","sharpOptions","animated","formattedCropData","height","Number","left","width","top","cropped","tempFilePath","data","extract","sharpFile","toBuffer","resolveWithObject","error","console"],"mappings":"AAOA,SAASA,wBAAwB,QAAQ,gCAA+B;AAExE,OAAO,MAAMC,iBAAiB,CAACC,OAAOC;IACpC,OAAOC,KAAKC,KAAK,CAAC,AAACC,WAAWJ,SAAS,MAAOC;AAChD,EAAC;AAYD,OAAO,eAAeI,UAAU,EAC9BC,QAAQ,EACRC,UAAU,EACVC,IAAI,EACJC,cAAc,EACdC,GAAG,EACHC,KAAK,EACLC,aAAa,EACbC,YAAY,EACE;IACd,IAAI;QACF,MAAM,EAAEC,CAAC,EAAEC,CAAC,EAAE,GAAGT;QAEjB,MAAMU,qBAAqB;YAAC;YAAc;YAAa;SAAa,CAACC,QAAQ,CAACT,KAAKU,QAAQ;QAE3F,MAAMC,eAA6B,CAAC;QAEpC,IAAIH,oBAAoB;YACtBG,aAAaC,QAAQ,GAAG;QAC1B;QAEA,MAAMC,oBAAoB;YACxBC,QAAQC,OAAOd;YACfe,MAAMzB,eAAee,GAAGP,WAAWkB,KAAK;YACxCC,KAAK3B,eAAegB,GAAGR,WAAWe,MAAM;YACxCG,OAAOF,OAAOX;QAChB;QAEA,IAAIe,UAAUhB,MAAMH,KAAKoB,YAAY,IAAIpB,KAAKqB,IAAI,EAAEV,cAAcW,OAAO,CAACT;QAE1EM,UAAU,MAAM7B,yBAAyB;YACvCY;YACAqB,WAAWJ;YACXd;QACF;QAEA,OAAO,MAAMc,QAAQK,QAAQ,CAAC;YAC5BC,mBAAmB;QACrB;IACF,EAAE,OAAOC,OAAO;QACdC,QAAQD,KAAK,CAAC,CAAC,qBAAqB,CAAC,EAAEA;QACvC,MAAMA;IACR;AACF"}

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

@@ -1 +1 @@
-{"version":3,"file":"deleteAssociatedFiles.d.ts","sourceRoot":"","sources":["../../src/uploads/deleteAssociatedFiles.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,gCAAgC,CAAA;AAC/E,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAA;AACzD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAA;AACvD,OAAO,KAAK,EAAY,UAAU,EAAE,MAAM,YAAY,CAAA;AAKtD,KAAK,IAAI,GAAG;IACV,gBAAgB,EAAE,yBAAyB,CAAA;IAC3C,MAAM,EAAE,eAAe,CAAA;IACvB,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;IAC5B,KAAK,CAAC,EAAE,UAAU,EAAE,CAAA;IACpB,cAAc,EAAE,OAAO,CAAA;IACvB,GAAG,EAAE,cAAc,CAAA;CACpB,CAAA;AAED,eAAO,MAAM,qBAAqB,EAAE,CAAC,IAAI,EAAE,IAAI,KAAK,OAAO,CAAC,IAAI,CAwC/D,CAAA"}
+{"version":3,"file":"deleteAssociatedFiles.d.ts","sourceRoot":"","sources":["../../src/uploads/deleteAssociatedFiles.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,gCAAgC,CAAA;AAC/E,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAA;AACzD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAA;AACvD,OAAO,KAAK,EAAY,UAAU,EAAE,MAAM,YAAY,CAAA;AAKtD,KAAK,IAAI,GAAG;IACV,gBAAgB,EAAE,yBAAyB,CAAA;IAC3C,MAAM,EAAE,eAAe,CAAA;IACvB,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;IAC5B,KAAK,CAAC,EAAE,UAAU,EAAE,CAAA;IACpB,cAAc,EAAE,OAAO,CAAA;IACvB,GAAG,EAAE,cAAc,CAAA;CACpB,CAAA;AAED,eAAO,MAAM,qBAAqB,EAAE,CAAC,IAAI,EAAE,IAAI,KAAK,OAAO,CAAC,IAAI,CAyC/D,CAAA"}

package/dist/uploads/deleteAssociatedFiles.js

@@ -2,7 +2,9 @@ import fs from 'fs';
 import { ErrorDeletingFile } from '../errors/index.js';
 import fileExists from './fileExists.js';
 export const deleteAssociatedFiles = async ({ collectionConfig, doc, files = [], overrideDelete, req })=>{
-    if (!collectionConfig.upload) return;
+    if (!collectionConfig.upload) {
+        return;
+    }
     if (overrideDelete || files.length > 0) {
         const { staticDir: staticPath } = collectionConfig.upload;
         const fileToDelete = `${staticPath}/${doc.filename}`;
@@ -18,11 +20,9 @@ export const deleteAssociatedFiles = async ({ collectionConfig, doc, files = [],
             // Since forEach will not wait until unlink is finished it could
             // happen that two operations will try to delete the same file.
             // To avoid this it is recommended to use "sync" instead
-            // eslint-disable-next-line no-restricted-syntax
             for (const size of sizes){
                 const sizeToDelete = `${staticPath}/${size.filename}`;
                 try {
-                    // eslint-disable-next-line no-await-in-loop
                     if (await fileExists(sizeToDelete)) {
                         fs.unlinkSync(sizeToDelete);
                     }

package/dist/uploads/deleteAssociatedFiles.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/uploads/deleteAssociatedFiles.ts"],"sourcesContent":["import fs from 'fs'\n\nimport type { SanitizedCollectionConfig } from '../collections/config/types.js'\nimport type { SanitizedConfig } from '../config/types.js'\nimport type { PayloadRequest } from '../types/index.js'\nimport type { FileData, FileToSave } from './types.js'\n\nimport { ErrorDeletingFile } from '../errors/index.js'\nimport fileExists from './fileExists.js'\n\ntype Args = {\n  collectionConfig: SanitizedCollectionConfig\n  config: SanitizedConfig\n  doc: Record<string, unknown>\n  files?: FileToSave[]\n  overrideDelete: boolean\n  req: PayloadRequest\n}\n\nexport const deleteAssociatedFiles: (args: Args) => Promise<void> = async ({\n  collectionConfig,\n  doc,\n  files = [],\n  overrideDelete,\n  req,\n}) => {\n  if (!collectionConfig.upload) return\n  if (overrideDelete || files.length > 0) {\n    const { staticDir: staticPath } = collectionConfig.upload\n\n    const fileToDelete = `${staticPath}/${doc.filename as string}`\n\n    try {\n      if (await fileExists(fileToDelete)) {\n        fs.unlinkSync(fileToDelete)\n      }\n    } catch (err) {\n      throw new ErrorDeletingFile(req.t)\n    }\n\n    if (doc.sizes) {\n      const sizes: FileData[] = Object.values(doc.sizes)\n      // Since forEach will not wait until unlink is finished it could\n      // happen that two operations will try to delete the same file.\n      // To avoid this it is recommended to use \"sync\" instead\n      // eslint-disable-next-line no-restricted-syntax\n      for (const size of sizes) {\n        const sizeToDelete = `${staticPath}/${size.filename}`\n        try {\n          // eslint-disable-next-line no-await-in-loop\n          if (await fileExists(sizeToDelete)) {\n            fs.unlinkSync(sizeToDelete)\n          }\n        } catch (err) {\n          throw new ErrorDeletingFile(req.t)\n        }\n      }\n    }\n  }\n}\n"],"names":["fs","ErrorDeletingFile","fileExists","deleteAssociatedFiles","collectionConfig","doc","files","overrideDelete","req","upload","length","staticDir","staticPath","fileToDelete","filename","unlinkSync","err","t","sizes","Object","values","size","sizeToDelete"],"rangeMappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;","mappings":"AAAA,OAAOA,QAAQ,KAAI;AAOnB,SAASC,iBAAiB,QAAQ,qBAAoB;AACtD,OAAOC,gBAAgB,kBAAiB;AAWxC,OAAO,MAAMC,wBAAuD,OAAO,EACzEC,gBAAgB,EAChBC,GAAG,EACHC,QAAQ,EAAE,EACVC,cAAc,EACdC,GAAG,EACJ;IACC,IAAI,CAACJ,iBAAiBK,MAAM,EAAE;IAC9B,IAAIF,kBAAkBD,MAAMI,MAAM,GAAG,GAAG;QACtC,MAAM,EAAEC,WAAWC,UAAU,EAAE,GAAGR,iBAAiBK,MAAM;QAEzD,MAAMI,eAAe,CAAC,EAAED,WAAW,CAAC,EAAEP,IAAIS,QAAQ,CAAW,CAAC;QAE9D,IAAI;YACF,IAAI,MAAMZ,WAAWW,eAAe;gBAClCb,GAAGe,UAAU,CAACF;YAChB;QACF,EAAE,OAAOG,KAAK;YACZ,MAAM,IAAIf,kBAAkBO,IAAIS,CAAC;QACnC;QAEA,IAAIZ,IAAIa,KAAK,EAAE;YACb,MAAMA,QAAoBC,OAAOC,MAAM,CAACf,IAAIa,KAAK;YACjD,gEAAgE;YAChE,+DAA+D;YAC/D,wDAAwD;YACxD,gDAAgD;YAChD,KAAK,MAAMG,QAAQH,MAAO;gBACxB,MAAMI,eAAe,CAAC,EAAEV,WAAW,CAAC,EAAES,KAAKP,QAAQ,CAAC,CAAC;gBACrD,IAAI;oBACF,4CAA4C;oBAC5C,IAAI,MAAMZ,WAAWoB,eAAe;wBAClCtB,GAAGe,UAAU,CAACO;oBAChB;gBACF,EAAE,OAAON,KAAK;oBACZ,MAAM,IAAIf,kBAAkBO,IAAIS,CAAC;gBACnC;YACF;QACF;IACF;AACF,EAAC"}
+{"version":3,"sources":["../../src/uploads/deleteAssociatedFiles.ts"],"sourcesContent":["import fs from 'fs'\n\nimport type { SanitizedCollectionConfig } from '../collections/config/types.js'\nimport type { SanitizedConfig } from '../config/types.js'\nimport type { PayloadRequest } from '../types/index.js'\nimport type { FileData, FileToSave } from './types.js'\n\nimport { ErrorDeletingFile } from '../errors/index.js'\nimport fileExists from './fileExists.js'\n\ntype Args = {\n  collectionConfig: SanitizedCollectionConfig\n  config: SanitizedConfig\n  doc: Record<string, unknown>\n  files?: FileToSave[]\n  overrideDelete: boolean\n  req: PayloadRequest\n}\n\nexport const deleteAssociatedFiles: (args: Args) => Promise<void> = async ({\n  collectionConfig,\n  doc,\n  files = [],\n  overrideDelete,\n  req,\n}) => {\n  if (!collectionConfig.upload) {\n    return\n  }\n  if (overrideDelete || files.length > 0) {\n    const { staticDir: staticPath } = collectionConfig.upload\n\n    const fileToDelete = `${staticPath}/${doc.filename as string}`\n\n    try {\n      if (await fileExists(fileToDelete)) {\n        fs.unlinkSync(fileToDelete)\n      }\n    } catch (err) {\n      throw new ErrorDeletingFile(req.t)\n    }\n\n    if (doc.sizes) {\n      const sizes: FileData[] = Object.values(doc.sizes)\n      // Since forEach will not wait until unlink is finished it could\n      // happen that two operations will try to delete the same file.\n      // To avoid this it is recommended to use \"sync\" instead\n\n      for (const size of sizes) {\n        const sizeToDelete = `${staticPath}/${size.filename}`\n        try {\n          if (await fileExists(sizeToDelete)) {\n            fs.unlinkSync(sizeToDelete)\n          }\n        } catch (err) {\n          throw new ErrorDeletingFile(req.t)\n        }\n      }\n    }\n  }\n}\n"],"names":["fs","ErrorDeletingFile","fileExists","deleteAssociatedFiles","collectionConfig","doc","files","overrideDelete","req","upload","length","staticDir","staticPath","fileToDelete","filename","unlinkSync","err","t","sizes","Object","values","size","sizeToDelete"],"mappings":"AAAA,OAAOA,QAAQ,KAAI;AAOnB,SAASC,iBAAiB,QAAQ,qBAAoB;AACtD,OAAOC,gBAAgB,kBAAiB;AAWxC,OAAO,MAAMC,wBAAuD,OAAO,EACzEC,gBAAgB,EAChBC,GAAG,EACHC,QAAQ,EAAE,EACVC,cAAc,EACdC,GAAG,EACJ;IACC,IAAI,CAACJ,iBAAiBK,MAAM,EAAE;QAC5B;IACF;IACA,IAAIF,kBAAkBD,MAAMI,MAAM,GAAG,GAAG;QACtC,MAAM,EAAEC,WAAWC,UAAU,EAAE,GAAGR,iBAAiBK,MAAM;QAEzD,MAAMI,eAAe,CAAC,EAAED,WAAW,CAAC,EAAEP,IAAIS,QAAQ,CAAW,CAAC;QAE9D,IAAI;YACF,IAAI,MAAMZ,WAAWW,eAAe;gBAClCb,GAAGe,UAAU,CAACF;YAChB;QACF,EAAE,OAAOG,KAAK;YACZ,MAAM,IAAIf,kBAAkBO,IAAIS,CAAC;QACnC;QAEA,IAAIZ,IAAIa,KAAK,EAAE;YACb,MAAMA,QAAoBC,OAAOC,MAAM,CAACf,IAAIa,KAAK;YACjD,gEAAgE;YAChE,+DAA+D;YAC/D,wDAAwD;YAExD,KAAK,MAAMG,QAAQH,MAAO;gBACxB,MAAMI,eAAe,CAAC,EAAEV,WAAW,CAAC,EAAES,KAAKP,QAAQ,CAAC,CAAC;gBACrD,IAAI;oBACF,IAAI,MAAMZ,WAAWoB,eAAe;wBAClCtB,GAAGe,UAAU,CAACO;oBAChB;gBACF,EAAE,OAAON,KAAK;oBACZ,MAAM,IAAIf,kBAAkBO,IAAIS,CAAC;gBACnC;YACF;QACF;IACF;AACF,EAAC"}

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

@@ -1 +1 @@
-{"version":3,"file":"docWithFilenameExists.d.ts","sourceRoot":"","sources":["../../src/uploads/docWithFilenameExists.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAA;AAEvD,KAAK,IAAI,GAAG;IACV,cAAc,EAAE,MAAM,CAAA;IACtB,QAAQ,EAAE,MAAM,CAAA;IAChB,IAAI,EAAE,MAAM,CAAA;IACZ,GAAG,EAAE,cAAc,CAAA;CACpB,CAAA;AAED,QAAA,MAAM,qBAAqB,sCAA6C,IAAI,KAAG,QAAQ,OAAO,CAa7F,CAAA;AAED,eAAe,qBAAqB,CAAA"}
+{"version":3,"file":"docWithFilenameExists.d.ts","sourceRoot":"","sources":["../../src/uploads/docWithFilenameExists.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAA;AAEvD,KAAK,IAAI,GAAG;IACV,cAAc,EAAE,MAAM,CAAA;IACtB,QAAQ,EAAE,MAAM,CAAA;IAChB,IAAI,EAAE,MAAM,CAAA;IACZ,GAAG,EAAE,cAAc,CAAA;CACpB,CAAA;AAED,QAAA,MAAM,qBAAqB,sCAA6C,IAAI,KAAG,OAAO,CAAC,OAAO,CAe7F,CAAA;AAED,eAAe,qBAAqB,CAAA"}

package/dist/uploads/docWithFilenameExists.js

@@ -8,7 +8,9 @@ const docWithFilenameExists = async ({ collectionSlug, filename, req })=>{
             }
         }
     });
-    if (doc) return true;
+    if (doc) {
+        return true;
+    }
     return false;
 };
 export default docWithFilenameExists;

package/dist/uploads/docWithFilenameExists.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/uploads/docWithFilenameExists.ts"],"sourcesContent":["import type { PayloadRequest } from '../types/index.js'\n\ntype Args = {\n  collectionSlug: string\n  filename: string\n  path: string\n  req: PayloadRequest\n}\n\nconst docWithFilenameExists = async ({ collectionSlug, filename, req }: Args): Promise<boolean> => {\n  const doc = await req.payload.db.findOne({\n    collection: collectionSlug,\n    req,\n    where: {\n      filename: {\n        equals: filename,\n      },\n    },\n  })\n  if (doc) return true\n\n  return false\n}\n\nexport default docWithFilenameExists\n"],"names":["docWithFilenameExists","collectionSlug","filename","req","doc","payload","db","findOne","collection","where","equals"],"rangeMappings":";;;;;;;;;;;;;","mappings":"AASA,MAAMA,wBAAwB,OAAO,EAAEC,cAAc,EAAEC,QAAQ,EAAEC,GAAG,EAAQ;IAC1E,MAAMC,MAAM,MAAMD,IAAIE,OAAO,CAACC,EAAE,CAACC,OAAO,CAAC;QACvCC,YAAYP;QACZE;QACAM,OAAO;YACLP,UAAU;gBACRQ,QAAQR;YACV;QACF;IACF;IACA,IAAIE,KAAK,OAAO;IAEhB,OAAO;AACT;AAEA,eAAeJ,sBAAqB"}
+{"version":3,"sources":["../../src/uploads/docWithFilenameExists.ts"],"sourcesContent":["import type { PayloadRequest } from '../types/index.js'\n\ntype Args = {\n  collectionSlug: string\n  filename: string\n  path: string\n  req: PayloadRequest\n}\n\nconst docWithFilenameExists = async ({ collectionSlug, filename, req }: Args): Promise<boolean> => {\n  const doc = await req.payload.db.findOne({\n    collection: collectionSlug,\n    req,\n    where: {\n      filename: {\n        equals: filename,\n      },\n    },\n  })\n  if (doc) {\n    return true\n  }\n\n  return false\n}\n\nexport default docWithFilenameExists\n"],"names":["docWithFilenameExists","collectionSlug","filename","req","doc","payload","db","findOne","collection","where","equals"],"mappings":"AASA,MAAMA,wBAAwB,OAAO,EAAEC,cAAc,EAAEC,QAAQ,EAAEC,GAAG,EAAQ;IAC1E,MAAMC,MAAM,MAAMD,IAAIE,OAAO,CAACC,EAAE,CAACC,OAAO,CAAC;QACvCC,YAAYP;QACZE;QACAM,OAAO;YACLP,UAAU;gBACRQ,QAAQR;YACV;QACF;IACF;IACA,IAAIE,KAAK;QACP,OAAO;IACT;IAEA,OAAO;AACT;AAEA,eAAeJ,sBAAqB"}

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

@@ -1 +1 @@
-{"version":3,"file":"fileExists.d.ts","sourceRoot":"","sources":["../../src/uploads/fileExists.ts"],"names":[],"mappings":"AAEA,QAAA,MAAM,UAAU,aAAoB,MAAM,KAAG,QAAQ,OAAO,CAQ3D,CAAA;AAED,eAAe,UAAU,CAAA"}
+{"version":3,"file":"fileExists.d.ts","sourceRoot":"","sources":["../../src/uploads/fileExists.ts"],"names":[],"mappings":"AAEA,QAAA,MAAM,UAAU,aAAoB,MAAM,KAAG,OAAO,CAAC,OAAO,CAQ3D,CAAA;AAED,eAAe,UAAU,CAAA"}

package/dist/uploads/fileExists.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/uploads/fileExists.ts"],"sourcesContent":["import fs from 'fs'\n\nconst fileExists = async (filename: string): Promise<boolean> => {\n  try {\n    await fs.promises.stat(filename)\n\n    return true\n  } catch (err) {\n    return false\n  }\n}\n\nexport default fileExists\n"],"names":["fs","fileExists","filename","promises","stat","err"],"rangeMappings":";;;;;;;;;","mappings":"AAAA,OAAOA,QAAQ,KAAI;AAEnB,MAAMC,aAAa,OAAOC;IACxB,IAAI;QACF,MAAMF,GAAGG,QAAQ,CAACC,IAAI,CAACF;QAEvB,OAAO;IACT,EAAE,OAAOG,KAAK;QACZ,OAAO;IACT;AACF;AAEA,eAAeJ,WAAU"}
+{"version":3,"sources":["../../src/uploads/fileExists.ts"],"sourcesContent":["import fs from 'fs'\n\nconst fileExists = async (filename: string): Promise<boolean> => {\n  try {\n    await fs.promises.stat(filename)\n\n    return true\n  } catch (err) {\n    return false\n  }\n}\n\nexport default fileExists\n"],"names":["fs","fileExists","filename","promises","stat","err"],"mappings":"AAAA,OAAOA,QAAQ,KAAI;AAEnB,MAAMC,aAAa,OAAOC;IACxB,IAAI;QACF,MAAMF,GAAGG,QAAQ,CAACC,IAAI,CAACF;QAEvB,OAAO;IACT,EAAE,OAAOG,KAAK;QACZ,OAAO;IACT;AACF;AAEA,eAAeJ,WAAU"}

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

@@ -1 +1 @@
-{"version":3,"file":"formatFilesize.d.ts","sourceRoot":"","sources":["../../src/uploads/formatFilesize.ts"],"names":[],"mappings":"AAAA,wBAAgB,cAAc,CAAC,KAAK,EAAE,MAAM,EAAE,QAAQ,SAAI,GAAG,MAAM,CAUlE"}
+{"version":3,"file":"formatFilesize.d.ts","sourceRoot":"","sources":["../../src/uploads/formatFilesize.ts"],"names":[],"mappings":"AAAA,wBAAgB,cAAc,CAAC,KAAK,EAAE,MAAM,EAAE,QAAQ,SAAI,GAAG,MAAM,CAYlE"}

package/dist/uploads/formatFilesize.js

@@ -1,5 +1,7 @@
 export function formatFilesize(bytes, decimals = 0) {
-    if (bytes === 0) return '0 bytes';
+    if (bytes === 0) {
+        return '0 bytes';
+    }
     const k = 1024;
     const dm = decimals < 0 ? 0 : decimals;
     const sizes = [

package/dist/uploads/formatFilesize.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/uploads/formatFilesize.ts"],"sourcesContent":["export function formatFilesize(bytes: number, decimals = 0): string {\n  if (bytes === 0) return '0 bytes'\n\n  const k = 1024\n  const dm = decimals < 0 ? 0 : decimals\n  const sizes = [' bytes', 'KB', 'MB', 'GB', 'TB', 'PB', 'EB', 'ZB', 'YB']\n\n  const i = Math.floor(Math.log(bytes) / Math.log(k))\n\n  return `${parseFloat((bytes / k ** i).toFixed(dm))}${sizes[i]}`\n}\n"],"names":["formatFilesize","bytes","decimals","k","dm","sizes","i","Math","floor","log","parseFloat","toFixed"],"rangeMappings":";;;;;;;;;;;;;;;;;","mappings":"AAAA,OAAO,SAASA,eAAeC,KAAa,EAAEC,WAAW,CAAC;IACxD,IAAID,UAAU,GAAG,OAAO;IAExB,MAAME,IAAI;IACV,MAAMC,KAAKF,WAAW,IAAI,IAAIA;IAC9B,MAAMG,QAAQ;QAAC;QAAU;QAAM;QAAM;QAAM;QAAM;QAAM;QAAM;QAAM;KAAK;IAExE,MAAMC,IAAIC,KAAKC,KAAK,CAACD,KAAKE,GAAG,CAACR,SAASM,KAAKE,GAAG,CAACN;IAEhD,OAAO,CAAC,EAAEO,WAAW,AAACT,CAAAA,QAAQE,KAAKG,CAAAA,EAAGK,OAAO,CAACP,KAAK,EAAEC,KAAK,CAACC,EAAE,CAAC,CAAC;AACjE"}
+{"version":3,"sources":["../../src/uploads/formatFilesize.ts"],"sourcesContent":["export function formatFilesize(bytes: number, decimals = 0): string {\n  if (bytes === 0) {\n    return '0 bytes'\n  }\n\n  const k = 1024\n  const dm = decimals < 0 ? 0 : decimals\n  const sizes = [' bytes', 'KB', 'MB', 'GB', 'TB', 'PB', 'EB', 'ZB', 'YB']\n\n  const i = Math.floor(Math.log(bytes) / Math.log(k))\n\n  return `${parseFloat((bytes / k ** i).toFixed(dm))}${sizes[i]}`\n}\n"],"names":["formatFilesize","bytes","decimals","k","dm","sizes","i","Math","floor","log","parseFloat","toFixed"],"mappings":"AAAA,OAAO,SAASA,eAAeC,KAAa,EAAEC,WAAW,CAAC;IACxD,IAAID,UAAU,GAAG;QACf,OAAO;IACT;IAEA,MAAME,IAAI;IACV,MAAMC,KAAKF,WAAW,IAAI,IAAIA;IAC9B,MAAMG,QAAQ;QAAC;QAAU;QAAM;QAAM;QAAM;QAAM;QAAM;QAAM;QAAM;KAAK;IAExE,MAAMC,IAAIC,KAAKC,KAAK,CAACD,KAAKE,GAAG,CAACR,SAASM,KAAKE,GAAG,CAACN;IAEhD,OAAO,CAAC,EAAEO,WAAW,AAACT,CAAAA,QAAQE,KAAKG,CAAAA,EAAGK,OAAO,CAACP,KAAK,EAAEC,KAAK,CAACC,EAAE,CAAC,CAAC;AACjE"}

package/dist/uploads/generateFileData.d.ts

@@ -6,6 +6,8 @@ type Args<T> = {
     collection: Collection;
     config: SanitizedConfig;
     data: T;
+    operation: 'create' | 'update';
+    originalDoc?: T;
     overwriteExistingFiles?: boolean;
     req: PayloadRequest;
     throwOnMissingFile?: boolean;
@@ -14,6 +16,6 @@ type Result<T> = Promise<{
     data: T;
     files: FileToSave[];
 }>;
-export declare const generateFileData: <T>({ collection: { config: collectionConfig }, data, overwriteExistingFiles, req, throwOnMissingFile, }: Args<T>) => Result<T>;
+export declare const generateFileData: <T>({ collection: { config: collectionConfig }, data, operation, originalDoc, overwriteExistingFiles, req, throwOnMissingFile, }: Args<T>) => Result<T>;
 export {};
 //# sourceMappingURL=generateFileData.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"generateFileData.d.ts","sourceRoot":"","sources":["../../src/uploads/generateFileData.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,gCAAgC,CAAA;AAChE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAA;AACzD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAA;AACvD,OAAO,KAAK,EAAY,UAAU,EAAmB,MAAM,YAAY,CAAA;AAYvE,KAAK,IAAI,CAAC,CAAC,IAAI;IACb,UAAU,EAAE,UAAU,CAAA;IACtB,MAAM,EAAE,eAAe,CAAA;IACvB,IAAI,EAAE,CAAC,CAAA;IACP,sBAAsB,CAAC,EAAE,OAAO,CAAA;IAChC,GAAG,EAAE,cAAc,CAAA;IACnB,kBAAkB,CAAC,EAAE,OAAO,CAAA;CAC7B,CAAA;AAED,KAAK,MAAM,CAAC,CAAC,IAAI,OAAO,CAAC;IACvB,IAAI,EAAE,CAAC,CAAA;IACP,KAAK,EAAE,UAAU,EAAE,CAAA;CACpB,CAAC,CAAA;AAEF,eAAO,MAAM,gBAAgB,4GAM1B,KAAK,CAAC,CAAC,KAAG,OAAO,CAAC,CA2NpB,CAAA"}
+{"version":3,"file":"generateFileData.d.ts","sourceRoot":"","sources":["../../src/uploads/generateFileData.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,gCAAgC,CAAA;AAChE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAA;AACzD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAA;AACvD,OAAO,KAAK,EAAY,UAAU,EAAgC,MAAM,YAAY,CAAA;AAapF,KAAK,IAAI,CAAC,CAAC,IAAI;IACb,UAAU,EAAE,UAAU,CAAA;IACtB,MAAM,EAAE,eAAe,CAAA;IACvB,IAAI,EAAE,CAAC,CAAA;IACP,SAAS,EAAE,QAAQ,GAAG,QAAQ,CAAA;IAC9B,WAAW,CAAC,EAAE,CAAC,CAAA;IACf,sBAAsB,CAAC,EAAE,OAAO,CAAA;IAChC,GAAG,EAAE,cAAc,CAAA;IACnB,kBAAkB,CAAC,EAAE,OAAO,CAAA;CAC7B,CAAA;AAED,KAAK,MAAM,CAAC,CAAC,IAAI,OAAO,CAAC;IACvB,IAAI,EAAE,CAAC,CAAA;IACP,KAAK,EAAE,UAAU,EAAE,CAAA;CACpB,CAAC,CAAA;AAEF,eAAO,MAAM,gBAAgB,GAAU,CAAC,gIAQrC,IAAI,CAAC,CAAC,CAAC,KAAG,MAAM,CAAC,CAAC,CA0QpB,CAAA"}

package/dist/uploads/generateFileData.js

@@ -1,18 +1,18 @@
-import fileType from 'file-type';
-const { fromBuffer } = fileType;
+import { fileTypeFromBuffer } from 'file-type';
 import fs from 'fs';
-import mkdirp from 'mkdirp';
+import { mkdirSync } from 'node:fs';
 import sanitize from 'sanitize-filename';
-import { FileUploadError, MissingFile } from '../errors/index.js';
-import canResizeImage from './canResizeImage.js';
-import cropImage from './cropImage.js';
+import { FileRetrievalError, FileUploadError, MissingFile } from '../errors/index.js';
+import { canResizeImage } from './canResizeImage.js';
+import { cropImage } from './cropImage.js';
 import { getExternalFile } from './getExternalFile.js';
 import { getFileByPath } from './getFileByPath.js';
 import { getImageSize } from './getImageSize.js';
-import getSafeFileName from './getSafeFilename.js';
-import resizeAndTransformImageSizes from './imageResizer.js';
-import isImage from './isImage.js';
-export const generateFileData = async ({ collection: { config: collectionConfig }, data, overwriteExistingFiles, req, throwOnMissingFile })=>{
+import { getSafeFileName } from './getSafeFilename.js';
+import { resizeAndTransformImageSizes } from './imageResizer.js';
+import { isImage } from './isImage.js';
+import { optionallyAppendMetadata } from './optionallyAppendMetadata.js';
+export const generateFileData = async ({ collection: { config: collectionConfig }, data, operation, originalDoc, overwriteExistingFiles, req, throwOnMissingFile })=>{
     if (!collectionConfig.upload) {
         return {
             data,
@@ -21,8 +21,13 @@ export const generateFileData = async ({ collection: { config: collectionConfig
     }
     const { sharp } = req.payload.config;
     let file = req.file;
-    const uploadEdits = req.query['uploadEdits'] || {};
-    const { disableLocalStorage, formatOptions, imageSizes, resizeOptions, staticDir, trimOptions } = collectionConfig.upload;
+    const uploadEdits = parseUploadEditsFromReqOrIncomingData({
+        data,
+        operation,
+        originalDoc,
+        req
+    });
+    const { disableLocalStorage, focalPoint: focalPointEnabled = true, formatOptions, imageSizes, resizeOptions, staticDir, trimOptions, withMetadata } = collectionConfig.upload;
     const staticPath = staticDir;
     if (!file && uploadEdits && data) {
         const { filename, url } = data;
@@ -35,28 +40,37 @@ export const generateFileData = async ({ collection: { config: collectionConfig
             } else if (filename && url) {
                 file = await getExternalFile({
                     data: data,
-                    req
+                    req,
+                    uploadConfig: collectionConfig.upload
                 });
                 overwriteExistingFiles = true;
             }
         } catch (err) {
-            throw new FileUploadError(req.t);
+            throw new FileRetrievalError(req.t, err instanceof Error ? err.message : undefined);
         }
     }
     if (!file) {
-        if (throwOnMissingFile) throw new MissingFile(req.t);
+        if (throwOnMissingFile) {
+            throw new MissingFile(req.t);
+        }
         return {
             data,
             files: []
         };
     }
     if (!disableLocalStorage) {
-        mkdirp.sync(staticPath);
+        mkdirSync(staticPath, {
+            recursive: true
+        });
     }
     let newData = data;
     const filesToSave = [];
     const fileData = {};
-    const fileIsAnimated = file.mimetype === 'image/gif' || file.mimetype === 'image/webp';
+    const fileIsAnimatedType = [
+        'image/avif',
+        'image/gif',
+        'image/webp'
+    ].includes(file.mimetype);
     const cropData = typeof uploadEdits === 'object' && 'crop' in uploadEdits ? uploadEdits.crop : undefined;
     try {
         const fileSupportsResize = canResizeImage(file.mimetype);
@@ -66,10 +80,12 @@ export const generateFileData = async ({ collection: { config: collectionConfig
         let fileBuffer;
         let ext;
         let mime;
-        const fileHasAdjustments = fileSupportsResize && Boolean(resizeOptions || formatOptions || trimOptions || file.tempFilePath);
+        const fileHasAdjustments = fileSupportsResize && Boolean(resizeOptions || formatOptions || imageSizes || trimOptions || file.tempFilePath);
         const sharpOptions = {};
-        if (fileIsAnimated) sharpOptions.animated = true;
-        if (fileHasAdjustments && sharp) {
+        if (fileIsAnimatedType) {
+            sharpOptions.animated = true;
+        }
+        if (sharp && (fileIsAnimatedType || fileHasAdjustments)) {
             if (file.tempFilePath) {
                 sharpFile = sharp(file.tempFilePath, sharpOptions).rotate() // pass rotate() to auto-rotate based on EXIF data. https://github.com/payloadcms/payload/pull/3081
                 ;
@@ -77,27 +93,34 @@ export const generateFileData = async ({ collection: { config: collectionConfig
                 sharpFile = sharp(file.data, sharpOptions).rotate() // pass rotate() to auto-rotate based on EXIF data. https://github.com/payloadcms/payload/pull/3081
                 ;
             }
-            if (resizeOptions) {
-                sharpFile = sharpFile.resize(resizeOptions);
-            }
-            if (formatOptions) {
-                sharpFile = sharpFile.toFormat(formatOptions.format, formatOptions.options);
-            }
-            if (trimOptions) {
-                sharpFile = sharpFile.trim(trimOptions);
+            if (fileHasAdjustments) {
+                if (resizeOptions) {
+                    sharpFile = sharpFile.resize(resizeOptions);
+                }
+                if (formatOptions) {
+                    sharpFile = sharpFile.toFormat(formatOptions.format, formatOptions.options);
+                }
+                if (trimOptions) {
+                    sharpFile = sharpFile.trim(trimOptions);
+                }
             }
         }
         if (fileSupportsResize || isImage(file.mimetype)) {
-            dimensions = getImageSize(file);
+            dimensions = await getImageSize(file);
             fileData.width = dimensions.width;
             fileData.height = dimensions.height;
         }
         if (sharpFile) {
             const metadata = await sharpFile.metadata();
+            sharpFile = await optionallyAppendMetadata({
+                req,
+                sharpFile,
+                withMetadata
+            });
             fileBuffer = await sharpFile.toBuffer({
                 resolveWithObject: true
             });
-            ({ ext, mime } = await fromBuffer(fileBuffer.data) // This is getting an incorrect gif height back.
+            ({ ext, mime } = await fileTypeFromBuffer(fileBuffer.data) // This is getting an incorrect gif height back.
             );
             fileData.width = fileBuffer.info.width;
             fileData.height = fileBuffer.info.height;
@@ -111,13 +134,15 @@ export const generateFileData = async ({ collection: { config: collectionConfig
             mime = file.mimetype;
             fileData.filesize = file.size;
             if (file.name.includes('.')) {
-                ext = file.name.split('.').pop();
+                ext = file.name.split('.').pop().split('?')[0];
             } else {
                 ext = '';
             }
         }
-        // Adust SVG mime type. fromBuffer modifies it.
-        if (mime === 'application/xml' && ext === 'svg') mime = 'image/svg+xml';
+        // Adjust SVG mime type. fromBuffer modifies it.
+        if (mime === 'application/xml' && ext === 'svg') {
+            mime = 'image/svg+xml';
+        }
         fileData.mimeType = mime;
         const baseFilename = sanitize(file.name.substring(0, file.name.lastIndexOf('.')) || file.name);
         fsSafeName = `${baseFilename}${ext ? `.${ext}` : ''}`;
@@ -136,7 +161,11 @@ export const generateFileData = async ({ collection: { config: collectionConfig
                 cropData,
                 dimensions,
                 file,
-                sharp
+                heightInPixels: uploadEdits.heightInPixels,
+                req,
+                sharp,
+                widthInPixels: uploadEdits.widthInPixels,
+                withMetadata
             });
             filesToSave.push({
                 buffer: croppedImage,
@@ -149,6 +178,10 @@ export const generateFileData = async ({ collection: { config: collectionConfig
             };
             fileData.width = info.width;
             fileData.height = info.height;
+            if (fileIsAnimatedType) {
+                const metadata = await sharpFile.metadata();
+                fileData.height = metadata.pages ? info.height / metadata.pages : info.height;
+            }
             fileData.filesize = info.size;
             if (file.tempFilePath) {
                 await fs.promises.writeFile(file.tempFilePath, croppedImage) // write fileBuffer to the temp path
@@ -176,9 +209,9 @@ export const generateFileData = async ({ collection: { config: collectionConfig
                 }
             }
         }
-        if (Array.isArray(imageSizes) && fileSupportsResize && sharp) {
+        if (fileSupportsResize && (Array.isArray(imageSizes) || focalPointEnabled !== false)) {
             req.payloadUploadSizes = {};
-            const { sizeData, sizesToSave } = await resizeAndTransformImageSizes({
+            const { focalPoint, sizeData, sizesToSave } = await resizeAndTransformImageSizes({
                 config: collectionConfig,
                 dimensions: !cropData ? dimensions : {
                     ...dimensions,
@@ -190,13 +223,17 @@ export const generateFileData = async ({ collection: { config: collectionConfig
                 req,
                 savedFilename: fsSafeName || file.name,
                 sharp,
-                staticPath
+                staticPath,
+                uploadEdits,
+                withMetadata
             });
             fileData.sizes = sizeData;
+            fileData.focalX = focalPoint?.x;
+            fileData.focalY = focalPoint?.y;
             filesToSave.push(...sizesToSave);
         }
     } catch (err) {
-        console.error(err);
+        req.payload.logger.error(err);
         throw new FileUploadError(req.t);
     }
     newData = {
@@ -208,5 +245,37 @@ export const generateFileData = async ({ collection: { config: collectionConfig
         files: filesToSave
     };
 };
+/**
+ * Parse upload edits from req or incoming data
+ */ function parseUploadEditsFromReqOrIncomingData(args) {
+    const { data, operation, originalDoc, req } = args;
+    // Get intended focal point change from query string or incoming data
+    const uploadEdits = req.query?.uploadEdits && typeof req.query.uploadEdits === 'object' ? req.query.uploadEdits : {};
+    if (uploadEdits.focalPoint) {
+        return uploadEdits;
+    }
+    const incomingData = data;
+    const origDoc = originalDoc;
+    // If no change in focal point, return undefined.
+    // This prevents a refocal operation triggered from admin, because it always sends the focal point.
+    if (origDoc && incomingData.focalX === origDoc.focalX && incomingData.focalY === origDoc.focalY) {
+        return undefined;
+    }
+    if (incomingData?.focalX && incomingData?.focalY) {
+        uploadEdits.focalPoint = {
+            x: incomingData.focalX,
+            y: incomingData.focalY
+        };
+        return uploadEdits;
+    }
+    // If no focal point is set, default to center
+    if (operation === 'create') {
+        uploadEdits.focalPoint = {
+            x: 50,
+            y: 50
+        };
+    }
+    return uploadEdits;
+}
 
 //# sourceMappingURL=generateFileData.js.map