@webiny/api-headless-cms 0.0.0-unstable.78f581c1d2 → 0.0.0-unstable.97a151f74d

package/index.js

@@ -58,6 +58,8 @@ var _default = require("./storage/default");
 
 var _object = require("./storage/object");
 
+var _dynamicZoneStorage = require("./graphqlFields/dynamicZone/dynamicZoneStorage");
+
 var _parameters = require("./parameters");
 
 var _context = require("./context");
@@ -103,7 +105,7 @@ const createHeadlessCmsContext = params => {
   /**
    *
    */
-  (0, _crud.createCrud)(params), (0, _graphqlFields.createGraphQLFields)(), (0, _fieldConverters.createFieldConverters)(), (0, _validators.createValidators)(), (0, _default.createDefaultStorageTransform)(), (0, _object.createObjectStorageTransform)(), (0, _upgrades.createUpgrades)()];
+  (0, _crud.createCrud)(params), (0, _graphqlFields.createGraphQLFields)(), (0, _fieldConverters.createFieldConverters)(), (0, _validators.createValidators)(), (0, _default.createDefaultStorageTransform)(), (0, _object.createObjectStorageTransform)(), (0, _dynamicZoneStorage.createDynamicZoneStorageTransform)(), (0, _upgrades.createUpgrades)()];
 };
 
 exports.createHeadlessCmsContext = createHeadlessCmsContext;

package/index.js.map

