@webiny/api-headless-cms 0.0.0-unstable.1e66d121db → 0.0.0-unstable.2696f9d9e8

package/crud/contentModel/beforeCreate.js

@@ -1,150 +1,87 @@
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
-
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.assignModelBeforeCreate = void 0;
-
 var _error = _interopRequireDefault(require("@webiny/error"));
-
 var _camelCase = _interopRequireDefault(require("lodash/camelCase"));
-
-var _pluralize = _interopRequireDefault(require("pluralize"));
-
 var _CmsModelPlugin = require("../../plugins/CmsModelPlugin");
-
 var _validateModel = require("./validateModel");
-
-var _validateLayout = require("./validateLayout");
-
-const disallowedModelIdList = ["contentModel", "contentModels", "contentModelGroup", "contentModelGroups"];
-/**
- * This list is to disallow creating models that might interfere with GraphQL schema creation.
- * Add more if required.
- */
-
-const disallowedModelIdEndingList = ["Response", "List", "Meta", "Input", "Sorter", "RefType"];
-/**
- * Checks for the uniqueness of provided modelId, against the provided list of models.
- * It also takes plural / singular forms of the provided modelId into account.
- */
-
-const checkModelIdUniqueness = (modelIdList, modelId) => {
-  if (modelIdList.includes(modelId) === true) {
-    throw new _error.default(`Content model with modelId "${modelId}" already exists.`, "MODEL_ID_EXISTS", {
-      modelId
-    });
-  }
-  /**
-   * Additionally, check if the plural form of the received modelId exists too. This prevents users
-   * from creating, for example, "event" and "events" models, which would break the GraphQL schema.
-   * 1. First check if user wants to create the "event" model, but the "events" model already exists.
-   */
-
-
-  const pluralizedModelIdCamelCase = (0, _pluralize.default)(modelId);
-
-  if (modelIdList.includes(pluralizedModelIdCamelCase) === true) {
-    throw new _error.default(`Content model with modelId "${modelId}" does not exist, but a model with modelId "${pluralizedModelIdCamelCase}" does.`, "MODEL_ID_PLURAL_ERROR", {
-      modelId,
-      plural: pluralizedModelIdCamelCase
-    });
-  }
-  /**
-   * 2. Then check if user wants to create the "events" model, but the "event" model already exists.
-   */
-
-
-  const singularizedModelIdCamelCase = _pluralize.default.singular(modelId);
-
-  if (modelIdList.includes(singularizedModelIdCamelCase) === true) {
-    throw new _error.default(`Content model with modelId "${modelId}" does not exist, but a model with modelId "${singularizedModelIdCamelCase}" does.`, "MODEL_ID_SINGULAR_ERROR", {
-      modelId,
-      singular: singularizedModelIdCamelCase
-    });
-  }
-};
-
-const checkModelIdAllowed = modelId => {
-  if (disallowedModelIdList.includes(modelId) === false) {
-    return;
-  }
-
-  throw new _error.default(`Provided model ID "${modelId}" is not allowed.`);
-};
-
-const checkModelIdEndingAllowed = modelId => {
-  for (const ending of disallowedModelIdEndingList) {
-    const re = new RegExp(`${ending}$`, "i");
-    const matched = modelId.match(re);
-
-    if (matched === null) {
-      continue;
-    }
-
-    throw new _error.default(`ModelId that ends with "${ending}" is not allowed.`, "MODEL_ID_NOT_ALLOWED", {
-      modelId
-    });
-  }
-};
-
+var _modelId = require("./validate/modelId");
+var _singularApiName = require("./validate/singularApiName");
+var _pluralApiName = require("./validate/pluralApiName");
+var _endingAllowed = require("./validate/endingAllowed");
 const getModelId = model => {
   const {
     modelId,
     name
   } = model;
-
-  if (!!modelId) {
-    return (0, _camelCase.default)(modelId.trim());
+  const value = modelId ? modelId.trim() : null;
+  if (value) {
+    const isModelIdValid = (0, _camelCase.default)(value).toLowerCase() === value.toLowerCase();
+    if (isModelIdValid) {
+      return value;
+    }
+    return (0, _camelCase.default)(value);
   } else if (name) {
     return (0, _camelCase.default)(name.trim());
   }
-
   throw new _error.default(`There is no "modelId" or "name" passed into the create model method.`, "MISSING_MODEL_DATA", {
     model
   });
 };
-
 const createOnModelBeforeCb = ({
   plugins,
   storageOperations
 }) => {
   return async params => {
     const {
-      model
+      model: newModel
     } = params;
-    const modelId = getModelId(model);
+    const modelId = getModelId(newModel);
+    newModel.modelId = modelId;
     const modelPlugin = plugins.byType(_CmsModelPlugin.CmsModelPlugin.type).find(item => item.contentModel.modelId === modelId);
-
     if (modelPlugin) {
-      throw new _error.default(`Cannot create "${model.modelId}" content model because one is already registered via a plugin.`, "CONTENT_MODEL_CREATE_ERROR", {
-        modelId: model.modelId
+      throw new _error.default(`Cannot create "${newModel.modelId}" content model because one is already registered via a plugin.`, "CONTENT_MODEL_CREATE_ERROR", {
+        modelId: newModel.modelId
       });
     }
-
     const models = await storageOperations.models.list({
       where: {
-        tenant: model.tenant,
-        locale: model.locale
+        tenant: newModel.tenant,
+        locale: newModel.locale
       }
     });
-    const modelIdList = models.map(m => m.modelId);
+    (0, _modelId.validateModelIdAllowed)({
+      model: newModel
+    });
+    (0, _endingAllowed.validateEndingAllowed)({
+      model: newModel
+    });
     /**
-     * We need to check for:
-     *  - is that exact modelId allowed
-     *  - is modelId unique
-     *  - is model ending allowed
+     * We need to check for the existence of:
+     * - modelId
+     * - singularApiName
+     * - pluralApiName
      */
-
-    checkModelIdAllowed(modelId);
-    checkModelIdEndingAllowed(modelId);
-    checkModelIdUniqueness(modelIdList, modelId);
-    model.modelId = modelId;
+    for (const model of models) {
+      (0, _modelId.validateExistingModelId)({
+        existingModel: model,
+        model: newModel
+      });
+      (0, _singularApiName.validateSingularApiName)({
+        existingModel: model,
+        model: newModel
+      });
+      (0, _pluralApiName.validatePluralApiName)({
+        existingModel: model,
+        model: newModel
+      });
+    }
   };
 };
-
 /**
  * We attach both on before create and createFrom events here.
  * Callables are identical.
@@ -154,41 +91,40 @@ const assignModelBeforeCreate = params => {
     onModelBeforeCreate,
     onModelBeforeCreateFrom,
     storageOperations,
-    plugins
+    context
   } = params;
   onModelBeforeCreate.subscribe(async ({
     model,
     input
   }) => {
     /**
-     * First the layout...
-     */
-    (0, _validateLayout.validateLayout)(model.layout, model.fields);
-    /**
-     * then we run the shared create/createFrom methods.
+     * Run the shared create/createFrom methods.
      */
-
     const cb = createOnModelBeforeCb({
       storageOperations,
-      plugins
+      plugins: context.plugins
     });
     await cb({
       model,
       input
     });
+    const models = await context.security.withoutAuthorization(async () => {
+      return context.cms.listModels();
+    });
     /**
      * and then we move onto model and fields...
      */
-
     await (0, _validateModel.validateModel)({
+      models,
       model,
-      plugins
+      context
     });
   });
   onModelBeforeCreateFrom.subscribe(createOnModelBeforeCb({
     storageOperations,
-    plugins
+    plugins: context.plugins
   }));
 };
