@webiny/api-headless-cms 0.0.0-unstable.e53eceafb5 → 0.0.0-unstable.e6f0dc8ca7

package/parameters/path.js

@@ -1,15 +1,6 @@
-"use strict";
-
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.createPathParameterPlugin = void 0;
-var _error = _interopRequireDefault(require("@webiny/error"));
-var _CmsParametersPlugin = require("../plugins/CmsParametersPlugin");
-const allowedEndpoints = ["manage", "read", "preview"];
-const createPathParameterPlugin = () => {
-  return new _CmsParametersPlugin.CmsParametersPlugin(async context => {
+import { CmsParametersPlugin } from "../plugins/CmsParametersPlugin.js";
+export const createPathParameterPlugin = () => {
+  return new CmsParametersPlugin(async context => {
     /**
      * If any of the properties is not defined, just ignore this plugin
      */
@@ -17,25 +8,15 @@ const createPathParameterPlugin = () => {
       return null;
     }
     const {
-      type,
-      locale
+      type
     } = context.request.params;
-    if (!type && !locale) {
-      return null;
-    }
     if (!type) {
-      throw new _error.default(`Missing request parameter "type".`);
-    } else if (!locale) {
-      throw new _error.default(`Missing request parameter "locale".`);
-    } else if (allowedEndpoints.includes(type) === false) {
-      throw new _error.default(`Endpoint "${type}" not allowed!`);
+      return null;
     }
     return {
-      type: type,
-      locale
+      type: type
     };
   });
 };
-exports.createPathParameterPlugin = createPathParameterPlugin;
 
 //# sourceMappingURL=path.js.map

package/parameters/path.js.map

@@ -1 +1 @@
-{"version":3,"names":["_error","_interopRequireDefault","require","_CmsParametersPlugin","allowedEndpoints","createPathParameterPlugin","CmsParametersPlugin","context","request","params","type","locale","WebinyError","includes","exports"],"sources":["path.ts"],"sourcesContent":["import WebinyError from \"@webiny/error\";\nimport { CmsParametersPlugin } from \"~/plugins/CmsParametersPlugin\";\nimport type { ApiEndpoint } from \"~/types\";\n\nconst allowedEndpoints: ApiEndpoint[] = [\"manage\", \"read\", \"preview\"];\n\nexport const createPathParameterPlugin = () => {\n    return new CmsParametersPlugin(async context => {\n        /**\n         * If any of the properties is not defined, just ignore this plugin\n         */\n        if (!context.request?.params) {\n            return null;\n        }\n\n        const { type, locale } = context.request.params as Record<string, string | null>;\n        if (!type && !locale) {\n            return null;\n        }\n\n        if (!type) {\n            throw new WebinyError(`Missing request parameter \"type\".`);\n        } else if (!locale) {\n            throw new WebinyError(`Missing request parameter \"locale\".`);\n        } else if (allowedEndpoints.includes(type as ApiEndpoint) === false) {\n            throw new WebinyError(`Endpoint \"${type}\" not allowed!`);\n        }\n\n        return {\n            type: type as ApiEndpoint,\n            locale\n        };\n    });\n};\n"],"mappings":";;;;;;;AAAA,IAAAA,MAAA,GAAAC,sBAAA,CAAAC,OAAA;AACA,IAAAC,oBAAA,GAAAD,OAAA;AAGA,MAAME,gBAA+B,GAAG,CAAC,QAAQ,EAAE,MAAM,EAAE,SAAS,CAAC;AAE9D,MAAMC,yBAAyB,GAAGA,CAAA,KAAM;EAC3C,OAAO,IAAIC,wCAAmB,CAAC,MAAMC,OAAO,IAAI;IAC5C;AACR;AACA;IACQ,IAAI,CAACA,OAAO,CAACC,OAAO,EAAEC,MAAM,EAAE;MAC1B,OAAO,IAAI;IACf;IAEA,MAAM;MAAEC,IAAI;MAAEC;IAAO,CAAC,GAAGJ,OAAO,CAACC,OAAO,CAACC,MAAuC;IAChF,IAAI,CAACC,IAAI,IAAI,CAACC,MAAM,EAAE;MAClB,OAAO,IAAI;IACf;IAEA,IAAI,CAACD,IAAI,EAAE;MACP,MAAM,IAAIE,cAAW,CAAC,mCAAmC,CAAC;IAC9D,CAAC,MAAM,IAAI,CAACD,MAAM,EAAE;MAChB,MAAM,IAAIC,cAAW,CAAC,qCAAqC,CAAC;IAChE,CAAC,MAAM,IAAIR,gBAAgB,CAACS,QAAQ,CAACH,IAAmB,CAAC,KAAK,KAAK,EAAE;MACjE,MAAM,IAAIE,cAAW,CAAC,aAAaF,IAAI,gBAAgB,CAAC;IAC5D;IAEA,OAAO;MACHA,IAAI,EAAEA,IAAmB;MACzBC;IACJ,CAAC;EACL,CAAC,CAAC;AACN,CAAC;AAACG,OAAA,CAAAT,yBAAA,GAAAA,yBAAA","ignoreList":[]}
+{"version":3,"names":["CmsParametersPlugin","createPathParameterPlugin","context","request","params","type"],"sources":["path.ts"],"sourcesContent":["import { CmsParametersPlugin } from \"~/plugins/CmsParametersPlugin.js\";\nimport type { ApiEndpoint } from \"~/types/index.js\";\n\nexport const createPathParameterPlugin = () => {\n    return new CmsParametersPlugin(async context => {\n        /**\n         * If any of the properties is not defined, just ignore this plugin\n         */\n        if (!context.request?.params) {\n            return null;\n        }\n\n        const { type } = context.request.params as Record<string, string | null>;\n\n        if (!type) {\n            return null;\n        }\n\n        return {\n            type: type as ApiEndpoint\n        };\n    });\n};\n"],"mappings":"AAAA,SAASA,mBAAmB;AAG5B,OAAO,MAAMC,yBAAyB,GAAGA,CAAA,KAAM;EAC3C,OAAO,IAAID,mBAAmB,CAAC,MAAME,OAAO,IAAI;IAC5C;AACR;AACA;IACQ,IAAI,CAACA,OAAO,CAACC,OAAO,EAAEC,MAAM,EAAE;MAC1B,OAAO,IAAI;IACf;IAEA,MAAM;MAAEC;IAAK,CAAC,GAAGH,OAAO,CAACC,OAAO,CAACC,MAAuC;IAExE,IAAI,CAACC,IAAI,EAAE;MACP,OAAO,IAAI;IACf;IAEA,OAAO;MACHA,IAAI,EAAEA;IACV,CAAC;EACL,CAAC,CAAC;AACN,CAAC","ignoreList":[]}

package/plugins/CmsGraphQLSchemaPlugin/CmsGraphQLSchemaPlugin.d.ts

@@ -1,6 +1,6 @@
 import type { GraphQLSchemaPluginConfig as BaseGraphQLSchemaPluginConfig, IGraphQLSchemaPlugin } from "@webiny/handler-graphql";
 import { GraphQLSchemaPlugin } from "@webiny/handler-graphql";
-import type { CmsContext } from "../../types";
+import type { CmsContext } from "../../types/index.js";
 export type ICmsGraphQLSchemaPlugin<T extends CmsContext = CmsContext> = IGraphQLSchemaPlugin<T>;
 export type CmsGraphQLSchemaPluginConfig<T extends CmsContext = CmsContext> = BaseGraphQLSchemaPluginConfig<T>;
 export declare class CmsGraphQLSchemaPlugin<T extends CmsContext = CmsContext> extends GraphQLSchemaPlugin<T> implements ICmsGraphQLSchemaPlugin<T> {

package/plugins/CmsGraphQLSchemaPlugin/CmsGraphQLSchemaPlugin.js

@@ -1,17 +1,9 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.createCmsGraphQLSchemaPlugin = exports.CmsGraphQLSchemaPlugin = void 0;
-var _handlerGraphql = require("@webiny/handler-graphql");
-class CmsGraphQLSchemaPlugin extends _handlerGraphql.GraphQLSchemaPlugin {
+import { GraphQLSchemaPlugin } from "@webiny/handler-graphql";
+export class CmsGraphQLSchemaPlugin extends GraphQLSchemaPlugin {
   static type = "cms.graphql.schema";
 }
-exports.CmsGraphQLSchemaPlugin = CmsGraphQLSchemaPlugin;
-const createCmsGraphQLSchemaPlugin = config => {
+export const createCmsGraphQLSchemaPlugin = config => {
   return new CmsGraphQLSchemaPlugin(config);
 };
-exports.createCmsGraphQLSchemaPlugin = createCmsGraphQLSchemaPlugin;
 
 //# sourceMappingURL=CmsGraphQLSchemaPlugin.js.map

package/plugins/CmsGraphQLSchemaPlugin/CmsGraphQLSchemaPlugin.js.map

@@ -1 +1 @@
-{"version":3,"names":["_handlerGraphql","require","CmsGraphQLSchemaPlugin","GraphQLSchemaPlugin","type","exports","createCmsGraphQLSchemaPlugin","config"],"sources":["CmsGraphQLSchemaPlugin.ts"],"sourcesContent":["import type {\n    GraphQLSchemaPluginConfig as BaseGraphQLSchemaPluginConfig,\n    IGraphQLSchemaPlugin\n} from \"@webiny/handler-graphql\";\nimport { GraphQLSchemaPlugin } from \"@webiny/handler-graphql\";\nimport type { CmsContext } from \"~/types\";\n\nexport type ICmsGraphQLSchemaPlugin<T extends CmsContext = CmsContext> = IGraphQLSchemaPlugin<T>;\n\nexport type CmsGraphQLSchemaPluginConfig<T extends CmsContext = CmsContext> =\n    BaseGraphQLSchemaPluginConfig<T>;\n\nexport class CmsGraphQLSchemaPlugin<T extends CmsContext = CmsContext>\n    extends GraphQLSchemaPlugin<T>\n    implements ICmsGraphQLSchemaPlugin<T>\n{\n    public static override readonly type = \"cms.graphql.schema\";\n}\n\nexport const createCmsGraphQLSchemaPlugin = <T extends CmsContext = CmsContext>(\n    config: CmsGraphQLSchemaPluginConfig<T>\n): ICmsGraphQLSchemaPlugin<T> => {\n    return new CmsGraphQLSchemaPlugin(config);\n};\n"],"mappings":";;;;;;AAIA,IAAAA,eAAA,GAAAC,OAAA;AAQO,MAAMC,sBAAsB,SACvBC,mCAAmB,CAE/B;EACI,OAAgCC,IAAI,GAAG,oBAAoB;AAC/D;AAACC,OAAA,CAAAH,sBAAA,GAAAA,sBAAA;AAEM,MAAMI,4BAA4B,GACrCC,MAAuC,IACV;EAC7B,OAAO,IAAIL,sBAAsB,CAACK,MAAM,CAAC;AAC7C,CAAC;AAACF,OAAA,CAAAC,4BAAA,GAAAA,4BAAA","ignoreList":[]}
+{"version":3,"names":["GraphQLSchemaPlugin","CmsGraphQLSchemaPlugin","type","createCmsGraphQLSchemaPlugin","config"],"sources":["CmsGraphQLSchemaPlugin.ts"],"sourcesContent":["import type {\n    GraphQLSchemaPluginConfig as BaseGraphQLSchemaPluginConfig,\n    IGraphQLSchemaPlugin\n} from \"@webiny/handler-graphql\";\nimport { GraphQLSchemaPlugin } from \"@webiny/handler-graphql\";\nimport type { CmsContext } from \"~/types/index.js\";\n\nexport type ICmsGraphQLSchemaPlugin<T extends CmsContext = CmsContext> = IGraphQLSchemaPlugin<T>;\n\nexport type CmsGraphQLSchemaPluginConfig<T extends CmsContext = CmsContext> =\n    BaseGraphQLSchemaPluginConfig<T>;\n\nexport class CmsGraphQLSchemaPlugin<T extends CmsContext = CmsContext>\n    extends GraphQLSchemaPlugin<T>\n    implements ICmsGraphQLSchemaPlugin<T>\n{\n    public static override readonly type = \"cms.graphql.schema\";\n}\n\nexport const createCmsGraphQLSchemaPlugin = <T extends CmsContext = CmsContext>(\n    config: CmsGraphQLSchemaPluginConfig<T>\n): ICmsGraphQLSchemaPlugin<T> => {\n    return new CmsGraphQLSchemaPlugin(config);\n};\n"],"mappings":"AAIA,SAASA,mBAAmB,QAAQ,yBAAyB;AAQ7D,OAAO,MAAMC,sBAAsB,SACvBD,mBAAmB,CAE/B;EACI,OAAgCE,IAAI,GAAG,oBAAoB;AAC/D;AAEA,OAAO,MAAMC,4BAA4B,GACrCC,MAAuC,IACV;EAC7B,OAAO,IAAIH,sBAAsB,CAACG,MAAM,CAAC;AAC7C,CAAC","ignoreList":[]}

package/plugins/CmsGraphQLSchemaPlugin/index.d.ts

@@ -1 +1 @@
-export * from "./CmsGraphQLSchemaPlugin";
+export * from "./CmsGraphQLSchemaPlugin.js";

package/plugins/CmsGraphQLSchemaPlugin/index.js

@@ -1,18 +1,3 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-var _CmsGraphQLSchemaPlugin = require("./CmsGraphQLSchemaPlugin");
-Object.keys(_CmsGraphQLSchemaPlugin).forEach(function (key) {
-  if (key === "default" || key === "__esModule") return;
-  if (key in exports && exports[key] === _CmsGraphQLSchemaPlugin[key]) return;
-  Object.defineProperty(exports, key, {
-    enumerable: true,
-    get: function () {
-      return _CmsGraphQLSchemaPlugin[key];
-    }
-  });
-});
+export * from "./CmsGraphQLSchemaPlugin.js";
 
 //# sourceMappingURL=index.js.map

package/plugins/CmsGraphQLSchemaPlugin/index.js.map

@@ -1 +1 @@
-{"version":3,"names":["_CmsGraphQLSchemaPlugin","require","Object","keys","forEach","key","exports","defineProperty","enumerable","get"],"sources":["index.ts"],"sourcesContent":["export * from \"./CmsGraphQLSchemaPlugin\";\n"],"mappings":";;;;;AAAA,IAAAA,uBAAA,GAAAC,OAAA;AAAAC,MAAA,CAAAC,IAAA,CAAAH,uBAAA,EAAAI,OAAA,WAAAC,GAAA;EAAA,IAAAA,GAAA,kBAAAA,GAAA;EAAA,IAAAA,GAAA,IAAAC,OAAA,IAAAA,OAAA,CAAAD,GAAA,MAAAL,uBAAA,CAAAK,GAAA;EAAAH,MAAA,CAAAK,cAAA,CAAAD,OAAA,EAAAD,GAAA;IAAAG,UAAA;IAAAC,GAAA,WAAAA,CAAA;MAAA,OAAAT,uBAAA,CAAAK,GAAA;IAAA;EAAA;AAAA","ignoreList":[]}
+{"version":3,"names":[],"sources":["index.ts"],"sourcesContent":["export * from \"./CmsGraphQLSchemaPlugin.js\";\n"],"mappings":"AAAA","ignoreList":[]}

package/plugins/CmsGroupPlugin.d.ts

@@ -1,12 +1,10 @@
 import { Plugin } from "@webiny/plugins";
-import type { CmsGroup as BaseCmsGroup } from "../types";
-export interface CmsGroupInput extends Omit<BaseCmsGroup, "locale" | "tenant" | "webinyVersion" | "isPlugin"> {
+import type { CmsGroup as BaseCmsGroup } from "../types/index.js";
+export interface CmsGroupInput extends Omit<BaseCmsGroup, "tenant" | "isPlugin"> {
     tenant?: string;
-    locale?: string;
 }
-export interface CmsGroup extends Omit<BaseCmsGroup, "locale" | "tenant" | "webinyVersion"> {
+export interface CmsGroup extends Omit<BaseCmsGroup, "tenant"> {
     tenant?: string;
-    locale?: string;
 }
 export declare class CmsGroupPlugin extends Plugin {
     static readonly type: string;

package/plugins/CmsGroupPlugin.js

@@ -1,11 +1,5 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.createModelGroupPlugin = exports.createCmsGroupPlugin = exports.createCmsGroup = exports.CmsGroupPlugin = void 0;
-var _plugins = require("@webiny/plugins");
-class CmsGroupPlugin extends _plugins.Plugin {
+import { Plugin } from "@webiny/plugins";
+export class CmsGroupPlugin extends Plugin {
   static type = "cms-content-model-group";
   constructor(contentModelGroup) {
     super();
@@ -19,22 +13,18 @@ class CmsGroupPlugin extends _plugins.Plugin {
 /**
  * @deprecated Use `createCmsGroupPlugin` instead.
  */
-exports.CmsGroupPlugin = CmsGroupPlugin;
-const createCmsGroup = group => {
+export const createCmsGroup = group => {
   return new CmsGroupPlugin(group);
 };
 
 /**
  * @deprecated Use `createModelGroupPlugin` instead.
  */
-exports.createCmsGroup = createCmsGroup;
-const createCmsGroupPlugin = group => {
+export const createCmsGroupPlugin = group => {
   return new CmsGroupPlugin(group);
 };
-exports.createCmsGroupPlugin = createCmsGroupPlugin;
-const createModelGroupPlugin = group => {
+export const createModelGroupPlugin = group => {
   return new CmsGroupPlugin(group);
 };
-exports.createModelGroupPlugin = createModelGroupPlugin;
 
 //# sourceMappingURL=CmsGroupPlugin.js.map

package/plugins/CmsGroupPlugin.js.map

@@ -1 +1 @@
-{"version":3,"names":["_plugins","require","CmsGroupPlugin","Plugin","type","constructor","contentModelGroup","isPlugin","exports","createCmsGroup","group","createCmsGroupPlugin","createModelGroupPlugin"],"sources":["CmsGroupPlugin.ts"],"sourcesContent":["import { Plugin } from \"@webiny/plugins\";\nimport type { CmsGroup as BaseCmsGroup } from \"~/types\";\n\nexport interface CmsGroupInput\n    extends Omit<BaseCmsGroup, \"locale\" | \"tenant\" | \"webinyVersion\" | \"isPlugin\"> {\n    tenant?: string;\n    locale?: string;\n}\n\nexport interface CmsGroup extends Omit<BaseCmsGroup, \"locale\" | \"tenant\" | \"webinyVersion\"> {\n    tenant?: string;\n    locale?: string;\n}\n\nexport class CmsGroupPlugin extends Plugin {\n    public static override readonly type: string = \"cms-content-model-group\";\n    public readonly contentModelGroup: CmsGroup;\n\n    constructor(contentModelGroup: CmsGroupInput) {\n        super();\n        this.contentModelGroup = {\n            ...contentModelGroup,\n            isPlugin: true\n        };\n    }\n}\n\n/**\n * @deprecated Use `createCmsGroupPlugin` instead.\n */\nexport const createCmsGroup = (group: CmsGroup): CmsGroupPlugin => {\n    return new CmsGroupPlugin(group);\n};\n\n/**\n * @deprecated Use `createModelGroupPlugin` instead.\n */\nexport const createCmsGroupPlugin = (group: CmsGroup): CmsGroupPlugin => {\n    return new CmsGroupPlugin(group);\n};\n\nexport const createModelGroupPlugin = (group: CmsGroup): CmsGroupPlugin => {\n    return new CmsGroupPlugin(group);\n};\n"],"mappings":";;;;;;AAAA,IAAAA,QAAA,GAAAC,OAAA;AAcO,MAAMC,cAAc,SAASC,eAAM,CAAC;EACvC,OAAgCC,IAAI,GAAW,yBAAyB;EAGxEC,WAAWA,CAACC,iBAAgC,EAAE;IAC1C,KAAK,CAAC,CAAC;IACP,IAAI,CAACA,iBAAiB,GAAG;MACrB,GAAGA,iBAAiB;MACpBC,QAAQ,EAAE;IACd,CAAC;EACL;AACJ;;AAEA;AACA;AACA;AAFAC,OAAA,CAAAN,cAAA,GAAAA,cAAA;AAGO,MAAMO,cAAc,GAAIC,KAAe,IAAqB;EAC/D,OAAO,IAAIR,cAAc,CAACQ,KAAK,CAAC;AACpC,CAAC;;AAED;AACA;AACA;AAFAF,OAAA,CAAAC,cAAA,GAAAA,cAAA;AAGO,MAAME,oBAAoB,GAAID,KAAe,IAAqB;EACrE,OAAO,IAAIR,cAAc,CAACQ,KAAK,CAAC;AACpC,CAAC;AAACF,OAAA,CAAAG,oBAAA,GAAAA,oBAAA;AAEK,MAAMC,sBAAsB,GAAIF,KAAe,IAAqB;EACvE,OAAO,IAAIR,cAAc,CAACQ,KAAK,CAAC;AACpC,CAAC;AAACF,OAAA,CAAAI,sBAAA,GAAAA,sBAAA","ignoreList":[]}
+{"version":3,"names":["Plugin","CmsGroupPlugin","type","constructor","contentModelGroup","isPlugin","createCmsGroup","group","createCmsGroupPlugin","createModelGroupPlugin"],"sources":["CmsGroupPlugin.ts"],"sourcesContent":["import { Plugin } from \"@webiny/plugins\";\nimport type { CmsGroup as BaseCmsGroup } from \"~/types/index.js\";\n\nexport interface CmsGroupInput extends Omit<BaseCmsGroup, \"tenant\" | \"isPlugin\"> {\n    tenant?: string;\n}\n\nexport interface CmsGroup extends Omit<BaseCmsGroup, \"tenant\"> {\n    tenant?: string;\n}\n\nexport class CmsGroupPlugin extends Plugin {\n    public static override readonly type: string = \"cms-content-model-group\";\n    public readonly contentModelGroup: CmsGroup;\n\n    constructor(contentModelGroup: CmsGroupInput) {\n        super();\n        this.contentModelGroup = {\n            ...contentModelGroup,\n            isPlugin: true\n        };\n    }\n}\n\n/**\n * @deprecated Use `createCmsGroupPlugin` instead.\n */\nexport const createCmsGroup = (group: CmsGroup): CmsGroupPlugin => {\n    return new CmsGroupPlugin(group);\n};\n\n/**\n * @deprecated Use `createModelGroupPlugin` instead.\n */\nexport const createCmsGroupPlugin = (group: CmsGroup): CmsGroupPlugin => {\n    return new CmsGroupPlugin(group);\n};\n\nexport const createModelGroupPlugin = (group: CmsGroup): CmsGroupPlugin => {\n    return new CmsGroupPlugin(group);\n};\n"],"mappings":"AAAA,SAASA,MAAM,QAAQ,iBAAiB;AAWxC,OAAO,MAAMC,cAAc,SAASD,MAAM,CAAC;EACvC,OAAgCE,IAAI,GAAW,yBAAyB;EAGxEC,WAAWA,CAACC,iBAAgC,EAAE;IAC1C,KAAK,CAAC,CAAC;IACP,IAAI,CAACA,iBAAiB,GAAG;MACrB,GAAGA,iBAAiB;MACpBC,QAAQ,EAAE;IACd,CAAC;EACL;AACJ;;AAEA;AACA;AACA;AACA,OAAO,MAAMC,cAAc,GAAIC,KAAe,IAAqB;EAC/D,OAAO,IAAIN,cAAc,CAACM,KAAK,CAAC;AACpC,CAAC;;AAED;AACA;AACA;AACA,OAAO,MAAMC,oBAAoB,GAAID,KAAe,IAAqB;EACrE,OAAO,IAAIN,cAAc,CAACM,KAAK,CAAC;AACpC,CAAC;AAED,OAAO,MAAME,sBAAsB,GAAIF,KAAe,IAAqB;EACvE,OAAO,IAAIN,cAAc,CAACM,KAAK,CAAC;AACpC,CAAC","ignoreList":[]}

package/plugins/CmsModelFieldConverterPlugin.d.ts

@@ -2,8 +2,8 @@
  * Field converters are used to convert the fieldId to storageId and vice versa.
  */
 import { Plugin } from "@webiny/plugins";
-import type { CmsEntryValues, CmsModelFieldWithParent } from "../types";
-import type { ConverterCollection } from "../utils/converters/ConverterCollection";
+import type { CmsEntryValues, CmsModelFieldWithParent } from "../types/index.js";
+import type { ConverterCollection } from "../utils/converters/ConverterCollection.js";
 export interface ConvertParams<F = CmsModelFieldWithParent> {
     field: F;
     value: any;

package/plugins/CmsModelFieldConverterPlugin.js

@@ -1,17 +1,9 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.CmsModelFieldConverterPlugin = void 0;
-var _plugins = require("@webiny/plugins");
 /**
  * Field converters are used to convert the fieldId to storageId and vice versa.
  */
-
-class CmsModelFieldConverterPlugin extends _plugins.Plugin {
+import { Plugin } from "@webiny/plugins";
+export class CmsModelFieldConverterPlugin extends Plugin {
   static type = "cms.field.converter";
 }
-exports.CmsModelFieldConverterPlugin = CmsModelFieldConverterPlugin;
 
 //# sourceMappingURL=CmsModelFieldConverterPlugin.js.map

package/plugins/CmsModelFieldConverterPlugin.js.map

@@ -1 +1 @@
-{"version":3,"names":["_plugins","require","CmsModelFieldConverterPlugin","Plugin","type","exports"],"sources":["CmsModelFieldConverterPlugin.ts"],"sourcesContent":["/**\n * Field converters are used to convert the fieldId to storageId and vice versa.\n */\nimport { Plugin } from \"@webiny/plugins\";\nimport type { CmsEntryValues, CmsModelFieldWithParent } from \"~/types\";\nimport type { ConverterCollection } from \"~/utils/converters/ConverterCollection\";\n\nexport interface ConvertParams<F = CmsModelFieldWithParent> {\n    field: F;\n    value: any;\n    converterCollection: ConverterCollection;\n}\n\nexport abstract class CmsModelFieldConverterPlugin extends Plugin {\n    public static override type = \"cms.field.converter\";\n\n    public abstract getFieldType(): string;\n\n    public abstract convertToStorage(params: ConvertParams): CmsEntryValues;\n    public abstract convertFromStorage(params: ConvertParams): CmsEntryValues;\n}\n"],"mappings":";;;;;;AAGA,IAAAA,QAAA,GAAAC,OAAA;AAHA;AACA;AACA;;AAWO,MAAeC,4BAA4B,SAASC,eAAM,CAAC;EAC9D,OAAuBC,IAAI,GAAG,qBAAqB;AAMvD;AAACC,OAAA,CAAAH,4BAAA,GAAAA,4BAAA","ignoreList":[]}
+{"version":3,"names":["Plugin","CmsModelFieldConverterPlugin","type"],"sources":["CmsModelFieldConverterPlugin.ts"],"sourcesContent":["/**\n * Field converters are used to convert the fieldId to storageId and vice versa.\n */\nimport { Plugin } from \"@webiny/plugins\";\nimport type { CmsEntryValues, CmsModelFieldWithParent } from \"~/types/index.js\";\nimport type { ConverterCollection } from \"~/utils/converters/ConverterCollection.js\";\n\nexport interface ConvertParams<F = CmsModelFieldWithParent> {\n    field: F;\n    value: any;\n    converterCollection: ConverterCollection;\n}\n\nexport abstract class CmsModelFieldConverterPlugin extends Plugin {\n    public static override type = \"cms.field.converter\";\n\n    public abstract getFieldType(): string;\n\n    public abstract convertToStorage(params: ConvertParams): CmsEntryValues;\n    public abstract convertFromStorage(params: ConvertParams): CmsEntryValues;\n}\n"],"mappings":"AAAA;AACA;AACA;AACA,SAASA,MAAM,QAAQ,iBAAiB;AAUxC,OAAO,MAAeC,4BAA4B,SAASD,MAAM,CAAC;EAC9D,OAAuBE,IAAI,GAAG,qBAAqB;AAMvD","ignoreList":[]}

package/plugins/CmsModelPlugin.d.ts

@@ -1,5 +1,5 @@
 import { Plugin } from "@webiny/plugins";
-import type { CmsModel as CmsModelBase, CmsModelField as CmsModelFieldBase, CmsModelFieldSettings as BaseCmsModelFieldSettings } from "../types";
+import type { CmsModel as CmsModelBase, CmsModelField as CmsModelFieldBase, CmsModelFieldSettings as BaseCmsModelFieldSettings } from "../types/index.js";
 interface CmsModelFieldSettings extends Omit<BaseCmsModelFieldSettings, "fields"> {
     /**
      * Object field has child fields.
@@ -30,7 +30,7 @@ export interface CmsApiModel extends Omit<CmsModelPluginModel, "isPrivate" | "fi
 export interface CmsApiModelFull extends Omit<CmsApiModel, "fields"> {
     fields: CmsModelFieldBase[];
 }
-interface CmsPrivateModel extends Omit<CmsModelPluginModel, "isPrivate" | "singularApiName" | "pluralApiName" | "fields" | "isPlugin" | "layout" | "titleFieldId" | "description"> {
+interface CmsPrivateModel extends Omit<CmsModelPluginModel, "isPrivate" | "singularApiName" | "pluralApiName" | "fields" | "isPlugin" | "layout" | "icon" | "titleFieldId" | "description"> {
     noValidate?: boolean;
     titleFieldId?: string;
     singularApiName?: never;
@@ -42,8 +42,7 @@ export interface CmsPrivateModelFull extends Omit<CmsPrivateModel, "fields" | "c
     fields: CmsModelFieldBase[];
 }
 export type CmsModelInput = CmsApiModel | CmsPrivateModel | CmsApiModelFull | CmsPrivateModelFull;
-export interface CmsModelPluginModel extends Omit<CmsModelBase, "locale" | "tenant" | "webinyVersion"> {
-    locale?: string;
+export interface CmsModelPluginModel extends Omit<CmsModelBase, "tenant"> {
     tenant?: string;
 }
 interface CmsModelPluginOptions {
@@ -59,27 +58,13 @@ export declare class CmsModelPlugin extends Plugin {
     private validateLayout;
 }
 /**
- * @deprecated Use `createCmsModelPlugin` instead.
+ * IMPORTANT! This function should NOT be used outside the `api-headless-cms` package!
+ * @internal
  */
-export declare const createCmsModel: (model: CmsModelInput, options?: CmsModelPluginOptions) => CmsModelPlugin;
-/**
- * @deprecated Use `createModelPlugin` instead.
- */
-export declare const createCmsModelPlugin: (model: CmsModelInput, options?: CmsModelPluginOptions) => CmsModelPlugin;
 export declare const createModelPlugin: (model: CmsModelInput, options?: CmsModelPluginOptions) => CmsModelPlugin;
 /**
- * @deprecated Use `createPrivateModelPlugin` instead.
+ * IMPORTANT! This function should NOT be used outside the `api-headless-cms` package!
+ * @internal
  */
-export declare const createPrivateModel: (input: Omit<CmsPrivateModelFull, "group" | "isPrivate">) => CmsPrivateModelFull;
 export declare const createPrivateModelPlugin: (input: Omit<CmsPrivateModelFull, "group" | "isPrivate">) => CmsModelPlugin;
-/**
- * @deprecated Use `createSingleEntryModelPlugin` instead.
- */
-export declare const createSingleEntryModel: (input: CmsModelInput, options?: CmsModelPluginOptions) => CmsModelPlugin;
-export declare const createSingleEntryModelPlugin: (input: CmsModelInput, options?: CmsModelPluginOptions) => CmsModelPlugin;
-/**
- * @deprecated Use `createSingleEntryPrivateModelPlugin` instead.
- */
-export declare const createSingleEntryPrivateModel: (input: Omit<CmsPrivateModelFull, "group" | "isPrivate">) => CmsPrivateModelFull;
-export declare const createPrivateSingleEntryModelPlugin: (input: Omit<CmsPrivateModelFull, "group" | "isPrivate">) => CmsModelPlugin;
 export {};

package/plugins/CmsModelPlugin.js

@@ -1,25 +1,18 @@
-"use strict";
-
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.createSingleEntryPrivateModel = exports.createSingleEntryModelPlugin = exports.createSingleEntryModel = exports.createPrivateSingleEntryModelPlugin = exports.createPrivateModelPlugin = exports.createPrivateModel = exports.createModelPlugin = exports.createCmsModelPlugin = exports.createCmsModel = exports.CmsModelPlugin = void 0;
-var _error = _interopRequireDefault(require("@webiny/error"));
-var _camelCase = _interopRequireDefault(require("lodash/camelCase"));
-var _upperFirst = _interopRequireDefault(require("lodash/upperFirst"));
-var _pluralize = _interopRequireDefault(require("pluralize"));
-var _plugins = require("@webiny/plugins");
-var _createFieldStorageId = require("../crud/contentModel/createFieldStorageId");
-var _validateStorageId = require("../crud/contentModel/validateStorageId");
-var _constants = require("../constants");
+import WebinyError from "@webiny/error";
+import lodashCamelCase from "lodash/camelCase.js";
+import camelCase from "lodash/camelCase.js";
+import upperFirst from "lodash/upperFirst.js";
+import pluralize from "pluralize";
+import { Plugin } from "@webiny/plugins";
+import { createFieldStorageId } from "../crud/contentModel/createFieldStorageId.js";
+import { validateStorageId } from "../crud/contentModel/validateStorageId.js";
 const createApiName = name => {
-  return (0, _upperFirst.default)((0, _camelCase.default)(name));
+  return upperFirst(camelCase(name));
 };
 const createPluralApiName = name => {
-  return (0, _pluralize.default)(createApiName(name));
+  return pluralize(createApiName(name));
 };
-class CmsModelPlugin extends _plugins.Plugin {
+export class CmsModelPlugin extends Plugin {
   static type = "cms-content-model";
   constructor(contentModel, options) {
     super();
@@ -31,14 +24,12 @@ class CmsModelPlugin extends _plugins.Plugin {
     const singularApiName = input.singularApiName ? createApiName(input.singularApiName) : createApiName(input.name);
     const pluralApiName = input.pluralApiName ? createApiName(input.pluralApiName) : createPluralApiName(input.name);
     const modelPlugin = {
-      group: {
-        id: "",
-        name: ""
-      },
+      group: input.group ?? "ungrouped",
       description: "",
       fields: [],
       isPlugin: true,
       isPrivate,
+      icon: null,
       layout: [],
       modelId: input.modelId,
       name: input.name,
@@ -72,7 +63,7 @@ class CmsModelPlugin extends _plugins.Plugin {
   }
   buildFields(model, inputFields) {
     if (inputFields.length === 0) {
-      throw new _error.default(`Missing fields for the defined model "${model.modelId}".`, "MISSING_FIELDS", {
+      throw new WebinyError(`Missing fields for the defined model "${model.modelId}".`, "MISSING_FIELDS", {
         model
       });
     }
@@ -84,17 +75,17 @@ class CmsModelPlugin extends _plugins.Plugin {
        * Field must contain an fieldId. It is required in the graphql, but lets check it just in case
        */
       if (!(input.fieldId || "").trim()) {
-        throw new _error.default(`Field's "storageId" is not defined for the content model "${model.modelId}".`, "FIELD_ID_ERROR", {
+        throw new WebinyError(`Field's "storageId" is not defined for the content model "${model.modelId}".`, "FIELD_ID_ERROR", {
           model,
           field: input
         });
       }
-      const fieldId = (0, _camelCase.default)(input.fieldId);
+      const fieldId = lodashCamelCase(input.fieldId);
       /**
        * FieldID must be in correct pattern.
        */
       if (fieldId.match(/^[0-9]/) !== null) {
-        throw new _error.default(`Field's "fieldId" does not match correct pattern in the content model "${model.modelId}" - cannot start with a number.`, "FIELD_FIELD_ID_ERROR", {
+        throw new WebinyError(`Field's "fieldId" does not match correct pattern in the content model "${model.modelId}" - cannot start with a number.`, "FIELD_FIELD_ID_ERROR", {
           model,
           field: input
         });
@@ -103,7 +94,7 @@ class CmsModelPlugin extends _plugins.Plugin {
        * FieldID also must be camelCased.
        */
       if (fieldId !== input.fieldId) {
-        throw new _error.default(`Field's "fieldId" must be a camel cased string in the content model "${model.modelId}".`, "FIELD_FIELD_ID_ERROR", {
+        throw new WebinyError(`Field's "fieldId" must be a camel cased string in the content model "${model.modelId}".`, "FIELD_FIELD_ID_ERROR", {
           model,
           field: input
         });
@@ -112,7 +103,7 @@ class CmsModelPlugin extends _plugins.Plugin {
        * ... and fieldId must be unique.
        */
       if (fieldIdList.includes(fieldId)) {
-        throw new _error.default(`Field's "fieldId" (id: ${input.id}) is not unique in the content model "${model.modelId}".`, "FIELD_ID_NOT_UNIQUE_ERROR", {
+        throw new WebinyError(`Field's "fieldId" (id: ${input.id}) is not unique in the content model "${model.modelId}".`, "FIELD_ID_NOT_UNIQUE_ERROR", {
           model,
           field: input
         });
@@ -120,9 +111,9 @@ class CmsModelPlugin extends _plugins.Plugin {
       let storageId = input.storageId;
       if (storageId) {
         try {
-          (0, _validateStorageId.validateStorageId)(storageId);
+          validateStorageId(storageId);
         } catch (e) {
-          throw _error.default.from(e, {
+          throw WebinyError.from(e, {
             data: {
               model,
               storageId,
@@ -131,14 +122,14 @@ class CmsModelPlugin extends _plugins.Plugin {
           });
         }
       } else {
-        storageId = (0, _createFieldStorageId.createFieldStorageId)(input);
+        storageId = createFieldStorageId(input);
       }
 
       /**
        * Fields storageId must be unique.
        */
       if (storageIdList.includes(storageId)) {
-        throw new _error.default(`Field's "storageId" is not unique in the content model "${model.modelId}".`, "STORAGE_ID_ERROR", {
+        throw new WebinyError(`Field's "storageId" is not unique in the content model "${model.modelId}".`, "STORAGE_ID_ERROR", {
           model,
           field: input
         });
@@ -177,21 +168,36 @@ class CmsModelPlugin extends _plugins.Plugin {
     if (this.options.validateLayout === false) {
       return;
     }
-    for (const field of model.fields) {
+    const countFieldInLayout = (fieldId, layout) => {
       let total = 0;
-      for (const row of model.layout) {
-        const count = row.filter(cell => cell === field.id).length;
-        total = total + count;
+      for (const row of layout) {
+        for (const cell of row) {
+          if (typeof cell === "string") {
+            if (cell === fieldId) {
+              total++;
+            }
+          } else if (cell && typeof cell === "object" && Array.isArray(cell.tabs)) {
+            for (const tab of cell.tabs) {
+              if (Array.isArray(tab.layout)) {
+                total += countFieldInLayout(fieldId, tab.layout);
+              }
+            }
+          }
+        }
       }
+      return total;
+    };
+    for (const field of model.fields) {
+      const total = countFieldInLayout(field.id, model.layout);
       if (total === 1) {
         continue;
       } else if (total > 1) {
-        throw new _error.default(`Field "${field.id}" is in more than one layout cell.`, "DUPLICATE_FIELD_IN_LAYOUT", {
+        throw new WebinyError(`Field "${field.id}" is in more than one layout cell.`, "DUPLICATE_FIELD_IN_LAYOUT", {
           model,
           field
         });
       }
-      throw new _error.default(`Missing field "${field.id}" in layout.`, "MISSING_FIELD_IN_LAYOUT", {
+      throw new WebinyError(`Missing field "${field.id}" in layout.`, "MISSING_FIELD_IN_LAYOUT", {
         model,
         field
       });
@@ -200,96 +206,27 @@ class CmsModelPlugin extends _plugins.Plugin {
 }
 
 /**
- * @deprecated Use `createCmsModelPlugin` instead.
+ * IMPORTANT! This function should NOT be used outside the `api-headless-cms` package!
+ * @internal
  */
-exports.CmsModelPlugin = CmsModelPlugin;
-const createCmsModel = (model, options) => {
+export const createModelPlugin = (model, options) => {
   return new CmsModelPlugin(model, options);
 };
 
 /**
- * @deprecated Use `createModelPlugin` instead.
+ * IMPORTANT! This function should NOT be used outside the `api-headless-cms` package!
+ * @internal
  */
-exports.createCmsModel = createCmsModel;
-const createCmsModelPlugin = (model, options) => {
-  return new CmsModelPlugin(model, options);
-};
-exports.createCmsModelPlugin = createCmsModelPlugin;
-const createModelPlugin = (model, options) => {
-  return new CmsModelPlugin(model, options);
-};
-
-/**
- * @deprecated Use `createPrivateModelPlugin` instead.
- */
-exports.createModelPlugin = createModelPlugin;
-const createPrivateModel = input => {
-  return {
-    authorization: false,
-    noValidate: true,
-    isPrivate: true,
-    group: {
-      id: "private",
-      name: "Private Models"
-    },
-    ...input
-  };
-};
-exports.createPrivateModel = createPrivateModel;
-const createPrivateModelPlugin = input => {
+export const createPrivateModelPlugin = input => {
   return createModelPlugin({
     authorization: false,
     noValidate: true,
     isPrivate: true,
-    group: {
-      id: "private",
-      name: "Private Models"
-    },
+    group: "private",
     ...input
   }, {
     validateLayout: false
   });
 };
-exports.createPrivateModelPlugin = createPrivateModelPlugin;
-const ensureSingletonTag = input => {
-  const tags = input || [];
-  return tags.includes(_constants.CMS_MODEL_SINGLETON_TAG) ? tags : [...tags, _constants.CMS_MODEL_SINGLETON_TAG];
-};
-
-/**
- * @deprecated Use `createSingleEntryModelPlugin` instead.
- */
-const createSingleEntryModel = (input, options) => {
-  return createCmsModelPlugin({
-    ...input,
-    tags: ensureSingletonTag(input.tags)
-  }, options);
-};
-exports.createSingleEntryModel = createSingleEntryModel;
-const createSingleEntryModelPlugin = (input, options) => {
-  return createModelPlugin({
-    ...input,
-    tags: ensureSingletonTag(input.tags)
-  }, options);
-};
-
-/**
- * @deprecated Use `createSingleEntryPrivateModelPlugin` instead.
- */
-exports.createSingleEntryModelPlugin = createSingleEntryModelPlugin;
-const createSingleEntryPrivateModel = input => {
-  return createPrivateModel({
-    ...input,
-    tags: ensureSingletonTag(input.tags)
-  });
-};
-exports.createSingleEntryPrivateModel = createSingleEntryPrivateModel;
-const createPrivateSingleEntryModelPlugin = input => {
-  return createPrivateModelPlugin({
-    ...input,
-    tags: ensureSingletonTag(input.tags)
-  });
-};
-exports.createPrivateSingleEntryModelPlugin = createPrivateSingleEntryModelPlugin;
 
 //# sourceMappingURL=CmsModelPlugin.js.map