payload 4.0.0-internal.e55ccef → 4.0.0-internal.ea6e8f8

package/dist/fields/hooks/afterRead/virtualFieldPopulationPromise.js

@@ -1,3 +1,4 @@
+import { resolveBranch } from '../../../branching/resolveBranch.js';
 import { createDataloaderCacheKey } from '../../../collections/dataloader.js';
 export const virtualFieldPopulationPromise = async ({ name, draft, fallbackLocale, fields, hasMany, locale, overrideAccess, ref, req, segments, showHiddenFields, siblingDoc })=>{
     const currentSegment = segments.shift();
@@ -76,6 +77,7 @@ export const virtualFieldPopulationPromise = async ({ name, draft, fallbackLocal
             const collectionSlug = currentField.relationTo;
             const populatedDocs = await Promise.all(docIDs.map((docID)=>{
                 return req.payloadDataLoader.load(createDataloaderCacheKey({
+                    branch: resolveBranch(req),
                     collectionSlug,
                     currentDepth: 0,
                     depth: 0,
@@ -126,6 +128,7 @@ export const virtualFieldPopulationPromise = async ({ name, draft, fallbackLocal
             return;
         }
         const populatedDoc = await req.payloadDataLoader.load(createDataloaderCacheKey({
+            branch: resolveBranch(req),
             collectionSlug: currentField.relationTo,
             currentDepth: 0,
             depth: 0,

package/dist/fields/hooks/afterRead/virtualFieldPopulationPromise.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../../src/fields/hooks/afterRead/virtualFieldPopulationPromise.ts"],"sourcesContent":["import type { TypedFallbackLocale } from '../../../index.js'\nimport type { PayloadRequest } from '../../../types/index.js'\nimport type { FlattenedField } from '../../config/types.js'\n\nimport { createDataloaderCacheKey } from '../../../collections/dataloader.js'\n\nexport const virtualFieldPopulationPromise = async ({\n  name,\n  draft,\n  fallbackLocale,\n  fields,\n  hasMany,\n  locale,\n  overrideAccess,\n  ref,\n  req,\n  segments,\n  showHiddenFields,\n  siblingDoc,\n}: {\n  draft: boolean\n  fallbackLocale: TypedFallbackLocale\n  fields: FlattenedField[]\n  hasMany?: boolean\n  locale: string\n  name: string\n  overrideAccess: boolean\n  ref: any\n  req: PayloadRequest\n  segments: string[]\n  shift?: boolean\n  showHiddenFields: boolean\n  siblingDoc: Record<string, unknown>\n}): Promise<void> => {\n  const currentSegment = segments.shift()\n\n  if (!currentSegment) {\n    return\n  }\n\n  const currentValue = ref[currentSegment]\n\n  if (typeof currentValue === 'undefined') {\n    return\n  }\n\n  // Final step\n  if (segments.length === 0) {\n    if (hasMany) {\n      if (!Array.isArray(siblingDoc[name])) {\n        siblingDoc[name] = []\n      }\n      ;(siblingDoc[name] as any[]).push(currentValue)\n    } else {\n      siblingDoc[name] = currentValue\n    }\n    return\n  }\n\n  const currentField = fields.find((each) => each.name === currentSegment)\n\n  if (!currentField) {\n    return\n  }\n\n  if (currentField.type === 'group' || currentField.type === 'tab') {\n    if (!currentValue || typeof currentValue !== 'object') {\n      return\n    }\n\n    return virtualFieldPopulationPromise({\n      name,\n      draft,\n      fallbackLocale,\n      fields: currentField.flattenedFields,\n      locale,\n      overrideAccess,\n      ref: currentValue,\n      req,\n      segments,\n      showHiddenFields,\n      siblingDoc,\n    })\n  }\n\n  if (\n    (currentField.type === 'relationship' || currentField.type === 'upload') &&\n    typeof currentField.relationTo === 'string'\n  ) {\n    const select = {}\n    let currentSelectRef: any = select\n    const currentFields = req.payload.collections[currentField.relationTo]?.config.flattenedFields\n\n    for (let i = 0; i < segments.length; i++) {\n      const field = currentFields?.find((each) => each.name === segments[i])\n\n      const shouldBreak =\n        i === segments.length - 1 || field?.type === 'relationship' || field?.type === 'upload'\n\n      currentSelectRef[segments[i]!] = shouldBreak ? true : {}\n      currentSelectRef = currentSelectRef[segments[i]!]\n\n      if (shouldBreak) {\n        break\n      }\n    }\n\n    if (currentField.hasMany) {\n      if (!Array.isArray(currentValue)) {\n        return\n      }\n\n      const docIDs = currentValue\n        .map((e) => {\n          if (!e) {\n            return null\n          }\n          if (typeof e === 'object') {\n            return e.id\n          }\n          return e\n        })\n        .filter((e) => typeof e === 'string' || typeof e === 'number')\n\n      if (segments[0] === 'id' && segments.length === 0) {\n        siblingDoc[name] = docIDs\n        return\n      }\n\n      const collectionSlug = currentField.relationTo\n\n      const populatedDocs = await Promise.all(\n        docIDs.map((docID) => {\n          return req.payloadDataLoader.load(\n            createDataloaderCacheKey({\n              collectionSlug,\n              currentDepth: 0,\n              depth: 0,\n              docID,\n              draft,\n              fallbackLocale,\n              locale,\n              overrideAccess,\n              select,\n              showHiddenFields,\n              transactionID: req.transactionID as number,\n            }),\n          )\n        }),\n      )\n\n      for (const doc of populatedDocs) {\n        if (!doc) {\n          continue\n        }\n\n        await virtualFieldPopulationPromise({\n          name,\n          draft,\n          fallbackLocale,\n          fields: req.payload.collections[currentField.relationTo]!.config.flattenedFields,\n          hasMany: true,\n          locale,\n          overrideAccess,\n          ref: doc,\n          req,\n          segments: [...segments],\n          showHiddenFields,\n          siblingDoc,\n        })\n      }\n\n      return\n    }\n\n    let docID: number | string\n\n    if (typeof currentValue === 'object' && currentValue) {\n      docID = currentValue.id\n    } else {\n      docID = currentValue\n    }\n\n    if (segments[0] === 'id' && segments.length === 0) {\n      siblingDoc[name] = docID\n      return\n    }\n\n    if (typeof docID !== 'string' && typeof docID !== 'number') {\n      return\n    }\n\n    const populatedDoc = await req.payloadDataLoader.load(\n      createDataloaderCacheKey({\n        collectionSlug: currentField.relationTo,\n        currentDepth: 0,\n        depth: 0,\n        docID,\n        draft,\n        fallbackLocale,\n        locale,\n        overrideAccess,\n        select,\n        showHiddenFields,\n        transactionID: req.transactionID as number,\n      }),\n    )\n\n    if (!populatedDoc) {\n      return\n    }\n\n    return virtualFieldPopulationPromise({\n      name,\n      draft,\n      fallbackLocale,\n      fields: req.payload.collections[currentField.relationTo]!.config.flattenedFields,\n      hasMany,\n      locale,\n      overrideAccess,\n      ref: populatedDoc,\n      req,\n      segments,\n      showHiddenFields,\n      siblingDoc,\n    })\n  }\n}\n"],"names":["createDataloaderCacheKey","virtualFieldPopulationPromise","name","draft","fallbackLocale","fields","hasMany","locale","overrideAccess","ref","req","segments","showHiddenFields","siblingDoc","currentSegment","shift","currentValue","length","Array","isArray","push","currentField","find","each","type","flattenedFields","relationTo","select","currentSelectRef","currentFields","payload","collections","config","i","field","shouldBreak","docIDs","map","e","id","filter","collectionSlug","populatedDocs","Promise","all","docID","payloadDataLoader","load","currentDepth","depth","transactionID","doc","populatedDoc"],"mappings":"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"}
+{"version":3,"sources":["../../../../src/fields/hooks/afterRead/virtualFieldPopulationPromise.ts"],"sourcesContent":["import type { TypedFallbackLocale } from '../../../index.js'\nimport type { PayloadRequest } from '../../../types/index.js'\nimport type { FlattenedField } from '../../config/types.js'\n\nimport { resolveBranch } from '../../../branching/resolveBranch.js'\nimport { createDataloaderCacheKey } from '../../../collections/dataloader.js'\n\nexport const virtualFieldPopulationPromise = async ({\n  name,\n  draft,\n  fallbackLocale,\n  fields,\n  hasMany,\n  locale,\n  overrideAccess,\n  ref,\n  req,\n  segments,\n  showHiddenFields,\n  siblingDoc,\n}: {\n  draft: boolean\n  fallbackLocale: TypedFallbackLocale\n  fields: FlattenedField[]\n  hasMany?: boolean\n  locale: string\n  name: string\n  overrideAccess: boolean\n  ref: any\n  req: PayloadRequest\n  segments: string[]\n  shift?: boolean\n  showHiddenFields: boolean\n  siblingDoc: Record<string, unknown>\n}): Promise<void> => {\n  const currentSegment = segments.shift()\n\n  if (!currentSegment) {\n    return\n  }\n\n  const currentValue = ref[currentSegment]\n\n  if (typeof currentValue === 'undefined') {\n    return\n  }\n\n  // Final step\n  if (segments.length === 0) {\n    if (hasMany) {\n      if (!Array.isArray(siblingDoc[name])) {\n        siblingDoc[name] = []\n      }\n      ;(siblingDoc[name] as any[]).push(currentValue)\n    } else {\n      siblingDoc[name] = currentValue\n    }\n    return\n  }\n\n  const currentField = fields.find((each) => each.name === currentSegment)\n\n  if (!currentField) {\n    return\n  }\n\n  if (currentField.type === 'group' || currentField.type === 'tab') {\n    if (!currentValue || typeof currentValue !== 'object') {\n      return\n    }\n\n    return virtualFieldPopulationPromise({\n      name,\n      draft,\n      fallbackLocale,\n      fields: currentField.flattenedFields,\n      locale,\n      overrideAccess,\n      ref: currentValue,\n      req,\n      segments,\n      showHiddenFields,\n      siblingDoc,\n    })\n  }\n\n  if (\n    (currentField.type === 'relationship' || currentField.type === 'upload') &&\n    typeof currentField.relationTo === 'string'\n  ) {\n    const select = {}\n    let currentSelectRef: any = select\n    const currentFields = req.payload.collections[currentField.relationTo]?.config.flattenedFields\n\n    for (let i = 0; i < segments.length; i++) {\n      const field = currentFields?.find((each) => each.name === segments[i])\n\n      const shouldBreak =\n        i === segments.length - 1 || field?.type === 'relationship' || field?.type === 'upload'\n\n      currentSelectRef[segments[i]!] = shouldBreak ? true : {}\n      currentSelectRef = currentSelectRef[segments[i]!]\n\n      if (shouldBreak) {\n        break\n      }\n    }\n\n    if (currentField.hasMany) {\n      if (!Array.isArray(currentValue)) {\n        return\n      }\n\n      const docIDs = currentValue\n        .map((e) => {\n          if (!e) {\n            return null\n          }\n          if (typeof e === 'object') {\n            return e.id\n          }\n          return e\n        })\n        .filter((e) => typeof e === 'string' || typeof e === 'number')\n\n      if (segments[0] === 'id' && segments.length === 0) {\n        siblingDoc[name] = docIDs\n        return\n      }\n\n      const collectionSlug = currentField.relationTo\n\n      const populatedDocs = await Promise.all(\n        docIDs.map((docID) => {\n          return req.payloadDataLoader.load(\n            createDataloaderCacheKey({\n              branch: resolveBranch(req),\n              collectionSlug,\n              currentDepth: 0,\n              depth: 0,\n              docID,\n              draft,\n              fallbackLocale,\n              locale,\n              overrideAccess,\n              select,\n              showHiddenFields,\n              transactionID: req.transactionID as number,\n            }),\n          )\n        }),\n      )\n\n      for (const doc of populatedDocs) {\n        if (!doc) {\n          continue\n        }\n\n        await virtualFieldPopulationPromise({\n          name,\n          draft,\n          fallbackLocale,\n          fields: req.payload.collections[currentField.relationTo]!.config.flattenedFields,\n          hasMany: true,\n          locale,\n          overrideAccess,\n          ref: doc,\n          req,\n          segments: [...segments],\n          showHiddenFields,\n          siblingDoc,\n        })\n      }\n\n      return\n    }\n\n    let docID: number | string\n\n    if (typeof currentValue === 'object' && currentValue) {\n      docID = currentValue.id\n    } else {\n      docID = currentValue\n    }\n\n    if (segments[0] === 'id' && segments.length === 0) {\n      siblingDoc[name] = docID\n      return\n    }\n\n    if (typeof docID !== 'string' && typeof docID !== 'number') {\n      return\n    }\n\n    const populatedDoc = await req.payloadDataLoader.load(\n      createDataloaderCacheKey({\n        branch: resolveBranch(req),\n        collectionSlug: currentField.relationTo,\n        currentDepth: 0,\n        depth: 0,\n        docID,\n        draft,\n        fallbackLocale,\n        locale,\n        overrideAccess,\n        select,\n        showHiddenFields,\n        transactionID: req.transactionID as number,\n      }),\n    )\n\n    if (!populatedDoc) {\n      return\n    }\n\n    return virtualFieldPopulationPromise({\n      name,\n      draft,\n      fallbackLocale,\n      fields: req.payload.collections[currentField.relationTo]!.config.flattenedFields,\n      hasMany,\n      locale,\n      overrideAccess,\n      ref: populatedDoc,\n      req,\n      segments,\n      showHiddenFields,\n      siblingDoc,\n    })\n  }\n}\n"],"names":["resolveBranch","createDataloaderCacheKey","virtualFieldPopulationPromise","name","draft","fallbackLocale","fields","hasMany","locale","overrideAccess","ref","req","segments","showHiddenFields","siblingDoc","currentSegment","shift","currentValue","length","Array","isArray","push","currentField","find","each","type","flattenedFields","relationTo","select","currentSelectRef","currentFields","payload","collections","config","i","field","shouldBreak","docIDs","map","e","id","filter","collectionSlug","populatedDocs","Promise","all","docID","payloadDataLoader","load","branch","currentDepth","depth","transactionID","doc","populatedDoc"],"mappings":"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"}

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,iIAYpD,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;AAMzF,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,CAqDrB,CAAA"}

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

@@ -8,7 +8,7 @@ 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 = [];
@@ -23,6 +23,7 @@ import { traverseFields } from './traverseFields.js';
         fieldLabelPath: '',
         fields: collection?.fields || global?.fields,
         global,
+        isValidationOperation,
         mergeLocaleActions,
         operation,
         overrideAccess: overrideAccess,
@@ -34,7 +35,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 +48,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 { 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  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","traverseFields","beforeChange","id","collection","context","data","incomingData","doc","docWithLocales","fieldsToValidate","submittedTopLevelFieldNames","global","isValidationOperation","onDataProcessed","operation","overrideAccess","req","skipHooks","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;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,OAAON,qBAAqBO;IAClC,MAAMa,qBAAqD,EAAE;IAC7D,MAAMC,SAAiC,EAAE;IAEzC,MAAMpB,eAAe;QACnBE;QACAC;QACAC;QACAC;QACAE;QACAC;QACAY;QACAC,gBAAgB;QAChBC,QAASnB,YAAYmB,UAAUX,QAAQW;QACvCX;QACAC;QACAO;QACAL;QACAC,gBAAgBA;QAChBQ,iBAAiB;QACjBC,mBAAmB;QACnBC,YAAY;QACZC,kBAAkB;QAClBV;QACAW,aAAatB;QACbuB,YAAYrB;QACZsB,uBAAuBrB;QACvBS;QACAC;QACAR;IACF;IAEA,IAAIU,OAAOU,MAAM,GAAG,GAAG;QACrB,MAAM,IAAIhC,gBACR;YACEI;YACAC,YAAYA,YAAY4B;YACxBX;YACAT,QAAQA,QAAQoB;YAChBf;QACF,GACAA,IAAIgB,CAAC;IAET;IAEAnB,kBAAkBR;IAElB,KAAK,MAAM4B,UAAUd,mBAAoB;QACvC,MAAMc;IACR;IAEA,OAAO5B;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 = {
@@ -25,8 +25,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 +38,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, 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,+TA0BjB,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;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,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,8XA6BjB,IAAI,KAAG,OAAO,CAAC,IAAI,CAunBrB,CAAA"}

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

@@ -20,7 +20,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, 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 +40,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 +66,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,6 +82,17 @@ 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];
@@ -198,6 +209,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 +221,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);
@@ -240,6 +254,7 @@ export const promise = async ({ id, blockData, collection, context, data, doc, d
                                 fieldLabelPath: blockLabelPath,
                                 fields: block.fields,
                                 global,
+                                isValidationOperation,
                                 mergeLocaleActions,
                                 operation,
                                 overrideAccess,
@@ -251,7 +266,9 @@ export const promise = async ({ id, blockData, collection, context, data, doc, d
                                 siblingData: row,
                                 siblingDoc: rowSiblingDoc,
                                 siblingDocWithLocales: rowSiblingDocWithLocales,
-                                skipValidation: skipValidationFromHere
+                                skipHooks,
+                                skipValidation: skipValidationFromHere,
+                                submittedTopLevelFieldNames
                             }));
                         }
                     });
@@ -274,6 +291,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 +303,9 @@ export const promise = async ({ id, blockData, collection, context, data, doc, d
                     siblingData,
                     siblingDoc,
                     siblingDocWithLocales: siblingDocWithLocales,
-                    skipValidation: skipValidationFromHere
+                    skipHooks,
+                    skipValidation: skipValidationFromHere,
+                    submittedTopLevelFieldNames
                 });
                 break;
             }
@@ -331,6 +351,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 +363,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 +393,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 +417,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) {
@@ -436,6 +459,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 +471,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;
             }
@@ -468,6 +494,7 @@ export const promise = async ({ id, blockData, collection, context, data, doc, d
                             type: 'tab'
                         })),
                     global,
+                    isValidationOperation,
                     mergeLocaleActions,
                     operation,
                     overrideAccess,
@@ -479,7 +506,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 +518,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