+exports.assignModelBeforeCreate = assignModelBeforeCreate;
 
-exports.assignModelBeforeCreate = assignModelBeforeCreate;
+//# sourceMappingURL=beforeCreate.js.map

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":["_error","_interopRequireDefault","require","_camelCase","_CmsModelPlugin","_validateModel","_modelId","_singularApiName","_pluralApiName","_endingAllowed","getModelId","model","modelId","name","value","trim","isModelIdValid","camelCase","toLowerCase","WebinyError","createOnModelBeforeCb","plugins","storageOperations","params","newModel","modelPlugin","byType","CmsModelPlugin","type","find","item","contentModel","models","list","where","tenant","locale","validateModelIdAllowed","validateEndingAllowed","validateExistingModelId","existingModel","validateSingularApiName","validatePluralApiName","assignModelBeforeCreate","onModelBeforeCreate","onModelBeforeCreateFrom","context","subscribe","input","cb","security","withoutAuthorization","cms","listModels","validateModel","exports"],"sources":["beforeCreate.ts"],"sourcesContent":["import WebinyError from \"@webiny/error\";\nimport camelCase from \"lodash/camelCase\";\nimport {\n    CmsContext,\n    CmsModel,\n    HeadlessCmsStorageOperations,\n    OnModelBeforeCreateFromTopicParams,\n    OnModelBeforeCreateTopicParams\n} from \"~/types\";\nimport { Topic } from \"@webiny/pubsub/types\";\nimport { PluginsContainer } from \"@webiny/plugins\";\nimport { CmsModelPlugin } from \"~/plugins/CmsModelPlugin\";\nimport { validateModel } from \"./validateModel\";\nimport { validateExistingModelId, validateModelIdAllowed } from \"./validate/modelId\";\nimport { validateSingularApiName } from \"./validate/singularApiName\";\nimport { validatePluralApiName } from \"./validate/pluralApiName\";\nimport { validateEndingAllowed } from \"~/crud/contentModel/validate/endingAllowed\";\n\nconst getModelId = (model: CmsModel): string => {\n    const { modelId, name } = model;\n    const value = modelId ? modelId.trim() : null;\n    if (value) {\n        const isModelIdValid = camelCase(value).toLowerCase() === value.toLowerCase();\n        if (isModelIdValid) {\n            return value;\n        }\n        return camelCase(value);\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}\n\nconst createOnModelBeforeCb = ({\n    plugins,\n    storageOperations\n}: CreateOnModelBeforeCreateCbParams) => {\n    return async (params: OnModelBeforeCreateTopicParams | OnModelBeforeCreateFromTopicParams) => {\n        const { model: newModel } = params;\n\n        const modelId = getModelId(newModel);\n\n        newModel.modelId = modelId;\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 \"${newModel.modelId}\" content model because one is already registered via a plugin.`,\n                \"CONTENT_MODEL_CREATE_ERROR\",\n                {\n                    modelId: newModel.modelId\n                }\n            );\n        }\n\n        const models = await storageOperations.models.list({\n            where: {\n                tenant: newModel.tenant,\n                locale: newModel.locale\n            }\n        });\n\n        validateModelIdAllowed({\n            model: newModel\n        });\n        validateEndingAllowed({\n            model: newModel\n        });\n        /**\n         * We need to check for the existence of:\n         * - modelId\n         * - singularApiName\n         * - pluralApiName\n         */\n        for (const model of models) {\n            validateExistingModelId({\n                existingModel: model,\n                model: newModel\n            });\n            validateSingularApiName({\n                existingModel: model,\n                model: newModel\n            });\n            validatePluralApiName({\n                existingModel: model,\n                model: newModel\n            });\n        }\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         * 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        const models = await context.security.withoutAuthorization(async () => {\n            return context.cms.listModels();\n        });\n        /**\n         * and then we move onto model and fields...\n         */\n        await validateModel({\n            models,\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/beforeDelete.d.ts

