@webiny/api-headless-cms 5.34.3-beta.1 → 5.34.3-beta.2

package/crud/contentModel/beforeCreate.d.ts

@@ -1,11 +1,10 @@
-import { OnModelBeforeCreateFromTopicParams, OnModelBeforeCreateTopicParams, HeadlessCmsStorageOperations } from "../../types";
+import { OnModelBeforeCreateFromTopicParams, OnModelBeforeCreateTopicParams, HeadlessCmsStorageOperations, CmsContext } from "../../types";
 import { Topic } from "@webiny/pubsub/types";
-import { PluginsContainer } from "@webiny/plugins";
 interface AssignBeforeModelCreateParams {
     onModelBeforeCreate: Topic<OnModelBeforeCreateTopicParams>;
     onModelBeforeCreateFrom: Topic<OnModelBeforeCreateFromTopicParams>;
     storageOperations: HeadlessCmsStorageOperations;
-    plugins: PluginsContainer;
+    context: CmsContext;
 }
 /**
  * We attach both on before create and createFrom events here.

package/crud/contentModel/beforeCreate.js

@@ -154,7 +154,7 @@ const assignModelBeforeCreate = params => {
     onModelBeforeCreate,
     onModelBeforeCreateFrom,
     storageOperations,
-    plugins
+    context
   } = params;
   onModelBeforeCreate.subscribe(async ({
     model,
@@ -170,7 +170,7 @@ const assignModelBeforeCreate = params => {
 
     const cb = createOnModelBeforeCb({
       storageOperations,
-      plugins
+      plugins: context.plugins
     });
     await cb({
       model,
@@ -182,12 +182,12 @@ const assignModelBeforeCreate = params => {
 
     await (0, _validateModel.validateModel)({
       model,
-      plugins
+      context
     });
   });
   onModelBeforeCreateFrom.subscribe(createOnModelBeforeCb({
     storageOperations,
-    plugins
+    plugins: context.plugins
   }));
 };
 

package/crud/contentModel/beforeCreate.js.map

@@ -1 +1 @@
-{"version":3,"names":["disallowedModelIdList","disallowedModelIdEndingList","checkModelIdUniqueness","modelIdList","modelId","includes","WebinyError","pluralizedModelIdCamelCase","pluralize","plural","singularizedModelIdCamelCase","singular","checkModelIdAllowed","checkModelIdEndingAllowed","ending","re","RegExp","matched","match","getModelId","model","name","camelCase","trim","createOnModelBeforeCb","plugins","storageOperations","params","modelPlugin","byType","CmsModelPlugin","type","find","item","contentModel","models","list","where","tenant","locale","map","m","assignModelBeforeCreate","onModelBeforeCreate","onModelBeforeCreateFrom","subscribe","input","validateLayout","layout","fields","cb","validateModel"],"sources":["beforeCreate.ts"],"sourcesContent":["import WebinyError from \"@webiny/error\";\nimport camelCase from \"lodash/camelCase\";\nimport pluralize from \"pluralize\";\nimport {\n    OnModelBeforeCreateFromTopicParams,\n    OnModelBeforeCreateTopicParams,\n    CmsModel,\n    HeadlessCmsStorageOperations\n} from \"~/types\";\nimport { Topic } from \"@webiny/pubsub/types\";\nimport { PluginsContainer } from \"@webiny/plugins\";\nimport { CmsModelPlugin } from \"~/plugins/CmsModelPlugin\";\nimport { validateModel } from \"./validateModel\";\nimport { validateLayout } from \"./validateLayout\";\n\nconst disallowedModelIdList: string[] = [\n    \"contentModel\",\n    \"contentModels\",\n    \"contentModelGroup\",\n    \"contentModelGroups\"\n];\n/**\n * This list is to disallow creating models that might interfere with GraphQL schema creation.\n * Add more if required.\n */\nconst disallowedModelIdEndingList: string[] = [\n    \"Response\",\n    \"List\",\n    \"Meta\",\n    \"Input\",\n    \"Sorter\",\n    \"RefType\"\n];\n\n/**\n * Checks for the uniqueness of provided modelId, against the provided list of models.\n * It also takes plural / singular forms of the provided modelId into account.\n */\nconst checkModelIdUniqueness = (modelIdList: string[], modelId: string) => {\n    if (modelIdList.includes(modelId) === true) {\n        throw new WebinyError(\n            `Content model with modelId \"${modelId}\" already exists.`,\n            \"MODEL_ID_EXISTS\",\n            {\n                modelId\n            }\n        );\n    }\n    /**\n     * Additionally, check if the plural form of the received modelId exists too. This prevents users\n     * from creating, for example, \"event\" and \"events\" models, which would break the GraphQL schema.\n     * 1. First check if user wants to create the \"event\" model, but the \"events\" model already exists.\n     */\n    const pluralizedModelIdCamelCase = pluralize(modelId);\n    if (modelIdList.includes(pluralizedModelIdCamelCase) === true) {\n        throw new WebinyError(\n            `Content model with modelId \"${modelId}\" does not exist, but a model with modelId \"${pluralizedModelIdCamelCase}\" does.`,\n            \"MODEL_ID_PLURAL_ERROR\",\n            {\n                modelId,\n                plural: pluralizedModelIdCamelCase\n            }\n        );\n    }\n\n    /**\n     * 2. Then check if user wants to create the \"events\" model, but the \"event\" model already exists.\n     */\n    const singularizedModelIdCamelCase = pluralize.singular(modelId);\n    if (modelIdList.includes(singularizedModelIdCamelCase) === true) {\n        throw new WebinyError(\n            `Content model with modelId \"${modelId}\" does not exist, but a model with modelId \"${singularizedModelIdCamelCase}\" does.`,\n            \"MODEL_ID_SINGULAR_ERROR\",\n            {\n                modelId,\n                singular: singularizedModelIdCamelCase\n            }\n        );\n    }\n};\n\nconst checkModelIdAllowed = (modelId: string): void => {\n    if (disallowedModelIdList.includes(modelId) === false) {\n        return;\n    }\n    throw new WebinyError(`Provided model ID \"${modelId}\" is not allowed.`);\n};\n\nconst checkModelIdEndingAllowed = (modelId: string): void => {\n    for (const ending of disallowedModelIdEndingList) {\n        const re = new RegExp(`${ending}$`, \"i\");\n        const matched = modelId.match(re);\n        if (matched === null) {\n            continue;\n        }\n        throw new WebinyError(\n            `ModelId that ends with \"${ending}\" is not allowed.`,\n            \"MODEL_ID_NOT_ALLOWED\",\n            {\n                modelId\n            }\n        );\n    }\n};\n\nconst getModelId = (model: CmsModel): string => {\n    const { modelId, name } = model;\n    if (!!modelId) {\n        return camelCase(modelId.trim());\n    } else if (name) {\n        return camelCase(name.trim());\n    }\n    throw new WebinyError(\n        `There is no \"modelId\" or \"name\" passed into the create model method.`,\n        \"MISSING_MODEL_DATA\",\n        {\n            model\n        }\n    );\n};\n\ninterface CreateOnModelBeforeCreateCbParams {\n    plugins: PluginsContainer;\n    storageOperations: HeadlessCmsStorageOperations;\n}\nconst createOnModelBeforeCb = ({\n    plugins,\n    storageOperations\n}: CreateOnModelBeforeCreateCbParams) => {\n    return async (params: OnModelBeforeCreateTopicParams | OnModelBeforeCreateFromTopicParams) => {\n        const { model } = params;\n\n        const modelId = getModelId(model);\n\n        const modelPlugin = plugins\n            .byType<CmsModelPlugin>(CmsModelPlugin.type)\n            .find((item: CmsModelPlugin) => item.contentModel.modelId === modelId);\n\n        if (modelPlugin) {\n            throw new WebinyError(\n                `Cannot create \"${model.modelId}\" content model because one is already registered via a plugin.`,\n                \"CONTENT_MODEL_CREATE_ERROR\",\n                {\n                    modelId: model.modelId\n                }\n            );\n        }\n\n        const models = await storageOperations.models.list({\n            where: {\n                tenant: model.tenant,\n                locale: model.locale\n            }\n        });\n        const modelIdList = models.map(m => m.modelId);\n\n        /**\n         * We need to check for:\n         *  - is that exact modelId allowed\n         *  - is modelId unique\n         *  - is model ending allowed\n         */\n        checkModelIdAllowed(modelId);\n        checkModelIdEndingAllowed(modelId);\n        checkModelIdUniqueness(modelIdList, modelId);\n        model.modelId = modelId;\n    };\n};\n\ninterface AssignBeforeModelCreateParams {\n    onModelBeforeCreate: Topic<OnModelBeforeCreateTopicParams>;\n    onModelBeforeCreateFrom: Topic<OnModelBeforeCreateFromTopicParams>;\n    storageOperations: HeadlessCmsStorageOperations;\n    plugins: PluginsContainer;\n}\n\n/**\n * We attach both on before create and createFrom events here.\n * Callables are identical.\n */\nexport const assignModelBeforeCreate = (params: AssignBeforeModelCreateParams) => {\n    const { onModelBeforeCreate, onModelBeforeCreateFrom, storageOperations, plugins } = params;\n\n    onModelBeforeCreate.subscribe(async ({ model, input }) => {\n        /**\n         * First the layout...\n         */\n        validateLayout(model.layout, model.fields);\n        /**\n         * then we run the shared create/createFrom methods.\n         */\n        const cb = createOnModelBeforeCb({\n            storageOperations,\n            plugins\n        });\n        await cb({\n            model,\n            input\n        });\n\n        /**\n         * and then we move onto model and fields...\n         */\n        await validateModel({\n            model,\n            plugins\n        });\n    });\n\n    onModelBeforeCreateFrom.subscribe(\n        createOnModelBeforeCb({\n            storageOperations,\n            plugins\n        })\n    );\n};\n"],"mappings":"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"}
+{"version":3,"names":["disallowedModelIdList","disallowedModelIdEndingList","checkModelIdUniqueness","modelIdList","modelId","includes","WebinyError","pluralizedModelIdCamelCase","pluralize","plural","singularizedModelIdCamelCase","singular","checkModelIdAllowed","checkModelIdEndingAllowed","ending","re","RegExp","matched","match","getModelId","model","name","camelCase","trim","createOnModelBeforeCb","plugins","storageOperations","params","modelPlugin","byType","CmsModelPlugin","type","find","item","contentModel","models","list","where","tenant","locale","map","m","assignModelBeforeCreate","onModelBeforeCreate","onModelBeforeCreateFrom","context","subscribe","input","validateLayout","layout","fields","cb","validateModel"],"sources":["beforeCreate.ts"],"sourcesContent":["import WebinyError from \"@webiny/error\";\nimport camelCase from \"lodash/camelCase\";\nimport pluralize from \"pluralize\";\nimport {\n    OnModelBeforeCreateFromTopicParams,\n    OnModelBeforeCreateTopicParams,\n    CmsModel,\n    HeadlessCmsStorageOperations,\n    CmsContext\n} from \"~/types\";\nimport { Topic } from \"@webiny/pubsub/types\";\nimport { PluginsContainer } from \"@webiny/plugins\";\nimport { CmsModelPlugin } from \"~/plugins/CmsModelPlugin\";\nimport { validateModel } from \"./validateModel\";\nimport { validateLayout } from \"./validateLayout\";\n\nconst disallowedModelIdList: string[] = [\n    \"contentModel\",\n    \"contentModels\",\n    \"contentModelGroup\",\n    \"contentModelGroups\"\n];\n/**\n * This list is to disallow creating models that might interfere with GraphQL schema creation.\n * Add more if required.\n */\nconst disallowedModelIdEndingList: string[] = [\n    \"Response\",\n    \"List\",\n    \"Meta\",\n    \"Input\",\n    \"Sorter\",\n    \"RefType\"\n];\n\n/**\n * Checks for the uniqueness of provided modelId, against the provided list of models.\n * It also takes plural / singular forms of the provided modelId into account.\n */\nconst checkModelIdUniqueness = (modelIdList: string[], modelId: string) => {\n    if (modelIdList.includes(modelId) === true) {\n        throw new WebinyError(\n            `Content model with modelId \"${modelId}\" already exists.`,\n            \"MODEL_ID_EXISTS\",\n            {\n                modelId\n            }\n        );\n    }\n    /**\n     * Additionally, check if the plural form of the received modelId exists too. This prevents users\n     * from creating, for example, \"event\" and \"events\" models, which would break the GraphQL schema.\n     * 1. First check if user wants to create the \"event\" model, but the \"events\" model already exists.\n     */\n    const pluralizedModelIdCamelCase = pluralize(modelId);\n    if (modelIdList.includes(pluralizedModelIdCamelCase) === true) {\n        throw new WebinyError(\n            `Content model with modelId \"${modelId}\" does not exist, but a model with modelId \"${pluralizedModelIdCamelCase}\" does.`,\n            \"MODEL_ID_PLURAL_ERROR\",\n            {\n                modelId,\n                plural: pluralizedModelIdCamelCase\n            }\n        );\n    }\n\n    /**\n     * 2. Then check if user wants to create the \"events\" model, but the \"event\" model already exists.\n     */\n    const singularizedModelIdCamelCase = pluralize.singular(modelId);\n    if (modelIdList.includes(singularizedModelIdCamelCase) === true) {\n        throw new WebinyError(\n            `Content model with modelId \"${modelId}\" does not exist, but a model with modelId \"${singularizedModelIdCamelCase}\" does.`,\n            \"MODEL_ID_SINGULAR_ERROR\",\n            {\n                modelId,\n                singular: singularizedModelIdCamelCase\n            }\n        );\n    }\n};\n\nconst checkModelIdAllowed = (modelId: string): void => {\n    if (disallowedModelIdList.includes(modelId) === false) {\n        return;\n    }\n    throw new WebinyError(`Provided model ID \"${modelId}\" is not allowed.`);\n};\n\nconst checkModelIdEndingAllowed = (modelId: string): void => {\n    for (const ending of disallowedModelIdEndingList) {\n        const re = new RegExp(`${ending}$`, \"i\");\n        const matched = modelId.match(re);\n        if (matched === null) {\n            continue;\n        }\n        throw new WebinyError(\n            `ModelId that ends with \"${ending}\" is not allowed.`,\n            \"MODEL_ID_NOT_ALLOWED\",\n            {\n                modelId\n            }\n        );\n    }\n};\n\nconst getModelId = (model: CmsModel): string => {\n    const { modelId, name } = model;\n    if (!!modelId) {\n        return camelCase(modelId.trim());\n    } else if (name) {\n        return camelCase(name.trim());\n    }\n    throw new WebinyError(\n        `There is no \"modelId\" or \"name\" passed into the create model method.`,\n        \"MISSING_MODEL_DATA\",\n        {\n            model\n        }\n    );\n};\n\ninterface CreateOnModelBeforeCreateCbParams {\n    plugins: PluginsContainer;\n    storageOperations: HeadlessCmsStorageOperations;\n}\nconst createOnModelBeforeCb = ({\n    plugins,\n    storageOperations\n}: CreateOnModelBeforeCreateCbParams) => {\n    return async (params: OnModelBeforeCreateTopicParams | OnModelBeforeCreateFromTopicParams) => {\n        const { model } = params;\n\n        const modelId = getModelId(model);\n\n        const modelPlugin = plugins\n            .byType<CmsModelPlugin>(CmsModelPlugin.type)\n            .find((item: CmsModelPlugin) => item.contentModel.modelId === modelId);\n\n        if (modelPlugin) {\n            throw new WebinyError(\n                `Cannot create \"${model.modelId}\" content model because one is already registered via a plugin.`,\n                \"CONTENT_MODEL_CREATE_ERROR\",\n                {\n                    modelId: model.modelId\n                }\n            );\n        }\n\n        const models = await storageOperations.models.list({\n            where: {\n                tenant: model.tenant,\n                locale: model.locale\n            }\n        });\n        const modelIdList = models.map(m => m.modelId);\n\n        /**\n         * We need to check for:\n         *  - is that exact modelId allowed\n         *  - is modelId unique\n         *  - is model ending allowed\n         */\n        checkModelIdAllowed(modelId);\n        checkModelIdEndingAllowed(modelId);\n        checkModelIdUniqueness(modelIdList, modelId);\n        model.modelId = modelId;\n    };\n};\n\ninterface AssignBeforeModelCreateParams {\n    onModelBeforeCreate: Topic<OnModelBeforeCreateTopicParams>;\n    onModelBeforeCreateFrom: Topic<OnModelBeforeCreateFromTopicParams>;\n    storageOperations: HeadlessCmsStorageOperations;\n    context: CmsContext;\n}\n\n/**\n * We attach both on before create and createFrom events here.\n * Callables are identical.\n */\nexport const assignModelBeforeCreate = (params: AssignBeforeModelCreateParams) => {\n    const { onModelBeforeCreate, onModelBeforeCreateFrom, storageOperations, context } = params;\n\n    onModelBeforeCreate.subscribe(async ({ model, input }) => {\n        /**\n         * First the layout...\n         */\n        validateLayout(model.layout, model.fields);\n        /**\n         * then we run the shared create/createFrom methods.\n         */\n        const cb = createOnModelBeforeCb({\n            storageOperations,\n            plugins: context.plugins\n        });\n        await cb({\n            model,\n            input\n        });\n        /**\n         * and then we move onto model and fields...\n         */\n        await validateModel({\n            model,\n            context\n        });\n    });\n\n    onModelBeforeCreateFrom.subscribe(\n        createOnModelBeforeCb({\n            storageOperations,\n            plugins: context.plugins\n        })\n    );\n};\n"],"mappings":"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"}

