payload 4.0.0-internal.fa345ef → 4.0.0-internal.ff27d6e

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

@@ -1,18 +1,26 @@
 import type { SanitizedCollectionConfig } from '../../../collections/config/types.js';
 import type { SanitizedGlobalConfig } from '../../../globals/config/types.js';
 import type { RequestContext } from '../../../index.js';
-import type { JsonObject, Operation, PayloadRequest } from '../../../types/index.js';
+import type { FieldOperation, JsonObject, PayloadRequest } from '../../../types/index.js';
 export type Args<T extends JsonObject> = {
     collection: null | SanitizedCollectionConfig;
     context: RequestContext;
     data: T;
     doc: T;
     docWithLocales: JsonObject;
+    /**
+     * Names of the top-level fields submitted by the caller. When present, validation skips other
+     * top-level fields and validates all nested fields below each submitted field.
+     */
+    fieldsToValidate?: ReadonlySet<string>;
     global: null | SanitizedGlobalConfig;
     id?: number | string;
-    operation: Operation;
+    isValidationOperation?: boolean;
+    onDataProcessed?: (data: T) => void;
+    operation: FieldOperation;
     overrideAccess?: boolean;
     req: PayloadRequest;
+    skipHooks?: boolean;
     skipValidation?: boolean;
 };
 /**
@@ -23,5 +31,5 @@ export type Args<T extends JsonObject> = {
  * - Transform data for storage
  * - 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 JsonObject>({ id, collection, context, data: incomingData, doc, docWithLocales, global, operation, overrideAccess, req, skipValidation, }: Args<T>) => Promise<T>;
+export declare const beforeChange: <T extends JsonObject>({ id, collection, context, data: incomingData, doc, docWithLocales, fieldsToValidate: submittedTopLevelFieldNames, global, isValidationOperation, onDataProcessed, operation, overrideAccess, req, skipHooks, 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;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;AAMpF,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,cAAc,CAAC,EAAE,OAAO,CAAA;IACxB,GAAG,EAAE,cAAc,CAAA;IACnB,cAAc,CAAC,EAAE,OAAO,CAAA;CACzB,CAAA;AAED;;;;;;;GAOG;AAEH,eAAO,MAAM,YAAY,GAAU,CAAC,SAAS,UAAU,EAAE,+HAYtD,IAAI,CAAC,CAAC,CAAC,KAAG,OAAO,CAAC,CAAC,CAgDrB,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,cAAc,EAAE,UAAU,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAA;AAOzF,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;;;OAGG;IACH,gBAAgB,CAAC,EAAE,WAAW,CAAC,MAAM,CAAC,CAAA;IACtC,MAAM,EAAE,IAAI,GAAG,qBAAqB,CAAA;IACpC,EAAE,CAAC,EAAE,MAAM,GAAG,MAAM,CAAA;IACpB,qBAAqB,CAAC,EAAE,OAAO,CAAA;IAC/B,eAAe,CAAC,EAAE,CAAC,IAAI,EAAE,CAAC,KAAK,IAAI,CAAA;IACnC,SAAS,EAAE,cAAc,CAAA;IACzB,cAAc,CAAC,EAAE,OAAO,CAAA;IACxB,GAAG,EAAE,cAAc,CAAA;IACnB,SAAS,CAAC,EAAE,OAAO,CAAA;IACnB,cAAc,CAAC,EAAE,OAAO,CAAA;CACzB,CAAA;AAED;;;;;;;GAOG;AAEH,eAAO,MAAM,YAAY,GAAU,CAAC,SAAS,UAAU,mOAgBpD,IAAI,CAAC,CAAC,CAAC,KAAG,OAAO,CAAC,CAAC,CAyDrB,CAAA"}

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

@@ -1,5 +1,6 @@
 import { ValidationError } from '../../../errors/index.js';
 import { deepCopyObjectSimple } from '../../../utilities/deepCopyObject.js';
+import { recordNewDoc } from '../../baseFields/authorship/index.js';
 import { traverseFields } from './traverseFields.js';
 /**
  * This function is responsible for the following actions, in order:
@@ -8,10 +9,13 @@ import { traverseFields } from './traverseFields.js';
  * - Validate data
  * - Transform data for storage
  * - 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, overrideAccess, req, skipValidation })=>{
+ */ export const beforeChange = async ({ id, collection, context, data: incomingData, doc, docWithLocales, fieldsToValidate: submittedTopLevelFieldNames, global, isValidationOperation, onDataProcessed, operation, overrideAccess, req, skipHooks, skipValidation })=>{
     const data = deepCopyObjectSimple(incomingData);
     const mergeLocaleActions = [];
     const errors = [];
+    // Record the first-write flag before traversal mutates `docWithLocales`, so `createdBy` is
+    // stamped reliably.
+    recordNewDoc(context, !docWithLocales || Object.keys(docWithLocales).length === 0);
     await traverseFields({
         id,
         collection,
@@ -23,6 +27,7 @@ import { traverseFields } from './traverseFields.js';
         fieldLabelPath: '',
         fields: collection?.fields || global?.fields,
         global,
+        isValidationOperation,
         mergeLocaleActions,
         operation,
         overrideAccess: overrideAccess,
@@ -34,7 +39,9 @@ import { traverseFields } from './traverseFields.js';
         siblingData: data,
         siblingDoc: doc,
         siblingDocWithLocales: docWithLocales,
-        skipValidation
+        skipHooks,
+        skipValidation,
+        submittedTopLevelFieldNames
     });
     if (errors.length > 0) {
         throw new ValidationError({
@@ -45,6 +52,7 @@ import { traverseFields } from './traverseFields.js';
             req
         }, req.t);
     }
+    onDataProcessed?.(data);
     for (const action of mergeLocaleActions){
         await action();
     }

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 { 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'\n\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  overrideAccess?: boolean\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 */\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  overrideAccess,\n  req,\n  skipValidation,\n}: Args<T>): Promise<T> => {\n  const data = deepCopyObjectSimple(incomingData)\n  const mergeLocaleActions: (() => Promise<void> | void)[] = []\n  const errors: ValidationFieldError[] = []\n\n  await traverseFields({\n    id,\n    collection,\n    context,\n    data,\n    doc,\n    docWithLocales,\n    errors,\n    fieldLabelPath: '',\n    fields: (collection?.fields || global?.fields)!,\n    global,\n    mergeLocaleActions,\n    operation,\n    overrideAccess: overrideAccess!,\n    parentIndexPath: '',\n    parentIsLocalized: false,\n    parentPath: '',\n    parentSchemaPath: '',\n    req,\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        req,\n      },\n      req.t,\n    )\n  }\n\n  for (const action of mergeLocaleActions) {\n    await action()\n  }\n\n  return data\n}\n"],"names":["ValidationError","deepCopyObjectSimple","traverseFields","beforeChange","id","collection","context","data","incomingData","doc","docWithLocales","global","operation","overrideAccess","req","skipValidation","mergeLocaleActions","errors","fieldLabelPath","fields","parentIndexPath","parentIsLocalized","parentPath","parentSchemaPath","siblingData","siblingDoc","siblingDocWithLocales","length","slug","t","action"],"mappings":"AAMA,SAASA,eAAe,QAAQ,2BAA0B;AAC1D,SAASC,oBAAoB,QAAQ,uCAAsC;AAC3E,SAASC,cAAc,QAAQ,sBAAqB;AAgBpD;;;;;;;CAOC,GAED,OAAO,MAAMC,eAAe,OAA6B,EACvDC,EAAE,EACFC,UAAU,EACVC,OAAO,EACPC,MAAMC,YAAY,EAClBC,GAAG,EACHC,cAAc,EACdC,MAAM,EACNC,SAAS,EACTC,cAAc,EACdC,GAAG,EACHC,cAAc,EACN;IACR,MAAMR,OAAON,qBAAqBO;IAClC,MAAMQ,qBAAqD,EAAE;IAC7D,MAAMC,SAAiC,EAAE;IAEzC,MAAMf,eAAe;QACnBE;QACAC;QACAC;QACAC;QACAE;QACAC;QACAO;QACAC,gBAAgB;QAChBC,QAASd,YAAYc,UAAUR,QAAQQ;QACvCR;QACAK;QACAJ;QACAC,gBAAgBA;QAChBO,iBAAiB;QACjBC,mBAAmB;QACnBC,YAAY;QACZC,kBAAkB;QAClBT;QACAU,aAAajB;QACbkB,YAAYhB;QACZiB,uBAAuBhB;QACvBK;IACF;IAEA,IAAIE,OAAOU,MAAM,GAAG,GAAG;QACrB,MAAM,IAAI3B,gBACR;YACEI;YACAC,YAAYA,YAAYuB;YACxBX;YACAN,QAAQA,QAAQiB;YAChBd;QACF,GACAA,IAAIe,CAAC;IAET;IAEA,KAAK,MAAMC,UAAUd,mBAAoB;QACvC,MAAMc;IACR;IAEA,OAAOvB;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 { FieldOperation, JsonObject, PayloadRequest } from '../../../types/index.js'\n\nimport { ValidationError } from '../../../errors/index.js'\nimport { deepCopyObjectSimple } from '../../../utilities/deepCopyObject.js'\nimport { recordNewDoc } from '../../baseFields/authorship/index.js'\nimport { traverseFields } from './traverseFields.js'\n\nexport type Args<T extends JsonObject> = {\n  collection: null | SanitizedCollectionConfig\n  context: RequestContext\n  data: T\n  doc: T\n  docWithLocales: JsonObject\n  /**\n   * Names of the top-level fields submitted by the caller. When present, validation skips other\n   * top-level fields and validates all nested fields below each submitted field.\n   */\n  fieldsToValidate?: ReadonlySet<string>\n  global: null | SanitizedGlobalConfig\n  id?: number | string\n  isValidationOperation?: boolean\n  onDataProcessed?: (data: T) => void\n  operation: FieldOperation\n  overrideAccess?: boolean\n  req: PayloadRequest\n  skipHooks?: boolean\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 */\n\nexport const beforeChange = async <T extends JsonObject>({\n  id,\n  collection,\n  context,\n  data: incomingData,\n  doc,\n  docWithLocales,\n  fieldsToValidate: submittedTopLevelFieldNames,\n  global,\n  isValidationOperation,\n  onDataProcessed,\n  operation,\n  overrideAccess,\n  req,\n  skipHooks,\n  skipValidation,\n}: Args<T>): Promise<T> => {\n  const data = deepCopyObjectSimple(incomingData)\n  const mergeLocaleActions: (() => Promise<void> | void)[] = []\n  const errors: ValidationFieldError[] = []\n\n  // Record the first-write flag before traversal mutates `docWithLocales`, so `createdBy` is\n  // stamped reliably.\n  recordNewDoc(context, !docWithLocales || Object.keys(docWithLocales).length === 0)\n\n  await traverseFields({\n    id,\n    collection,\n    context,\n    data,\n    doc,\n    docWithLocales,\n    errors,\n    fieldLabelPath: '',\n    fields: (collection?.fields || global?.fields)!,\n    global,\n    isValidationOperation,\n    mergeLocaleActions,\n    operation,\n    overrideAccess: overrideAccess!,\n    parentIndexPath: '',\n    parentIsLocalized: false,\n    parentPath: '',\n    parentSchemaPath: '',\n    req,\n    siblingData: data,\n    siblingDoc: doc,\n    siblingDocWithLocales: docWithLocales,\n    skipHooks,\n    skipValidation,\n    submittedTopLevelFieldNames,\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        req,\n      },\n      req.t,\n    )\n  }\n\n  onDataProcessed?.(data)\n\n  for (const action of mergeLocaleActions) {\n    await action()\n  }\n\n  return data\n}\n"],"names":["ValidationError","deepCopyObjectSimple","recordNewDoc","traverseFields","beforeChange","id","collection","context","data","incomingData","doc","docWithLocales","fieldsToValidate","submittedTopLevelFieldNames","global","isValidationOperation","onDataProcessed","operation","overrideAccess","req","skipHooks","skipValidation","mergeLocaleActions","errors","Object","keys","length","fieldLabelPath","fields","parentIndexPath","parentIsLocalized","parentPath","parentSchemaPath","siblingData","siblingDoc","siblingDocWithLocales","slug","t","action"],"mappings":"AAMA,SAASA,eAAe,QAAQ,2BAA0B;AAC1D,SAASC,oBAAoB,QAAQ,uCAAsC;AAC3E,SAASC,YAAY,QAAQ,uCAAsC;AACnE,SAASC,cAAc,QAAQ,sBAAqB;AAwBpD;;;;;;;CAOC,GAED,OAAO,MAAMC,eAAe,OAA6B,EACvDC,EAAE,EACFC,UAAU,EACVC,OAAO,EACPC,MAAMC,YAAY,EAClBC,GAAG,EACHC,cAAc,EACdC,kBAAkBC,2BAA2B,EAC7CC,MAAM,EACNC,qBAAqB,EACrBC,eAAe,EACfC,SAAS,EACTC,cAAc,EACdC,GAAG,EACHC,SAAS,EACTC,cAAc,EACN;IACR,MAAMb,OAAOP,qBAAqBQ;IAClC,MAAMa,qBAAqD,EAAE;IAC7D,MAAMC,SAAiC,EAAE;IAEzC,2FAA2F;IAC3F,oBAAoB;IACpBrB,aAAaK,SAAS,CAACI,kBAAkBa,OAAOC,IAAI,CAACd,gBAAgBe,MAAM,KAAK;IAEhF,MAAMvB,eAAe;QACnBE;QACAC;QACAC;QACAC;QACAE;QACAC;QACAY;QACAI,gBAAgB;QAChBC,QAAStB,YAAYsB,UAAUd,QAAQc;QACvCd;QACAC;QACAO;QACAL;QACAC,gBAAgBA;QAChBW,iBAAiB;QACjBC,mBAAmB;QACnBC,YAAY;QACZC,kBAAkB;QAClBb;QACAc,aAAazB;QACb0B,YAAYxB;QACZyB,uBAAuBxB;QACvBS;QACAC;QACAR;IACF;IAEA,IAAIU,OAAOG,MAAM,GAAG,GAAG;QACrB,MAAM,IAAI1B,gBACR;YACEK;YACAC,YAAYA,YAAY8B;YACxBb;YACAT,QAAQA,QAAQsB;YAChBjB;QACF,GACAA,IAAIkB,CAAC;IAET;IAEArB,kBAAkBR;IAElB,KAAK,MAAM8B,UAAUhB,mBAAoB;QACvC,MAAMgB;IACR;IAEA,OAAO9B;AACT,EAAC"}

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

@@ -1,7 +1,7 @@
 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 { JsonObject, Operation, PayloadRequest } from '../../../types/index.js';
+import type { FieldOperation, JsonObject, PayloadRequest } from '../../../types/index.js';
 import type { Field, TabAsField } from '../../config/types.js';
 import { type RequestContext } from '../../../index.js';
 type Args = {
@@ -9,6 +9,7 @@ type Args = {
      * Data of the nearest parent block. If no parent block exists, this will be the `undefined`
      */
     blockData?: JsonObject;
+    blockFields?: Field[];
     collection: null | SanitizedCollectionConfig;
     context: RequestContext;
     data: JsonObject;
@@ -25,8 +26,9 @@ type Args = {
     fieldLabelPath: string;
     global: null | SanitizedGlobalConfig;
     id?: number | string;
+    isValidationOperation: boolean;
     mergeLocaleActions: (() => Promise<void> | void)[];
-    operation: Operation;
+    operation: FieldOperation;
     overrideAccess: boolean;
     parentIndexPath: string;
     parentIsLocalized: boolean;
@@ -37,8 +39,10 @@ type Args = {
     siblingDoc: JsonObject;
     siblingDocWithLocales?: JsonObject;
     siblingFields?: (Field | TabAsField)[];
+    skipHooks: boolean;
     skipValidation: boolean;
+    submittedTopLevelFieldNames?: ReadonlySet<string>;
 };
-export declare const promise: ({ id, blockData, collection, context, data, doc, docWithLocales, errors, field, fieldIndex, fieldLabelPath, global, mergeLocaleActions, operation, overrideAccess, parentIndexPath, parentIsLocalized, parentPath, parentSchemaPath, req, siblingData, siblingDoc, siblingDocWithLocales, siblingFields, skipValidation, }: Args) => Promise<void>;
+export declare const promise: ({ id, blockData, blockFields, collection, context, data, doc, docWithLocales, errors, field, fieldIndex, fieldLabelPath, global, isValidationOperation, mergeLocaleActions, operation, overrideAccess, parentIndexPath, parentIsLocalized, parentPath, parentSchemaPath, req, siblingData, siblingDoc, siblingDocWithLocales, siblingFields, skipHooks, skipValidation, submittedTopLevelFieldNames, }: 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":"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,UAAU,EAAE,SAAS,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAA;AACpF,OAAO,KAAK,EAAS,KAAK,EAAE,UAAU,EAAY,MAAM,uBAAuB,CAAA;AAG/E,OAAO,EAAE,KAAK,cAAc,EAA+B,MAAM,mBAAmB,CAAA;AAkBpF,KAAK,IAAI,GAAG;IACV;;OAEG;IACH,SAAS,CAAC,EAAE,UAAU,CAAA;IACtB,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,UAAU,EAAE,MAAM,CAAA;IAClB;;;;OAIG;IACH,cAAc,EAAE,MAAM,CAAA;IACtB,MAAM,EAAE,IAAI,GAAG,qBAAqB,CAAA;IACpC,EAAE,CAAC,EAAE,MAAM,GAAG,MAAM,CAAA;IACpB,kBAAkB,EAAE,CAAC,MAAM,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,EAAE,CAAA;IAClD,SAAS,EAAE,SAAS,CAAA;IACpB,cAAc,EAAE,OAAO,CAAA;IACvB,eAAe,EAAE,MAAM,CAAA;IACvB,iBAAiB,EAAE,OAAO,CAAA;IAC1B,UAAU,EAAE,MAAM,CAAA;IAClB,gBAAgB,EAAE,MAAM,CAAA;IACxB,GAAG,EAAE,cAAc,CAAA;IACnB,WAAW,EAAE,UAAU,CAAA;IACvB,UAAU,EAAE,UAAU,CAAA;IACtB,qBAAqB,CAAC,EAAE,UAAU,CAAA;IAClC,aAAa,CAAC,EAAE,CAAC,KAAK,GAAG,UAAU,CAAC,EAAE,CAAA;IACtC,cAAc,EAAE,OAAO,CAAA;CACxB,CAAA;AAUD,eAAO,MAAM,OAAO,GAAU,4TA0B3B,IAAI,KAAG,OAAO,CAAC,IAAI,CA+kBrB,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,UAAU,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAA;AACzF,OAAO,KAAK,EAAS,KAAK,EAAE,UAAU,EAAY,MAAM,uBAAuB,CAAA;AAG/E,OAAO,EAAE,KAAK,cAAc,EAA+B,MAAM,mBAAmB,CAAA;AAoBpF,KAAK,IAAI,GAAG;IACV;;OAEG;IACH,SAAS,CAAC,EAAE,UAAU,CAAA;IACtB,WAAW,CAAC,EAAE,KAAK,EAAE,CAAA;IACrB,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,UAAU,EAAE,MAAM,CAAA;IAClB;;;;OAIG;IACH,cAAc,EAAE,MAAM,CAAA;IACtB,MAAM,EAAE,IAAI,GAAG,qBAAqB,CAAA;IACpC,EAAE,CAAC,EAAE,MAAM,GAAG,MAAM,CAAA;IACpB,qBAAqB,EAAE,OAAO,CAAA;IAC9B,kBAAkB,EAAE,CAAC,MAAM,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,EAAE,CAAA;IAClD,SAAS,EAAE,cAAc,CAAA;IACzB,cAAc,EAAE,OAAO,CAAA;IACvB,eAAe,EAAE,MAAM,CAAA;IACvB,iBAAiB,EAAE,OAAO,CAAA;IAC1B,UAAU,EAAE,MAAM,CAAA;IAClB,gBAAgB,EAAE,MAAM,CAAA;IACxB,GAAG,EAAE,cAAc,CAAA;IACnB,WAAW,EAAE,UAAU,CAAA;IACvB,UAAU,EAAE,UAAU,CAAA;IACtB,qBAAqB,CAAC,EAAE,UAAU,CAAA;IAClC,aAAa,CAAC,EAAE,CAAC,KAAK,GAAG,UAAU,CAAC,EAAE,CAAA;IACtC,SAAS,EAAE,OAAO,CAAA;IAClB,cAAc,EAAE,OAAO,CAAA;IACvB,2BAA2B,CAAC,EAAE,WAAW,CAAC,MAAM,CAAC,CAAA;CAClD,CAAA;AAUD,eAAO,MAAM,OAAO,2YA8BjB,IAAI,KAAG,OAAO,CAAC,IAAI,CAmtBrB,CAAA"}

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

@@ -2,8 +2,10 @@ import { MissingEditorProp } from '../../../errors/index.js';
 import { validateBlocksFilterOptions } from '../../../index.js';
 import { deepMergeWithSourceArrays } from '../../../utilities/deepMerge.js';
 import { getTranslatedLabel } from '../../../utilities/getTranslatedLabel.js';
+import { isolateObjectProperty } from '../../../utilities/isolateObjectProperty.js';
 import { fieldAffectsData, fieldShouldBeLocalized, tabHasName } from '../../config/types.js';
 import { getFieldPaths } from '../../getFieldPaths.js';
+import { flattenValidationData } from './flattenValidationData.js';
 import { getExistingRowDoc } from './getExistingRowDoc.js';
 import { traverseFields } from './traverseFields.js';
 function buildFieldLabel(parentLabel, label) {
@@ -20,7 +22,7 @@ function buildFieldLabel(parentLabel, label) {
 // - Transform data for storage
 // - beforeDuplicate hooks (if duplicate)
 // - Unflatten locales
-export const promise = async ({ id, blockData, collection, context, data, doc, docWithLocales, errors, field, fieldIndex, fieldLabelPath, global, mergeLocaleActions, operation, overrideAccess, parentIndexPath, parentIsLocalized, parentPath, parentSchemaPath, req, siblingData, siblingDoc, siblingDocWithLocales, siblingFields, skipValidation })=>{
+export const promise = async ({ id, blockData, blockFields, collection, context, data, doc, docWithLocales, errors, field, fieldIndex, fieldLabelPath, global, isValidationOperation, mergeLocaleActions, operation, overrideAccess, parentIndexPath, parentIsLocalized, parentPath, parentSchemaPath, req, siblingData, siblingDoc, siblingDocWithLocales, siblingFields, skipHooks, skipValidation, submittedTopLevelFieldNames })=>{
     const { indexPath, path, schemaPath } = getFieldPaths({
         field,
         index: fieldIndex,
@@ -40,22 +42,21 @@ export const promise = async ({ id, blockData, collection, context, data, doc, d
         path: pathSegments,
         user: req.user
     })) : true;
-    let skipValidationFromHere = skipValidation || !passesCondition;
+    const isOutsideSubmittedFieldScope = submittedTopLevelFieldNames !== undefined && fieldAffectsData(field) && !submittedTopLevelFieldNames.has(pathSegments[0]);
+    let skipValidationFromHere = skipValidation || isOutsideSubmittedFieldScope || !passesCondition;
     if (fieldAffectsData(field)) {
-        // skip validation if the field is localized and the incoming data is null
-        if (fieldShouldBeLocalized({
+        const shouldSkipValidationForLocalizedFallback = !isValidationOperation && operation !== 'validate' && fieldShouldBeLocalized({
             field,
             parentIsLocalized
-        }) && operationLocale !== defaultLocale) {
-            if ([
-                'array',
-                'blocks'
-            ].includes(field.type) && siblingData[field.name] === null) {
-                skipValidationFromHere = true;
-            }
+        }) && operationLocale !== defaultLocale && [
+            'array',
+            'blocks'
+        ].includes(field.type) && siblingData[field.name] === null;
+        if (shouldSkipValidationForLocalizedFallback) {
+            skipValidationFromHere = true;
         }
         // Execute hooks
-        if ('hooks' in field && field.hooks?.beforeChange) {
+        if (!skipHooks && 'hooks' in field && field.hooks?.beforeChange) {
             for (const hook of field.hooks.beforeChange){
                 const hookedValue = await hook({
                     blockData,
@@ -67,6 +68,7 @@ export const promise = async ({ id, blockData, collection, context, data, doc, d
                     indexPath: indexPathSegments,
                     operation,
                     originalDoc: doc,
+                    overrideAccess,
                     path: pathSegments,
                     previousSiblingDoc: siblingDoc,
                     previousValue: siblingDoc[field.name],
@@ -82,9 +84,40 @@ export const promise = async ({ id, blockData, collection, context, data, doc, d
                 }
             }
         }
+        if (hasInvalidFieldValueShape({
+            field,
+            value: siblingData[field.name]
+        })) {
+            errors.push({
+                label: buildFieldLabel(fieldLabelPath, getTranslatedLabel(field?.label || field?.name, req.i18n)),
+                message: req.t('validation:invalidInput'),
+                path
+            });
+            return;
+        }
         // Validate
         if (!skipValidationFromHere && 'validate' in field && field.validate) {
             const valueToValidate = siblingData[field.name];
+            // With `locale: 'all'` a localized scalar is a locale-keyed object; validate each locale, not the
+            // wrapper. Containers (`group`/`array`/`blocks`) are excluded - per-locale child validation is a follow-up.
+            const isLocaleKeyedValue = operationLocale === 'all' && localization && fieldShouldBeLocalized({
+                field,
+                parentIsLocalized
+            }) && field.type !== 'group' && valueToValidate !== null && typeof valueToValidate === 'object' && !Array.isArray(valueToValidate);
+            const localizedValuesToValidate = isLocaleKeyedValue ? localization.localeCodes.filter((locale)=>locale in valueToValidate).map((locale)=>({
+                    locale,
+                    value: valueToValidate[locale]
+                })) : [
+                {
+                    value: valueToValidate
+                }
+            ];
+            // No recognized locales (e.g. `{}`): validate `undefined` once so required/optional still apply.
+            if (localizedValuesToValidate.length === 0) {
+                localizedValuesToValidate.push({
+                    value: undefined
+                });
+            }
             let jsonError;
             if (field.type === 'json' && typeof siblingData[field.name] === 'string') {
                 try {
@@ -94,25 +127,66 @@ export const promise = async ({ id, blockData, collection, context, data, doc, d
                 }
             }
             const validateFn = field.validate;
-            const validationResult = await validateFn(valueToValidate, {
-                ...field,
-                id,
-                blockData: blockData,
-                collectionSlug: collection?.slug,
-                data: deepMergeWithSourceArrays(doc, data),
-                event: 'submit',
-                // @ts-expect-error
-                jsonError,
-                operation,
-                overrideAccess,
-                path: pathSegments,
-                preferences: {
-                    fields: {}
-                },
-                previousValue: siblingDoc[field.name],
-                req,
-                siblingData: deepMergeWithSourceArrays(siblingDoc, siblingData)
-            });
+            let validationResult = true;
+            let failedLocale;
+            const validationData = deepMergeWithSourceArrays(doc, data);
+            const validationSiblingData = deepMergeWithSourceArrays(siblingDoc, siblingData);
+            for (const { locale, value } of localizedValuesToValidate){
+                // Scope `req.locale` to the locale being validated without mutating the shared request.
+                const validationReq = locale ? isolateObjectProperty(req, 'locale') : req;
+                if (locale) {
+                    validationReq.locale = locale;
+                }
+                const localeContext = locale ? {
+                    blockData: blockData && blockFields ? flattenValidationData({
+                        config: req.payload.config,
+                        data: blockData,
+                        fields: blockFields,
+                        locale,
+                        parentIsLocalized
+                    }) : blockData,
+                    data: flattenValidationData({
+                        config: req.payload.config,
+                        data: validationData,
+                        fields: collection?.fields || global?.fields,
+                        locale
+                    }),
+                    siblingData: flattenValidationData({
+                        config: req.payload.config,
+                        data: validationSiblingData,
+                        fields: siblingFields,
+                        locale,
+                        parentIsLocalized
+                    })
+                } : {
+                    blockData,
+                    data: validationData,
+                    siblingData: validationSiblingData
+                };
+                validationResult = await validateFn(value, {
+                    ...field,
+                    id,
+                    blockData: localeContext.blockData,
+                    collectionSlug: collection?.slug,
+                    data: localeContext.data,
+                    event: 'submit',
+                    // @ts-expect-error generic validation options cannot infer JSON fields
+                    jsonError,
+                    operation,
+                    overrideAccess,
+                    path: pathSegments,
+                    preferences: {
+                        fields: {}
+                    },
+                    previousValue: locale ? siblingDoc[field.name]?.[locale] : siblingDoc[field.name],
+                    req: validationReq,
+                    siblingData: localeContext.siblingData
+                });
+                if (typeof validationResult === 'string') {
+                    failedLocale = locale;
+                    break;
+                }
+            }
             if (typeof validationResult === 'string') {
                 let filterOptionsError = false;
                 if (field.type === 'blocks' && field.filterOptions) {
@@ -151,7 +225,7 @@ export const promise = async ({ id, blockData, collection, context, data, doc, d
                     // field itself => only push the error if the field is not a block field with validation failure due to filterOptions
                     const fieldLabel = buildFieldLabel(fieldLabelPath, getTranslatedLabel(field?.label || field?.name, req.i18n));
                     errors.push({
-                        label: fieldLabel,
+                        label: failedLocale ? `${fieldLabel} (${failedLocale})` : fieldLabel,
                         message: validationResult,
                         path
                     });
@@ -165,8 +239,13 @@ export const promise = async ({ id, blockData, collection, context, data, doc, d
         })) {
             mergeLocaleActions.push(()=>{
                 const localeData = {};
+                // With `locale: 'all'`, siblingData holds a locale-keyed object (`{ en, es }`) rather than a single
+                // locale's value - take each submitted locale, falling back to the existing doc for ones not sent.
+                const submittedValue = siblingData[field.name];
+                const isAllLocales = req.locale === 'all' && submittedValue !== null && typeof submittedValue === 'object' && !Array.isArray(submittedValue);
                 for (const locale of localization.localeCodes){
-                    const fieldValue = locale === req.locale ? siblingData[field.name] : siblingDocWithLocales?.[field.name]?.[locale];
+                    const existingValue = siblingDocWithLocales?.[field.name]?.[locale];
+                    const fieldValue = isAllLocales ? locale in submittedValue ? submittedValue[locale] : existingValue : locale === req.locale ? submittedValue : existingValue;
                     // update locale value if it's not undefined
                     if (typeof fieldValue !== 'undefined') {
                         localeData[locale] = fieldValue;
@@ -189,6 +268,7 @@ export const promise = async ({ id, blockData, collection, context, data, doc, d
                         promises.push(traverseFields({
                             id,
                             blockData,
+                            blockFields,
                             collection,
                             context,
                             data,
@@ -198,6 +278,7 @@ export const promise = async ({ id, blockData, collection, context, data, doc, d
                             fieldLabelPath: field?.label === false ? fieldLabelPath : buildFieldLabel(fieldLabelPath, `${getTranslatedLabel(field?.label || field?.name, req.i18n)} ${rowIndex + 1}`),
                             fields: field.fields,
                             global,
+                            isValidationOperation,
                             mergeLocaleActions,
                             operation,
                             overrideAccess,
@@ -209,7 +290,9 @@ export const promise = async ({ id, blockData, collection, context, data, doc, d
                             siblingData: row,
                             siblingDoc: getExistingRowDoc(row, siblingDoc[field.name]),
                             siblingDocWithLocales: getExistingRowDoc(row, siblingDocWithLocales?.[field.name]),
-                            skipValidation: skipValidationFromHere
+                            skipHooks,
+                            skipValidation: skipValidationFromHere,
+                            submittedTopLevelFieldNames
                         }));
                     });
                     await Promise.all(promises);
@@ -231,6 +314,7 @@ export const promise = async ({ id, blockData, collection, context, data, doc, d
                             promises.push(traverseFields({
                                 id,
                                 blockData: row,
+                                blockFields: block.fields,
                                 collection,
                                 context,
                                 data,
@@ -240,6 +324,7 @@ export const promise = async ({ id, blockData, collection, context, data, doc, d
                                 fieldLabelPath: blockLabelPath,
                                 fields: block.fields,
                                 global,
+                                isValidationOperation,
                                 mergeLocaleActions,
                                 operation,
                                 overrideAccess,
@@ -251,7 +336,9 @@ export const promise = async ({ id, blockData, collection, context, data, doc, d
                                 siblingData: row,
                                 siblingDoc: rowSiblingDoc,
                                 siblingDocWithLocales: rowSiblingDocWithLocales,
-                                skipValidation: skipValidationFromHere
+                                skipHooks,
+                                skipValidation: skipValidationFromHere,
+                                submittedTopLevelFieldNames
                             }));
                         }
                     });
@@ -265,6 +352,7 @@ export const promise = async ({ id, blockData, collection, context, data, doc, d
                 await traverseFields({
                     id,
                     blockData,
+                    blockFields,
                     collection,
                     context,
                     data,
@@ -274,6 +362,7 @@ export const promise = async ({ id, blockData, collection, context, data, doc, d
                     fieldLabelPath: field.type === 'row' || field?.label === false ? fieldLabelPath : buildFieldLabel(fieldLabelPath, getTranslatedLabel(field?.label || field?.type, req.i18n)),
                     fields: field.fields,
                     global,
+                    isValidationOperation,
                     mergeLocaleActions,
                     operation,
                     overrideAccess,
@@ -285,7 +374,9 @@ export const promise = async ({ id, blockData, collection, context, data, doc, d
                     siblingData,
                     siblingDoc,
                     siblingDocWithLocales: siblingDocWithLocales,
-                    skipValidation: skipValidationFromHere
+                    skipHooks,
+                    skipValidation: skipValidationFromHere,
+                    submittedTopLevelFieldNames
                 });
                 break;
             }
@@ -322,6 +413,7 @@ export const promise = async ({ id, blockData, collection, context, data, doc, d
                 await traverseFields({
                     id,
                     blockData,
+                    blockFields,
                     collection,
                     context,
                     data,
@@ -331,6 +423,7 @@ export const promise = async ({ id, blockData, collection, context, data, doc, d
                     fieldLabelPath: field?.label === false ? fieldLabelPath : buildFieldLabel(fieldLabelPath, getTranslatedLabel(fallbackLabel, req.i18n)),
                     fields: field.fields,
                     global,
+                    isValidationOperation,
                     mergeLocaleActions,
                     operation,
                     overrideAccess,
@@ -342,7 +435,9 @@ export const promise = async ({ id, blockData, collection, context, data, doc, d
                     siblingData: groupSiblingData,
                     siblingDoc: groupSiblingDoc,
                     siblingDocWithLocales: groupSiblingDocWithLocales,
-                    skipValidation: skipValidationFromHere
+                    skipHooks,
+                    skipValidation: skipValidationFromHere,
+                    submittedTopLevelFieldNames
                 });
                 break;
             }
@@ -370,7 +465,7 @@ export const promise = async ({ id, blockData, collection, context, data, doc, d
                     throw new Error('Attempted to access unsanitized rich text editor.');
                 }
                 const editor = field?.editor;
-                if (editor?.hooks?.beforeChange?.length) {
+                if (!skipHooks && editor?.hooks?.beforeChange?.length) {
                     for (const hook of editor.hooks.beforeChange){
                         const hookedValue = await hook({
                             collection,
@@ -394,7 +489,7 @@ export const promise = async ({ id, blockData, collection, context, data, doc, d
                             schemaPath: schemaPathSegments,
                             siblingData,
                             siblingDocWithLocales,
-                            skipValidation,
+                            skipValidation: skipValidationFromHere,
                             value: siblingData[field.name]
                         });
                         if (hookedValue !== undefined) {
@@ -427,6 +522,7 @@ export const promise = async ({ id, blockData, collection, context, data, doc, d
                 await traverseFields({
                     id,
                     blockData,
+                    blockFields,
                     collection,
                     context,
                     data,
@@ -436,6 +532,7 @@ export const promise = async ({ id, blockData, collection, context, data, doc, d
                     fieldLabelPath: field?.label === false ? fieldLabelPath : buildFieldLabel(fieldLabelPath, getTranslatedLabel(field?.label || field.name, req.i18n)),
                     fields: field.fields,
                     global,
+                    isValidationOperation,
                     mergeLocaleActions,
                     operation,
                     overrideAccess,
@@ -447,7 +544,9 @@ export const promise = async ({ id, blockData, collection, context, data, doc, d
                     siblingData: tabSiblingData,
                     siblingDoc: tabSiblingDoc,
                     siblingDocWithLocales: tabSiblingDocWithLocales,
-                    skipValidation: skipValidationFromHere
+                    skipHooks,
+                    skipValidation: skipValidationFromHere,
+                    submittedTopLevelFieldNames
                 });
                 break;
             }
@@ -456,6 +555,7 @@ export const promise = async ({ id, blockData, collection, context, data, doc, d
                 await traverseFields({
                     id,
                     blockData,
+                    blockFields,
                     collection,
                     context,
                     data,
@@ -468,6 +568,7 @@ export const promise = async ({ id, blockData, collection, context, data, doc, d
                             type: 'tab'
                         })),
                     global,
+                    isValidationOperation,
                     mergeLocaleActions,
                     operation,
                     overrideAccess,
@@ -479,7 +580,9 @@ export const promise = async ({ id, blockData, collection, context, data, doc, d
                     siblingData,
                     siblingDoc,
                     siblingDocWithLocales: siblingDocWithLocales,
-                    skipValidation: skipValidationFromHere
+                    skipHooks,
+                    skipValidation: skipValidationFromHere,
+                    submittedTopLevelFieldNames
                 });
                 break;
             }
@@ -489,5 +592,29 @@ export const promise = async ({ id, blockData, collection, context, data, doc, d
             }
     }
 };
+function hasInvalidFieldValueShape({ field, value }) {
+    if (value === null || typeof value === 'undefined' || !fieldAffectsData(field)) {
+        return false;
+    }
+    if (field.type === 'array' || field.type === 'blocks') {
+        // Form state may use a numeric row count, while submitted values use arrays.
+        return !(Array.isArray(value) || typeof value === 'number');
+    }
+    if (field.type === 'number') {
+        // Only hasMany number fields may receive arrays.
+        return typeof value === 'object' && !(field.hasMany && Array.isArray(value));
+    }
+    if ((field.type === 'relationship' || field.type === 'upload') && field.hasMany) {
+        // HasMany relationships/uploads may receive arrays or one valid polymorphic value.
+        if (typeof value !== 'object' || Array.isArray(value)) {
+            return false;
+        }
+        const relationshipValue = value;
+        const valuePrototype = Object.getPrototypeOf(value);
+        const isSinglePolymorphicRelationshipValue = Array.isArray(field.relationTo) && (valuePrototype === null || valuePrototype === Object.prototype) && Object.hasOwn(relationshipValue, 'relationTo') && Object.hasOwn(relationshipValue, 'value') && Reflect.ownKeys(relationshipValue).length === 2 && typeof relationshipValue.relationTo === 'string' && field.relationTo.includes(relationshipValue.relationTo) && (typeof relationshipValue.value === 'string' || typeof relationshipValue.value === 'number');
+        return !isSinglePolymorphicRelationshipValue;
+    }
+    return false;
+}
 
 //# sourceMappingURL=promise.js.map