@@ -1,5 +1,5 @@
 import { Topic } from "@webiny/pubsub/types";
-import { OnModelBeforeDeleteTopicParams, HeadlessCmsStorageOperations } from "../../types";
+import { HeadlessCmsStorageOperations, OnModelBeforeDeleteTopicParams } from "../../types";
 import { PluginsContainer } from "@webiny/plugins";
 interface AssignBeforeModelDeleteParams {
     onModelBeforeDelete: Topic<OnModelBeforeDeleteTopicParams>;

package/crud/contentModel/beforeDelete.js

@@ -1,18 +1,12 @@
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
-
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.assignModelBeforeDelete = void 0;
-
 var _error = _interopRequireDefault(require("@webiny/error"));
-
 var _CmsModelPlugin = require("../../plugins/CmsModelPlugin");
-
-var _valueKeyStorageConverter = require("../../utils/converters/valueKeyStorageConverter");
-
 const assignModelBeforeDelete = params => {
   const {
     onModelBeforeDelete,
@@ -24,20 +18,14 @@ const assignModelBeforeDelete = params => {
       model
     } = params;
     const modelPlugin = plugins.byType(_CmsModelPlugin.CmsModelPlugin.type).find(item => item.contentModel.modelId === model.modelId);
-
     if (modelPlugin) {
       throw new _error.default("Content models defined via plugins cannot be deleted.", "CONTENT_MODEL_DELETE_ERROR", {
         modelId: model.modelId
       });
     }
-
     let entries = [];
-
     try {
-      const result = await storageOperations.entries.list((0, _valueKeyStorageConverter.attachCmsModelFieldConverters)({
-        model,
-        plugins
-      }), {
+      const result = await storageOperations.entries.list(model, {
         where: {
           latest: true
         },
@@ -50,11 +38,11 @@ const assignModelBeforeDelete = params => {
         model
       });
     }
-
     if (entries.length > 0) {
       throw new _error.default(`Cannot delete content model "${model.modelId}" because there are existing entries.`, "CONTENT_MODEL_BEFORE_DELETE_HOOK_FAILED");
     }
   });
 };
+exports.assignModelBeforeDelete = assignModelBeforeDelete;
 
-exports.assignModelBeforeDelete = assignModelBeforeDelete;
+//# sourceMappingURL=beforeDelete.js.map

package/crud/contentModel/beforeDelete.js.map

@@ -1 +1 @@
-{"version":3,"names":["assignModelBeforeDelete","params","onModelBeforeDelete","storageOperations","plugins","subscribe","model","modelPlugin","byType","CmsModelPlugin","type","find","item","contentModel","modelId","WebinyError","entries","result","list","attachCmsModelFieldConverters","where","latest","limit","items","ex","error","length"],"sources":["beforeDelete.ts"],"sourcesContent":["import { Topic } from \"@webiny/pubsub/types\";\nimport { OnModelBeforeDeleteTopicParams, HeadlessCmsStorageOperations } from \"~/types\";\nimport { PluginsContainer } from \"@webiny/plugins\";\nimport WebinyError from \"@webiny/error\";\nimport { CmsModelPlugin } from \"~/plugins/CmsModelPlugin\";\nimport { attachCmsModelFieldConverters } from \"~/utils/converters/valueKeyStorageConverter\";\n\ninterface AssignBeforeModelDeleteParams {\n    onModelBeforeDelete: Topic<OnModelBeforeDeleteTopicParams>;\n    storageOperations: HeadlessCmsStorageOperations;\n    plugins: PluginsContainer;\n}\nexport const assignModelBeforeDelete = (params: AssignBeforeModelDeleteParams) => {\n    const { onModelBeforeDelete, storageOperations, plugins } = params;\n\n    onModelBeforeDelete.subscribe(async params => {\n        const { model } = 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 deleted.\",\n                \"CONTENT_MODEL_DELETE_ERROR\",\n                {\n                    modelId: model.modelId\n                }\n            );\n        }\n\n        let entries = [];\n        try {\n            const result = await storageOperations.entries.list(\n                attachCmsModelFieldConverters({\n                    model,\n                    plugins\n                }),\n                {\n                    where: {\n                        latest: true\n                    },\n                    limit: 1\n                }\n            );\n            entries = result.items;\n        } catch (ex) {\n            throw new WebinyError(\n                \"Could not retrieve a list of content entries from the model.\",\n                \"ENTRIES_ERROR\",\n                {\n                    error: ex,\n                    model\n                }\n            );\n        }\n        if (entries.length > 0) {\n            throw new WebinyError(\n                `Cannot delete content model \"${model.modelId}\" because there are existing entries.`,\n                \"CONTENT_MODEL_BEFORE_DELETE_HOOK_FAILED\"\n            );\n        }\n    });\n};\n"],"mappings":";;;;;;;;;AAGA;;AACA;;AACA;;AAOO,MAAMA,uBAAuB,GAAIC,MAAD,IAA2C;EAC9E,MAAM;IAAEC,mBAAF;IAAuBC,iBAAvB;IAA0CC;EAA1C,IAAsDH,MAA5D;EAEAC,mBAAmB,CAACG,SAApB,CAA8B,MAAMJ,MAAN,IAAgB;IAC1C,MAAM;MAAEK;IAAF,IAAYL,MAAlB;IAEA,MAAMM,WAAW,GAAGH,OAAO,CACtBI,MADe,CACQC,8BAAA,CAAeC,IADvB,EAEfC,IAFe,CAEVC,IAAI,IAAIA,IAAI,CAACC,YAAL,CAAkBC,OAAlB,KAA8BR,KAAK,CAACQ,OAFlC,CAApB;;IAIA,IAAIP,WAAJ,EAAiB;MACb,MAAM,IAAIQ,cAAJ,CACF,uDADE,EAEF,4BAFE,EAGF;QACID,OAAO,EAAER,KAAK,CAACQ;MADnB,CAHE,CAAN;IAOH;;IAED,IAAIE,OAAO,GAAG,EAAd;;IACA,IAAI;MACA,MAAMC,MAAM,GAAG,MAAMd,iBAAiB,CAACa,OAAlB,CAA0BE,IAA1B,CACjB,IAAAC,uDAAA,EAA8B;QAC1Bb,KAD0B;QAE1BF;MAF0B,CAA9B,CADiB,EAKjB;QACIgB,KAAK,EAAE;UACHC,MAAM,EAAE;QADL,CADX;QAIIC,KAAK,EAAE;MAJX,CALiB,CAArB;MAYAN,OAAO,GAAGC,MAAM,CAACM,KAAjB;IACH,CAdD,CAcE,OAAOC,EAAP,EAAW;MACT,MAAM,IAAIT,cAAJ,CACF,8DADE,EAEF,eAFE,EAGF;QACIU,KAAK,EAAED,EADX;QAEIlB;MAFJ,CAHE,CAAN;IAQH;;IACD,IAAIU,OAAO,CAACU,MAAR,GAAiB,CAArB,EAAwB;MACpB,MAAM,IAAIX,cAAJ,CACD,gCAA+BT,KAAK,CAACQ,OAAQ,uCAD5C,EAEF,yCAFE,CAAN;IAIH;EACJ,CAhDD;AAiDH,CApDM"}
+{"version":3,"names":["_error","_interopRequireDefault","require","_CmsModelPlugin","assignModelBeforeDelete","params","onModelBeforeDelete","storageOperations","plugins","subscribe","model","modelPlugin","byType","CmsModelPlugin","type","find","item","contentModel","modelId","WebinyError","entries","result","list","where","latest","limit","items","ex","error","length","exports"],"sources":["beforeDelete.ts"],"sourcesContent":["import { Topic } from \"@webiny/pubsub/types\";\nimport { HeadlessCmsStorageOperations, OnModelBeforeDeleteTopicParams } from \"~/types\";\nimport { PluginsContainer } from \"@webiny/plugins\";\nimport WebinyError from \"@webiny/error\";\nimport { CmsModelPlugin } from \"~/plugins/CmsModelPlugin\";\n\ninterface AssignBeforeModelDeleteParams {\n    onModelBeforeDelete: Topic<OnModelBeforeDeleteTopicParams>;\n    storageOperations: HeadlessCmsStorageOperations;\n    plugins: PluginsContainer;\n}\nexport const assignModelBeforeDelete = (params: AssignBeforeModelDeleteParams) => {\n    const { onModelBeforeDelete, storageOperations, plugins } = params;\n\n    onModelBeforeDelete.subscribe(async params => {\n        const { model } = 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 deleted.\",\n                \"CONTENT_MODEL_DELETE_ERROR\",\n                {\n                    modelId: model.modelId\n                }\n            );\n        }\n\n        let entries = [];\n        try {\n            const result = await storageOperations.entries.list(model, {\n                where: {\n                    latest: true\n                },\n                limit: 1\n            });\n            entries = result.items;\n        } catch (ex) {\n            throw new WebinyError(\n                \"Could not retrieve a list of content entries from the model.\",\n                \"ENTRIES_ERROR\",\n                {\n                    error: ex,\n                    model\n                }\n            );\n        }\n        if (entries.length > 0) {\n            throw new WebinyError(\n                `Cannot delete content model \"${model.modelId}\" because there are existing entries.`,\n                \"CONTENT_MODEL_BEFORE_DELETE_HOOK_FAILED\"\n            );\n        }\n    });\n};\n"],"mappings":";;;;;;;AAGA,IAAAA,MAAA,GAAAC,sBAAA,CAAAC,OAAA;AACA,IAAAC,eAAA,GAAAD,OAAA;AAOO,MAAME,uBAAuB,GAAIC,MAAqC,IAAK;EAC9E,MAAM;IAAEC,mBAAmB;IAAEC,iBAAiB;IAAEC;EAAQ,CAAC,GAAGH,MAAM;EAElEC,mBAAmB,CAACG,SAAS,CAAC,MAAMJ,MAAM,IAAI;IAC1C,MAAM;MAAEK;IAAM,CAAC,GAAGL,MAAM;IAExB,MAAMM,WAAW,GAAGH,OAAO,CACtBI,MAAM,CAAiBC,8BAAc,CAACC,IAAI,CAAC,CAC3CC,IAAI,CAACC,IAAI,IAAIA,IAAI,CAACC,YAAY,CAACC,OAAO,KAAKR,KAAK,CAACQ,OAAO,CAAC;IAE9D,IAAIP,WAAW,EAAE;MACb,MAAM,IAAIQ,cAAW,CACjB,uDAAuD,EACvD,4BAA4B,EAC5B;QACID,OAAO,EAAER,KAAK,CAACQ;MACnB,CACJ,CAAC;IACL;IAEA,IAAIE,OAAO,GAAG,EAAE;IAChB,IAAI;MACA,MAAMC,MAAM,GAAG,MAAMd,iBAAiB,CAACa,OAAO,CAACE,IAAI,CAACZ,KAAK,EAAE;QACvDa,KAAK,EAAE;UACHC,MAAM,EAAE;QACZ,CAAC;QACDC,KAAK,EAAE;MACX,CAAC,CAAC;MACFL,OAAO,GAAGC,MAAM,CAACK,KAAK;IAC1B,CAAC,CAAC,OAAOC,EAAE,EAAE;MACT,MAAM,IAAIR,cAAW,CACjB,8DAA8D,EAC9D,eAAe,EACf;QACIS,KAAK,EAAED,EAAE;QACTjB;MACJ,CACJ,CAAC;IACL;IACA,IAAIU,OAAO,CAACS,MAAM,GAAG,CAAC,EAAE;MACpB,MAAM,IAAIV,cAAW,CAChB,gCAA+BT,KAAK,CAACQ,OAAQ,uCAAsC,EACpF,yCACJ,CAAC;IACL;EACJ,CAAC,CAAC;AACN,CAAC;AAACY,OAAA,CAAA1B,uBAAA,GAAAA,uBAAA"}

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 { CmsContext, OnModelBeforeUpdateTopicParams } 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

@@ -4,34 +4,54 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.assignModelBeforeUpdate = void 0;
-
 var _validateModel = require("./validateModel");
-
-var _validateLayout = require("./validateLayout");
-
+var _singularApiName = require("./validate/singularApiName");
+var _pluralApiName = require("./validate/pluralApiName");
+var _endingAllowed = require("./validate/endingAllowed");
 const assignModelBeforeUpdate = params => {
   const {
     onModelBeforeUpdate,
-    plugins
+    context
   } = params;
   onModelBeforeUpdate.subscribe(async ({
-    model,
+    model: newModel,
     original
   }) => {
+    const models = await context.security.withoutAuthorization(async () => {
+      return (await context.cms.listModels()).filter(model => {
+        return model.modelId !== newModel.modelId;
+      });
+    });
+    (0, _endingAllowed.validateEndingAllowed)({
+      model: newModel
+    });
     /**
-     * First we go through the layout...
+     * We need to check for the existence of:
+     * - modelId
+     * - singularApiName
+     * - pluralApiName
      */
-    (0, _validateLayout.validateLayout)(model.layout, model.fields);
+    for (const model of models) {
+      (0, _singularApiName.validateSingularApiName)({
+        existingModel: model,
+        model: newModel
+      });
+      (0, _pluralApiName.validatePluralApiName)({
+        existingModel: model,
+        model: newModel
+      });
+    }
     /**
      * then the model and fields...
      */
-
     await (0, _validateModel.validateModel)({
-      model,
+      models,
+      model: newModel,
       original,
-      plugins
+      context
     });
   });
 };
+exports.assignModelBeforeUpdate = assignModelBeforeUpdate;
 
-exports.assignModelBeforeUpdate = assignModelBeforeUpdate;
+//# sourceMappingURL=beforeUpdate.js.map

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":["_validateModel","require","_singularApiName","_pluralApiName","_endingAllowed","assignModelBeforeUpdate","params","onModelBeforeUpdate","context","subscribe","model","newModel","original","models","security","withoutAuthorization","cms","listModels","filter","modelId","validateEndingAllowed","validateSingularApiName","existingModel","validatePluralApiName","validateModel","exports"],"sources":["beforeUpdate.ts"],"sourcesContent":["import { Topic } from \"@webiny/pubsub/types\";\nimport { CmsContext, OnModelBeforeUpdateTopicParams } from \"~/types\";\nimport { validateModel } from \"./validateModel\";\nimport { validateSingularApiName } from \"./validate/singularApiName\";\nimport { validatePluralApiName } from \"./validate/pluralApiName\";\nimport { validateEndingAllowed } from \"~/crud/contentModel/validate/endingAllowed\";\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: newModel, original }) => {\n        const models = await context.security.withoutAuthorization(async () => {\n            return (await context.cms.listModels()).filter(model => {\n                return model.modelId !== newModel.modelId;\n            });\n        });\n\n        validateEndingAllowed({\n            model: newModel\n        });\n        /**\n         * We need to check for the existence of:\n         * - modelId\n         * - singularApiName\n         * - pluralApiName\n         */\n        for (const model of models) {\n            validateSingularApiName({\n                existingModel: model,\n                model: newModel\n            });\n            validatePluralApiName({\n                existingModel: model,\n                model: newModel\n            });\n        }\n        /**\n         * then the model and fields...\n         */\n        await validateModel({\n            models,\n            model: newModel,\n            original,\n            context\n        });\n    });\n};\n"],"mappings":";;;;;;AAEA,IAAAA,cAAA,GAAAC,OAAA;AACA,IAAAC,gBAAA,GAAAD,OAAA;AACA,IAAAE,cAAA,GAAAF,OAAA;AACA,IAAAG,cAAA,GAAAH,OAAA;AAOO,MAAMI,uBAAuB,GAAIC,MAAqC,IAAK;EAC9E,MAAM;IAAEC,mBAAmB;IAAEC;EAAQ,CAAC,GAAGF,MAAM;EAE/CC,mBAAmB,CAACE,SAAS,CAAC,OAAO;IAAEC,KAAK,EAAEC,QAAQ;IAAEC;EAAS,CAAC,KAAK;IACnE,MAAMC,MAAM,GAAG,MAAML,OAAO,CAACM,QAAQ,CAACC,oBAAoB,CAAC,YAAY;MACnE,OAAO,CAAC,MAAMP,OAAO,CAACQ,GAAG,CAACC,UAAU,CAAC,CAAC,EAAEC,MAAM,CAACR,KAAK,IAAI;QACpD,OAAOA,KAAK,CAACS,OAAO,KAAKR,QAAQ,CAACQ,OAAO;MAC7C,CAAC,CAAC;IACN,CAAC,CAAC;IAEF,IAAAC,oCAAqB,EAAC;MAClBV,KAAK,EAAEC;IACX,CAAC,CAAC;IACF;AACR;AACA;AACA;AACA;AACA;IACQ,KAAK,MAAMD,KAAK,IAAIG,MAAM,EAAE;MACxB,IAAAQ,wCAAuB,EAAC;QACpBC,aAAa,EAAEZ,KAAK;QACpBA,KAAK,EAAEC;MACX,CAAC,CAAC;MACF,IAAAY,oCAAqB,EAAC;QAClBD,aAAa,EAAEZ,KAAK;QACpBA,KAAK,EAAEC;MACX,CAAC,CAAC;IACN;IACA;AACR;AACA;IACQ,MAAM,IAAAa,4BAAa,EAAC;MAChBX,MAAM;MACNH,KAAK,EAAEC,QAAQ;MACfC,QAAQ;MACRJ;IACJ,CAAC,CAAC;EACN,CAAC,CAAC;AACN,CAAC;AAACiB,OAAA,CAAApB,uBAAA,GAAAA,uBAAA"}

package/crud/contentModel/compatibility/modelApiName.d.ts

@@ -0,0 +1,3 @@
+import { CmsModel } from "../../../types";
+export declare const ensureSingularApiName: (model: CmsModel) => string;
+export declare const ensurePluralApiName: (model: CmsModel) => string;

package/crud/contentModel/compatibility/modelApiName.js

@@ -0,0 +1,26 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.ensureSingularApiName = exports.ensurePluralApiName = void 0;
+var _camelCase = _interopRequireDefault(require("lodash/camelCase"));
+var _upperFirst = _interopRequireDefault(require("lodash/upperFirst"));
+var _pluralize = _interopRequireDefault(require("pluralize"));
+const ensureSingularApiName = model => {
+  if (!model.singularApiName) {
+    return (0, _upperFirst.default)((0, _camelCase.default)(model.modelId));
+  }
+  return model.singularApiName;
+};
+exports.ensureSingularApiName = ensureSingularApiName;
+const ensurePluralApiName = model => {
+  if (!model.pluralApiName) {
+    return (0, _pluralize.default)(ensureSingularApiName(model));
+  }
+  return model.pluralApiName;
+};
+exports.ensurePluralApiName = ensurePluralApiName;
+
+//# sourceMappingURL=modelApiName.js.map

package/crud/contentModel/compatibility/modelApiName.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["_camelCase","_interopRequireDefault","require","_upperFirst","_pluralize","ensureSingularApiName","model","singularApiName","upperFirst","camelCase","modelId","exports","ensurePluralApiName","pluralApiName","pluralize"],"sources":["modelApiName.ts"],"sourcesContent":["import camelCase from \"lodash/camelCase\";\nimport upperFirst from \"lodash/upperFirst\";\nimport pluralize from \"pluralize\";\nimport { CmsModel } from \"~/types\";\n\nexport const ensureSingularApiName = (model: CmsModel): string => {\n    if (!model.singularApiName) {\n        return upperFirst(camelCase(model.modelId));\n    }\n    return model.singularApiName;\n};\n\nexport const ensurePluralApiName = (model: CmsModel): string => {\n    if (!model.pluralApiName) {\n        return pluralize(ensureSingularApiName(model));\n    }\n    return model.pluralApiName;\n};\n"],"mappings":";;;;;;;AAAA,IAAAA,UAAA,GAAAC,sBAAA,CAAAC,OAAA;AACA,IAAAC,WAAA,GAAAF,sBAAA,CAAAC,OAAA;AACA,IAAAE,UAAA,GAAAH,sBAAA,CAAAC,OAAA;AAGO,MAAMG,qBAAqB,GAAIC,KAAe,IAAa;EAC9D,IAAI,CAACA,KAAK,CAACC,eAAe,EAAE;IACxB,OAAO,IAAAC,mBAAU,EAAC,IAAAC,kBAAS,EAACH,KAAK,CAACI,OAAO,CAAC,CAAC;EAC/C;EACA,OAAOJ,KAAK,CAACC,eAAe;AAChC,CAAC;AAACI,OAAA,CAAAN,qBAAA,GAAAA,qBAAA;AAEK,MAAMO,mBAAmB,GAAIN,KAAe,IAAa;EAC5D,IAAI,CAACA,KAAK,CAACO,aAAa,EAAE;IACtB,OAAO,IAAAC,kBAAS,EAACT,qBAAqB,CAACC,KAAK,CAAC,CAAC;EAClD;EACA,OAAOA,KAAK,CAACO,aAAa;AAC9B,CAAC;AAACF,OAAA,CAAAC,mBAAA,GAAAA,mBAAA"}

