payload 3.0.0-beta.13 → 3.0.0-beta.131

package/dist/fields/hooks/beforeChange/index.d.ts

@@ -1,14 +1,14 @@
 import type { SanitizedCollectionConfig } from '../../../collections/config/types.js';
 import type { SanitizedGlobalConfig } from '../../../globals/config/types.js';
-import type { Operation, PayloadRequest, RequestContext } from '../../../types/index.js';
-type Args<T> = {
-    collection: SanitizedCollectionConfig | null;
+import type { RequestContext } from '../../../index.js';
+import type { JsonObject, Operation, PayloadRequest } from '../../../types/index.js';
+export type Args<T extends JsonObject> = {
+    collection: null | SanitizedCollectionConfig;
     context: RequestContext;
-    data: Record<string, unknown> | T;
-    doc: Record<string, unknown> | T;
-    docWithLocales: Record<string, unknown>;
-    duplicate?: boolean;
-    global: SanitizedGlobalConfig | null;
+    data: T;
+    doc: T;
+    docWithLocales: JsonObject;
+    global: null | SanitizedGlobalConfig;
     id?: number | string;
     operation: Operation;
     req: PayloadRequest;
@@ -20,9 +20,7 @@ type Args<T> = {
  * - Execute field hooks
  * - Validate data
  * - Transform data for storage
- * - beforeDuplicate hooks (if duplicate)
- * - Unflatten locales
+ * - Unflatten locales. The input `data` is the normal document for one locale. The output result will become the document with locales.
  */
-export declare const beforeChange: <T extends Record<string, unknown>>({ id, collection, context, data: incomingData, doc, docWithLocales, duplicate, global, operation, req, skipValidation, }: Args<T>) => Promise<T>;
-export {};
+export declare const beforeChange: <T extends JsonObject>({ id, collection, context, data: incomingData, doc, docWithLocales, global, operation, req, skipValidation, }: Args<T>) => Promise<T>;
 //# sourceMappingURL=index.d.ts.map

package/dist/fields/hooks/beforeChange/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/fields/hooks/beforeChange/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,sCAAsC,CAAA;AACrF,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,kCAAkC,CAAA;AAC7E,OAAO,KAAK,EAAE,SAAS,EAAE,cAAc,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAA;AAMxF,KAAK,IAAI,CAAC,CAAC,IAAI;IACb,UAAU,EAAE,yBAAyB,GAAG,IAAI,CAAA;IAC5C,OAAO,EAAE,cAAc,CAAA;IACvB,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,CAAC,CAAA;IACjC,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,CAAC,CAAA;IAChC,cAAc,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;IACvC,SAAS,CAAC,EAAE,OAAO,CAAA;IACnB,MAAM,EAAE,qBAAqB,GAAG,IAAI,CAAA;IACpC,EAAE,CAAC,EAAE,MAAM,GAAG,MAAM,CAAA;IACpB,SAAS,EAAE,SAAS,CAAA;IACpB,GAAG,EAAE,cAAc,CAAA;IACnB,cAAc,CAAC,EAAE,OAAO,CAAA;CACzB,CAAA;AAED;;;;;;;;GAQG;AACH,eAAO,MAAM,YAAY,gKAYtB,KAAK,CAAC,CAAC,KAAG,QAAQ,CAAC,CAoCrB,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/fields/hooks/beforeChange/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,sCAAsC,CAAA;AAErF,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,kCAAkC,CAAA;AAC7E,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAA;AACvD,OAAO,KAAK,EAAE,UAAU,EAAE,SAAS,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAA;AAKpF,MAAM,MAAM,IAAI,CAAC,CAAC,SAAS,UAAU,IAAI;IACvC,UAAU,EAAE,IAAI,GAAG,yBAAyB,CAAA;IAC5C,OAAO,EAAE,cAAc,CAAA;IACvB,IAAI,EAAE,CAAC,CAAA;IACP,GAAG,EAAE,CAAC,CAAA;IACN,cAAc,EAAE,UAAU,CAAA;IAC1B,MAAM,EAAE,IAAI,GAAG,qBAAqB,CAAA;IACpC,EAAE,CAAC,EAAE,MAAM,GAAG,MAAM,CAAA;IACpB,SAAS,EAAE,SAAS,CAAA;IACpB,GAAG,EAAE,cAAc,CAAA;IACnB,cAAc,CAAC,EAAE,OAAO,CAAA;CACzB,CAAA;AAED;;;;;;;GAOG;AACH,eAAO,MAAM,YAAY,GAAU,CAAC,SAAS,UAAU,iHAWpD,IAAI,CAAC,CAAC,CAAC,KAAG,OAAO,CAAC,CAAC,CA4CrB,CAAA"}

package/dist/fields/hooks/beforeChange/index.js

@@ -1,5 +1,5 @@
 import { ValidationError } from '../../../errors/index.js';
-import { deepCopyObject } from '../../../utilities/deepCopyObject.js';
+import { deepCopyObjectSimple } from '../../../utilities/deepCopyObject.js';
 import { traverseFields } from './traverseFields.js';
 /**
  * This function is responsible for the following actions, in order:
@@ -7,10 +7,9 @@ import { traverseFields } from './traverseFields.js';
  * - Execute field hooks
  * - Validate data
  * - Transform data for storage
- * - beforeDuplicate hooks (if duplicate)
- * - Unflatten locales
- */ export const beforeChange = async ({ id, collection, context, data: incomingData, doc, docWithLocales, duplicate = false, global, operation, req, skipValidation })=>{
-    const data = deepCopyObject(incomingData);
+ * - Unflatten locales. The input `data` is the normal document for one locale. The output result will become the document with locales.
+ */ export const beforeChange = async ({ id, collection, context, data: incomingData, doc, docWithLocales, global, operation, req, skipValidation })=>{
+    const data = deepCopyObjectSimple(incomingData);
     const mergeLocaleActions = [];
     const errors = [];
     await traverseFields({
@@ -20,21 +19,26 @@ import { traverseFields } from './traverseFields.js';
         data,
         doc,
         docWithLocales,
-        duplicate,
         errors,
         fields: collection?.fields || global?.fields,
         global,
         mergeLocaleActions,
         operation,
-        path: '',
+        path: [],
         req,
+        schemaPath: [],
         siblingData: data,
         siblingDoc: doc,
         siblingDocWithLocales: docWithLocales,
         skipValidation
     });
     if (errors.length > 0) {
-        throw new ValidationError(errors, req.t);
+        throw new ValidationError({
+            id,
+            collection: collection?.slug,
+            errors,
+            global: global?.slug
+        }, req.t);
     }
     await mergeLocaleActions.reduce(async (priorAction, action)=>{
         await priorAction;

package/dist/fields/hooks/beforeChange/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../../src/fields/hooks/beforeChange/index.ts"],"sourcesContent":["import type { SanitizedCollectionConfig } from '../../../collections/config/types.js'\nimport type { SanitizedGlobalConfig } from '../../../globals/config/types.js'\nimport type { Operation, PayloadRequest, RequestContext } from '../../../types/index.js'\n\nimport { ValidationError } from '../../../errors/index.js'\nimport { deepCopyObject } from '../../../utilities/deepCopyObject.js'\nimport { traverseFields } from './traverseFields.js'\n\ntype Args<T> = {\n  collection: SanitizedCollectionConfig | null\n  context: RequestContext\n  data: Record<string, unknown> | T\n  doc: Record<string, unknown> | T\n  docWithLocales: Record<string, unknown>\n  duplicate?: boolean\n  global: SanitizedGlobalConfig | null\n  id?: number | string\n  operation: Operation\n  req: PayloadRequest\n  skipValidation?: boolean\n}\n\n/**\n * This function is responsible for the following actions, in order:\n * - Run condition\n * - Execute field hooks\n * - Validate data\n * - Transform data for storage\n * - beforeDuplicate hooks (if duplicate)\n * - Unflatten locales\n */\nexport const beforeChange = async <T extends Record<string, unknown>>({\n  id,\n  collection,\n  context,\n  data: incomingData,\n  doc,\n  docWithLocales,\n  duplicate = false,\n  global,\n  operation,\n  req,\n  skipValidation,\n}: Args<T>): Promise<T> => {\n  const data = deepCopyObject(incomingData)\n  const mergeLocaleActions = []\n  const errors: { field: string; message: string }[] = []\n\n  await traverseFields({\n    id,\n    collection,\n    context,\n    data,\n    doc,\n    docWithLocales,\n    duplicate,\n    errors,\n    fields: collection?.fields || global?.fields,\n    global,\n    mergeLocaleActions,\n    operation,\n    path: '',\n    req,\n    siblingData: data,\n    siblingDoc: doc,\n    siblingDocWithLocales: docWithLocales,\n    skipValidation,\n  })\n\n  if (errors.length > 0) {\n    throw new ValidationError(errors, req.t)\n  }\n\n  await mergeLocaleActions.reduce(async (priorAction, action) => {\n    await priorAction\n    await action()\n  }, Promise.resolve())\n\n  return data\n}\n"],"names":["ValidationError","deepCopyObject","traverseFields","beforeChange","id","collection","context","data","incomingData","doc","docWithLocales","duplicate","global","operation","req","skipValidation","mergeLocaleActions","errors","fields","path","siblingData","siblingDoc","siblingDocWithLocales","length","t","reduce","priorAction","action","Promise","resolve"],"rangeMappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;","mappings":"AAIA,SAASA,eAAe,QAAQ,2BAA0B;AAC1D,SAASC,cAAc,QAAQ,uCAAsC;AACrE,SAASC,cAAc,QAAQ,sBAAqB;AAgBpD;;;;;;;;CAQC,GACD,OAAO,MAAMC,eAAe,OAA0C,EACpEC,EAAE,EACFC,UAAU,EACVC,OAAO,EACPC,MAAMC,YAAY,EAClBC,GAAG,EACHC,cAAc,EACdC,YAAY,KAAK,EACjBC,MAAM,EACNC,SAAS,EACTC,GAAG,EACHC,cAAc,EACN;IACR,MAAMR,OAAON,eAAeO;IAC5B,MAAMQ,qBAAqB,EAAE;IAC7B,MAAMC,SAA+C,EAAE;IAEvD,MAAMf,eAAe;QACnBE;QACAC;QACAC;QACAC;QACAE;QACAC;QACAC;QACAM;QACAC,QAAQb,YAAYa,UAAUN,QAAQM;QACtCN;QACAI;QACAH;QACAM,MAAM;QACNL;QACAM,aAAab;QACbc,YAAYZ;QACZa,uBAAuBZ;QACvBK;IACF;IAEA,IAAIE,OAAOM,MAAM,GAAG,GAAG;QACrB,MAAM,IAAIvB,gBAAgBiB,QAAQH,IAAIU,CAAC;IACzC;IAEA,MAAMR,mBAAmBS,MAAM,CAAC,OAAOC,aAAaC;QAClD,MAAMD;QACN,MAAMC;IACR,GAAGC,QAAQC,OAAO;IAElB,OAAOtB;AACT,EAAC"}
+{"version":3,"sources":["../../../../src/fields/hooks/beforeChange/index.ts"],"sourcesContent":["import type { SanitizedCollectionConfig } from '../../../collections/config/types.js'\nimport type { ValidationFieldError } from '../../../errors/index.js'\nimport type { SanitizedGlobalConfig } from '../../../globals/config/types.js'\nimport type { RequestContext } from '../../../index.js'\nimport type { JsonObject, Operation, PayloadRequest } from '../../../types/index.js'\n\nimport { ValidationError } from '../../../errors/index.js'\nimport { deepCopyObjectSimple } from '../../../utilities/deepCopyObject.js'\nimport { traverseFields } from './traverseFields.js'\nexport type Args<T extends JsonObject> = {\n  collection: null | SanitizedCollectionConfig\n  context: RequestContext\n  data: T\n  doc: T\n  docWithLocales: JsonObject\n  global: null | SanitizedGlobalConfig\n  id?: number | string\n  operation: Operation\n  req: PayloadRequest\n  skipValidation?: boolean\n}\n\n/**\n * This function is responsible for the following actions, in order:\n * - Run condition\n * - Execute field hooks\n * - Validate data\n * - Transform data for storage\n * - Unflatten locales. The input `data` is the normal document for one locale. The output result will become the document with locales.\n */\nexport const beforeChange = async <T extends JsonObject>({\n  id,\n  collection,\n  context,\n  data: incomingData,\n  doc,\n  docWithLocales,\n  global,\n  operation,\n  req,\n  skipValidation,\n}: Args<T>): Promise<T> => {\n  const data = deepCopyObjectSimple(incomingData)\n  const mergeLocaleActions = []\n  const errors: ValidationFieldError[] = []\n\n  await traverseFields({\n    id,\n    collection,\n    context,\n    data,\n    doc,\n    docWithLocales,\n    errors,\n    fields: collection?.fields || global?.fields,\n    global,\n    mergeLocaleActions,\n    operation,\n    path: [],\n    req,\n    schemaPath: [],\n    siblingData: data,\n    siblingDoc: doc,\n    siblingDocWithLocales: docWithLocales,\n    skipValidation,\n  })\n\n  if (errors.length > 0) {\n    throw new ValidationError(\n      {\n        id,\n        collection: collection?.slug,\n        errors,\n        global: global?.slug,\n      },\n      req.t,\n    )\n  }\n\n  await mergeLocaleActions.reduce(async (priorAction, action) => {\n    await priorAction\n    await action()\n  }, Promise.resolve())\n\n  return data\n}\n"],"names":["ValidationError","deepCopyObjectSimple","traverseFields","beforeChange","id","collection","context","data","incomingData","doc","docWithLocales","global","operation","req","skipValidation","mergeLocaleActions","errors","fields","path","schemaPath","siblingData","siblingDoc","siblingDocWithLocales","length","slug","t","reduce","priorAction","action","Promise","resolve"],"mappings":"AAMA,SAASA,eAAe,QAAQ,2BAA0B;AAC1D,SAASC,oBAAoB,QAAQ,uCAAsC;AAC3E,SAASC,cAAc,QAAQ,sBAAqB;AAcpD;;;;;;;CAOC,GACD,OAAO,MAAMC,eAAe,OAA6B,EACvDC,EAAE,EACFC,UAAU,EACVC,OAAO,EACPC,MAAMC,YAAY,EAClBC,GAAG,EACHC,cAAc,EACdC,MAAM,EACNC,SAAS,EACTC,GAAG,EACHC,cAAc,EACN;IACR,MAAMP,OAAON,qBAAqBO;IAClC,MAAMO,qBAAqB,EAAE;IAC7B,MAAMC,SAAiC,EAAE;IAEzC,MAAMd,eAAe;QACnBE;QACAC;QACAC;QACAC;QACAE;QACAC;QACAM;QACAC,QAAQZ,YAAYY,UAAUN,QAAQM;QACtCN;QACAI;QACAH;QACAM,MAAM,EAAE;QACRL;QACAM,YAAY,EAAE;QACdC,aAAab;QACbc,YAAYZ;QACZa,uBAAuBZ;QACvBI;IACF;IAEA,IAAIE,OAAOO,MAAM,GAAG,GAAG;QACrB,MAAM,IAAIvB,gBACR;YACEI;YACAC,YAAYA,YAAYmB;YACxBR;YACAL,QAAQA,QAAQa;QAClB,GACAX,IAAIY,CAAC;IAET;IAEA,MAAMV,mBAAmBW,MAAM,CAAC,OAAOC,aAAaC;QAClD,MAAMD;QACN,MAAMC;IACR,GAAGC,QAAQC,OAAO;IAElB,OAAOvB;AACT,EAAC"}

package/dist/fields/hooks/beforeChange/promise.d.ts

@@ -1,30 +1,40 @@
 import type { SanitizedCollectionConfig } from '../../../collections/config/types.js';
+import type { ValidationFieldError } from '../../../errors/index.js';
 import type { SanitizedGlobalConfig } from '../../../globals/config/types.js';
-import type { Operation, PayloadRequest, RequestContext } from '../../../types/index.js';
+import type { RequestContext } from '../../../index.js';
+import type { JsonObject, Operation, PayloadRequest } from '../../../types/index.js';
 import type { Field, TabAsField } from '../../config/types.js';
 type Args = {
-    collection: SanitizedCollectionConfig | null;
+    collection: null | SanitizedCollectionConfig;
     context: RequestContext;
-    data: Record<string, unknown>;
-    doc: Record<string, unknown>;
-    docWithLocales: Record<string, unknown>;
-    duplicate: boolean;
-    errors: {
-        field: string;
-        message: string;
-    }[];
+    data: JsonObject;
+    doc: JsonObject;
+    docWithLocales: JsonObject;
+    errors: ValidationFieldError[];
     field: Field | TabAsField;
-    global: SanitizedGlobalConfig | null;
+    /**
+     * The index of the field as it appears in the parent's fields array. This is used to construct the field path / schemaPath
+     * for unnamed fields like rows and collapsibles.
+     */
+    fieldIndex: number;
+    global: null | SanitizedGlobalConfig;
     id?: number | string;
     mergeLocaleActions: (() => Promise<void>)[];
     operation: Operation;
-    path: string;
+    /**
+     * The parent's path.
+     */
+    parentPath: (number | string)[];
+    /**
+     * The parent's schemaPath (path without indexes).
+     */
+    parentSchemaPath: string[];
     req: PayloadRequest;
-    siblingData: Record<string, unknown>;
-    siblingDoc: Record<string, unknown>;
-    siblingDocWithLocales?: Record<string, unknown>;
+    siblingData: JsonObject;
+    siblingDoc: JsonObject;
+    siblingDocWithLocales?: JsonObject;
     skipValidation: boolean;
 };
-export declare const promise: ({ id, collection, context, data, doc, docWithLocales, duplicate, errors, field, global, mergeLocaleActions, operation, path, req, siblingData, siblingDoc, siblingDocWithLocales, skipValidation, }: Args) => Promise<void>;
+export declare const promise: ({ id, collection, context, data, doc, docWithLocales, errors, field, fieldIndex, global, mergeLocaleActions, operation, parentPath, parentSchemaPath, req, siblingData, siblingDoc, siblingDocWithLocales, skipValidation, }: Args) => Promise<void>;
 export {};
 //# sourceMappingURL=promise.d.ts.map

package/dist/fields/hooks/beforeChange/promise.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"promise.d.ts","sourceRoot":"","sources":["../../../../src/fields/hooks/beforeChange/promise.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,sCAAsC,CAAA;AACrF,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,kCAAkC,CAAA;AAC7E,OAAO,KAAK,EAAE,SAAS,EAAE,cAAc,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAA;AACxF,OAAO,KAAK,EAAE,KAAK,EAAiB,UAAU,EAAE,MAAM,uBAAuB,CAAA;AAO7E,KAAK,IAAI,GAAG;IACV,UAAU,EAAE,yBAAyB,GAAG,IAAI,CAAA;IAC5C,OAAO,EAAE,cAAc,CAAA;IACvB,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;IAC7B,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;IAC5B,cAAc,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;IACvC,SAAS,EAAE,OAAO,CAAA;IAClB,MAAM,EAAE;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,MAAM,CAAA;KAAE,EAAE,CAAA;IAC5C,KAAK,EAAE,KAAK,GAAG,UAAU,CAAA;IACzB,MAAM,EAAE,qBAAqB,GAAG,IAAI,CAAA;IACpC,EAAE,CAAC,EAAE,MAAM,GAAG,MAAM,CAAA;IACpB,kBAAkB,EAAE,CAAC,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC,EAAE,CAAA;IAC3C,SAAS,EAAE,SAAS,CAAA;IACpB,IAAI,EAAE,MAAM,CAAA;IACZ,GAAG,EAAE,cAAc,CAAA;IACnB,WAAW,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;IACpC,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;IACnC,qBAAqB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;IAC/C,cAAc,EAAE,OAAO,CAAA;CACxB,CAAA;AAUD,eAAO,MAAM,OAAO,wMAmBjB,IAAI,KAAG,QAAQ,IAAI,CAmWrB,CAAA"}
+{"version":3,"file":"promise.d.ts","sourceRoot":"","sources":["../../../../src/fields/hooks/beforeChange/promise.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,sCAAsC,CAAA;AACrF,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,0BAA0B,CAAA;AACpE,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,kCAAkC,CAAA;AAC7E,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAA;AACvD,OAAO,KAAK,EAAE,UAAU,EAAE,SAAS,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAA;AACpF,OAAO,KAAK,EAAE,KAAK,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAA;AAS9D,KAAK,IAAI,GAAG;IACV,UAAU,EAAE,IAAI,GAAG,yBAAyB,CAAA;IAC5C,OAAO,EAAE,cAAc,CAAA;IACvB,IAAI,EAAE,UAAU,CAAA;IAChB,GAAG,EAAE,UAAU,CAAA;IACf,cAAc,EAAE,UAAU,CAAA;IAC1B,MAAM,EAAE,oBAAoB,EAAE,CAAA;IAC9B,KAAK,EAAE,KAAK,GAAG,UAAU,CAAA;IACzB;;;OAGG;IACH,UAAU,EAAE,MAAM,CAAA;IAClB,MAAM,EAAE,IAAI,GAAG,qBAAqB,CAAA;IACpC,EAAE,CAAC,EAAE,MAAM,GAAG,MAAM,CAAA;IACpB,kBAAkB,EAAE,CAAC,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC,EAAE,CAAA;IAC3C,SAAS,EAAE,SAAS,CAAA;IACpB;;OAEG;IACH,UAAU,EAAE,CAAC,MAAM,GAAG,MAAM,CAAC,EAAE,CAAA;IAC/B;;OAEG;IACH,gBAAgB,EAAE,MAAM,EAAE,CAAA;IAC1B,GAAG,EAAE,cAAc,CAAA;IACnB,WAAW,EAAE,UAAU,CAAA;IACvB,UAAU,EAAE,UAAU,CAAA;IACtB,qBAAqB,CAAC,EAAE,UAAU,CAAA;IAClC,cAAc,EAAE,OAAO,CAAA;CACxB,CAAA;AAUD,eAAO,MAAM,OAAO,iOAoBjB,IAAI,KAAG,OAAO,CAAC,IAAI,CA2ZrB,CAAA"}

package/dist/fields/hooks/beforeChange/promise.js

@@ -1,6 +1,7 @@
-import merge from 'deepmerge';
+import { MissingEditorProp } from '../../../errors/index.js';
+import { deepMergeWithSourceArrays } from '../../../utilities/deepMerge.js';
 import { fieldAffectsData, tabHasName } from '../../config/types.js';
-import { beforeDuplicate } from './beforeDuplicate.js';
+import { getFieldPaths } from '../../getFieldPaths.js';
 import { getExistingRowDoc } from './getExistingRowDoc.js';
 import { traverseFields } from './traverseFields.js';
 // This function is responsible for the following actions, in order:
@@ -10,7 +11,7 @@ import { traverseFields } from './traverseFields.js';
 // - Transform data for storage
 // - beforeDuplicate hooks (if duplicate)
 // - Unflatten locales
-export const promise = async ({ id, collection, context, data, doc, docWithLocales, duplicate, errors, field, global, mergeLocaleActions, operation, path, req, siblingData, siblingDoc, siblingDocWithLocales, skipValidation })=>{
+export const promise = async ({ id, collection, context, data, doc, docWithLocales, errors, field, fieldIndex, global, mergeLocaleActions, operation, parentPath, parentSchemaPath, req, siblingData, siblingDoc, siblingDocWithLocales, skipValidation })=>{
     const passesCondition = field.admin?.condition ? Boolean(field.admin.condition(data, siblingData, {
         user: req.user
     })) : true;
@@ -18,6 +19,15 @@ export const promise = async ({ id, collection, context, data, doc, docWithLocal
     const { localization } = req.payload.config;
     const defaultLocale = localization ? localization?.defaultLocale : 'en';
     const operationLocale = req.locale || defaultLocale;
+    const { path: _fieldPath, schemaPath: _fieldSchemaPath } = getFieldPaths({
+        field,
+        index: fieldIndex,
+        parentIndexPath: '',
+        parentPath: parentPath.join('.'),
+        parentSchemaPath: parentSchemaPath.join('.')
+    });
+    const fieldPath = _fieldPath ? _fieldPath.split('.') : [];
+    const fieldSchemaPath = _fieldSchemaPath ? _fieldSchemaPath.split('.') : [];
     if (fieldAffectsData(field)) {
         // skip validation if the field is localized and the incoming data is null
         if (field.localized && operationLocale !== defaultLocale) {
@@ -40,10 +50,13 @@ export const promise = async ({ id, collection, context, data, doc, docWithLocal
                     global,
                     operation,
                     originalDoc: doc,
+                    path: fieldPath,
                     previousSiblingDoc: siblingDoc,
                     previousValue: siblingDoc[field.name],
                     req,
+                    schemaPath: parentSchemaPath,
                     siblingData,
+                    siblingDocWithLocales,
                     value: siblingData[field.name]
                 });
                 if (hookedValue !== undefined) {
@@ -52,7 +65,7 @@ export const promise = async ({ id, collection, context, data, doc, docWithLocal
             }, Promise.resolve());
         }
         // Validate
-        if (!skipValidationFromHere && field.validate) {
+        if (!skipValidationFromHere && 'validate' in field && field.validate) {
             const valueToValidate = siblingData[field.name];
             let jsonError;
             if (field.type === 'json' && typeof siblingData[field.name] === 'string') {
@@ -65,44 +78,30 @@ export const promise = async ({ id, collection, context, data, doc, docWithLocal
             const validationResult = await field.validate(valueToValidate, {
                 ...field,
                 id,
-                data: merge(doc, data, {
-                    arrayMerge: (_, source)=>source
-                }),
-                // @ts-expect-error-next-line
+                collectionSlug: collection?.slug,
+                data: deepMergeWithSourceArrays(doc, data),
                 jsonError,
                 operation,
+                preferences: {
+                    fields: {}
+                },
+                previousValue: siblingDoc[field.name],
                 req,
-                siblingData: merge(siblingDoc, siblingData, {
-                    arrayMerge: (_, source)=>source
-                })
+                siblingData: deepMergeWithSourceArrays(siblingDoc, siblingData)
             });
             if (typeof validationResult === 'string') {
                 errors.push({
-                    field: `${path}${field.name}`,
-                    message: validationResult
+                    message: validationResult,
+                    path: fieldPath.join('.')
                 });
             }
         }
-        const beforeDuplicateArgs = {
-            collection,
-            context,
-            data,
-            field,
-            global: undefined,
-            req,
-            siblingData,
-            value: siblingData[field.name]
-        };
         // Push merge locale action if applicable
         if (localization && field.localized) {
             mergeLocaleActions.push(async ()=>{
                 const localeData = await localization.localeCodes.reduce(async (localizedValuesPromise, locale)=>{
                     const localizedValues = await localizedValuesPromise;
-                    let fieldValue = locale === req.locale ? siblingData[field.name] : siblingDocWithLocales?.[field.name]?.[locale];
-                    if (duplicate && field.hooks?.beforeDuplicate?.length) {
-                        beforeDuplicateArgs.value = fieldValue;
-                        fieldValue = await beforeDuplicate(beforeDuplicateArgs);
-                    }
+                    const fieldValue = locale === req.locale ? siblingData[field.name] : siblingDocWithLocales?.[field.name]?.[locale];
                     // const result = await localizedValues
                     // update locale value if it's not undefined
                     if (typeof fieldValue !== 'undefined') {
@@ -118,54 +117,9 @@ export const promise = async ({ id, collection, context, data, doc, docWithLocal
                     siblingData[field.name] = localeData;
                 }
             });
-        } else if (duplicate && field.hooks?.beforeDuplicate?.length) {
-            mergeLocaleActions.push(async ()=>{
-                siblingData[field.name] = await beforeDuplicate(beforeDuplicateArgs);
-            });
         }
     }
     switch(field.type){
-        case 'point':
-            {
-                // Transform point data for storage
-                if (Array.isArray(siblingData[field.name]) && siblingData[field.name][0] !== null && siblingData[field.name][1] !== null) {
-                    siblingData[field.name] = {
-                        type: 'Point',
-                        coordinates: [
-                            parseFloat(siblingData[field.name][0]),
-                            parseFloat(siblingData[field.name][1])
-                        ]
-                    };
-                }
-                break;
-            }
-        case 'group':
-            {
-                if (typeof siblingData[field.name] !== 'object') siblingData[field.name] = {};
-                if (typeof siblingDoc[field.name] !== 'object') siblingDoc[field.name] = {};
-                if (typeof siblingDocWithLocales[field.name] !== 'object') siblingDocWithLocales[field.name] = {};
-                await traverseFields({
-                    id,
-                    collection,
-                    context,
-                    data,
-                    doc,
-                    docWithLocales,
-                    duplicate,
-                    errors,
-                    fields: field.fields,
-                    global,
-                    mergeLocaleActions,
-                    operation,
-                    path: `${path}${field.name}.`,
-                    req,
-                    siblingData: siblingData[field.name],
-                    siblingDoc: siblingDoc[field.name],
-                    siblingDocWithLocales: siblingDocWithLocales[field.name],
-                    skipValidation: skipValidationFromHere
-                });
-                break;
-            }
         case 'array':
             {
                 const rows = siblingData[field.name];
@@ -179,14 +133,17 @@ export const promise = async ({ id, collection, context, data, doc, docWithLocal
                             data,
                             doc,
                             docWithLocales,
-                            duplicate,
                             errors,
                             fields: field.fields,
                             global,
                             mergeLocaleActions,
                             operation,
-                            path: `${path}${field.name}.${i}.`,
+                            path: [
+                                ...fieldPath,
+                                i
+                            ],
                             req,
+                            schemaPath: fieldSchemaPath,
                             siblingData: row,
                             siblingDoc: getExistingRowDoc(row, siblingDoc[field.name]),
                             siblingDocWithLocales: getExistingRowDoc(row, siblingDocWithLocales[field.name]),
@@ -204,7 +161,7 @@ export const promise = async ({ id, collection, context, data, doc, docWithLocal
                     const promises = [];
                     rows.forEach((row, i)=>{
                         const rowSiblingDoc = getExistingRowDoc(row, siblingDoc[field.name]);
-                        const rowSiblingDocWithLocales = getExistingRowDoc(row, siblingDocWithLocales[field.name]);
+                        const rowSiblingDocWithLocales = getExistingRowDoc(row, siblingDocWithLocales ? siblingDocWithLocales[field.name] : {});
                         const blockTypeToMatch = row.blockType || rowSiblingDoc.blockType;
                         const block = field.blocks.find((blockType)=>blockType.slug === blockTypeToMatch);
                         if (block) {
@@ -215,14 +172,17 @@ export const promise = async ({ id, collection, context, data, doc, docWithLocal
                                 data,
                                 doc,
                                 docWithLocales,
-                                duplicate,
                                 errors,
                                 fields: block.fields,
                                 global,
                                 mergeLocaleActions,
                                 operation,
-                                path: `${path}${field.name}.${i}.`,
+                                path: [
+                                    ...fieldPath,
+                                    i
+                                ],
                                 req,
+                                schemaPath: fieldSchemaPath,
                                 siblingData: row,
                                 siblingDoc: rowSiblingDoc,
                                 siblingDocWithLocales: rowSiblingDocWithLocales,
@@ -234,8 +194,8 @@ export const promise = async ({ id, collection, context, data, doc, docWithLocal
                 }
                 break;
             }
-        case 'row':
         case 'collapsible':
+        case 'row':
             {
                 await traverseFields({
                     id,
@@ -244,14 +204,14 @@ export const promise = async ({ id, collection, context, data, doc, docWithLocal
                     data,
                     doc,
                     docWithLocales,
-                    duplicate,
                     errors,
                     fields: field.fields,
                     global,
                     mergeLocaleActions,
                     operation,
-                    path,
+                    path: fieldPath,
                     req,
+                    schemaPath: fieldSchemaPath,
                     siblingData,
                     siblingDoc,
                     siblingDocWithLocales,
@@ -259,17 +219,109 @@ export const promise = async ({ id, collection, context, data, doc, docWithLocal
                 });
                 break;
             }
+        case 'group':
+            {
+                if (typeof siblingData[field.name] !== 'object') {
+                    siblingData[field.name] = {};
+                }
+                if (typeof siblingDoc[field.name] !== 'object') {
+                    siblingDoc[field.name] = {};
+                }
+                if (typeof siblingDocWithLocales[field.name] !== 'object') {
+                    siblingDocWithLocales[field.name] = {};
+                }
+                await traverseFields({
+                    id,
+                    collection,
+                    context,
+                    data,
+                    doc,
+                    docWithLocales,
+                    errors,
+                    fields: field.fields,
+                    global,
+                    mergeLocaleActions,
+                    operation,
+                    path: fieldPath,
+                    req,
+                    schemaPath: fieldSchemaPath,
+                    siblingData: siblingData[field.name],
+                    siblingDoc: siblingDoc[field.name],
+                    siblingDocWithLocales: siblingDocWithLocales[field.name],
+                    skipValidation: skipValidationFromHere
+                });
+                break;
+            }
+        case 'point':
+            {
+                // Transform point data for storage
+                if (Array.isArray(siblingData[field.name]) && siblingData[field.name][0] !== null && siblingData[field.name][1] !== null) {
+                    siblingData[field.name] = {
+                        type: 'Point',
+                        coordinates: [
+                            parseFloat(siblingData[field.name][0]),
+                            parseFloat(siblingData[field.name][1])
+                        ]
+                    };
+                }
+                break;
+            }
+        case 'richText':
+            {
+                if (!field?.editor) {
+                    throw new MissingEditorProp(field) // while we allow disabling editor functionality, you should not have any richText fields defined if you do not have an editor
+                    ;
+                }
+                if (typeof field?.editor === 'function') {
+                    throw new Error('Attempted to access unsanitized rich text editor.');
+                }
+                const editor = field?.editor;
+                if (editor?.hooks?.beforeChange?.length) {
+                    await editor.hooks.beforeChange.reduce(async (priorHook, currentHook)=>{
+                        await priorHook;
+                        const hookedValue = await currentHook({
+                            collection,
+                            context,
+                            data,
+                            docWithLocales,
+                            errors,
+                            field,
+                            global,
+                            mergeLocaleActions,
+                            operation,
+                            originalDoc: doc,
+                            path: fieldPath,
+                            previousSiblingDoc: siblingDoc,
+                            previousValue: siblingDoc[field.name],
+                            req,
+                            schemaPath: parentSchemaPath,
+                            siblingData,
+                            siblingDocWithLocales,
+                            skipValidation,
+                            value: siblingData[field.name]
+                        });
+                        if (hookedValue !== undefined) {
+                            siblingData[field.name] = hookedValue;
+                        }
+                    }, Promise.resolve());
+                }
+                break;
+            }
         case 'tab':
             {
-                let tabPath = path;
                 let tabSiblingData = siblingData;
                 let tabSiblingDoc = siblingDoc;
                 let tabSiblingDocWithLocales = siblingDocWithLocales;
                 if (tabHasName(field)) {
-                    tabPath = `${path}${field.name}.`;
-                    if (typeof siblingData[field.name] !== 'object') siblingData[field.name] = {};
-                    if (typeof siblingDoc[field.name] !== 'object') siblingDoc[field.name] = {};
-                    if (typeof siblingDocWithLocales[field.name] !== 'object') siblingDocWithLocales[field.name] = {};
+                    if (typeof siblingData[field.name] !== 'object') {
+                        siblingData[field.name] = {};
+                    }
+                    if (typeof siblingDoc[field.name] !== 'object') {
+                        siblingDoc[field.name] = {};
+                    }
+                    if (typeof siblingDocWithLocales[field.name] !== 'object') {
+                        siblingDocWithLocales[field.name] = {};
+                    }
                     tabSiblingData = siblingData[field.name];
                     tabSiblingDoc = siblingDoc[field.name];
                     tabSiblingDocWithLocales = siblingDocWithLocales[field.name];
@@ -281,14 +333,14 @@ export const promise = async ({ id, collection, context, data, doc, docWithLocal
                     data,
                     doc,
                     docWithLocales,
-                    duplicate,
                     errors,
                     fields: field.fields,
                     global,
                     mergeLocaleActions,
                     operation,
-                    path: tabPath,
+                    path: fieldPath,
                     req,
+                    schemaPath: fieldSchemaPath,
                     siblingData: tabSiblingData,
                     siblingDoc: tabSiblingDoc,
                     siblingDocWithLocales: tabSiblingDocWithLocales,
@@ -305,7 +357,6 @@ export const promise = async ({ id, collection, context, data, doc, docWithLocal
                     data,
                     doc,
                     docWithLocales,
-                    duplicate,
                     errors,
                     fields: field.tabs.map((tab)=>({
                             ...tab,
@@ -314,8 +365,9 @@ export const promise = async ({ id, collection, context, data, doc, docWithLocal
                     global,
                     mergeLocaleActions,
                     operation,
-                    path,
+                    path: fieldPath,
                     req,
+                    schemaPath: fieldSchemaPath,
                     siblingData,
                     siblingDoc,
                     siblingDocWithLocales,