@webiny/api-headless-cms 6.0.0-beta.0 → 6.0.0-rc.1

package/crud/contentEntry/entryDataValidation.d.ts

@@ -1,12 +1,21 @@
-import { CmsContext, CmsEntry, CmsModel } from "../../types";
-declare type InputData = Record<string, any>;
-export interface ValidateModelEntryDataParams {
+import type { CmsContext, CmsEntry, CmsEntryValues, CmsModel } from "../../types/index.js";
+interface IValidateModelEntryDataParams<TValues extends CmsEntryValues = CmsEntryValues> {
     context: CmsContext;
     model: CmsModel;
-    data: InputData;
-    entry?: CmsEntry;
+    values: TValues;
+    entry?: CmsEntry<TValues>;
     skipValidators?: string[];
 }
-export declare const validateModelEntryData: (params: ValidateModelEntryDataParams) => Promise<any[]>;
-export declare const validateModelEntryDataOrThrow: (params: ValidateModelEntryDataParams) => Promise<void>;
+export declare const validateModelEntryData: <TValues extends CmsEntryValues = CmsEntryValues>(params: IValidateModelEntryDataParams) => Promise<FieldError[]>;
+export declare const validateModelEntryDataOrThrow: <TValues extends CmsEntryValues = CmsEntryValues>(params: IValidateModelEntryDataParams<TValues>) => Promise<void>;
+/**
+ *
+ */
+interface FieldError {
+    id: string;
+    fieldId: string;
+    storageId: string;
+    error: any;
+    parents: string[];
+}
 export {};

package/crud/contentEntry/entryDataValidation.js

@@ -1,12 +1,5 @@
-"use strict";
-
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.validateModelEntryDataOrThrow = exports.validateModelEntryData = void 0;
-var _error = _interopRequireDefault(require("@webiny/error"));
-var _camelCase = _interopRequireDefault(require("lodash/camelCase"));
+import camelCase from "lodash/camelCase.js";
+import { EntryValidationError } from "../../domain/contentEntry/errors.js";
 const validateValue = async (params, fieldValidators, value) => {
   if (!fieldValidators) {
     return null;
@@ -53,7 +46,7 @@ const validatePredefinedValue = (field, value) => {
     return null;
   } else if (Array.isArray(predefinedValues) === false || predefinedValues.length === 0) {
     return "Missing predefined values to validate against.";
-  } else if (value == "" || value == null || value == undefined) {
+  } else if (value === "" || value === null || value === undefined) {
     return null;
   }
   for (const predefinedValue of predefinedValues) {
@@ -80,9 +73,9 @@ const getFieldValidation = listValidation => {
 const runFieldMultipleValuesValidations = async params => {
   const {
     field,
-    data
+    values: initialValues
   } = params;
-  const values = data?.[field.fieldId];
+  const values = initialValues[field.fieldId];
   const valuesError = await validateValue(params, getFieldValidation(field.listValidation), values);
   if (valuesError) {
     return valuesError;
@@ -107,10 +100,10 @@ const runFieldMultipleValuesValidations = async params => {
  */
 const runFieldValueValidations = async params => {
   const {
-    data,
+    values,
     field
   } = params;
-  const value = data[field.fieldId];
+  const value = values[field.fieldId];
   const error = await validateValue(params, field.validation || [], value);
   if (error) {
     return error;
@@ -121,24 +114,24 @@ const execValidation = async params => {
   const {
     field
   } = params;
-  if (field.multipleValues) {
+  if (field.list) {
     return await runFieldMultipleValuesValidations(params);
   }
   return await runFieldValueValidations(params);
 };
-const validateModelEntryData = async params => {
+export const validateModelEntryData = async params => {
   const {
     context,
     model,
     entry,
-    data,
+    values,
     skipValidators
   } = params;
   const isValidatorSkipped = plugin => {
     if (!skipValidators) {
       return false;
     }
-    return skipValidators.includes((0, _camelCase.default)(plugin.validator.name));
+    return skipValidators.includes(camelCase(plugin.validator.name));
   };
   const skippedValidators = new Set();
 
@@ -170,28 +163,27 @@ const validateModelEntryData = async params => {
     validatorList,
     context,
     model,
-    entry,
+    entry: entry,
     parents: [],
     fields: model.fields,
-    data: {
+    values: {
       ...entry?.values,
-      ...data
+      ...values
     }
   });
 };
-exports.validateModelEntryData = validateModelEntryData;
-const validateModelEntryDataOrThrow = async params => {
+export const validateModelEntryDataOrThrow = async params => {
   const invalidFields = await validateModelEntryData(params);
   if (invalidFields.length === 0) {
     return;
   }
-  throw new _error.default("Validation failed.", "VALIDATION_FAILED", invalidFields);
+  throw new EntryValidationError("Validation failed.", invalidFields);
 };
 
 /**
  *
  */
-exports.validateModelEntryDataOrThrow = validateModelEntryDataOrThrow;
+
 const executeFieldValidation = async params => {
   // TODO put per-field validation into plugins.
   const {
@@ -222,20 +214,20 @@ const executeFieldValidation = async params => {
         parents: params.parents
       });
     }
-    const objectValue = params.data?.[field.fieldId];
+    const objectValue = params.values[field.fieldId];
     if (!objectValue) {
       return validations;
     }
     const values = Array.isArray(objectValue) ? objectValue : [objectValue];
     for (const index in values) {
-      const parents = field.multipleValues ? [field.fieldId, index] : [field.fieldId];
+      const parents = field.list ? [field.fieldId, index] : [field.fieldId];
       const value = values[index];
       for (const childField of fields) {
         const errors = await executeFieldValidation({
           ...params,
           parents: params.parents.concat(parents),
           field: childField,
-          data: value
+          values: value
         });
         if (errors.length === 0) {
           continue;
@@ -267,7 +259,7 @@ const executeFieldValidation = async params => {
     const templates = field.settings?.templates || [];
     for (const template of templates) {
       const fields = template.fields;
-      const fieldData = params.data?.[field.fieldId];
+      const fieldData = params.values[field.fieldId];
       if (!fieldData) {
         continue;
       }
@@ -284,7 +276,7 @@ const executeFieldValidation = async params => {
          * - gqlTypeName
          */
         const parents = [field.fieldId];
-        if (field.multipleValues) {
+        if (field.list) {
           parents.push(index);
         }
         parents.push(template.gqlTypeName);
@@ -293,7 +285,7 @@ const executeFieldValidation = async params => {
             ...params,
             parents: params.parents.concat(parents),
             field: childField,
-            data: templateValue
+            values: templateValue
           });
           if (errors.length === 0) {
             continue;
@@ -323,15 +315,17 @@ const validate = async params => {
     fields
   } = params;
   const errors = [];
-  for (const field of fields) {
-    const results = await executeFieldValidation({
+  const results = await Promise.all(fields.map(async field => {
+    return await executeFieldValidation({
       ...params,
       field
     });
-    if (results.length === 0) {
+  }));
+  for (const result of results) {
+    if (result.length === 0) {
       continue;
     }
-    errors.push(...results);
+    errors.push(...result);
   }
   return errors;
 };

package/crud/contentEntry/entryDataValidation.js.map

@@ -1 +1 @@
-{"version":3,"names":["_error","_interopRequireDefault","require","_camelCase","validateValue","params","fieldValidators","value","validatorList","context","field","model","entry","fieldValidator","name","validations","length","validate","result","validator","message","ex","validatePredefinedValue","enabled","values","predefinedValues","Array","isArray","undefined","predefinedValue","getFieldValidation","listValidation","filter","item","runFieldMultipleValuesValidations","data","fieldId","valuesError","valueError","validation","predefinedValueError","runFieldValueValidations","error","execValidation","multipleValues","validateModelEntryData","skipValidators","isValidatorSkipped","plugin","includes","camelCase","skippedValidators","Set","validators","plugins","byType","isSkipped","add","push","keys","Object","size","parents","fields","exports","validateModelEntryDataOrThrow","invalidFields","WebinyError","executeFieldValidation","type","settings","id","storageId","objectValue","index","childField","errors","concat","templates","template","fieldData","templateValue","gqlTypeName","results"],"sources":["entryDataValidation.ts"],"sourcesContent":["import {\n    CmsContext,\n    CmsDynamicZoneTemplate,\n    CmsEntry,\n    CmsModel,\n    CmsModelField,\n    CmsModelFieldValidation,\n    CmsModelFieldValidatorPlugin,\n    CmsModelFieldValidatorValidateParams\n} from \"~/types\";\nimport WebinyError from \"@webiny/error\";\nimport camelCase from \"lodash/camelCase\";\n\ntype PluginValidationCallable = (params: CmsModelFieldValidatorValidateParams) => Promise<boolean>;\ntype PluginValidationList = Record<string, PluginValidationCallable[]>;\ntype InputData = Record<string, any>;\n\ninterface ExecuteValidationParams {\n    validatorList: PluginValidationList;\n    field: CmsModelField;\n    model: CmsModel;\n    data: InputData;\n    context: CmsContext;\n    entry?: CmsEntry;\n}\n\ntype PossibleValue = boolean | number | string | null | undefined;\n\nconst validateValue = async (\n    params: ExecuteValidationParams,\n    fieldValidators: CmsModelFieldValidation[],\n    value: PossibleValue | PossibleValue[]\n): Promise<string | null> => {\n    if (!fieldValidators) {\n        return null;\n    }\n    const { validatorList, context, field, model, entry } = params;\n    try {\n        for (const fieldValidator of fieldValidators) {\n            const name = fieldValidator.name;\n            const validations = validatorList[name];\n            if (!validations || validations.length === 0) {\n                return `There are no \"${name}\" validators defined.`;\n            }\n            for (const validate of validations) {\n                const result = await validate({\n                    value,\n                    context,\n                    validator: fieldValidator,\n                    field,\n                    model,\n                    entry\n                });\n                if (!result) {\n                    return fieldValidator.message;\n                }\n            }\n        }\n    } catch (ex) {\n        return ex.message;\n    }\n\n    return null;\n};\n\nconst validatePredefinedValue = (field: CmsModelField, value: any | any[]): string | null => {\n    const { enabled = false, values: predefinedValues = [] } = field.predefinedValues || {};\n    if (!enabled) {\n        return null;\n    } else if (Array.isArray(predefinedValues) === false || predefinedValues.length === 0) {\n        return \"Missing predefined values to validate against.\";\n    } else if (value == \"\" || value == null || value == undefined) {\n        return null;\n    }\n    for (const predefinedValue of predefinedValues) {\n        /**\n         * No strict compare because the value sent can be 12345 (number) and predefinedValue can be \"12345\" (string),\n         * and we want it to match.\n         */\n        if (predefinedValue.value == value) {\n            return null;\n        }\n    }\n    return \"Value sent does not match any of the available predefined values.\";\n};\n\nconst getFieldValidation = (\n    listValidation?: CmsModelFieldValidation[]\n): CmsModelFieldValidation[] => {\n    if (!listValidation?.length) {\n        return [];\n    }\n    return listValidation.filter(item => item.name !== \"dynamicZone\");\n};\n/**\n * When multiple values is selected we must run validations on the array containing the values\n * And then on each value in the array\n */\nconst runFieldMultipleValuesValidations = async (\n    params: ExecuteValidationParams\n): Promise<string | null> => {\n    const { field, data } = params;\n    const values = data?.[field.fieldId];\n    const valuesError = await validateValue(\n        params,\n        getFieldValidation(field.listValidation),\n        values\n    );\n    if (valuesError) {\n        return valuesError;\n    }\n    if (values === null || values === undefined) {\n        return null;\n    }\n    for (const value of values) {\n        const valueError = await validateValue(params, getFieldValidation(field.validation), value);\n        if (valueError) {\n            return valueError;\n        }\n        const predefinedValueError = validatePredefinedValue(field, value);\n        if (predefinedValueError) {\n            return predefinedValueError;\n        }\n    }\n    return null;\n};\n/**\n * Runs validation on given value.\n */\nconst runFieldValueValidations = async (\n    params: ExecuteValidationParams\n): Promise<string | null> => {\n    const { data, field } = params;\n    const value = data[field.fieldId];\n    const error = await validateValue(params, field.validation || [], value);\n    if (error) {\n        return error;\n    }\n    return validatePredefinedValue(field, value);\n};\n\nconst execValidation = async (params: ExecuteValidationParams): Promise<string | null> => {\n    const { field } = params;\n    if (field.multipleValues) {\n        return await runFieldMultipleValuesValidations(params);\n    }\n    return await runFieldValueValidations(params);\n};\n\nexport interface ValidateModelEntryDataParams {\n    context: CmsContext;\n    model: CmsModel;\n    data: InputData;\n    entry?: CmsEntry;\n    skipValidators?: string[];\n}\n\nexport const validateModelEntryData = async (params: ValidateModelEntryDataParams) => {\n    const { context, model, entry, data, skipValidators } = params;\n\n    const isValidatorSkipped = (plugin: CmsModelFieldValidatorPlugin) => {\n        if (!skipValidators) {\n            return false;\n        }\n        return skipValidators.includes(camelCase(plugin.validator.name));\n    };\n\n    const skippedValidators = new Set<string>();\n\n    /**\n     * To later simplify searching for the validations we map them to a name.\n     * @see CmsModelFieldValidatorPlugin.validator.validate\n     */\n    const validatorList: PluginValidationList = {};\n    const validators = context.plugins.byType<CmsModelFieldValidatorPlugin>(\n        \"cms-model-field-validator\"\n    );\n    for (const plugin of validators) {\n        const name = plugin.validator.name;\n        if (!validatorList[name]) {\n            validatorList[name] = [];\n        }\n        const isSkipped = isValidatorSkipped(plugin);\n        if (isSkipped) {\n            skippedValidators.add(name);\n        }\n        validatorList[name].push(isSkipped ? async () => true : plugin.validator.validate);\n    }\n    /**\n     * No point in continuing if all validators are skipped.\n     */\n    const keys = Object.keys(validatorList);\n    if (keys.length === skippedValidators.size) {\n        return [];\n    }\n\n    return await validate({\n        validatorList,\n        context,\n        model,\n        entry,\n        parents: [],\n        fields: model.fields,\n        data: {\n            ...entry?.values,\n            ...data\n        }\n    });\n};\n\nexport const validateModelEntryDataOrThrow = async (params: ValidateModelEntryDataParams) => {\n    const invalidFields = await validateModelEntryData(params);\n    if (invalidFields.length === 0) {\n        return;\n    }\n    throw new WebinyError(\"Validation failed.\", \"VALIDATION_FAILED\", invalidFields);\n};\n\n/**\n *\n */\ninterface FieldError {\n    id: string;\n    fieldId: string;\n    storageId: string;\n    error: any;\n    parents: string[];\n}\n\ninterface ValidateParams {\n    validatorList: PluginValidationList;\n    parents: string[];\n    model: CmsModel;\n    data: InputData;\n    context: CmsContext;\n    fields: CmsModelField[];\n    entry?: CmsEntry;\n}\n\nconst executeFieldValidation = async (\n    params: Omit<ValidateParams, \"fields\"> & {\n        field: CmsModelField;\n    }\n): Promise<FieldError[]> => {\n    // TODO put per-field validation into plugins.\n    const { field } = params;\n    /**\n     * Object field.\n     */\n    if (field.type === \"object\") {\n        const fields = field.settings?.fields;\n        if (!Array.isArray(fields)) {\n            return [];\n        }\n        const validations: FieldError[] = [];\n        /**\n         * We need to validate the object field as well.\n         */\n        const error = await execValidation({\n            ...params,\n            field\n        });\n        if (error) {\n            validations.push({\n                id: field.id,\n                fieldId: field.fieldId,\n                storageId: field.storageId,\n                error,\n                parents: params.parents\n            });\n        }\n        const objectValue = params.data?.[field.fieldId];\n        if (!objectValue) {\n            return validations;\n        }\n        const values = Array.isArray(objectValue) ? objectValue : [objectValue];\n        for (const index in values) {\n            const parents = field.multipleValues ? [field.fieldId, index] : [field.fieldId];\n            const value = values[index];\n            for (const childField of fields) {\n                const errors = await executeFieldValidation({\n                    ...params,\n                    parents: params.parents.concat(parents),\n                    field: childField,\n                    data: value\n                });\n                if (errors.length === 0) {\n                    continue;\n                }\n                validations.push(...errors);\n            }\n        }\n        return validations;\n    }\n    /**\n     * Dynamic Zone Field\n     */\n    //\n    else if (field.type === \"dynamicZone\") {\n        const validations: FieldError[] = [];\n\n        const error = await execValidation({\n            ...params,\n            field\n        });\n        if (error) {\n            validations.push({\n                id: field.id,\n                fieldId: field.fieldId,\n                storageId: field.storageId,\n                error,\n                parents: params.parents\n            });\n        }\n\n        const templates = (field.settings?.templates || []) as CmsDynamicZoneTemplate[];\n        for (const template of templates) {\n            const fields = template.fields;\n            const fieldData = params.data?.[field.fieldId];\n            if (!fieldData) {\n                continue;\n            }\n            const values = Array.isArray(fieldData) ? fieldData : [fieldData];\n            for (const index in values) {\n                const templateValue = values[index]?.[template.gqlTypeName];\n                if (!templateValue) {\n                    continue;\n                }\n                /**\n                 * Order of the parents must be\n                 * - fieldId\n                 * - index (if multiple values)\n                 * - gqlTypeName\n                 */\n                const parents = [field.fieldId];\n                if (field.multipleValues) {\n                    parents.push(index);\n                }\n                parents.push(template.gqlTypeName);\n                for (const childField of fields) {\n                    const errors = await executeFieldValidation({\n                        ...params,\n                        parents: params.parents.concat(parents),\n                        field: childField,\n                        data: templateValue\n                    });\n                    if (errors.length === 0) {\n                        continue;\n                    }\n                    validations.push(...errors);\n                }\n            }\n        }\n\n        return validations;\n    }\n    const error = await execValidation({\n        ...params\n    });\n    if (!error) {\n        return [];\n    }\n    return [\n        {\n            id: field.id,\n            fieldId: field.fieldId,\n            storageId: field.storageId,\n            error,\n            parents: params.parents\n        }\n    ];\n};\n\nconst validate = async (params: ValidateParams): Promise<any[]> => {\n    const { fields } = params;\n    const errors: FieldError[] = [];\n    for (const field of fields) {\n        const results = await executeFieldValidation({\n            ...params,\n            field\n        });\n        if (results.length === 0) {\n            continue;\n        }\n        errors.push(...results);\n    }\n    return errors;\n};\n"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["camelCase","EntryValidationError","validateValue","params","fieldValidators","value","validatorList","context","field","model","entry","fieldValidator","name","validations","length","validate","result","validator","message","ex","validatePredefinedValue","enabled","values","predefinedValues","Array","isArray","undefined","predefinedValue","getFieldValidation","listValidation","filter","item","runFieldMultipleValuesValidations","initialValues","fieldId","valuesError","valueError","validation","predefinedValueError","runFieldValueValidations","error","execValidation","list","validateModelEntryData","skipValidators","isValidatorSkipped","plugin","includes","skippedValidators","Set","validators","plugins","byType","isSkipped","add","push","keys","Object","size","parents","fields","validateModelEntryDataOrThrow","invalidFields","executeFieldValidation","type","settings","id","storageId","objectValue","index","childField","errors","concat","templates","template","fieldData","templateValue","gqlTypeName","results","Promise","all","map"],"sources":["entryDataValidation.ts"],"sourcesContent":["import type {\n    CmsContext,\n    CmsDynamicZoneTemplate,\n    CmsEntry,\n    CmsEntryValues,\n    CmsModel,\n    CmsModelField,\n    CmsModelFieldValidation,\n    CmsModelFieldValidatorPlugin,\n    CmsModelFieldValidatorValidateParams\n} from \"~/types/index.js\";\nimport camelCase from \"lodash/camelCase.js\";\nimport { EntryValidationError } from \"~/domain/contentEntry/errors.js\";\n\ntype PluginValidationCallable = (params: CmsModelFieldValidatorValidateParams) => Promise<boolean>;\ntype PluginValidationList = Record<string, PluginValidationCallable[]>;\n\ninterface ExecuteValidationParams<TValues extends CmsEntryValues = CmsEntryValues> {\n    validatorList: PluginValidationList;\n    field: CmsModelField;\n    model: CmsModel;\n    values: TValues;\n    context: CmsContext;\n    entry?: CmsEntry<TValues>;\n}\n\ntype PossibleValue = boolean | number | string | null | undefined;\n\nconst validateValue = async <TValues extends CmsEntryValues = CmsEntryValues>(\n    params: ExecuteValidationParams<TValues>,\n    fieldValidators: CmsModelFieldValidation[],\n    value: PossibleValue | PossibleValue[]\n): Promise<string | null> => {\n    if (!fieldValidators) {\n        return null;\n    }\n    const { validatorList, context, field, model, entry } = params;\n    try {\n        for (const fieldValidator of fieldValidators) {\n            const name = fieldValidator.name;\n            const validations = validatorList[name];\n            if (!validations || validations.length === 0) {\n                return `There are no \"${name}\" validators defined.`;\n            }\n            for (const validate of validations) {\n                const result = await validate({\n                    value,\n                    context,\n                    validator: fieldValidator,\n                    field,\n                    model,\n                    entry\n                });\n                if (!result) {\n                    return fieldValidator.message;\n                }\n            }\n        }\n    } catch (ex) {\n        return ex.message;\n    }\n\n    return null;\n};\n\nconst validatePredefinedValue = (field: CmsModelField, value: any | any[]): string | null => {\n    const { enabled = false, values: predefinedValues = [] } = field.predefinedValues || {};\n    if (!enabled) {\n        return null;\n    } else if (Array.isArray(predefinedValues) === false || predefinedValues.length === 0) {\n        return \"Missing predefined values to validate against.\";\n    } else if (value === \"\" || value === null || value === undefined) {\n        return null;\n    }\n    for (const predefinedValue of predefinedValues) {\n        /**\n         * No strict compare because the value sent can be 12345 (number) and predefinedValue can be \"12345\" (string),\n         * and we want it to match.\n         */\n        if (predefinedValue.value == value) {\n            return null;\n        }\n    }\n    return \"Value sent does not match any of the available predefined values.\";\n};\n\nconst getFieldValidation = (\n    listValidation?: CmsModelFieldValidation[]\n): CmsModelFieldValidation[] => {\n    if (!listValidation?.length) {\n        return [];\n    }\n    return listValidation.filter(item => item.name !== \"dynamicZone\");\n};\n/**\n * When multiple values is selected we must run validations on the array containing the values\n * And then on each value in the array\n */\nconst runFieldMultipleValuesValidations = async <TValues extends CmsEntryValues = CmsEntryValues>(\n    params: ExecuteValidationParams<TValues>\n): Promise<string | null> => {\n    const { field, values: initialValues } = params;\n    const values = initialValues[field.fieldId as keyof TValues] as\n        | PossibleValue[]\n        | null\n        | undefined;\n    const valuesError = await validateValue(\n        params,\n        getFieldValidation(field.listValidation),\n        values\n    );\n    if (valuesError) {\n        return valuesError;\n    }\n    if (values === null || values === undefined) {\n        return null;\n    }\n    for (const value of values) {\n        const valueError = await validateValue(params, getFieldValidation(field.validation), value);\n        if (valueError) {\n            return valueError;\n        }\n        const predefinedValueError = validatePredefinedValue(field, value);\n        if (predefinedValueError) {\n            return predefinedValueError;\n        }\n    }\n    return null;\n};\n/**\n * Runs validation on given value.\n */\nconst runFieldValueValidations = async <TValues extends CmsEntryValues = CmsEntryValues>(\n    params: ExecuteValidationParams<TValues>\n): Promise<string | null> => {\n    const { values, field } = params;\n    const value = values[field.fieldId as keyof TValues] as PossibleValue | null | undefined;\n    const error = await validateValue(params, field.validation || [], value);\n    if (error) {\n        return error;\n    }\n    return validatePredefinedValue(field, value);\n};\n\nconst execValidation = async (params: ExecuteValidationParams): Promise<string | null> => {\n    const { field } = params;\n    if (field.list) {\n        return await runFieldMultipleValuesValidations(params);\n    }\n    return await runFieldValueValidations(params);\n};\n\ninterface IValidateModelEntryDataParams<TValues extends CmsEntryValues = CmsEntryValues> {\n    context: CmsContext;\n    model: CmsModel;\n    values: TValues;\n    entry?: CmsEntry<TValues>;\n    skipValidators?: string[];\n}\n\nexport const validateModelEntryData = async <TValues extends CmsEntryValues = CmsEntryValues>(\n    params: IValidateModelEntryDataParams\n) => {\n    const { context, model, entry, values, skipValidators } = params;\n\n    const isValidatorSkipped = (plugin: CmsModelFieldValidatorPlugin) => {\n        if (!skipValidators) {\n            return false;\n        }\n        return skipValidators.includes(camelCase(plugin.validator.name));\n    };\n\n    const skippedValidators = new Set<string>();\n\n    /**\n     * To later simplify searching for the validations we map them to a name.\n     * @see CmsModelFieldValidatorPlugin.validator.validate\n     */\n    const validatorList: PluginValidationList = {};\n    const validators = context.plugins.byType<CmsModelFieldValidatorPlugin>(\n        \"cms-model-field-validator\"\n    );\n    for (const plugin of validators) {\n        const name = plugin.validator.name;\n        if (!validatorList[name]) {\n            validatorList[name] = [];\n        }\n        const isSkipped = isValidatorSkipped(plugin);\n        if (isSkipped) {\n            skippedValidators.add(name);\n        }\n        validatorList[name].push(isSkipped ? async () => true : plugin.validator.validate);\n    }\n    /**\n     * No point in continuing if all validators are skipped.\n     */\n    const keys = Object.keys(validatorList);\n    if (keys.length === skippedValidators.size) {\n        return [];\n    }\n\n    return await validate<TValues>({\n        validatorList,\n        context,\n        model,\n        entry: entry as CmsEntry<TValues>,\n        parents: [],\n        fields: model.fields,\n        values: {\n            ...(entry?.values as TValues),\n            ...values\n        }\n    });\n};\n\nexport const validateModelEntryDataOrThrow = async <\n    TValues extends CmsEntryValues = CmsEntryValues\n>(\n    params: IValidateModelEntryDataParams<TValues>\n) => {\n    const invalidFields = await validateModelEntryData(params);\n    if (invalidFields.length === 0) {\n        return;\n    }\n    throw new EntryValidationError(\"Validation failed.\", invalidFields);\n};\n\n/**\n *\n */\ninterface FieldError {\n    id: string;\n    fieldId: string;\n    storageId: string;\n    error: any;\n    parents: string[];\n}\n\ninterface ValidateFieldParams<TValues extends CmsEntryValues = CmsEntryValues> {\n    validatorList: PluginValidationList;\n    parents: string[];\n    model: CmsModel;\n    values: TValues;\n    context: CmsContext;\n    field: CmsModelField;\n    entry?: CmsEntry<TValues>;\n}\n\nconst executeFieldValidation = async <TValues extends CmsEntryValues = CmsEntryValues>(\n    params: ValidateFieldParams<TValues>\n): Promise<FieldError[]> => {\n    // TODO put per-field validation into plugins.\n    const { field } = params;\n    /**\n     * Object field.\n     */\n    if (field.type === \"object\") {\n        const fields = field.settings?.fields;\n        if (!Array.isArray(fields)) {\n            return [];\n        }\n        const validations: FieldError[] = [];\n        /**\n         * We need to validate the object field as well.\n         */\n        const error = await execValidation({\n            ...params,\n            field\n        });\n        if (error) {\n            validations.push({\n                id: field.id,\n                fieldId: field.fieldId,\n                storageId: field.storageId,\n                error,\n                parents: params.parents\n            });\n        }\n        const objectValue = params.values[field.fieldId as keyof TValues];\n        if (!objectValue) {\n            return validations;\n        }\n        const values = (Array.isArray(objectValue) ? objectValue : [objectValue]) as TValues[];\n        for (const index in values) {\n            const parents = field.list ? [field.fieldId, index] : [field.fieldId];\n            const value = values[index] as TValues;\n            for (const childField of fields) {\n                const errors = await executeFieldValidation<typeof value>({\n                    ...params,\n                    parents: params.parents.concat(parents),\n                    field: childField,\n                    values: value\n                });\n                if (errors.length === 0) {\n                    continue;\n                }\n                validations.push(...errors);\n            }\n        }\n        return validations;\n    }\n    /**\n     * Dynamic Zone Field\n     */\n    //\n    else if (field.type === \"dynamicZone\") {\n        const validations: FieldError[] = [];\n\n        const error = await execValidation({\n            ...params,\n            field\n        });\n        if (error) {\n            validations.push({\n                id: field.id,\n                fieldId: field.fieldId,\n                storageId: field.storageId,\n                error,\n                parents: params.parents\n            });\n        }\n\n        const templates = (field.settings?.templates || []) as CmsDynamicZoneTemplate[];\n        for (const template of templates) {\n            const fields = template.fields;\n            const fieldData = params.values[field.fieldId as keyof TValues];\n            if (!fieldData) {\n                continue;\n            }\n            const values: TValues[keyof TValues][] = Array.isArray(fieldData)\n                ? fieldData\n                : [fieldData];\n            for (const index in values) {\n                const templateValue = values[index]?.[template.gqlTypeName];\n                if (!templateValue) {\n                    continue;\n                }\n                /**\n                 * Order of the parents must be\n                 * - fieldId\n                 * - index (if multiple values)\n                 * - gqlTypeName\n                 */\n                const parents = [field.fieldId];\n                if (field.list) {\n                    parents.push(index);\n                }\n                parents.push(template.gqlTypeName);\n                for (const childField of fields) {\n                    const errors = await executeFieldValidation({\n                        ...params,\n                        parents: params.parents.concat(parents),\n                        field: childField,\n                        values: templateValue\n                    });\n                    if (errors.length === 0) {\n                        continue;\n                    }\n                    validations.push(...errors);\n                }\n            }\n        }\n\n        return validations;\n    }\n    const error = await execValidation({\n        ...params\n    });\n    if (!error) {\n        return [];\n    }\n    return [\n        {\n            id: field.id,\n            fieldId: field.fieldId,\n            storageId: field.storageId,\n            error,\n            parents: params.parents\n        }\n    ];\n};\n\ninterface ValidateFieldsParams<TValues extends CmsEntryValues = CmsEntryValues> {\n    validatorList: PluginValidationList;\n    parents: string[];\n    model: CmsModel;\n    values: TValues;\n    fields: CmsModelField[];\n    context: CmsContext;\n    entry?: CmsEntry<TValues>;\n}\n\nconst validate = async <TValues extends CmsEntryValues = CmsEntryValues>(\n    params: ValidateFieldsParams<TValues>\n): Promise<FieldError[]> => {\n    const { fields } = params;\n    const errors: FieldError[] = [];\n\n    const results = await Promise.all(\n        fields.map(async field => {\n            return await executeFieldValidation<TValues>({\n                ...params,\n                field\n            });\n        })\n    );\n\n    for (const result of results) {\n        if (result.length === 0) {\n            continue;\n        }\n        errors.push(...result);\n    }\n    return errors;\n};\n"],"mappings":"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","ignoreList":[]}

package/crud/contentEntry/referenceFieldsMapping.d.ts

@@ -1,12 +1,8 @@
-import { CmsContext, CmsModel } from "../../types";
-interface ReferenceObject {
-    id: string;
-    modelId: string;
-}
-interface Params {
+import type { CmsContext, CmsEntryValues, CmsModel } from "../../types/index.js";
+interface IReferenceFieldsMappingParams<TValues extends CmsEntryValues = CmsEntryValues> {
     context: CmsContext;
     model: CmsModel;
-    input: Record<string, ReferenceObject | ReferenceObject[]>;
+    values: TValues;
     validateEntries?: boolean;
 }
 /**
@@ -15,5 +11,5 @@ interface Params {
  * always contain `{ id, modelId, entryId }`. `entryId` is important when data is being loaded via
  * the `read` and `preview` endpoint.
  */
-export declare const referenceFieldsMapping: (params: Params) => Promise<Record<string, any>>;
+export declare const referenceFieldsMapping: <TValues extends CmsEntryValues = CmsEntryValues>(params: IReferenceFieldsMappingParams<TValues>) => Promise<TValues>;
 export {};

package/crud/contentEntry/referenceFieldsMapping.js

@@ -1,168 +1,25 @@
-"use strict";
-
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.referenceFieldsMapping = void 0;
-var _dotProp = _interopRequireDefault(require("dot-prop"));
-var _error = _interopRequireDefault(require("@webiny/error"));
-var _utils = require("@webiny/utils");
-var _getBaseFieldType = require("../../utils/getBaseFieldType");
-const buildReferenceFieldPaths = params => {
-  const {
-    fields,
-    parentPaths: initialParentPaths,
-    input
-  } = params;
-  const parentPaths = [...initialParentPaths];
-  const isMultipleValues = Array.isArray(input);
-  return fields.filter(field => ["object", "ref", "dynamicZone"].includes((0, _getBaseFieldType.getBaseFieldType)(field))).reduce((collection, field) => {
-    /**
-     * First we check the ref field
-     */
-    const baseType = (0, _getBaseFieldType.getBaseFieldType)(field);
-    if (baseType === "ref") {
-      const parentPathsValue = parentPaths.length > 0 ? `${parentPaths.join(".")}.` : "";
-      if (field.multipleValues) {
-        const inputValue = _dotProp.default.get(input, `${field.fieldId}`, []);
-        if (!Array.isArray(inputValue)) {
-          return collection;
-        }
-        for (const key in inputValue) {
-          const path = `${parentPathsValue}${field.fieldId}.${key}`;
-          collection.push(path);
-        }
-        return collection;
-      }
-      if (isMultipleValues) {
-        for (const key in input) {
-          const path = `${parentPathsValue}${key}.${field.fieldId}`;
-          collection.push(path);
-        }
-        return collection;
-      }
-      collection.push(`${parentPathsValue}${field.fieldId}`);
-      return collection;
-    }
-    if (baseType === "dynamicZone") {
-      const templates = field.settings?.templates || [];
-      if (field.multipleValues) {
-        const values = _dotProp.default.get(input, field.fieldId, []);
-        if (!Array.isArray(values)) {
-          return collection;
-        }
-        values.forEach((value, index) => {
-          const valueTemplate = Object.keys(value)[0];
-          const template = templates.find(tpl => tpl.gqlTypeName === valueTemplate);
-          if (!template) {
-            return;
-          }
-          const result = buildReferenceFieldPaths({
-            fields: template.fields,
-            input: value[valueTemplate],
-            parentPaths: parentPaths.concat([field.fieldId, String(index), template.gqlTypeName])
-          });
-          collection.push(...result);
-        });
-        return collection;
-      }
-      const value = _dotProp.default.get(input, field.fieldId, {});
-      if (!value) {
-        return collection;
-      }
-      const valueTemplate = Object.keys(value)[0];
-      const template = templates.find(tpl => tpl.gqlTypeName === valueTemplate);
-      if (!template) {
-        return collection;
-      }
-      const result = buildReferenceFieldPaths({
-        fields: template.fields,
-        input: _dotProp.default.get(value, valueTemplate, {}),
-        parentPaths: parentPaths.concat([field.fieldId, template.gqlTypeName])
-      });
-      collection.push(...result);
-      return collection;
-    }
-
-    /**
-     * Then we move onto the object field
-     */
-    const parentPathsValue = parentPaths.length > 0 ? `${parentPaths.join(".")}.` : "";
-    /**
-     * This is if received input is array. We need to map key with fieldId at this point.
-     */
-    if (isMultipleValues) {
-      for (const key in input) {
-        const path = `${parentPathsValue}${key}.${field.fieldId}`;
-        collection.push(path);
-      }
-      return collection;
-    }
-    const objFieldPath = `${field.fieldId}`;
-    const objFieldInputValue = _dotProp.default.get(input, objFieldPath, []);
-
-    /**
-     * If field is multiple values one, we need to go through the input and use the existing keys.
-     */
-    if (field.multipleValues) {
-      if (Array.isArray(objFieldInputValue) === false) {
-        return collection;
-      }
-      for (const key in objFieldInputValue) {
-        const result = buildReferenceFieldPaths({
-          fields: field.settings?.fields || [],
-          input: objFieldInputValue[key],
-          parentPaths: parentPaths.concat([field.fieldId, key])
-        });
-        collection.push(...result);
-      }
-      return collection;
-    }
-
-    /**
-     * Single value reference field.
-     */
-    const results = buildReferenceFieldPaths({
-      fields: field.settings?.fields || [],
-      input: objFieldInputValue,
-      parentPaths: parentPaths.concat([field.fieldId])
-    });
-    return collection.concat(results);
-  }, []);
-};
-const getReferenceFieldValue = ref => {
-  if (!ref) {
-    return {
-      id: null,
-      modelId: null
-    };
-  }
-  return {
-    id: (ref.id || ref.entryId || "").trim() || null,
-    modelId: (ref.modelId || "").trim() || null
-  };
-};
-
+import dotPropImmutable from "dot-prop-immutable";
+import { parseIdentifier } from "@webiny/utils";
+import { buildReferenceFieldPaths } from "./references/buildPaths.js";
+import { validateReferencedEntries } from "./references/validateEntries.js";
+import { createIdentifier } from "@webiny/utils/createIdentifier.js";
 /**
  * This function traverses the content entry input value, extracts all occurrences of the `ref` field,
  * optionally verifies that those referenced entries exist (by loading them), and normalizes the `ref` value to
  * always contain `{ id, modelId, entryId }`. `entryId` is important when data is being loaded via
  * the `read` and `preview` endpoint.
  */
-const referenceFieldsMapping = async params => {
+export const referenceFieldsMapping = async params => {
   const {
     context,
     model,
-    input,
+    values,
     validateEntries = false
   } = params;
-  let output = {
-    ...input
-  };
+  let output = structuredClone(values);
   const referenceFieldPaths = buildReferenceFieldPaths({
     fields: model.fields,
-    input,
+    input: values,
     parentPaths: []
   });
   if (!referenceFieldPaths.length) {
@@ -181,7 +38,7 @@ const referenceFieldsMapping = async params => {
    */
   for (const path of referenceFieldPaths) {
     // It is safe to cast here, because `referenceFieldPaths` array is generated from the `input`.
-    const refValue = _dotProp.default.get(input, path);
+    const refValue = dotPropImmutable.get(values, path);
     if (!refValue) {
       continue;
     }
@@ -192,97 +49,20 @@ const referenceFieldsMapping = async params => {
      * to make sure that the legacy structure { entryId, modelId } is supported.
      */
     const {
-      id,
-      modelId,
-      entryId: maybeEntryId
-    } = refValue;
-    const {
+      id: entryId,
+      version
+    } = parseIdentifier(refValue.id || refValue.entryId);
+    const id = createIdentifier({
+      version: version || 1,
       id: entryId
-    } = (0, _utils.parseIdentifier)(maybeEntryId || id);
-    output = _dotProp.default.set(output, path, {
-      // If `id` is not set, we're dealing with the legacy structure.
-      id: id ?? maybeEntryId,
+    });
+    output = dotPropImmutable.set(output, path, {
+      id,
       entryId,
-      modelId
+      modelId: refValue.modelId
     });
   }
   return output;
 };
-exports.referenceFieldsMapping = referenceFieldsMapping;
-async function validateReferencedEntries({
-  output,
-  context,
-  referenceFieldPaths
-}) {
-  const referencesByModel = new Map();
-
-  /**
-   * Group references by modelId.
-   */
-  for (const path of referenceFieldPaths) {
-    const ref = _dotProp.default.get(output, path);
-    const {
-      id,
-      modelId
-    } = getReferenceFieldValue(ref);
-    if (!id || !modelId) {
-      continue;
-    }
-    if (!referencesByModel.has(modelId)) {
-      referencesByModel.set(modelId, []);
-    }
-    referencesByModel.get(modelId)?.push(id);
-  }
-  if (!referencesByModel.size) {
-    return;
-  }
-
-  /**
-   * Load all models and use only those that are used in reference.
-   */
-  const models = await context.security.withoutAuthorization(async () => {
-    return (await context.cms.listModels()).filter(model => {
-      const entries = referencesByModel.get(model.modelId);
-      if (!Array.isArray(entries) || entries.length === 0) {
-        return false;
-      }
-      return true;
-    });
-  });
-  if (!models.length) {
-    return;
-  }
-
-  /**
-   * Load all the entries by their IDs.
-   */
-  const promises = await context.security.withoutAuthorization(async () => {
-    return models.map(model => {
-      return context.cms.getEntriesByIds(model, referencesByModel.get(model.modelId) || []);
-    });
-  });
-  const allEntries = await Promise.all(promises).then(res => res.flat());
-  const entriesByModel = allEntries.reduce((acc, entry) => {
-    return {
-      ...acc,
-      [entry.modelId]: [...(acc[entry.modelId] || []), entry.id]
-    };
-  }, {});
-
-  /**
-   * Verify that all entries exist.
-   */
-  referencesByModel.forEach((ids, modelId) => {
-    const modelEntriesInDb = entriesByModel[modelId];
-    for (const id of ids) {
-      if (!modelEntriesInDb || !modelEntriesInDb.includes(id)) {
-        throw new _error.default(`Missing referenced entry with id "${id}" in model "${modelId}".`, "ENTRY_NOT_FOUND", {
-          id,
-          model: modelId
-        });
-      }
-    }
-  });
-}
 
 //# sourceMappingURL=referenceFieldsMapping.js.map