package/crud/contentModel/contentModelManagerFactory.js

@@ -5,25 +5,20 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.contentModelManagerFactory = void 0;
 const defaultName = "content-model-manager-default";
-
 const contentModelManagerFactory = async (context, model) => {
   const pluginsByType = context.plugins.byType("cms-content-model-manager").reverse();
-
   for (const plugin of pluginsByType) {
     const target = Array.isArray(plugin.modelId) ? plugin.modelId : [plugin.modelId];
-
     if (target.includes(model.modelId) === true && plugin.name !== defaultName) {
       return await plugin.create(context, model);
     }
   }
-
   const plugin = pluginsByType.find(plugin => plugin.name === defaultName);
-
   if (!plugin) {
     throw new Error("There is no default plugin to create CmsModelManager");
   }
-
   return await plugin.create(context, model);
 };
+exports.contentModelManagerFactory = contentModelManagerFactory;
 
-exports.contentModelManagerFactory = contentModelManagerFactory;
+//# sourceMappingURL=contentModelManagerFactory.js.map

package/crud/contentModel/contentModelManagerFactory.js.map

@@ -1 +1 @@
-{"version":3,"names":["defaultName","contentModelManagerFactory","context","model","pluginsByType","plugins","byType","reverse","plugin","target","Array","isArray","modelId","includes","name","create","find","Error"],"sources":["contentModelManagerFactory.ts"],"sourcesContent":["import { CmsModel, CmsContext, ModelManagerPlugin, CmsModelManager } from \"~/types\";\n\nconst defaultName = \"content-model-manager-default\";\n\nexport const contentModelManagerFactory = async (\n    context: CmsContext,\n    model: CmsModel\n): Promise<CmsModelManager> => {\n    const pluginsByType = context.plugins\n        .byType<ModelManagerPlugin>(\"cms-content-model-manager\")\n        .reverse();\n    for (const plugin of pluginsByType) {\n        const target = Array.isArray(plugin.modelId) ? plugin.modelId : [plugin.modelId];\n        if (target.includes(model.modelId) === true && plugin.name !== defaultName) {\n            return await plugin.create(context, model);\n        }\n    }\n    const plugin = pluginsByType.find(plugin => plugin.name === defaultName);\n    if (!plugin) {\n        throw new Error(\"There is no default plugin to create CmsModelManager\");\n    }\n    return await plugin.create(context, model);\n};\n"],"mappings":";;;;;;AAEA,MAAMA,WAAW,GAAG,+BAApB;;AAEO,MAAMC,0BAA0B,GAAG,OACtCC,OADsC,EAEtCC,KAFsC,KAGX;EAC3B,MAAMC,aAAa,GAAGF,OAAO,CAACG,OAAR,CACjBC,MADiB,CACU,2BADV,EAEjBC,OAFiB,EAAtB;;EAGA,KAAK,MAAMC,MAAX,IAAqBJ,aAArB,EAAoC;IAChC,MAAMK,MAAM,GAAGC,KAAK,CAACC,OAAN,CAAcH,MAAM,CAACI,OAArB,IAAgCJ,MAAM,CAACI,OAAvC,GAAiD,CAACJ,MAAM,CAACI,OAAR,CAAhE;;IACA,IAAIH,MAAM,CAACI,QAAP,CAAgBV,KAAK,CAACS,OAAtB,MAAmC,IAAnC,IAA2CJ,MAAM,CAACM,IAAP,KAAgBd,WAA/D,EAA4E;MACxE,OAAO,MAAMQ,MAAM,CAACO,MAAP,CAAcb,OAAd,EAAuBC,KAAvB,CAAb;IACH;EACJ;;EACD,MAAMK,MAAM,GAAGJ,aAAa,CAACY,IAAd,CAAmBR,MAAM,IAAIA,MAAM,CAACM,IAAP,KAAgBd,WAA7C,CAAf;;EACA,IAAI,CAACQ,MAAL,EAAa;IACT,MAAM,IAAIS,KAAJ,CAAU,sDAAV,CAAN;EACH;;EACD,OAAO,MAAMT,MAAM,CAACO,MAAP,CAAcb,OAAd,EAAuBC,KAAvB,CAAb;AACH,CAlBM"}
+{"version":3,"names":["defaultName","contentModelManagerFactory","context","model","pluginsByType","plugins","byType","reverse","plugin","target","Array","isArray","modelId","includes","name","create","find","Error","exports"],"sources":["contentModelManagerFactory.ts"],"sourcesContent":["import { CmsModel, CmsContext, ModelManagerPlugin, CmsModelManager } from \"~/types\";\n\nconst defaultName = \"content-model-manager-default\";\n\nexport const contentModelManagerFactory = async (\n    context: CmsContext,\n    model: CmsModel\n): Promise<CmsModelManager> => {\n    const pluginsByType = context.plugins\n        .byType<ModelManagerPlugin>(\"cms-content-model-manager\")\n        .reverse();\n    for (const plugin of pluginsByType) {\n        const target = Array.isArray(plugin.modelId) ? plugin.modelId : [plugin.modelId];\n        if (target.includes(model.modelId) === true && plugin.name !== defaultName) {\n            return await plugin.create(context, model);\n        }\n    }\n    const plugin = pluginsByType.find(plugin => plugin.name === defaultName);\n    if (!plugin) {\n        throw new Error(\"There is no default plugin to create CmsModelManager\");\n    }\n    return await plugin.create(context, model);\n};\n"],"mappings":";;;;;;AAEA,MAAMA,WAAW,GAAG,+BAA+B;AAE5C,MAAMC,0BAA0B,GAAG,MAAAA,CACtCC,OAAmB,EACnBC,KAAe,KACY;EAC3B,MAAMC,aAAa,GAAGF,OAAO,CAACG,OAAO,CAChCC,MAAM,CAAqB,2BAA2B,CAAC,CACvDC,OAAO,CAAC,CAAC;EACd,KAAK,MAAMC,MAAM,IAAIJ,aAAa,EAAE;IAChC,MAAMK,MAAM,GAAGC,KAAK,CAACC,OAAO,CAACH,MAAM,CAACI,OAAO,CAAC,GAAGJ,MAAM,CAACI,OAAO,GAAG,CAACJ,MAAM,CAACI,OAAO,CAAC;IAChF,IAAIH,MAAM,CAACI,QAAQ,CAACV,KAAK,CAACS,OAAO,CAAC,KAAK,IAAI,IAAIJ,MAAM,CAACM,IAAI,KAAKd,WAAW,EAAE;MACxE,OAAO,MAAMQ,MAAM,CAACO,MAAM,CAACb,OAAO,EAAEC,KAAK,CAAC;IAC9C;EACJ;EACA,MAAMK,MAAM,GAAGJ,aAAa,CAACY,IAAI,CAACR,MAAM,IAAIA,MAAM,CAACM,IAAI,KAAKd,WAAW,CAAC;EACxE,IAAI,CAACQ,MAAM,EAAE;IACT,MAAM,IAAIS,KAAK,CAAC,sDAAsD,CAAC;EAC3E;EACA,OAAO,MAAMT,MAAM,CAACO,MAAM,CAACb,OAAO,EAAEC,KAAK,CAAC;AAC9C,CAAC;AAACe,OAAA,CAAAjB,0BAAA,GAAAA,0BAAA"}