@@ -1 +1 @@
-{"version":3,"names":["createHeadlessCmsGraphQL","params","createPathParameterPlugin","createHeaderParameterPlugin","createContextParameterPlugin","baseCreateGraphQL","createHeadlessCmsContext","createContextPlugin","createDefaultModelManager","createCrud","createGraphQLFields","createFieldConverters","createValidators","createDefaultStorageTransform","createObjectStorageTransform","createUpgrades"],"sources":["index.ts"],"sourcesContent":["import { createGraphQL as baseCreateGraphQL, CreateGraphQLParams } from \"~/graphql\";\nimport { createUpgrades } from \"~/upgrades\";\nimport { createDefaultModelManager } from \"~/modelManager\";\nimport { createCrud, CrudParams } from \"~/crud\";\nimport { createGraphQLFields } from \"~/graphqlFields\";\nimport { createValidators } from \"~/validators\";\nimport { createDefaultStorageTransform } from \"~/storage/default\";\nimport { createObjectStorageTransform } from \"~/storage/object\";\nimport {\n    createContextParameterPlugin,\n    createHeaderParameterPlugin,\n    createPathParameterPlugin\n} from \"~/parameters\";\nimport { createContextPlugin } from \"~/context\";\nimport {\n    entryFieldFromStorageTransform,\n    entryFromStorageTransform,\n    entryToStorageTransform\n} from \"./utils/entryStorage\";\nimport { createFieldConverters } from \"~/fieldConverters\";\n\nexport type CreateHeadlessCmsGraphQLParams = CreateGraphQLParams;\nexport const createHeadlessCmsGraphQL = (params: CreateHeadlessCmsGraphQLParams = {}) => {\n    return [\n        /**\n         * PathParameter plugins are used to determine the type of the cms endpoint\n         */\n        createPathParameterPlugin(),\n        createHeaderParameterPlugin(),\n        createContextParameterPlugin(),\n        /**\n         * At this point we can create, or not create, CMS GraphQL Schema.\n         */\n        baseCreateGraphQL(params)\n    ];\n};\n\nexport type ContentContextParams = CrudParams;\nexport const createHeadlessCmsContext = (params: ContentContextParams) => {\n    return [\n        /**\n         * Context for all Lambdas - everything is loaded now.\n         */\n        createContextPlugin(),\n        createDefaultModelManager(),\n        /**\n         *\n         */\n        createCrud(params),\n        createGraphQLFields(),\n        createFieldConverters(),\n        createValidators(),\n        createDefaultStorageTransform(),\n        createObjectStorageTransform(),\n        createUpgrades()\n    ];\n};\nexport * from \"~/graphqlFields\";\nexport * from \"~/plugins\";\nexport { entryToStorageTransform, entryFieldFromStorageTransform, entryFromStorageTransform };\n"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;;AACA;;AACA;;AACA;;AACA;;AAqDA;EAAA;EAAA;EAAA;EAAA;IAAA;IAAA;MAAA;IAAA;EAAA;AAAA;;AApDA;;AACA;;AACA;;AACA;;AAKA;;AACA;;AAKA;;AAuCA;;AAAA;EAAA;EAAA;EAAA;EAAA;IAAA;IAAA;MAAA;IAAA;EAAA;AAAA;;AApCO,MAAMA,wBAAwB,GAAG,CAACC,MAAsC,GAAG,EAA1C,KAAiD;EACrF,OAAO;EACH;AACR;AACA;EACQ,IAAAC,qCAAA,GAJG,EAKH,IAAAC,uCAAA,GALG,EAMH,IAAAC,wCAAA,GANG;EAOH;AACR;AACA;EACQ,IAAAC,sBAAA,EAAkBJ,MAAlB,CAVG,CAAP;AAYH,CAbM;;;;AAgBA,MAAMK,wBAAwB,GAAIL,MAAD,IAAkC;EACtE,OAAO;EACH;AACR;AACA;EACQ,IAAAM,4BAAA,GAJG,EAKH,IAAAC,uCAAA,GALG;EAMH;AACR;AACA;EACQ,IAAAC,gBAAA,EAAWR,MAAX,CATG,EAUH,IAAAS,kCAAA,GAVG,EAWH,IAAAC,sCAAA,GAXG,EAYH,IAAAC,4BAAA,GAZG,EAaH,IAAAC,sCAAA,GAbG,EAcH,IAAAC,oCAAA,GAdG,EAeH,IAAAC,wBAAA,GAfG,CAAP;AAiBH,CAlBM"}
+{"version":3,"names":["createHeadlessCmsGraphQL","params","createPathParameterPlugin","createHeaderParameterPlugin","createContextParameterPlugin","baseCreateGraphQL","createHeadlessCmsContext","createContextPlugin","createDefaultModelManager","createCrud","createGraphQLFields","createFieldConverters","createValidators","createDefaultStorageTransform","createObjectStorageTransform","createDynamicZoneStorageTransform","createUpgrades"],"sources":["index.ts"],"sourcesContent":["import { createGraphQL as baseCreateGraphQL, CreateGraphQLParams } from \"~/graphql\";\nimport { createUpgrades } from \"~/upgrades\";\nimport { createDefaultModelManager } from \"~/modelManager\";\nimport { createCrud, CrudParams } from \"~/crud\";\nimport { createGraphQLFields } from \"~/graphqlFields\";\nimport { createValidators } from \"~/validators\";\nimport { createDefaultStorageTransform } from \"~/storage/default\";\nimport { createObjectStorageTransform } from \"~/storage/object\";\nimport { createDynamicZoneStorageTransform } from \"~/graphqlFields/dynamicZone/dynamicZoneStorage\";\nimport {\n    createContextParameterPlugin,\n    createHeaderParameterPlugin,\n    createPathParameterPlugin\n} from \"~/parameters\";\nimport { createContextPlugin } from \"~/context\";\nimport {\n    entryFieldFromStorageTransform,\n    entryFromStorageTransform,\n    entryToStorageTransform\n} from \"./utils/entryStorage\";\nimport { createFieldConverters } from \"~/fieldConverters\";\n\nexport type CreateHeadlessCmsGraphQLParams = CreateGraphQLParams;\nexport const createHeadlessCmsGraphQL = (params: CreateHeadlessCmsGraphQLParams = {}) => {\n    return [\n        /**\n         * PathParameter plugins are used to determine the type of the cms endpoint\n         */\n        createPathParameterPlugin(),\n        createHeaderParameterPlugin(),\n        createContextParameterPlugin(),\n        /**\n         * At this point we can create, or not create, CMS GraphQL Schema.\n         */\n        baseCreateGraphQL(params)\n    ];\n};\n\nexport type ContentContextParams = CrudParams;\nexport const createHeadlessCmsContext = (params: ContentContextParams) => {\n    return [\n        /**\n         * Context for all Lambdas - everything is loaded now.\n         */\n        createContextPlugin(),\n        createDefaultModelManager(),\n        /**\n         *\n         */\n        createCrud(params),\n        createGraphQLFields(),\n        createFieldConverters(),\n        createValidators(),\n        createDefaultStorageTransform(),\n        createObjectStorageTransform(),\n        createDynamicZoneStorageTransform(),\n        createUpgrades()\n    ];\n};\nexport * from \"~/graphqlFields\";\nexport * from \"~/plugins\";\nexport { entryToStorageTransform, entryFieldFromStorageTransform, entryFromStorageTransform };\n"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;;AACA;;AACA;;AACA;;AACA;;AAuDA;EAAA;EAAA;EAAA;EAAA;IAAA;IAAA;MAAA;IAAA;EAAA;AAAA;;AAtDA;;AACA;;AACA;;AACA;;AACA;;AAKA;;AACA;;AAKA;;AAwCA;;AAAA;EAAA;EAAA;EAAA;EAAA;IAAA;IAAA;MAAA;IAAA;EAAA;AAAA;;AArCO,MAAMA,wBAAwB,GAAG,CAACC,MAAsC,GAAG,EAA1C,KAAiD;EACrF,OAAO;EACH;AACR;AACA;EACQ,IAAAC,qCAAA,GAJG,EAKH,IAAAC,uCAAA,GALG,EAMH,IAAAC,wCAAA,GANG;EAOH;AACR;AACA;EACQ,IAAAC,sBAAA,EAAkBJ,MAAlB,CAVG,CAAP;AAYH,CAbM;;;;AAgBA,MAAMK,wBAAwB,GAAIL,MAAD,IAAkC;EACtE,OAAO;EACH;AACR;AACA;EACQ,IAAAM,4BAAA,GAJG,EAKH,IAAAC,uCAAA,GALG;EAMH;AACR;AACA;EACQ,IAAAC,gBAAA,EAAWR,MAAX,CATG,EAUH,IAAAS,kCAAA,GAVG,EAWH,IAAAC,sCAAA,GAXG,EAYH,IAAAC,4BAAA,GAZG,EAaH,IAAAC,sCAAA,GAbG,EAcH,IAAAC,oCAAA,GAdG,EAeH,IAAAC,qDAAA,GAfG,EAgBH,IAAAC,wBAAA,GAhBG,CAAP;AAkBH,CAnBM"}

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@webiny/api-headless-cms",
-	"version": "0.0.0-unstable.78f581c1d2",
+	"version": "0.0.0-unstable.97a151f74d",
 	"main": "index.js",
 	"keywords": [
 		"cms:base"
@@ -21,22 +21,23 @@
 		"@babel/runtime": "7.19.0",
 		"@commodo/fields": "1.1.2-beta.20",
 		"@graphql-tools/schema": "7.1.5",
-		"@webiny/api": "0.0.0-unstable.78f581c1d2",
-		"@webiny/api-file-manager": "0.0.0-unstable.78f581c1d2",
-		"@webiny/api-i18n": "0.0.0-unstable.78f581c1d2",
-		"@webiny/api-i18n-ddb": "0.0.0-unstable.78f581c1d2",
-		"@webiny/api-security": "0.0.0-unstable.78f581c1d2",
-		"@webiny/api-tenancy": "0.0.0-unstable.78f581c1d2",
-		"@webiny/api-upgrade": "0.0.0-unstable.78f581c1d2",
-		"@webiny/error": "0.0.0-unstable.78f581c1d2",
-		"@webiny/handler": "0.0.0-unstable.78f581c1d2",
-		"@webiny/handler-aws": "0.0.0-unstable.78f581c1d2",
-		"@webiny/handler-db": "0.0.0-unstable.78f581c1d2",
-		"@webiny/handler-graphql": "0.0.0-unstable.78f581c1d2",
-		"@webiny/plugins": "0.0.0-unstable.78f581c1d2",
-		"@webiny/pubsub": "0.0.0-unstable.78f581c1d2",
-		"@webiny/utils": "0.0.0-unstable.78f581c1d2",
-		"@webiny/validation": "0.0.0-unstable.78f581c1d2",
+		"@webiny/api": "0.0.0-unstable.97a151f74d",
+		"@webiny/api-file-manager": "0.0.0-unstable.97a151f74d",
+		"@webiny/api-i18n": "0.0.0-unstable.97a151f74d",
+		"@webiny/api-i18n-ddb": "0.0.0-unstable.97a151f74d",
+		"@webiny/api-security": "0.0.0-unstable.97a151f74d",
+		"@webiny/api-tenancy": "0.0.0-unstable.97a151f74d",
+		"@webiny/api-upgrade": "0.0.0-unstable.97a151f74d",
+		"@webiny/error": "0.0.0-unstable.97a151f74d",
+		"@webiny/handler": "0.0.0-unstable.97a151f74d",
+		"@webiny/handler-aws": "0.0.0-unstable.97a151f74d",
+		"@webiny/handler-db": "0.0.0-unstable.97a151f74d",
+		"@webiny/handler-graphql": "0.0.0-unstable.97a151f74d",
+		"@webiny/plugins": "0.0.0-unstable.97a151f74d",
+		"@webiny/pubsub": "0.0.0-unstable.97a151f74d",
+		"@webiny/utils": "0.0.0-unstable.97a151f74d",
+		"@webiny/validation": "0.0.0-unstable.97a151f74d",
+		"code-frame": "5.0.0",
 		"commodo-fields-object": "1.0.6",
 		"dataloader": "2.1.0",
 		"dot-prop": "6.0.1",
@@ -52,11 +53,11 @@
 		"@babel/cli": "^7.19.3",
 		"@babel/core": "^7.19.3",
 		"@babel/preset-env": "^7.19.4",
-		"@webiny/api-security-so-ddb": "^0.0.0-unstable.78f581c1d2",
-		"@webiny/api-tenancy-so-ddb": "^0.0.0-unstable.78f581c1d2",
-		"@webiny/api-wcp": "^0.0.0-unstable.78f581c1d2",
-		"@webiny/cli": "^0.0.0-unstable.78f581c1d2",
-		"@webiny/project-utils": "^0.0.0-unstable.78f581c1d2",
+		"@webiny/api-security-so-ddb": "^0.0.0-unstable.97a151f74d",
+		"@webiny/api-tenancy-so-ddb": "^0.0.0-unstable.97a151f74d",
+		"@webiny/api-wcp": "^0.0.0-unstable.97a151f74d",
+		"@webiny/cli": "^0.0.0-unstable.97a151f74d",
+		"@webiny/project-utils": "^0.0.0-unstable.97a151f74d",
 		"apollo-graphql": "^0.9.5",
 		"get-yarn-workspaces": "^1.0.2",
 		"graphql": "^15.7.2",
@@ -76,5 +77,5 @@
 		"build": "yarn webiny run build",
 		"watch": "yarn webiny run watch"
 	},
-	"gitHead": "78f581c1d2e5e6936aa11b9452a66d2a3652a1b2"
+	"gitHead": "97a151f74d8c5679323989fcc8cc7036be0f150e"
 }

package/plugins/StorageTransformPlugin.d.ts

@@ -1,31 +1,31 @@
 import { Plugin } from "@webiny/plugins/Plugin";
 import { CmsModel, CmsModelField } from "../types";
 import { PluginsContainer } from "@webiny/plugins";
-export interface ToStorageParams<T> {
+export interface ToStorageParams<T, F extends CmsModelField> {
     model: CmsModel;
-    field: CmsModelField;
+    field: F;
     value: T;
     getStoragePlugin(fieldType: string): StorageTransformPlugin<T>;
     plugins: PluginsContainer;
 }
-export interface FromStorageParams<T> {
+export interface FromStorageParams<T, F extends CmsModelField> {
     model: CmsModel;
-    field: CmsModelField;
+    field: Partial<F> & Pick<F, "id" | "fieldId" | "storageId" | "type" | "settings">;
     value: T;
     getStoragePlugin(fieldType: string): StorageTransformPlugin<T>;
     plugins: PluginsContainer;
 }
-export interface StorageTransformPluginParams<T, R> {
+export interface StorageTransformPluginParams<T, R, F extends CmsModelField> {
     name?: string;
     fieldType: string;
-    toStorage: (params: ToStorageParams<T>) => Promise<R>;
-    fromStorage: (params: FromStorageParams<R>) => Promise<T>;
+    toStorage: (params: ToStorageParams<T, F>) => Promise<R>;
+    fromStorage: (params: FromStorageParams<R, F>) => Promise<T>;
 }
-export declare class StorageTransformPlugin<T = any, R = any> extends Plugin {
+export declare class StorageTransformPlugin<T = any, R = any, F extends CmsModelField = CmsModelField> extends Plugin {
     static readonly type: string;
     get fieldType(): string;
     private readonly config;
-    constructor(config: StorageTransformPluginParams<T, R>);
-    toStorage(params: ToStorageParams<T>): Promise<R>;
-    fromStorage(params: FromStorageParams<R>): Promise<T>;
+    constructor(config: StorageTransformPluginParams<T, R, F>);
+    toStorage(params: ToStorageParams<T, F>): Promise<R>;
+    fromStorage(params: FromStorageParams<R, F>): Promise<T>;
 }

package/plugins/StorageTransformPlugin.js.map

@@ -1 +1 @@
-{"version":3,"names":["StorageTransformPlugin","Plugin","fieldType","config","constructor","name","toStorage","params","fromStorage"],"sources":["StorageTransformPlugin.ts"],"sourcesContent":["import { Plugin } from \"@webiny/plugins/Plugin\";\nimport { CmsModel, CmsModelField } from \"~/types\";\nimport { PluginsContainer } from \"@webiny/plugins\";\n\nexport interface ToStorageParams<T> {\n    model: CmsModel;\n    field: CmsModelField;\n    value: T;\n    getStoragePlugin(fieldType: string): StorageTransformPlugin<T>;\n    plugins: PluginsContainer;\n}\n\nexport interface FromStorageParams<T> {\n    model: CmsModel;\n    field: CmsModelField;\n    value: T;\n    getStoragePlugin(fieldType: string): StorageTransformPlugin<T>;\n    plugins: PluginsContainer;\n}\n\nexport interface StorageTransformPluginParams<T, R> {\n    name?: string;\n    fieldType: string;\n    toStorage: (params: ToStorageParams<T>) => Promise<R>;\n    fromStorage: (params: FromStorageParams<R>) => Promise<T>;\n}\nexport class StorageTransformPlugin<T = any, R = any> extends Plugin {\n    public static override readonly type: string = \"cms.storage.transform.plugin\";\n    public get fieldType(): string {\n        return this.config.fieldType;\n    }\n\n    private readonly config: StorageTransformPluginParams<T, R>;\n\n    public constructor(config: StorageTransformPluginParams<T, R>) {\n        super();\n        this.name = config.name;\n        this.config = config;\n    }\n\n    public toStorage(params: ToStorageParams<T>): Promise<R> {\n        return this.config.toStorage(params);\n    }\n\n    public fromStorage(params: FromStorageParams<R>): Promise<T> {\n        return this.config.fromStorage(params);\n    }\n}\n"],"mappings":";;;;;;;;;;;AAAA;;AA0BO,MAAMA,sBAAN,SAAuDC,cAAvD,CAA8D;EAE7C,IAATC,SAAS,GAAW;IAC3B,OAAO,KAAKC,MAAL,CAAYD,SAAnB;EACH;;EAIME,WAAW,CAACD,MAAD,EAA6C;IAC3D;IAD2D;IAE3D,KAAKE,IAAL,GAAYF,MAAM,CAACE,IAAnB;IACA,KAAKF,MAAL,GAAcA,MAAd;EACH;;EAEMG,SAAS,CAACC,MAAD,EAAyC;IACrD,OAAO,KAAKJ,MAAL,CAAYG,SAAZ,CAAsBC,MAAtB,CAAP;EACH;;EAEMC,WAAW,CAACD,MAAD,EAA2C;IACzD,OAAO,KAAKJ,MAAL,CAAYK,WAAZ,CAAwBD,MAAxB,CAAP;EACH;;AApBgE;;;8BAAxDP,sB,UACsC,8B"}
+{"version":3,"names":["StorageTransformPlugin","Plugin","fieldType","config","constructor","name","toStorage","params","fromStorage"],"sources":["StorageTransformPlugin.ts"],"sourcesContent":["import { Plugin } from \"@webiny/plugins/Plugin\";\nimport { CmsModel, CmsModelField } from \"~/types\";\nimport { PluginsContainer } from \"@webiny/plugins\";\n\nexport interface ToStorageParams<T, F extends CmsModelField> {\n    model: CmsModel;\n    field: F;\n    value: T;\n    getStoragePlugin(fieldType: string): StorageTransformPlugin<T>;\n    plugins: PluginsContainer;\n}\n\nexport interface FromStorageParams<T, F extends CmsModelField> {\n    model: CmsModel;\n    field: Partial<F> & Pick<F, \"id\" | \"fieldId\" | \"storageId\" | \"type\" | \"settings\">;\n    value: T;\n    getStoragePlugin(fieldType: string): StorageTransformPlugin<T>;\n    plugins: PluginsContainer;\n}\n\nexport interface StorageTransformPluginParams<T, R, F extends CmsModelField> {\n    name?: string;\n    fieldType: string;\n    toStorage: (params: ToStorageParams<T, F>) => Promise<R>;\n    fromStorage: (params: FromStorageParams<R, F>) => Promise<T>;\n}\nexport class StorageTransformPlugin<\n    T = any,\n    R = any,\n    F extends CmsModelField = CmsModelField\n> extends Plugin {\n    public static override readonly type: string = \"cms.storage.transform.plugin\";\n    public get fieldType(): string {\n        return this.config.fieldType;\n    }\n\n    private readonly config: StorageTransformPluginParams<T, R, F>;\n\n    public constructor(config: StorageTransformPluginParams<T, R, F>) {\n        super();\n        this.name = config.name;\n        this.config = config;\n    }\n\n    public toStorage(params: ToStorageParams<T, F>): Promise<R> {\n        return this.config.toStorage(params);\n    }\n\n    public fromStorage(params: FromStorageParams<R, F>): Promise<T> {\n        return this.config.fromStorage(params);\n    }\n}\n"],"mappings":";;;;;;;;;;;AAAA;;AA0BO,MAAMA,sBAAN,SAIGC,cAJH,CAIU;EAEO,IAATC,SAAS,GAAW;IAC3B,OAAO,KAAKC,MAAL,CAAYD,SAAnB;EACH;;EAIME,WAAW,CAACD,MAAD,EAAgD;IAC9D;IAD8D;IAE9D,KAAKE,IAAL,GAAYF,MAAM,CAACE,IAAnB;IACA,KAAKF,MAAL,GAAcA,MAAd;EACH;;EAEMG,SAAS,CAACC,MAAD,EAA4C;IACxD,OAAO,KAAKJ,MAAL,CAAYG,SAAZ,CAAsBC,MAAtB,CAAP;EACH;;EAEMC,WAAW,CAACD,MAAD,EAA8C;IAC5D,OAAO,KAAKJ,MAAL,CAAYK,WAAZ,CAAwBD,MAAxB,CAAP;EACH;;AApBY;;;8BAJJP,sB,UAKsC,8B"}

package/storage/object.js

@@ -15,6 +15,8 @@ var _pMap = _interopRequireDefault(require("p-map"));
 
 var _StorageTransformPlugin = require("../plugins/StorageTransformPlugin");
 
+var _getBaseFieldType = require("../utils/getBaseFieldType");
+
 const processValue = async params => {
   const {
     fields,
@@ -25,10 +27,11 @@ const processValue = async params => {
     operation
   } = params;
   return await (0, _pReduce.default)(fields, async (values, field) => {
-    const plugin = getStoragePlugin(field.type);
+    const baseType = (0, _getBaseFieldType.getBaseFieldType)(field);
+    const plugin = getStoragePlugin(baseType);
 
     if (!plugin) {
-      throw new Error(`Missing storage plugin for field type "${field.type}".`);
+      throw new Error(`Missing storage plugin for field type "${baseType}".`);
     }
 
     const value = await plugin[operation]({

package/storage/object.js.map

@@ -1 +1 @@
-{"version":3,"names":["processValue","params","fields","sourceValue","getStoragePlugin","plugins","model","operation","pReduce","values","field","plugin","type","Error","value","fieldId","createObjectStorageTransform","StorageTransformPlugin","name","fieldType","toStorage","settings","multipleValues","pMap","fromStorage"],"sources":["object.ts"],"sourcesContent":["import pReduce from \"p-reduce\";\nimport pMap from \"p-map\";\nimport { CmsModel, CmsModelField } from \"~/types\";\nimport { PluginsContainer } from \"@webiny/plugins\";\nimport { StorageTransformPlugin } from \"~/plugins/StorageTransformPlugin\";\n\ninterface ProcessValueParams {\n    fields: CmsModelField[];\n    sourceValue: Record<string, any>;\n    getStoragePlugin: (fieldType: string) => StorageTransformPlugin;\n    plugins: PluginsContainer;\n    model: CmsModel;\n    operation: \"toStorage\" | \"fromStorage\";\n}\ninterface ProcessValue {\n    (params: ProcessValueParams): Promise<Record<string, any>>;\n}\n\nconst processValue: ProcessValue = async params => {\n    const { fields, sourceValue, getStoragePlugin, plugins, model, operation } = params;\n    return await pReduce(\n        fields,\n        async (values, field) => {\n            const plugin = getStoragePlugin(field.type);\n            if (!plugin) {\n                throw new Error(`Missing storage plugin for field type \"${field.type}\".`);\n            }\n            const value = await plugin[operation]({\n                plugins,\n                model,\n                field,\n                value: sourceValue[field.fieldId],\n                getStoragePlugin\n            });\n            return { ...values, [field.fieldId]: value };\n        },\n        {}\n    );\n};\n\nexport const createObjectStorageTransform = (): StorageTransformPlugin => {\n    return new StorageTransformPlugin({\n        name: \"headless-cms.storage-transform.object.default\",\n        fieldType: \"object\",\n        toStorage: async ({ field, value, getStoragePlugin, model, plugins }) => {\n            if (!value) {\n                return null;\n            }\n\n            const fields = (field.settings?.fields || []) as CmsModelField[];\n\n            if (field.multipleValues) {\n                return await pMap(value as Record<string, any>[], value =>\n                    processValue({\n                        sourceValue: value,\n                        getStoragePlugin,\n                        model,\n                        plugins,\n                        operation: \"toStorage\",\n                        fields\n                    })\n                );\n            }\n\n            return await processValue({\n                sourceValue: value,\n                getStoragePlugin,\n                model,\n                plugins,\n                operation: \"toStorage\",\n                fields\n            });\n        },\n        fromStorage: async ({ field, value, getStoragePlugin, plugins, model }) => {\n            if (!value) {\n                return null;\n            }\n\n            const fields = (field.settings?.fields || []) as CmsModelField[];\n\n            if (field.multipleValues) {\n                return pMap(value as Record<string, any>[], value =>\n                    processValue({\n                        sourceValue: value,\n                        getStoragePlugin,\n                        model,\n                        plugins,\n                        operation: \"fromStorage\",\n                        fields\n                    })\n                );\n            }\n\n            return processValue({\n                sourceValue: value,\n                getStoragePlugin,\n                model,\n                plugins,\n                operation: \"fromStorage\",\n                fields\n            });\n        }\n    });\n};\n"],"mappings":";;;;;;;;;;;AAAA;;AACA;;AAGA;;AAcA,MAAMA,YAA0B,GAAG,MAAMC,MAAN,IAAgB;EAC/C,MAAM;IAAEC,MAAF;IAAUC,WAAV;IAAuBC,gBAAvB;IAAyCC,OAAzC;IAAkDC,KAAlD;IAAyDC;EAAzD,IAAuEN,MAA7E;EACA,OAAO,MAAM,IAAAO,gBAAA,EACTN,MADS,EAET,OAAOO,MAAP,EAAeC,KAAf,KAAyB;IACrB,MAAMC,MAAM,GAAGP,gBAAgB,CAACM,KAAK,CAACE,IAAP,CAA/B;;IACA,IAAI,CAACD,MAAL,EAAa;MACT,MAAM,IAAIE,KAAJ,CAAW,0CAAyCH,KAAK,CAACE,IAAK,IAA/D,CAAN;IACH;;IACD,MAAME,KAAK,GAAG,MAAMH,MAAM,CAACJ,SAAD,CAAN,CAAkB;MAClCF,OADkC;MAElCC,KAFkC;MAGlCI,KAHkC;MAIlCI,KAAK,EAAEX,WAAW,CAACO,KAAK,CAACK,OAAP,CAJgB;MAKlCX;IALkC,CAAlB,CAApB;IAOA,mEAAYK,MAAZ;MAAoB,CAACC,KAAK,CAACK,OAAP,GAAiBD;IAArC;EACH,CAfQ,EAgBT,EAhBS,CAAb;AAkBH,CApBD;;AAsBO,MAAME,4BAA4B,GAAG,MAA8B;EACtE,OAAO,IAAIC,8CAAJ,CAA2B;IAC9BC,IAAI,EAAE,+CADwB;IAE9BC,SAAS,EAAE,QAFmB;IAG9BC,SAAS,EAAE,OAAO;MAAEV,KAAF;MAASI,KAAT;MAAgBV,gBAAhB;MAAkCE,KAAlC;MAAyCD;IAAzC,CAAP,KAA8D;MAAA;;MACrE,IAAI,CAACS,KAAL,EAAY;QACR,OAAO,IAAP;MACH;;MAED,MAAMZ,MAAM,GAAI,oBAAAQ,KAAK,CAACW,QAAN,oEAAgBnB,MAAhB,KAA0B,EAA1C;;MAEA,IAAIQ,KAAK,CAACY,cAAV,EAA0B;QACtB,OAAO,MAAM,IAAAC,aAAA,EAAKT,KAAL,EAAqCA,KAAK,IACnDd,YAAY,CAAC;UACTG,WAAW,EAAEW,KADJ;UAETV,gBAFS;UAGTE,KAHS;UAITD,OAJS;UAKTE,SAAS,EAAE,WALF;UAMTL;QANS,CAAD,CADH,CAAb;MAUH;;MAED,OAAO,MAAMF,YAAY,CAAC;QACtBG,WAAW,EAAEW,KADS;QAEtBV,gBAFsB;QAGtBE,KAHsB;QAItBD,OAJsB;QAKtBE,SAAS,EAAE,WALW;QAMtBL;MANsB,CAAD,CAAzB;IAQH,CA/B6B;IAgC9BsB,WAAW,EAAE,OAAO;MAAEd,KAAF;MAASI,KAAT;MAAgBV,gBAAhB;MAAkCC,OAAlC;MAA2CC;IAA3C,CAAP,KAA8D;MAAA;;MACvE,IAAI,CAACQ,KAAL,EAAY;QACR,OAAO,IAAP;MACH;;MAED,MAAMZ,MAAM,GAAI,qBAAAQ,KAAK,CAACW,QAAN,sEAAgBnB,MAAhB,KAA0B,EAA1C;;MAEA,IAAIQ,KAAK,CAACY,cAAV,EAA0B;QACtB,OAAO,IAAAC,aAAA,EAAKT,KAAL,EAAqCA,KAAK,IAC7Cd,YAAY,CAAC;UACTG,WAAW,EAAEW,KADJ;UAETV,gBAFS;UAGTE,KAHS;UAITD,OAJS;UAKTE,SAAS,EAAE,aALF;UAMTL;QANS,CAAD,CADT,CAAP;MAUH;;MAED,OAAOF,YAAY,CAAC;QAChBG,WAAW,EAAEW,KADG;QAEhBV,gBAFgB;QAGhBE,KAHgB;QAIhBD,OAJgB;QAKhBE,SAAS,EAAE,aALK;QAMhBL;MANgB,CAAD,CAAnB;IAQH;EA5D6B,CAA3B,CAAP;AA8DH,CA/DM"}
+{"version":3,"names":["processValue","params","fields","sourceValue","getStoragePlugin","plugins","model","operation","pReduce","values","field","baseType","getBaseFieldType","plugin","Error","value","fieldId","createObjectStorageTransform","StorageTransformPlugin","name","fieldType","toStorage","settings","multipleValues","pMap","fromStorage"],"sources":["object.ts"],"sourcesContent":["import pReduce from \"p-reduce\";\nimport pMap from \"p-map\";\nimport { CmsModel, CmsModelField } from \"~/types\";\nimport { PluginsContainer } from \"@webiny/plugins\";\nimport { StorageTransformPlugin } from \"~/plugins/StorageTransformPlugin\";\nimport { getBaseFieldType } from \"~/utils/getBaseFieldType\";\n\ninterface ProcessValueParams {\n    fields: CmsModelField[];\n    sourceValue: Record<string, any>;\n    getStoragePlugin: (fieldType: string) => StorageTransformPlugin;\n    plugins: PluginsContainer;\n    model: CmsModel;\n    operation: \"toStorage\" | \"fromStorage\";\n}\ninterface ProcessValue {\n    (params: ProcessValueParams): Promise<Record<string, any>>;\n}\n\nconst processValue: ProcessValue = async params => {\n    const { fields, sourceValue, getStoragePlugin, plugins, model, operation } = params;\n    return await pReduce(\n        fields,\n        async (values, field) => {\n            const baseType = getBaseFieldType(field);\n            const plugin = getStoragePlugin(baseType);\n            if (!plugin) {\n                throw new Error(`Missing storage plugin for field type \"${baseType}\".`);\n            }\n            const value = await plugin[operation]({\n                plugins,\n                model,\n                field,\n                value: sourceValue[field.fieldId],\n                getStoragePlugin\n            });\n            return { ...values, [field.fieldId]: value };\n        },\n        {}\n    );\n};\n\nexport const createObjectStorageTransform = (): StorageTransformPlugin => {\n    return new StorageTransformPlugin({\n        name: \"headless-cms.storage-transform.object.default\",\n        fieldType: \"object\",\n        toStorage: async ({ field, value, getStoragePlugin, model, plugins }) => {\n            if (!value) {\n                return null;\n            }\n\n            const fields = (field.settings?.fields || []) as CmsModelField[];\n\n            if (field.multipleValues) {\n                return await pMap(value as Record<string, any>[], value =>\n                    processValue({\n                        sourceValue: value,\n                        getStoragePlugin,\n                        model,\n                        plugins,\n                        operation: \"toStorage\",\n                        fields\n                    })\n                );\n            }\n\n            return await processValue({\n                sourceValue: value,\n                getStoragePlugin,\n                model,\n                plugins,\n                operation: \"toStorage\",\n                fields\n            });\n        },\n        fromStorage: async ({ field, value, getStoragePlugin, plugins, model }) => {\n            if (!value) {\n                return null;\n            }\n\n            const fields = (field.settings?.fields || []) as CmsModelField[];\n\n            if (field.multipleValues) {\n                return pMap(value as Record<string, any>[], value =>\n                    processValue({\n                        sourceValue: value,\n                        getStoragePlugin,\n                        model,\n                        plugins,\n                        operation: \"fromStorage\",\n                        fields\n                    })\n                );\n            }\n\n            return processValue({\n                sourceValue: value,\n                getStoragePlugin,\n                model,\n                plugins,\n                operation: \"fromStorage\",\n                fields\n            });\n        }\n    });\n};\n"],"mappings":";;;;;;;;;;;AAAA;;AACA;;AAGA;;AACA;;AAcA,MAAMA,YAA0B,GAAG,MAAMC,MAAN,IAAgB;EAC/C,MAAM;IAAEC,MAAF;IAAUC,WAAV;IAAuBC,gBAAvB;IAAyCC,OAAzC;IAAkDC,KAAlD;IAAyDC;EAAzD,IAAuEN,MAA7E;EACA,OAAO,MAAM,IAAAO,gBAAA,EACTN,MADS,EAET,OAAOO,MAAP,EAAeC,KAAf,KAAyB;IACrB,MAAMC,QAAQ,GAAG,IAAAC,kCAAA,EAAiBF,KAAjB,CAAjB;IACA,MAAMG,MAAM,GAAGT,gBAAgB,CAACO,QAAD,CAA/B;;IACA,IAAI,CAACE,MAAL,EAAa;MACT,MAAM,IAAIC,KAAJ,CAAW,0CAAyCH,QAAS,IAA7D,CAAN;IACH;;IACD,MAAMI,KAAK,GAAG,MAAMF,MAAM,CAACN,SAAD,CAAN,CAAkB;MAClCF,OADkC;MAElCC,KAFkC;MAGlCI,KAHkC;MAIlCK,KAAK,EAAEZ,WAAW,CAACO,KAAK,CAACM,OAAP,CAJgB;MAKlCZ;IALkC,CAAlB,CAApB;IAOA,mEAAYK,MAAZ;MAAoB,CAACC,KAAK,CAACM,OAAP,GAAiBD;IAArC;EACH,CAhBQ,EAiBT,EAjBS,CAAb;AAmBH,CArBD;;AAuBO,MAAME,4BAA4B,GAAG,MAA8B;EACtE,OAAO,IAAIC,8CAAJ,CAA2B;IAC9BC,IAAI,EAAE,+CADwB;IAE9BC,SAAS,EAAE,QAFmB;IAG9BC,SAAS,EAAE,OAAO;MAAEX,KAAF;MAASK,KAAT;MAAgBX,gBAAhB;MAAkCE,KAAlC;MAAyCD;IAAzC,CAAP,KAA8D;MAAA;;MACrE,IAAI,CAACU,KAAL,EAAY;QACR,OAAO,IAAP;MACH;;MAED,MAAMb,MAAM,GAAI,oBAAAQ,KAAK,CAACY,QAAN,oEAAgBpB,MAAhB,KAA0B,EAA1C;;MAEA,IAAIQ,KAAK,CAACa,cAAV,EAA0B;QACtB,OAAO,MAAM,IAAAC,aAAA,EAAKT,KAAL,EAAqCA,KAAK,IACnDf,YAAY,CAAC;UACTG,WAAW,EAAEY,KADJ;UAETX,gBAFS;UAGTE,KAHS;UAITD,OAJS;UAKTE,SAAS,EAAE,WALF;UAMTL;QANS,CAAD,CADH,CAAb;MAUH;;MAED,OAAO,MAAMF,YAAY,CAAC;QACtBG,WAAW,EAAEY,KADS;QAEtBX,gBAFsB;QAGtBE,KAHsB;QAItBD,OAJsB;QAKtBE,SAAS,EAAE,WALW;QAMtBL;MANsB,CAAD,CAAzB;IAQH,CA/B6B;IAgC9BuB,WAAW,EAAE,OAAO;MAAEf,KAAF;MAASK,KAAT;MAAgBX,gBAAhB;MAAkCC,OAAlC;MAA2CC;IAA3C,CAAP,KAA8D;MAAA;;MACvE,IAAI,CAACS,KAAL,EAAY;QACR,OAAO,IAAP;MACH;;MAED,MAAMb,MAAM,GAAI,qBAAAQ,KAAK,CAACY,QAAN,sEAAgBpB,MAAhB,KAA0B,EAA1C;;MAEA,IAAIQ,KAAK,CAACa,cAAV,EAA0B;QACtB,OAAO,IAAAC,aAAA,EAAKT,KAAL,EAAqCA,KAAK,IAC7Cf,YAAY,CAAC;UACTG,WAAW,EAAEY,KADJ;UAETX,gBAFS;UAGTE,KAHS;UAITD,OAJS;UAKTE,SAAS,EAAE,aALF;UAMTL;QANS,CAAD,CADT,CAAP;MAUH;;MAED,OAAOF,YAAY,CAAC;QAChBG,WAAW,EAAEY,KADG;QAEhBX,gBAFgB;QAGhBE,KAHgB;QAIhBD,OAJgB;QAKhBE,SAAS,EAAE,aALK;QAMhBL;MANgB,CAAD,CAAnB;IAQH;EA5D6B,CAA3B,CAAP;AA8DH,CA/DM"}

package/types.d.ts

@@ -195,6 +195,10 @@ export interface CmsModelField {
      *
      */
     multipleValues?: boolean;
+    /**
+     * Fields can be tagged to give them contextual meaning.
+     */
+    tags?: string[];
     /**
      * Any user defined settings.
      *
@@ -202,6 +206,27 @@ export interface CmsModelField {
      */
     settings?: CmsModelFieldSettings;
 }
+export interface CmsDynamicZoneTemplate {
+    id: string;
+    name: string;
+    gqlTypeName: string;
+    description: string;
+    icon: string;
+    fields: CmsModelField[];
+    layout: string[][];
+    validation: CmsModelFieldValidation[];
+}
+/**
+ * A definition for dynamic-zone field to show possible type of the field in settings.
+ */
+export interface CmsModelDynamicZoneField extends CmsModelField {
+    /**
+     * Settings object for the field. Contains `templates` property.
+     */
+    settings: {
+        templates: CmsDynamicZoneTemplate[];
+    };
+}
 /**
  * Used for our internal functionality.
  */
@@ -213,7 +238,7 @@ export interface CmsModelFieldWithParent extends CmsModelField {
  */
 export interface CmsModelDateTimeField extends CmsModelField {
     /**
-     * Settings object for the field. Contains type property.
+     * Settings object for the field. Contains `type` property.
      */
     settings: {
         type: "time" | "date" | "dateTimeWithoutTimezone" | "dateTimeWithTimezone";
@@ -401,6 +426,10 @@ export interface CmsModel {
      * ```
      */
     layout: string[][];
+    /**
+     * Models can be tagged to give them contextual meaning.
+     */
+    tags?: string[];
     /**
      * List of locked fields. Updated when entry is saved and a field has been used.
      */
@@ -437,15 +466,15 @@ export interface CmsModelFieldDefinition {
     fields: string;
     typeDefs?: string;
 }
-interface CmsModelFieldToGraphQLCreateResolverParams {
+interface CmsModelFieldToGraphQLCreateResolverParams<TField> {
     models: CmsModel[];
     model: CmsModel;
     graphQLType: string;
-    field: CmsModelField;
+    field: TField;
     createFieldResolvers: any;
 }
-export interface CmsModelFieldToGraphQLCreateResolver {
-    (params: CmsModelFieldToGraphQLCreateResolverParams): GraphQLFieldResolver | {
+export interface CmsModelFieldToGraphQLCreateResolver<TField = CmsModelField> {
+    (params: CmsModelFieldToGraphQLCreateResolverParams<TField>): GraphQLFieldResolver | {
         resolver: GraphQLFieldResolver | null;
         typeResolvers: Resolvers<CmsContext>;
     } | false;
@@ -455,7 +484,7 @@ export interface CmsModelFieldToGraphQLCreateResolver {
  * @category ModelField
  * @category GraphQL
  */
-export interface CmsModelFieldToGraphQLPlugin extends Plugin {
+export interface CmsModelFieldToGraphQLPlugin<TField extends CmsModelField = CmsModelField> extends Plugin {
     /**
      * A plugin type
      */
@@ -509,7 +538,7 @@ export interface CmsModelFieldToGraphQLPlugin extends Plugin {
      */
     createStorageId?: (params: {
         model: CmsModel;
-        field: CmsModelField;
+        field: TField;
     }) => string | null | undefined;
     /**
      * Read API methods.
@@ -528,7 +557,7 @@ export interface CmsModelFieldToGraphQLPlugin extends Plugin {
          */
         createGetFilters?(params: {
             model: CmsModel;
-            field: CmsModelField;
+            field: TField;
         }): string;
         /**
          * Definition for list filtering for GraphQL.
@@ -548,7 +577,8 @@ export interface CmsModelFieldToGraphQLPlugin extends Plugin {
          */
         createListFilters?(params: {
             model: CmsModel;
-            field: CmsModelField;
+            field: TField;
+            plugins: CmsFieldTypePlugins;
         }): string;
         /**
          * Definition of the field type for GraphQL - be aware if multiple values is selected.
@@ -567,12 +597,12 @@ export interface CmsModelFieldToGraphQLPlugin extends Plugin {
          */
         createTypeField(params: {
             model: CmsModel;
-            field: CmsModelField;
+            field: TField;
             fieldTypePlugins: CmsFieldTypePlugins;
         }): CmsModelFieldDefinition | string | null;
         /**
          * Definition for field resolver.
-         * By default it is simple return of the `instance.values[storageId]` but if required, users can define their own.
+         * By default, it is simple return of the `instance.values[storageId]` but if required, users can define their own.
          *
          * ```ts
          * read: {
@@ -584,7 +614,7 @@ export interface CmsModelFieldToGraphQLPlugin extends Plugin {
          * }
          * ```
          */
-        createResolver?: CmsModelFieldToGraphQLCreateResolver;
+        createResolver?: CmsModelFieldToGraphQLCreateResolver<TField>;
         /**
          * Read API schema definitions for the field and resolvers for them.
          *
@@ -627,7 +657,8 @@ export interface CmsModelFieldToGraphQLPlugin extends Plugin {
          */
         createListFilters?: (params: {
             model: CmsModel;
-            field: CmsModelField;
+            field: TField;
+            plugins: CmsFieldTypePlugins;
         }) => string;
         /**
          * Manage API schema definitions for the field and resolvers for them. Probably similar to `read.createSchema`.
@@ -666,7 +697,7 @@ export interface CmsModelFieldToGraphQLPlugin extends Plugin {
          */
         createTypeField: (params: {
             model: CmsModel;
-            field: CmsModelField;
+            field: TField;
             fieldTypePlugins: CmsFieldTypePlugins;
         }) => CmsModelFieldDefinition | string | null;
         /**
@@ -686,12 +717,12 @@ export interface CmsModelFieldToGraphQLPlugin extends Plugin {
          */
         createInputField: (params: {
             model: CmsModel;
-            field: CmsModelField;
+            field: TField;
             fieldTypePlugins: CmsFieldTypePlugins;
         }) => CmsModelFieldDefinition | string | null;
         /**
          * Definition for field resolver.
-         * By default it is simple return of the `instance.values[storageId]` but if required, users can define their own.
+         * By default, it is simple return of the `instance.values[storageId]` but if required, users can define their own.
          *
          * ```ts
          * manage: {
@@ -703,7 +734,7 @@ export interface CmsModelFieldToGraphQLPlugin extends Plugin {
          * }
          * ```
          */
-        createResolver?: CmsModelFieldToGraphQLCreateResolver;
+        createResolver?: CmsModelFieldToGraphQLCreateResolver<TField>;
     };
 }
 /**
@@ -743,7 +774,7 @@ export interface CmsFieldTypePlugins {
     [key: string]: CmsModelFieldToGraphQLPlugin;
 }
 /**
- * A interface describing the reference to a user that created some data in the database.
+ * An interface describing the reference to a user that created some data in the database.
  *
  * @category General
  */
@@ -837,7 +868,7 @@ export declare type CmsSystemContext = {
     onSystemInstallError: Topic<OnSystemInstallErrorTopicParams>;
 };
 /**
- * A GraphQL params.data parameter received when creating content model group.
+ * A GraphQL `params.data` parameter received when creating content model group.
  *
  * @category CmsGroup
  * @category GraphQL params
@@ -849,7 +880,7 @@ export interface CmsGroupCreateInput {
     icon: string;
 }
 /**
- * A GraphQL params.data parameter received when updating content model group.
+ * A GraphQL `params.data` parameter received when updating content model group.
  *
  * @category CmsGroup
  * @category GraphQL params
@@ -919,7 +950,7 @@ export interface CmsGroup {
     isPrivate?: boolean;
 }
 /**
- * A data.where parameter received when listing content model groups.
+ * A `data.where` parameter received when listing content model groups.
  *
  * @category CmsGroup
  * @category GraphQL params
@@ -1060,7 +1091,7 @@ export interface CmsModelFieldValidation {
     };
 }
 /**
- * A GraphQL params.data parameter received when creating content model.
+ * A GraphQL `params.data` parameter received when creating content model.
  *
  * @category GraphQL params
  * @category CmsModel
@@ -1097,6 +1128,10 @@ export interface CmsModelCreateInput {
      * ```
      */
     layout?: string[][];
+    /**
+     * Models can be tagged to give them contextual meaning.
+     */
+    tags?: string[];
     /**
      * The field that is being displayed as entry title.
      * It is picked as first available text field. Or user can select own field.
@@ -1104,7 +1139,7 @@ export interface CmsModelCreateInput {
     titleFieldId?: string;
 }
 /**
- * A GraphQL params.data parameter received when creating content model from existing model.
+ * A GraphQL `params.data` parameter received when creating content model from existing model.
  *
  * @category GraphQL params
  * @category CmsModel
@@ -1150,6 +1185,10 @@ export interface CmsModelFieldInput {
      * Text to display in the field.
      */
     placeholderText?: string;
+    /**
+     * Fields can be tagged to give them contextual meaning.
+     */
+    tags?: string[];
     /**
      * Are multiple values allowed?
      */
@@ -1176,7 +1215,7 @@ export interface CmsModelFieldInput {
     settings?: Record<string, any>;
 }
 /**
- * A GraphQL params.data parameter received when updating content model.
+ * A GraphQL `params.data` parameter received when updating content model.
  *
  * @category GraphQL params
  * @category CmsModel
@@ -1258,7 +1297,7 @@ export interface CmsEntryValues {
 export interface CmsEntry<T = CmsEntryValues> {
     /**
      * A version of the webiny this entry was created with.
-     * This can be used when upgrading the system so we know which entries to update.
+     * This can be used when upgrading the system, so we know which entries to update.
      */
     webinyVersion: string;
     /**
@@ -1328,10 +1367,10 @@ export interface CmsEntry<T = CmsEntryValues> {
     /**
      * Settings for the given entry.
      *
-     * Introduced with Advanced Publishing Workflow - will be always inserted after this PR is merged.
-     * Be aware that when accessing properties in it on old systems - it will break if not checked first.
+     * Introduced with Advanced Publishing Workflow. Will always be inserted once this PR is merged.
+     * Be aware that when accessing properties in it on old systems, it will break if not checked first.
      *
-     * Available only on the Manage API in entry GraphQL type meta.data property.
+     * Available only on the Manage API in entry GraphQL type `meta.data` property.
      */
     meta?: {
         [key: string]: any;
@@ -1364,7 +1403,7 @@ export interface CmsModelManager {
      */
     getPublishedByIds: (ids: string[]) => Promise<CmsEntry[]>;
     /**
-     * Get a list of latest entries by the ID list.
+     * Get a list of the latest entries by the ID list.
      */
     getLatestByIds: (ids: string[]) => Promise<CmsEntry[]>;
     /**
@@ -1372,15 +1411,15 @@ export interface CmsModelManager {
      */
     get: (id: string) => Promise<CmsEntry>;
     /**
-     * Create a entry.
+     * Create an entry.
      */
     create: (data: CreateCmsEntryInput) => Promise<CmsEntry>;
     /**
-     * Update a entry.
+     * Update an entry.
      */
     update: (id: string, data: UpdateCmsEntryInput) => Promise<CmsEntry>;
     /**
-     * Delete a entry.
+     * Delete an entry.
      */
     delete: (id: string) => Promise<void>;
 }
@@ -1469,7 +1508,7 @@ export interface CmsModelContext {
      */
     initializeModel: (modelId: string) => Promise<boolean>;
     /**
-     * Get a instance of CmsModelManager for given content modelId.
+     * Get an instance of CmsModelManager for given content modelId.
      *
      * @see CmsModelManager
      *
@@ -1619,7 +1658,12 @@ export interface CmsEntryListWhere {
     /**
      * This is to allow querying by any content model field defined by the user.
      */
-    [key: string]: any | CmsEntryListWhereRef;
+    [key: string]: string | number | boolean | undefined | string[] | number[] | null | CmsEntryListWhere[] | CmsEntryListWhere | CmsEntryListWhereRef;
+    /**
+     * To allow querying via nested queries, we added the AND / OR properties.
+     */
+    AND?: CmsEntryListWhere[];
+    OR?: CmsEntryListWhere[];
 }
 /**
  * Entry listing sort.
@@ -1834,7 +1878,7 @@ export interface CmsEntryContext {
      */
     listEntries: (model: CmsModel, params: CmsEntryListParams) => Promise<[CmsEntry[], CmsEntryMeta]>;
     /**
-     * Lists latest entries. Used for manage API.
+     * Lists the latest entries. Used for manage API.
      */
     listLatestEntries: (model: CmsModel, params?: CmsEntryListParams) => Promise<[CmsEntry[], CmsEntryMeta]>;
     /**
@@ -2022,13 +2066,13 @@ export interface BaseCmsSecurityPermission extends SecurityPermission {
  */
 export interface CmsModelPermission extends BaseCmsSecurityPermission {
     /**
-     * A object representing `key: model.modelId` values where key is locale code.
+     * An object representing `key: model.modelId` values where key is locale code.
      */
     models?: {
         [key: string]: string[];
     };
     /**
-     * A object representing `key: group.id` values where key is locale code.
+     * {locale: groupId[]} map, where key is a locale code.
      */
     groups?: {
         [key: string]: string[];
@@ -2042,7 +2086,7 @@ export interface CmsModelPermission extends BaseCmsSecurityPermission {
  */
 export interface CmsGroupPermission extends BaseCmsSecurityPermission {
     /**
-     * A object representing `key: group.id` values where key is locale code.
+     * {locale: groupId[]} map, where key is a locale code.
      */
     groups?: {
         [key: string]: string[];
@@ -2057,13 +2101,13 @@ export interface CmsGroupPermission extends BaseCmsSecurityPermission {
 export interface CmsEntryPermission extends BaseCmsSecurityPermission {
     pw?: string;
     /**
-     * A object representing `key: model.modelId` values where key is locale code.
+     * An object representing `key: model.modelId` values where key is locale code.
      */
     models?: {
         [key: string]: string[];
     };
     /**
-     * A object representing `key: group.id` values where key is locale code.
+     * {locale: groupId[]} map, where key is a locale code.
      */
     groups?: {
         [key: string]: string[];
@@ -2439,6 +2483,7 @@ export interface CmsSystemStorageOperations {
     update: (params: CmsSystemStorageOperationsUpdateParams) => Promise<CmsSystem>;
 }
 export interface HeadlessCmsStorageOperations<C = CmsContext> {
+    name: string;
     system: CmsSystemStorageOperations;
     settings: CmsSettingsStorageOperations;
     groups: CmsGroupStorageOperations;