package/crud/contentModel/beforeUpdate.d.ts

@@ -1,10 +1,8 @@
 import { Topic } from "@webiny/pubsub/types";
-import { OnModelBeforeUpdateTopicParams, HeadlessCmsStorageOperations } from "../../types";
-import { PluginsContainer } from "@webiny/plugins";
+import { OnModelBeforeUpdateTopicParams, CmsContext } from "../../types";
 interface AssignBeforeModelUpdateParams {
     onModelBeforeUpdate: Topic<OnModelBeforeUpdateTopicParams>;
-    storageOperations: HeadlessCmsStorageOperations;
-    plugins: PluginsContainer;
+    context: CmsContext;
 }
 export declare const assignModelBeforeUpdate: (params: AssignBeforeModelUpdateParams) => void;
 export {};

package/crud/contentModel/beforeUpdate.js

@@ -12,7 +12,7 @@ var _validateLayout = require("./validateLayout");
 const assignModelBeforeUpdate = params => {
   const {
     onModelBeforeUpdate,
-    plugins
+    context
   } = params;
   onModelBeforeUpdate.subscribe(async ({
     model,
@@ -29,7 +29,7 @@ const assignModelBeforeUpdate = params => {
     await (0, _validateModel.validateModel)({
       model,
       original,
-      plugins
+      context
     });
   });
 };

package/crud/contentModel/beforeUpdate.js.map

@@ -1 +1 @@
-{"version":3,"names":["assignModelBeforeUpdate","params","onModelBeforeUpdate","plugins","subscribe","model","original","validateLayout","layout","fields","validateModel"],"sources":["beforeUpdate.ts"],"sourcesContent":["import { Topic } from \"@webiny/pubsub/types\";\nimport { OnModelBeforeUpdateTopicParams, HeadlessCmsStorageOperations } from \"~/types\";\nimport { PluginsContainer } from \"@webiny/plugins\";\nimport { validateModel } from \"./validateModel\";\nimport { validateLayout } from \"./validateLayout\";\n\ninterface AssignBeforeModelUpdateParams {\n    onModelBeforeUpdate: Topic<OnModelBeforeUpdateTopicParams>;\n    storageOperations: HeadlessCmsStorageOperations;\n    plugins: PluginsContainer;\n}\n\nexport const assignModelBeforeUpdate = (params: AssignBeforeModelUpdateParams) => {\n    const { onModelBeforeUpdate, plugins } = params;\n\n    onModelBeforeUpdate.subscribe(async ({ model, original }) => {\n        /**\n         * First we go through the layout...\n         */\n        validateLayout(model.layout, model.fields);\n        /**\n         * then the model and fields...\n         */\n        await validateModel({\n            model,\n            original,\n            plugins\n        });\n    });\n};\n"],"mappings":";;;;;;;AAGA;;AACA;;AAQO,MAAMA,uBAAuB,GAAIC,MAAD,IAA2C;EAC9E,MAAM;IAAEC,mBAAF;IAAuBC;EAAvB,IAAmCF,MAAzC;EAEAC,mBAAmB,CAACE,SAApB,CAA8B,OAAO;IAAEC,KAAF;IAASC;EAAT,CAAP,KAA+B;IACzD;AACR;AACA;IACQ,IAAAC,8BAAA,EAAeF,KAAK,CAACG,MAArB,EAA6BH,KAAK,CAACI,MAAnC;IACA;AACR;AACA;;IACQ,MAAM,IAAAC,4BAAA,EAAc;MAChBL,KADgB;MAEhBC,QAFgB;MAGhBH;IAHgB,CAAd,CAAN;EAKH,CAbD;AAcH,CAjBM"}
+{"version":3,"names":["assignModelBeforeUpdate","params","onModelBeforeUpdate","context","subscribe","model","original","validateLayout","layout","fields","validateModel"],"sources":["beforeUpdate.ts"],"sourcesContent":["import { Topic } from \"@webiny/pubsub/types\";\nimport { OnModelBeforeUpdateTopicParams, CmsContext } from \"~/types\";\nimport { validateModel } from \"./validateModel\";\nimport { validateLayout } from \"./validateLayout\";\n\ninterface AssignBeforeModelUpdateParams {\n    onModelBeforeUpdate: Topic<OnModelBeforeUpdateTopicParams>;\n    context: CmsContext;\n}\n\nexport const assignModelBeforeUpdate = (params: AssignBeforeModelUpdateParams) => {\n    const { onModelBeforeUpdate, context } = params;\n\n    onModelBeforeUpdate.subscribe(async ({ model, original }) => {\n        /**\n         * First we go through the layout...\n         */\n        validateLayout(model.layout, model.fields);\n        /**\n         * then the model and fields...\n         */\n        await validateModel({\n            model,\n            original,\n            context\n        });\n    });\n};\n"],"mappings":";;;;;;;AAEA;;AACA;;AAOO,MAAMA,uBAAuB,GAAIC,MAAD,IAA2C;EAC9E,MAAM;IAAEC,mBAAF;IAAuBC;EAAvB,IAAmCF,MAAzC;EAEAC,mBAAmB,CAACE,SAApB,CAA8B,OAAO;IAAEC,KAAF;IAASC;EAAT,CAAP,KAA+B;IACzD;AACR;AACA;IACQ,IAAAC,8BAAA,EAAeF,KAAK,CAACG,MAArB,EAA6BH,KAAK,CAACI,MAAnC;IACA;AACR;AACA;;IACQ,MAAM,IAAAC,4BAAA,EAAc;MAChBL,KADgB;MAEhBC,QAFgB;MAGhBH;IAHgB,CAAd,CAAN;EAKH,CAbD;AAcH,CAjBM"}

package/crud/contentModel/validateModel.d.ts

@@ -1,9 +1,8 @@
-import { CmsModel } from "../../types";
-import { PluginsContainer } from "@webiny/plugins";
+import { CmsContext, CmsModel } from "../../types";
 interface ValidateModelParams {
     model: CmsModel;
     original?: CmsModel;
-    plugins: PluginsContainer;
+    context: CmsContext;
 }
-export declare const validateModel: (params: ValidateModelParams) => void;
+export declare const validateModel: (params: ValidateModelParams) => Promise<void>;
 export {};

package/crud/contentModel/validateModel.js

@@ -13,11 +13,14 @@ var _CmsModelPlugin = require("../../plugins/CmsModelPlugin");
 
 var _validateModelFields = require("./validateModelFields");
 
-const validateModel = params => {
+const validateModel = async params => {
   const {
     model,
-    plugins
+    context
   } = params;
+  const {
+    plugins
+  } = context;
   const modelPlugin = plugins.byType(_CmsModelPlugin.CmsModelPlugin.type).find(item => item.contentModel.modelId === model.modelId);
 
   if (modelPlugin) {
@@ -26,7 +29,7 @@ const validateModel = params => {
     });
   }
 
-  (0, _validateModelFields.validateModelFields)(params);
+  await (0, _validateModelFields.validateModelFields)(params);
 };
 
 exports.validateModel = validateModel;

package/crud/contentModel/validateModel.js.map

@@ -1 +1 @@
-{"version":3,"names":["validateModel","params","model","plugins","modelPlugin","byType","CmsModelPlugin","type","find","item","contentModel","modelId","WebinyError","validateModelFields"],"sources":["validateModel.ts"],"sourcesContent":["import WebinyError from \"@webiny/error\";\nimport { CmsModelPlugin } from \"~/plugins/CmsModelPlugin\";\nimport { CmsModel } from \"~/types\";\nimport { PluginsContainer } from \"@webiny/plugins\";\nimport { validateModelFields } from \"~/crud/contentModel/validateModelFields\";\n\ninterface ValidateModelParams {\n    model: CmsModel;\n    original?: CmsModel;\n    plugins: PluginsContainer;\n}\n\nexport const validateModel = (params: ValidateModelParams) => {\n    const { model, plugins } = params;\n\n    const modelPlugin = plugins\n        .byType<CmsModelPlugin>(CmsModelPlugin.type)\n        .find(item => item.contentModel.modelId === model.modelId);\n\n    if (modelPlugin) {\n        throw new WebinyError(\n            \"Content models defined via plugins cannot be updated.\",\n            \"CONTENT_MODEL_UPDATE_ERROR\",\n            {\n                modelId: model.modelId\n            }\n        );\n    }\n\n    validateModelFields(params);\n};\n"],"mappings":";;;;;;;;;AAAA;;AACA;;AAGA;;AAQO,MAAMA,aAAa,GAAIC,MAAD,IAAiC;EAC1D,MAAM;IAAEC,KAAF;IAASC;EAAT,IAAqBF,MAA3B;EAEA,MAAMG,WAAW,GAAGD,OAAO,CACtBE,MADe,CACQC,8BAAA,CAAeC,IADvB,EAEfC,IAFe,CAEVC,IAAI,IAAIA,IAAI,CAACC,YAAL,CAAkBC,OAAlB,KAA8BT,KAAK,CAACS,OAFlC,CAApB;;EAIA,IAAIP,WAAJ,EAAiB;IACb,MAAM,IAAIQ,cAAJ,CACF,uDADE,EAEF,4BAFE,EAGF;MACID,OAAO,EAAET,KAAK,CAACS;IADnB,CAHE,CAAN;EAOH;;EAED,IAAAE,wCAAA,EAAoBZ,MAApB;AACH,CAlBM"}
+{"version":3,"names":["validateModel","params","model","context","plugins","modelPlugin","byType","CmsModelPlugin","type","find","item","contentModel","modelId","WebinyError","validateModelFields"],"sources":["validateModel.ts"],"sourcesContent":["import WebinyError from \"@webiny/error\";\nimport { CmsModelPlugin } from \"~/plugins/CmsModelPlugin\";\nimport { CmsContext, CmsModel } from \"~/types\";\nimport { validateModelFields } from \"~/crud/contentModel/validateModelFields\";\n\ninterface ValidateModelParams {\n    model: CmsModel;\n    original?: CmsModel;\n    context: CmsContext;\n}\n\nexport const validateModel = async (params: ValidateModelParams): Promise<void> => {\n    const { model, context } = params;\n\n    const { plugins } = context;\n\n    const modelPlugin = plugins\n        .byType<CmsModelPlugin>(CmsModelPlugin.type)\n        .find(item => item.contentModel.modelId === model.modelId);\n\n    if (modelPlugin) {\n        throw new WebinyError(\n            \"Content models defined via plugins cannot be updated.\",\n            \"CONTENT_MODEL_UPDATE_ERROR\",\n            {\n                modelId: model.modelId\n            }\n        );\n    }\n\n    await validateModelFields(params);\n};\n"],"mappings":";;;;;;;;;AAAA;;AACA;;AAEA;;AAQO,MAAMA,aAAa,GAAG,MAAOC,MAAP,IAAsD;EAC/E,MAAM;IAAEC,KAAF;IAASC;EAAT,IAAqBF,MAA3B;EAEA,MAAM;IAAEG;EAAF,IAAcD,OAApB;EAEA,MAAME,WAAW,GAAGD,OAAO,CACtBE,MADe,CACQC,8BAAA,CAAeC,IADvB,EAEfC,IAFe,CAEVC,IAAI,IAAIA,IAAI,CAACC,YAAL,CAAkBC,OAAlB,KAA8BV,KAAK,CAACU,OAFlC,CAApB;;EAIA,IAAIP,WAAJ,EAAiB;IACb,MAAM,IAAIQ,cAAJ,CACF,uDADE,EAEF,4BAFE,EAGF;MACID,OAAO,EAAEV,KAAK,CAACU;IADnB,CAHE,CAAN;EAOH;;EAED,MAAM,IAAAE,wCAAA,EAAoBb,MAApB,CAAN;AACH,CApBM"}

package/crud/contentModel/validateModelFields.d.ts

@@ -1,9 +1,8 @@
-import { CmsModel } from "../../types";
-import { PluginsContainer } from "@webiny/plugins";
+import { CmsContext, CmsModel } from "../../types";
 interface ValidateModelFieldsParams {
     model: CmsModel;
     original?: CmsModel;
-    plugins: PluginsContainer;
+    context: CmsContext;
 }
-export declare const validateModelFields: (params: ValidateModelFieldsParams) => void;
+export declare const validateModelFields: (params: ValidateModelFieldsParams) => Promise<void>;
 export {};

package/crud/contentModel/validateModelFields.js

@@ -21,6 +21,12 @@ var _getBaseFieldType = require("../../utils/getBaseFieldType");
 
 var _plugins = require("../../plugins");
 
+var _buildSchemaPlugins = require("../../graphql/buildSchemaPlugins");
+
+var _createExecutableSchema = require("../../graphql/createExecutableSchema");
+
+var _handlerGraphql = require("@webiny/handler-graphql");
+
 const defaultTitleFieldId = "id";
 const allowedTitleFieldTypes = ["text", "number"];
 
@@ -138,7 +144,7 @@ const createValidateChildFields = plugins => {
     fields,
     originalFields
   }) => {
-    if (fields.length === 0) {
+    if (fields.length === 0 && originalFields.length === 0) {
       return;
     }
 
@@ -158,9 +164,9 @@ const validateFields = params => {
     originalFields,
     lockedFields
   } = params;
+  const idList = [];
   const fieldIdList = [];
   const storageIdList = [];
-  const validateChildFields = createValidateChildFields(plugins);
 
   for (const field of fields) {
     const baseType = (0, _getBaseFieldType.getBaseFieldType)(field);
@@ -169,7 +175,17 @@ const validateFields = params => {
     if (!plugin) {
       throw new Error(`Cannot update content model because of the unknown "${baseType}" field.`);
     }
+    /**
+     * Check the field's id against existing ones.
+     * There cannot be two fields with the same id.
+     */
 
+
+    if (idList.includes(field.id)) {
+      throw new _error.default(`Cannot update content model because field "${field.storageId || field.fieldId}" has id "${field.id}", which is already used.`);
+    }
+
+    idList.push(field.id);
     const originalField = originalFields.find(f => f.id === field.id);
     /**
      * Field MUST have an fieldId defined.
@@ -196,7 +212,7 @@ const validateFields = params => {
 
 
     const isLocked = lockedFields.some(lockedField => {
-      return lockedField.fieldId === field.storageId;
+      return lockedField.fieldId === field.storageId || lockedField.fieldId === field.fieldId;
     });
 
     if (!field.storageId) {
@@ -253,6 +269,7 @@ const validateFields = params => {
       continue;
     }
 
+    const validateChildFields = createValidateChildFields(plugins);
     plugin.validateChildFields({
       field,
       originalField,
@@ -261,15 +278,45 @@ const validateFields = params => {
   }
 };
 
-const validateModelFields = params => {
+const createGraphQLSchema = async params => {
+  const {
+    context,
+    model
+  } = params;
+  const modelPlugins = await (0, _buildSchemaPlugins.buildSchemaPlugins)({
+    context,
+    models: [model]
+  });
+  const plugins = context.plugins.byType(_handlerGraphql.GraphQLSchemaPlugin.type);
+  plugins.push(...modelPlugins);
+  return (0, _createExecutableSchema.createExecutableSchema)({
+    plugins
+  });
+};
+
+const extractErrorObject = error => {
+  return ["message", "code", "data", "stack"].reduce((output, key) => {
+    if (!error[key]) {
+      return output;
+    }
+
+    output[key] = error[key];
+    return output;
+  }, {});
+};
+
+const validateModelFields = async params => {
   const {
     model,
     original,
-    plugins
+    context
   } = params;
   const {
     titleFieldId
   } = model;
+  const {
+    plugins
+  } = context;
   /**
    * There should be fields/locked fields in either model or data to be updated.
    */
@@ -284,7 +331,6 @@ const validateModelFields = params => {
    */
 
   const fieldTypePlugins = plugins.byType("cms-model-field-to-graphql");
-  const sorterPlugins = plugins.byType(_plugins.CmsGraphQLSchemaSorterPlugin.type);
   validateFields({
     fields,
     originalFields: (original === null || original === void 0 ? void 0 : original.fields) || [],
@@ -293,9 +339,11 @@ const validateModelFields = params => {
   });
 
   if (fields.length) {
+    const sorterPlugins = plugins.byType(_plugins.CmsGraphQLSchemaSorterPlugin.type);
     /**
      * Make sure that this model can be safely converted to a GraphQL SDL
      */
+
     const schema = (0, _createManageSDL.createManageSDL)({
       model,
       fieldTypePlugins: fieldTypePlugins.reduce((acc, pl) => (0, _objectSpread2.default)((0, _objectSpread2.default)({}, acc), {}, {
@@ -309,6 +357,26 @@ const validateModelFields = params => {
     } catch (err) {
       throw new _error.default(extractInvalidField(model, err));
     }
+    /**
+     *
+     */
+
+
+    try {
+      await createGraphQLSchema({
+        context,
+        model
+      });
+    } catch (err) {
+      throw new _error.default({
+        message: "Cannot generate GraphQL schema when testing with the given model. Please check the response for more details.",
+        code: "GRAPHQL_SCHEMA_ERROR",
+        data: {
+          modelId: model.modelId,
+          error: extractErrorObject(err)
+        }
+      });
+    }
   }
 
   model.titleFieldId = getContentModelTitleFieldId(fields, titleFieldId);

package/crud/contentModel/validateModelFields.js.map

@@ -1 +1 @@
-{"version":3,"names":["defaultTitleFieldId","allowedTitleFieldTypes","getContentModelTitleFieldId","fields","titleFieldId","length","titleField","find","field","getBaseFieldType","multipleValues","fieldId","target","f","WebinyError","includes","type","join","storageId","extractInvalidField","model","err","sdl","source","body","line","lineNumber","locations","sdlLines","split","sdlLine","gqlType","i","match","invalidField","undefined","Array","isArray","fieldRegex","RegExp","matched","message","data","modelId","code","createValidateChildFields","plugins","originalFields","validateFields","lockedFields","params","fieldIdList","storageIdList","validateChildFields","baseType","plugin","fieldType","Error","originalField","id","isLocked","some","lockedField","createFieldStorageId","push","label","validate","validateModelFields","original","fieldTypePlugins","byType","sorterPlugins","CmsGraphQLSchemaSorterPlugin","schema","createManageSDL","reduce","acc","pl","gql","cmsLockedFieldPlugins","existingField","item","reason","lockedFieldType","existingFieldType","lockedFieldsByType","filter","checkLockedField"],"sources":["validateModelFields.ts"],"sourcesContent":["import {\n    CmsModel,\n    CmsModelField,\n    CmsModelFieldToGraphQLPlugin,\n    CmsModelFieldToGraphQLPluginValidateChildFieldsValidate,\n    CmsModelLockedFieldPlugin,\n    LockedField\n} from \"~/types\";\nimport WebinyError from \"@webiny/error\";\nimport { createManageSDL } from \"~/graphql/schema/createManageSDL\";\nimport gql from \"graphql-tag\";\nimport { PluginsContainer } from \"@webiny/plugins\";\nimport { createFieldStorageId } from \"./createFieldStorageId\";\nimport { GraphQLError } from \"graphql\";\nimport { getBaseFieldType } from \"~/utils/getBaseFieldType\";\nimport { CmsGraphQLSchemaSorterPlugin } from \"~/plugins\";\n\nconst defaultTitleFieldId = \"id\";\n\nconst allowedTitleFieldTypes = [\"text\", \"number\"];\n\nconst getContentModelTitleFieldId = (fields: CmsModelField[], titleFieldId?: string): string => {\n    /**\n     * If there are no fields defined, we will return the default field\n     */\n    if (fields.length === 0) {\n        return defaultTitleFieldId;\n    }\n    /**\n     * if there is no title field defined either in input data or existing content model data\n     * we will take first text field that has no multiple values enabled\n     * or if initial titleFieldId is the default one also try to find first available text field\n     */\n    if (!titleFieldId || titleFieldId === defaultTitleFieldId) {\n        const titleField = fields.find(field => {\n            return getBaseFieldType(field) === \"text\" && !field.multipleValues;\n        });\n        return titleField?.fieldId || defaultTitleFieldId;\n    }\n    /**\n     * check existing titleFieldId for existence in the model\n     * for correct type\n     * and that it is not multiple values field\n     */\n    const target = fields.find(f => f.fieldId === titleFieldId);\n    if (!target) {\n        throw new WebinyError(\n            `Field selected for the title field does not exist in the model.`,\n            \"VALIDATION_ERROR\",\n            {\n                fieldId: titleFieldId,\n                fields\n            }\n        );\n    }\n\n    if (allowedTitleFieldTypes.includes(target.type) === false) {\n        throw new WebinyError(\n            `Only ${allowedTitleFieldTypes.join(\n                \", \"\n            )} and id fields can be used as an entry title.`,\n            \"ENTRY_TITLE_FIELD_TYPE\",\n            {\n                storageId: target.storageId,\n                fieldId: target.fieldId,\n                type: target.type\n            }\n        );\n    }\n\n    if (target.multipleValues) {\n        throw new WebinyError(\n            `Fields that accept multiple values cannot be used as the entry title.`,\n            \"ENTRY_TITLE_FIELD_TYPE\",\n            {\n                storageId: target.storageId,\n                fieldId: target.fieldId,\n                type: target.type\n            }\n        );\n    }\n\n    return target.fieldId;\n};\n\nconst extractInvalidField = (model: CmsModel, err: GraphQLError) => {\n    const sdl = err.source?.body || \"\";\n\n    /**\n     * Find the invalid type\n     */\n    const { line: lineNumber } = err.locations\n        ? err.locations[0]\n        : {\n              line: 0\n          };\n    const sdlLines = sdl.split(\"\\n\");\n    let sdlLine;\n    let gqlType;\n    for (let i = lineNumber; i > 0; i--) {\n        if (sdlLine && sdlLine.includes(\"type \")) {\n            gqlType = sdlLine.match(/type\\s+(.*?)\\s+{/);\n            break;\n        }\n\n        sdlLine = sdlLines[i];\n    }\n\n    let invalidField: string | undefined = undefined;\n    if (Array.isArray(gqlType)) {\n        const fieldRegex = new RegExp(`([^\\\\s+].*?):\\\\s+\\\\[?${gqlType[1]}!?\\\\]?`);\n\n        const matched = sdl.match(fieldRegex);\n        if (matched) {\n            invalidField = matched[1];\n        }\n    }\n\n    let message = `See more details in the browser console.`;\n    if (invalidField) {\n        message = `Please review the definition of \"${invalidField}\" field.`;\n    }\n\n    return {\n        data: {\n            modelId: model.modelId,\n            sdl,\n            invalidField\n        },\n        code: \"INVALID_MODEL_DEFINITION\",\n        message: [`Model \"${model.modelId}\" was not saved!`, message].join(\"\\n\")\n    };\n};\n\nconst createValidateChildFields = (\n    plugins: CmsModelFieldToGraphQLPlugin[]\n): CmsModelFieldToGraphQLPluginValidateChildFieldsValidate => {\n    return ({ fields, originalFields }) => {\n        if (fields.length === 0) {\n            return;\n        }\n        validateFields({\n            fields,\n            originalFields,\n            plugins,\n            lockedFields: []\n        });\n    };\n};\n\ninterface ValidateFieldsParams {\n    plugins: CmsModelFieldToGraphQLPlugin[];\n    fields: CmsModelField[];\n    originalFields: CmsModelField[];\n    lockedFields: LockedField[];\n}\nconst validateFields = (params: ValidateFieldsParams) => {\n    const { plugins, fields, originalFields, lockedFields } = params;\n\n    const fieldIdList: string[] = [];\n\n    const storageIdList: string[] = [];\n\n    const validateChildFields = createValidateChildFields(plugins);\n\n    for (const field of fields) {\n        const baseType = getBaseFieldType(field);\n        const plugin = plugins.find(plugin => plugin.fieldType === baseType);\n\n        if (!plugin) {\n            throw new Error(\n                `Cannot update content model because of the unknown \"${baseType}\" field.`\n            );\n        }\n        const originalField = originalFields.find(f => f.id === field.id);\n        /**\n         * Field MUST have an fieldId defined.\n         */\n        if (!field.fieldId) {\n            throw new WebinyError(`Field does not have an \"fieldId\" defined.`, \"MISSING_FIELD_ID\", {\n                field\n            });\n        }\n        /**\n         * If storageId does not match a certain pattern, add that pattern, but only if field is not locked (used) already.\n         * This is to avoid errors in the already installed systems.\n         *\n         * Why are we using the @?\n         *\n         * It is not part of special characters for the query syntax in the Lucene.\n         *\n         * Relevant links:\n         * https://lucene.apache.org/core/3_4_0/queryparsersyntax.html\n         * https://discuss.elastic.co/t/special-characters-in-field-names/10658/3\n         * https://discuss.elastic.co/t/illegal-characters-in-elasticsearch-field-names/17196/2\n         */\n        const isLocked = lockedFields.some(lockedField => {\n            return lockedField.fieldId === field.storageId;\n        });\n        if (!field.storageId) {\n            /**\n             * In case field is locked, we must set the storageId to the fieldId value.\n             * This should not happen, because we upgrade all the fields in 5.33.0, but let's have a check just in case of some upgrade miss.\n             */\n            //\n            if (isLocked) {\n                field.storageId = field.fieldId;\n            }\n            /**\n             * When having original field, just set the storageId to value from the originalField\n             */\n            //\n            else if (originalField) {\n                field.storageId = originalField.storageId;\n            }\n            /**\n             * The last case is when no original field and not locked - so this is a completely new field.\n             */\n            //\n            else {\n                field.storageId = createFieldStorageId(field);\n            }\n        }\n        /**\n         * Check the field's fieldId against existing ones.\n         * There cannot be two fields with the same fieldId - outside world identifier.\n         */\n        if (fieldIdList.includes(field.fieldId)) {\n            throw new WebinyError(\n                `Cannot update content model because field \"${field.storageId}\" has fieldId \"${field.fieldId}\", which is already used.`\n            );\n        }\n        fieldIdList.push(field.fieldId);\n        /**\n         * Check the field's storageId against the existing ones.\n         * There cannot be two fields with the same storageId.\n         */\n        if (storageIdList.includes(field.storageId)) {\n            throw new WebinyError(\n                `Cannot update content model because field \"${field.label}\" has storageId \"${field.storageId}\", which is already used.`\n            );\n        }\n        storageIdList.push(field.storageId);\n        /**\n         * There might be some plugins which allow child fields.\n         * We use this method to validate them as well.\n         */\n        if (!plugin.validateChildFields) {\n            continue;\n        }\n        plugin.validateChildFields({\n            field,\n            originalField,\n            validate: validateChildFields\n        });\n    }\n};\n\ninterface ValidateModelFieldsParams {\n    model: CmsModel;\n    original?: CmsModel;\n    plugins: PluginsContainer;\n}\nexport const validateModelFields = (params: ValidateModelFieldsParams) => {\n    const { model, original, plugins } = params;\n    const { titleFieldId } = model;\n\n    /**\n     * There should be fields/locked fields in either model or data to be updated.\n     */\n    const { fields = [], lockedFields = [] } = model;\n\n    /**\n     * Let's inspect the fields of the received content model. We prevent saving of a content model if it\n     * contains a field for which a \"cms-model-field-to-graphql\" plugin does not exist on the backend.\n     */\n    const fieldTypePlugins = plugins.byType<CmsModelFieldToGraphQLPlugin>(\n        \"cms-model-field-to-graphql\"\n    );\n    const sorterPlugins = plugins.byType<CmsGraphQLSchemaSorterPlugin>(\n        CmsGraphQLSchemaSorterPlugin.type\n    );\n\n    validateFields({\n        fields,\n        originalFields: original?.fields || [],\n        lockedFields,\n        plugins: fieldTypePlugins\n    });\n\n    if (fields.length) {\n        /**\n         * Make sure that this model can be safely converted to a GraphQL SDL\n         */\n        const schema = createManageSDL({\n            model,\n            fieldTypePlugins: fieldTypePlugins.reduce(\n                (acc, pl) => ({ ...acc, [pl.fieldType]: pl }),\n                {}\n            ),\n            sorterPlugins\n        });\n\n        try {\n            gql(schema);\n        } catch (err) {\n            throw new WebinyError(extractInvalidField(model, err));\n        }\n    }\n\n    model.titleFieldId = getContentModelTitleFieldId(fields, titleFieldId);\n\n    const cmsLockedFieldPlugins =\n        plugins.byType<CmsModelLockedFieldPlugin>(\"cms-model-locked-field\");\n\n    /**\n     * We must not allow removal or changes in fields that are already in use in content entries.\n     * Locked fields still have fieldId (should be storageId) because of the old existing locked fields in the models.\n     */\n    for (const lockedField of lockedFields) {\n        const existingField = fields.find(item => item.storageId === lockedField.fieldId);\n\n        /**\n         * Starting with 5.33.0 fields can be deleted.\n         * Our UI gives a warning upon locked field deletion, but if user is managing fields through API directly - we cannot do anything.\n         */\n        if (!existingField) {\n            continue;\n            // throw new WebinyError(\n            //     `Cannot remove the field \"${lockedField.fieldId}\" because it's already in use in created content.`,\n            //     \"ENTRY_FIELD_USED\",\n            //     {\n            //         lockedField,\n            //         fields\n            //     }\n            // );\n        }\n\n        if (lockedField.multipleValues !== existingField.multipleValues) {\n            throw new WebinyError(\n                `Cannot change \"multipleValues\" for the \"${lockedField.fieldId}\" field because it's already in use in created content.`,\n                \"ENTRY_FIELD_USED\",\n                {\n                    reason: `\"multipleValues\" changed`,\n                    field: existingField\n                }\n            );\n        }\n\n        const fieldType = getBaseFieldType(existingField);\n        if (lockedField.type !== fieldType) {\n            throw new WebinyError(\n                `Cannot change field type for the \"${lockedField.fieldId}\" field because it's already in use in created content.`,\n                \"ENTRY_FIELD_USED\",\n                {\n                    reason: `\"type\" changed`,\n                    lockedFieldType: lockedField.type,\n                    existingFieldType: fieldType\n                }\n            );\n        }\n\n        /**\n         * Check `lockedField` invariant for specific field\n         */\n        const lockedFieldsByType = cmsLockedFieldPlugins.filter(\n            pl => pl.fieldType === getBaseFieldType(lockedField)\n        );\n        for (const plugin of lockedFieldsByType) {\n            if (typeof plugin.checkLockedField !== \"function\") {\n                continue;\n            }\n            plugin.checkLockedField({\n                lockedField,\n                field: existingField\n            });\n        }\n    }\n};\n"],"mappings":"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"}
+{"version":3,"names":["defaultTitleFieldId","allowedTitleFieldTypes","getContentModelTitleFieldId","fields","titleFieldId","length","titleField","find","field","getBaseFieldType","multipleValues","fieldId","target","f","WebinyError","includes","type","join","storageId","extractInvalidField","model","err","sdl","source","body","line","lineNumber","locations","sdlLines","split","sdlLine","gqlType","i","match","invalidField","undefined","Array","isArray","fieldRegex","RegExp","matched","message","data","modelId","code","createValidateChildFields","plugins","originalFields","validateFields","lockedFields","params","idList","fieldIdList","storageIdList","baseType","plugin","fieldType","Error","id","push","originalField","isLocked","some","lockedField","createFieldStorageId","label","validateChildFields","validate","createGraphQLSchema","context","modelPlugins","buildSchemaPlugins","models","byType","GraphQLSchemaPlugin","createExecutableSchema","extractErrorObject","error","reduce","output","key","validateModelFields","original","fieldTypePlugins","sorterPlugins","CmsGraphQLSchemaSorterPlugin","schema","createManageSDL","acc","pl","gql","cmsLockedFieldPlugins","existingField","item","reason","lockedFieldType","existingFieldType","lockedFieldsByType","filter","checkLockedField"],"sources":["validateModelFields.ts"],"sourcesContent":["import {\n    CmsContext,\n    CmsModel,\n    CmsModelField,\n    CmsModelFieldToGraphQLPlugin,\n    CmsModelFieldToGraphQLPluginValidateChildFieldsValidate,\n    CmsModelLockedFieldPlugin,\n    LockedField\n} from \"~/types\";\nimport WebinyError from \"@webiny/error\";\nimport { createManageSDL } from \"~/graphql/schema/createManageSDL\";\nimport gql from \"graphql-tag\";\nimport { createFieldStorageId } from \"./createFieldStorageId\";\nimport { GraphQLError } from \"graphql\";\nimport { getBaseFieldType } from \"~/utils/getBaseFieldType\";\nimport { CmsGraphQLSchemaSorterPlugin } from \"~/plugins\";\nimport { buildSchemaPlugins } from \"~/graphql/buildSchemaPlugins\";\nimport { createExecutableSchema } from \"~/graphql/createExecutableSchema\";\nimport { GraphQLSchemaPlugin } from \"@webiny/handler-graphql\";\n\nconst defaultTitleFieldId = \"id\";\n\nconst allowedTitleFieldTypes = [\"text\", \"number\"];\n\nconst getContentModelTitleFieldId = (fields: CmsModelField[], titleFieldId?: string): string => {\n    /**\n     * If there are no fields defined, we will return the default field\n     */\n    if (fields.length === 0) {\n        return defaultTitleFieldId;\n    }\n    /**\n     * if there is no title field defined either in input data or existing content model data\n     * we will take first text field that has no multiple values enabled\n     * or if initial titleFieldId is the default one also try to find first available text field\n     */\n    if (!titleFieldId || titleFieldId === defaultTitleFieldId) {\n        const titleField = fields.find(field => {\n            return getBaseFieldType(field) === \"text\" && !field.multipleValues;\n        });\n        return titleField?.fieldId || defaultTitleFieldId;\n    }\n    /**\n     * check existing titleFieldId for existence in the model\n     * for correct type\n     * and that it is not multiple values field\n     */\n    const target = fields.find(f => f.fieldId === titleFieldId);\n    if (!target) {\n        throw new WebinyError(\n            `Field selected for the title field does not exist in the model.`,\n            \"VALIDATION_ERROR\",\n            {\n                fieldId: titleFieldId,\n                fields\n            }\n        );\n    }\n\n    if (allowedTitleFieldTypes.includes(target.type) === false) {\n        throw new WebinyError(\n            `Only ${allowedTitleFieldTypes.join(\n                \", \"\n            )} and id fields can be used as an entry title.`,\n            \"ENTRY_TITLE_FIELD_TYPE\",\n            {\n                storageId: target.storageId,\n                fieldId: target.fieldId,\n                type: target.type\n            }\n        );\n    }\n\n    if (target.multipleValues) {\n        throw new WebinyError(\n            `Fields that accept multiple values cannot be used as the entry title.`,\n            \"ENTRY_TITLE_FIELD_TYPE\",\n            {\n                storageId: target.storageId,\n                fieldId: target.fieldId,\n                type: target.type\n            }\n        );\n    }\n\n    return target.fieldId;\n};\n\nconst extractInvalidField = (model: CmsModel, err: GraphQLError) => {\n    const sdl = err.source?.body || \"\";\n\n    /**\n     * Find the invalid type\n     */\n    const { line: lineNumber } = err.locations\n        ? err.locations[0]\n        : {\n              line: 0\n          };\n    const sdlLines = sdl.split(\"\\n\");\n    let sdlLine;\n    let gqlType;\n    for (let i = lineNumber; i > 0; i--) {\n        if (sdlLine && sdlLine.includes(\"type \")) {\n            gqlType = sdlLine.match(/type\\s+(.*?)\\s+{/);\n            break;\n        }\n\n        sdlLine = sdlLines[i];\n    }\n\n    let invalidField: string | undefined = undefined;\n    if (Array.isArray(gqlType)) {\n        const fieldRegex = new RegExp(`([^\\\\s+].*?):\\\\s+\\\\[?${gqlType[1]}!?\\\\]?`);\n\n        const matched = sdl.match(fieldRegex);\n        if (matched) {\n            invalidField = matched[1];\n        }\n    }\n\n    let message = `See more details in the browser console.`;\n    if (invalidField) {\n        message = `Please review the definition of \"${invalidField}\" field.`;\n    }\n\n    return {\n        data: {\n            modelId: model.modelId,\n            sdl,\n            invalidField\n        },\n        code: \"INVALID_MODEL_DEFINITION\",\n        message: [`Model \"${model.modelId}\" was not saved!`, message].join(\"\\n\")\n    };\n};\n\nconst createValidateChildFields = (\n    plugins: CmsModelFieldToGraphQLPlugin[]\n): CmsModelFieldToGraphQLPluginValidateChildFieldsValidate => {\n    return ({ fields, originalFields }) => {\n        if (fields.length === 0 && originalFields.length === 0) {\n            return;\n        }\n        validateFields({\n            fields,\n            originalFields,\n            plugins,\n            lockedFields: []\n        });\n    };\n};\n\ninterface ValidateFieldsParams {\n    plugins: CmsModelFieldToGraphQLPlugin[];\n    fields: CmsModelField[];\n    originalFields: CmsModelField[];\n    lockedFields: LockedField[];\n}\nconst validateFields = (params: ValidateFieldsParams) => {\n    const { plugins, fields, originalFields, lockedFields } = params;\n\n    const idList: string[] = [];\n    const fieldIdList: string[] = [];\n    const storageIdList: string[] = [];\n\n    for (const field of fields) {\n        const baseType = getBaseFieldType(field);\n        const plugin = plugins.find(plugin => plugin.fieldType === baseType);\n\n        if (!plugin) {\n            throw new Error(\n                `Cannot update content model because of the unknown \"${baseType}\" field.`\n            );\n        }\n        /**\n         * Check the field's id against existing ones.\n         * There cannot be two fields with the same id.\n         */\n        if (idList.includes(field.id)) {\n            throw new WebinyError(\n                `Cannot update content model because field \"${\n                    field.storageId || field.fieldId\n                }\" has id \"${field.id}\", which is already used.`\n            );\n        }\n        idList.push(field.id);\n\n        const originalField = originalFields.find(f => f.id === field.id);\n        /**\n         * Field MUST have an fieldId defined.\n         */\n        if (!field.fieldId) {\n            throw new WebinyError(`Field does not have an \"fieldId\" defined.`, \"MISSING_FIELD_ID\", {\n                field\n            });\n        }\n        /**\n         * If storageId does not match a certain pattern, add that pattern, but only if field is not locked (used) already.\n         * This is to avoid errors in the already installed systems.\n         *\n         * Why are we using the @?\n         *\n         * It is not part of special characters for the query syntax in the Lucene.\n         *\n         * Relevant links:\n         * https://lucene.apache.org/core/3_4_0/queryparsersyntax.html\n         * https://discuss.elastic.co/t/special-characters-in-field-names/10658/3\n         * https://discuss.elastic.co/t/illegal-characters-in-elasticsearch-field-names/17196/2\n         */\n        const isLocked = lockedFields.some(lockedField => {\n            return lockedField.fieldId === field.storageId || lockedField.fieldId === field.fieldId;\n        });\n        if (!field.storageId) {\n            /**\n             * In case field is locked, we must set the storageId to the fieldId value.\n             * This should not happen, because we upgrade all the fields in 5.33.0, but let's have a check just in case of some upgrade miss.\n             */\n            //\n            if (isLocked) {\n                field.storageId = field.fieldId;\n            }\n            /**\n             * When having original field, just set the storageId to value from the originalField\n             */\n            //\n            else if (originalField) {\n                field.storageId = originalField.storageId;\n            }\n            /**\n             * The last case is when no original field and not locked - so this is a completely new field.\n             */\n            //\n            else {\n                field.storageId = createFieldStorageId(field);\n            }\n        }\n        /**\n         * Check the field's fieldId against existing ones.\n         * There cannot be two fields with the same fieldId - outside world identifier.\n         */\n        if (fieldIdList.includes(field.fieldId)) {\n            throw new WebinyError(\n                `Cannot update content model because field \"${field.storageId}\" has fieldId \"${field.fieldId}\", which is already used.`\n            );\n        }\n        fieldIdList.push(field.fieldId);\n        /**\n         * Check the field's storageId against the existing ones.\n         * There cannot be two fields with the same storageId.\n         */\n        if (storageIdList.includes(field.storageId)) {\n            throw new WebinyError(\n                `Cannot update content model because field \"${field.label}\" has storageId \"${field.storageId}\", which is already used.`\n            );\n        }\n        storageIdList.push(field.storageId);\n        /**\n         * There might be some plugins which allow child fields.\n         * We use this method to validate them as well.\n         */\n        if (!plugin.validateChildFields) {\n            continue;\n        }\n        const validateChildFields = createValidateChildFields(plugins);\n        plugin.validateChildFields({\n            field,\n            originalField,\n            validate: validateChildFields\n        });\n    }\n};\ninterface CreateGraphQLSchemaParams {\n    context: CmsContext;\n    model: CmsModel;\n}\nconst createGraphQLSchema = async (params: CreateGraphQLSchemaParams): Promise<any> => {\n    const { context, model } = params;\n\n    const modelPlugins = await buildSchemaPlugins({\n        context,\n        models: [model]\n    });\n\n    const plugins = context.plugins.byType<GraphQLSchemaPlugin<CmsContext>>(\n        GraphQLSchemaPlugin.type\n    );\n    plugins.push(...modelPlugins);\n\n    return createExecutableSchema({\n        plugins\n    });\n};\n\nconst extractErrorObject = (error: any) => {\n    return [\"message\", \"code\", \"data\", \"stack\"].reduce<Record<string, any>>((output, key) => {\n        if (!error[key]) {\n            return output;\n        }\n        output[key] = error[key];\n        return output;\n    }, {});\n};\n\ninterface ValidateModelFieldsParams {\n    model: CmsModel;\n    original?: CmsModel;\n    context: CmsContext;\n}\nexport const validateModelFields = async (params: ValidateModelFieldsParams): Promise<void> => {\n    const { model, original, context } = params;\n    const { titleFieldId } = model;\n    const { plugins } = context;\n\n    /**\n     * There should be fields/locked fields in either model or data to be updated.\n     */\n    const { fields = [], lockedFields = [] } = model;\n\n    /**\n     * Let's inspect the fields of the received content model. We prevent saving of a content model if it\n     * contains a field for which a \"cms-model-field-to-graphql\" plugin does not exist on the backend.\n     */\n    const fieldTypePlugins = plugins.byType<CmsModelFieldToGraphQLPlugin>(\n        \"cms-model-field-to-graphql\"\n    );\n\n    validateFields({\n        fields,\n        originalFields: original?.fields || [],\n        lockedFields,\n        plugins: fieldTypePlugins\n    });\n\n    if (fields.length) {\n        const sorterPlugins = plugins.byType<CmsGraphQLSchemaSorterPlugin>(\n            CmsGraphQLSchemaSorterPlugin.type\n        );\n        /**\n         * Make sure that this model can be safely converted to a GraphQL SDL\n         */\n        const schema = createManageSDL({\n            model,\n            fieldTypePlugins: fieldTypePlugins.reduce(\n                (acc, pl) => ({ ...acc, [pl.fieldType]: pl }),\n                {}\n            ),\n            sorterPlugins\n        });\n\n        try {\n            gql(schema);\n        } catch (err) {\n            throw new WebinyError(extractInvalidField(model, err));\n        }\n        /**\n         *\n         */\n        try {\n            await createGraphQLSchema({\n                context,\n                model\n            });\n        } catch (err) {\n            throw new WebinyError({\n                message:\n                    \"Cannot generate GraphQL schema when testing with the given model. Please check the response for more details.\",\n                code: \"GRAPHQL_SCHEMA_ERROR\",\n                data: {\n                    modelId: model.modelId,\n                    error: extractErrorObject(err)\n                }\n            });\n        }\n    }\n\n    model.titleFieldId = getContentModelTitleFieldId(fields, titleFieldId);\n\n    const cmsLockedFieldPlugins =\n        plugins.byType<CmsModelLockedFieldPlugin>(\"cms-model-locked-field\");\n\n    /**\n     * We must not allow removal or changes in fields that are already in use in content entries.\n     * Locked fields still have fieldId (should be storageId) because of the old existing locked fields in the models.\n     */\n    for (const lockedField of lockedFields) {\n        const existingField = fields.find(item => item.storageId === lockedField.fieldId);\n\n        /**\n         * Starting with 5.33.0 fields can be deleted.\n         * Our UI gives a warning upon locked field deletion, but if user is managing fields through API directly - we cannot do anything.\n         */\n        if (!existingField) {\n            continue;\n            // throw new WebinyError(\n            //     `Cannot remove the field \"${lockedField.fieldId}\" because it's already in use in created content.`,\n            //     \"ENTRY_FIELD_USED\",\n            //     {\n            //         lockedField,\n            //         fields\n            //     }\n            // );\n        }\n\n        if (lockedField.multipleValues !== existingField.multipleValues) {\n            throw new WebinyError(\n                `Cannot change \"multipleValues\" for the \"${lockedField.fieldId}\" field because it's already in use in created content.`,\n                \"ENTRY_FIELD_USED\",\n                {\n                    reason: `\"multipleValues\" changed`,\n                    field: existingField\n                }\n            );\n        }\n\n        const fieldType = getBaseFieldType(existingField);\n        if (lockedField.type !== fieldType) {\n            throw new WebinyError(\n                `Cannot change field type for the \"${lockedField.fieldId}\" field because it's already in use in created content.`,\n                \"ENTRY_FIELD_USED\",\n                {\n                    reason: `\"type\" changed`,\n                    lockedFieldType: lockedField.type,\n                    existingFieldType: fieldType\n                }\n            );\n        }\n\n        /**\n         * Check `lockedField` invariant for specific field\n         */\n        const lockedFieldsByType = cmsLockedFieldPlugins.filter(\n            pl => pl.fieldType === getBaseFieldType(lockedField)\n        );\n        for (const plugin of lockedFieldsByType) {\n            if (typeof plugin.checkLockedField !== \"function\") {\n                continue;\n            }\n            plugin.checkLockedField({\n                lockedField,\n                field: existingField\n            });\n        }\n    }\n};\n"],"mappings":"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"}

package/crud/contentModel.crud.js

@@ -47,8 +47,6 @@ var _ownership = require("../utils/ownership");
 
 var _access = require("../utils/access");
 
-var _validateModelFields = require("./contentModel/validateModelFields");
-
 /**
  * Given a model, return an array of tags ensuring the `type` tag is set.
  */
@@ -113,7 +111,7 @@ const createModelsCrud = params => {
   const getModelsAsPlugins = () => {
     const tenant = getTenant().id;
     const locale = getLocale().code;
-    const models = context.plugins.byType(_CmsModelPlugin.CmsModelPlugin.type)
+    return context.plugins.byType(_CmsModelPlugin.CmsModelPlugin.type)
     /**
      * We need to filter out models that are not for this tenant or locale.
      * If it does not have tenant or locale define, it is for every locale and tenant
@@ -139,18 +137,6 @@ const createModelsCrud = params => {
         webinyVersion: context.WEBINY_VERSION
       });
     });
-    /**
-     * Only point where we can truly validate the user model is in the runtime.
-     */
-
-    for (const model of models) {
-      (0, _validateModelFields.validateModelFields)({
-        model,
-        plugins: context.plugins
-      });
-    }
-
-    return models;
   };
 
   const modelsGet = async modelId => {
@@ -260,7 +246,7 @@ const createModelsCrud = params => {
   (0, _beforeCreate.assignModelBeforeCreate)({
     onModelBeforeCreate,
     onModelBeforeCreateFrom,
-    plugins: context.plugins,
+    context,
     storageOperations
   });
   (0, _afterCreate.assignModelAfterCreate)({
@@ -269,8 +255,7 @@ const createModelsCrud = params => {
   });
   (0, _beforeUpdate.assignModelBeforeUpdate)({
     onModelBeforeUpdate,
-    plugins: context.plugins,
-    storageOperations
+    context
   });
   (0, _afterUpdate.assignModelAfterUpdate)({
     context,