package/crud/contentModel/createFieldStorageId.js

@@ -4,13 +4,16 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.createFieldStorageId = void 0;
-
+var _getBaseFieldType = require("../../utils/getBaseFieldType");
 const createFieldStorageId = params => {
   const {
     type,
     id
   } = params;
-  return `${type}@${id}`;
+  return `${(0, _getBaseFieldType.getBaseFieldType)({
+    type
+  })}@${id}`;
 };
+exports.createFieldStorageId = createFieldStorageId;
 
-exports.createFieldStorageId = createFieldStorageId;
+//# sourceMappingURL=createFieldStorageId.js.map

package/crud/contentModel/createFieldStorageId.js.map

@@ -1 +1 @@
-{"version":3,"names":["createFieldStorageId","params","type","id"],"sources":["createFieldStorageId.ts"],"sourcesContent":["import { CmsModelField } from \"~/types\";\n\nexport const createFieldStorageId = (params: Pick<CmsModelField, \"id\" | \"type\">): string => {\n    const { type, id } = params;\n    return `${type}@${id}`;\n};\n"],"mappings":";;;;;;;AAEO,MAAMA,oBAAoB,GAAIC,MAAD,IAAwD;EACxF,MAAM;IAAEC,IAAF;IAAQC;EAAR,IAAeF,MAArB;EACA,OAAQ,GAAEC,IAAK,IAAGC,EAAG,EAArB;AACH,CAHM"}
+{"version":3,"names":["_getBaseFieldType","require","createFieldStorageId","params","type","id","getBaseFieldType","exports"],"sources":["createFieldStorageId.ts"],"sourcesContent":["import { CmsModelField } from \"~/types\";\nimport { getBaseFieldType } from \"~/utils/getBaseFieldType\";\n\nexport const createFieldStorageId = (params: Pick<CmsModelField, \"id\" | \"type\">): string => {\n    const { type, id } = params;\n    return `${getBaseFieldType({ type })}@${id}`;\n};\n"],"mappings":";;;;;;AACA,IAAAA,iBAAA,GAAAC,OAAA;AAEO,MAAMC,oBAAoB,GAAIC,MAA0C,IAAa;EACxF,MAAM;IAAEC,IAAI;IAAEC;EAAG,CAAC,GAAGF,MAAM;EAC3B,OAAQ,GAAE,IAAAG,kCAAgB,EAAC;IAAEF;EAAK,CAAC,CAAE,IAAGC,EAAG,EAAC;AAChD,CAAC;AAACE,OAAA,CAAAL,oBAAA,GAAAA,oBAAA"}

package/crud/contentModel/defaultFields.d.ts

@@ -0,0 +1,5 @@
+import { CmsModelCreateInput } from "../../types";
+/**
+ * We only assign default fields if there are no fields in the model already.
+ */
+export declare const assignModelDefaultFields: (model: CmsModelCreateInput) => void;