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

package/features/whereMapper/DEVELOPER.md

@@ -0,0 +1,29 @@
+# Cms Where Mapper
+
+The mapper is used to convert a private model GraphQL `where` to one that can be used within the CMS methods.
+
+For example, private model can have field `title`. The `where` parameter can contain a filter for that field like this:
+
+```graphql
+{
+    where: {
+        title_contains: "My Title"
+    }
+}
+```
+
+When passing the `where` int CMS list/get or similar methods, user must pass the `where` variable through the
+CmsWhereMapper.map method so it is converted to something like:
+
+```graphql
+{
+    where: {
+        values: {
+            title_contains: "My Title"
+        }
+    }
+}
+```
+
+The reason behind it is that we store all user defined values in a nested `values` object in the database, so all
+filters must be applied to that object.

package/features/whereMapper/WhereMapper.d.ts

@@ -0,0 +1,16 @@
+/**
+ * Used to map a model with custom schema with fields in a root to values object.
+ * eg. File Manager File model has "title" and "tags" fields in the root, but they should be
+ * mapped to "values.title" and "values.tags" when creating the entry.
+ */
+import { GenericRecord } from "@webiny/api/types.js";
+import { CmsEntryListWhere } from "../../types/types.js";
+import { CmsWhereMapper, ICmsWhereMapperParams } from "./abstractions.js";
+declare class WhereMapperImpl implements CmsWhereMapper.Interface {
+    map<T extends GenericRecord>(params: ICmsWhereMapperParams<T>): CmsEntryListWhere | undefined;
+    private mapWhere;
+}
+export declare const WhereMapper: typeof WhereMapperImpl & {
+    __abstraction: import("@webiny/di").Abstraction<import("./abstractions.js").ICmsWhereMapper>;
+};
+export {};

package/features/whereMapper/WhereMapper.js

@@ -0,0 +1,79 @@
+/**
+ * Used to map a model with custom schema with fields in a root to values object.
+ * eg. File Manager File model has "title" and "tags" fields in the root, but they should be
+ * mapped to "values.title" and "values.tags" when creating the entry.
+ */
+
+import { CmsWhereMapper } from "./abstractions.js";
+const isPlainObject = value => {
+  if (!value || typeof value !== "object") {
+    return false;
+  } else if (Array.isArray(value)) {
+    return false;
+  }
+  return true;
+};
+const isLogicalKey = key => {
+  return key === "AND" || key === "OR";
+};
+class WhereMapperImpl {
+  map(params) {
+    const {
+      fields: modelFields,
+      input
+    } = params;
+    if (!input) {
+      return undefined;
+    }
+    const fields = modelFields.map(field => {
+      return field.fieldId;
+    });
+    const isField = key => {
+      const field = key.split("_")[0];
+      return fields.includes(field);
+    };
+    return this.mapWhere({
+      input,
+      isField
+    });
+  }
+  mapWhere(params) {
+    const {
+      input,
+      isField
+    } = params;
+    const out = {};
+    const keys = Object.keys(input);
+    if (keys.length === 0) {
+      return out;
+    }
+    for (const key of keys) {
+      const value = input[key];
+      if (isLogicalKey(key)) {
+        if (Array.isArray(value)) {
+          out[key] = value.filter(isPlainObject).map(child => {
+            return this.mapWhere({
+              input: child,
+              isField
+            });
+          });
+        }
+        continue;
+      } else if (isField(key)) {
+        if (!out.values) {
+          out.values = {};
+        }
+        out.values[key] = value;
+        continue;
+      }
+      out[key] = value;
+    }
+    return out;
+  }
+}
+export const WhereMapper = CmsWhereMapper.createImplementation({
+  implementation: WhereMapperImpl,
+  dependencies: []
+});
+
+//# sourceMappingURL=WhereMapper.js.map

package/features/whereMapper/WhereMapper.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["CmsWhereMapper","isPlainObject","value","Array","isArray","isLogicalKey","key","WhereMapperImpl","map","params","fields","modelFields","input","undefined","field","fieldId","isField","split","includes","mapWhere","out","keys","Object","length","filter","child","values","WhereMapper","createImplementation","implementation","dependencies"],"sources":["WhereMapper.ts"],"sourcesContent":["/**\n * Used to map a model with custom schema with fields in a root to values object.\n * eg. File Manager File model has \"title\" and \"tags\" fields in the root, but they should be\n * mapped to \"values.title\" and \"values.tags\" when creating the entry.\n */\nimport { GenericRecord } from \"@webiny/api/types.js\";\nimport { CmsEntryListWhere } from \"~/types/types.js\";\nimport { CmsWhereMapper, ICmsWhereMapperParams } from \"./abstractions.js\";\n\nconst isPlainObject = (value: unknown): value is Record<string, unknown> => {\n    if (!value || typeof value !== \"object\") {\n        return false;\n    } else if (Array.isArray(value)) {\n        return false;\n    }\n    return true;\n};\n\nconst isLogicalKey = (key: string): key is \"AND\" | \"OR\" => {\n    return key === \"AND\" || key === \"OR\";\n};\n\ninterface IMapNodeWhereParams {\n    input: GenericRecord;\n    isField: (key: string) => boolean;\n}\n\nclass WhereMapperImpl implements CmsWhereMapper.Interface {\n    map<T extends GenericRecord>(params: ICmsWhereMapperParams<T>): CmsEntryListWhere | undefined {\n        const { fields: modelFields, input } = params;\n        if (!input) {\n            return undefined;\n        }\n\n        const fields = modelFields.map(field => {\n            return field.fieldId;\n        });\n\n        const isField = (key: string): boolean => {\n            const field = key.split(\"_\")[0];\n            return fields.includes(field);\n        };\n\n        return this.mapWhere({\n            input,\n            isField\n        });\n    }\n\n    private mapWhere(params: IMapNodeWhereParams) {\n        const { input, isField } = params;\n        const out: CmsEntryListWhere = {};\n\n        const keys = Object.keys(input) as (keyof typeof out)[];\n        if (keys.length === 0) {\n            return out;\n        }\n\n        for (const key of keys) {\n            const value = input[key];\n\n            if (isLogicalKey(key)) {\n                if (Array.isArray(value)) {\n                    out[key] = value.filter(isPlainObject).map(child => {\n                        return this.mapWhere({\n                            input: child,\n                            isField\n                        });\n                    });\n                }\n                continue;\n            } else if (isField(key)) {\n                if (!out.values) {\n                    out.values = {};\n                }\n                out.values[key] = value;\n                continue;\n            }\n\n            out[key] = value;\n        }\n\n        return out;\n    }\n}\n\nexport const WhereMapper = CmsWhereMapper.createImplementation({\n    implementation: WhereMapperImpl,\n    dependencies: []\n});\n"],"mappings":"AAAA;AACA;AACA;AACA;AACA;;AAGA,SAASA,cAAc;AAEvB,MAAMC,aAAa,GAAIC,KAAc,IAAuC;EACxE,IAAI,CAACA,KAAK,IAAI,OAAOA,KAAK,KAAK,QAAQ,EAAE;IACrC,OAAO,KAAK;EAChB,CAAC,MAAM,IAAIC,KAAK,CAACC,OAAO,CAACF,KAAK,CAAC,EAAE;IAC7B,OAAO,KAAK;EAChB;EACA,OAAO,IAAI;AACf,CAAC;AAED,MAAMG,YAAY,GAAIC,GAAW,IAA0B;EACvD,OAAOA,GAAG,KAAK,KAAK,IAAIA,GAAG,KAAK,IAAI;AACxC,CAAC;AAOD,MAAMC,eAAe,CAAqC;EACtDC,GAAGA,CAA0BC,MAAgC,EAAiC;IAC1F,MAAM;MAAEC,MAAM,EAAEC,WAAW;MAAEC;IAAM,CAAC,GAAGH,MAAM;IAC7C,IAAI,CAACG,KAAK,EAAE;MACR,OAAOC,SAAS;IACpB;IAEA,MAAMH,MAAM,GAAGC,WAAW,CAACH,GAAG,CAACM,KAAK,IAAI;MACpC,OAAOA,KAAK,CAACC,OAAO;IACxB,CAAC,CAAC;IAEF,MAAMC,OAAO,GAAIV,GAAW,IAAc;MACtC,MAAMQ,KAAK,GAAGR,GAAG,CAACW,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;MAC/B,OAAOP,MAAM,CAACQ,QAAQ,CAACJ,KAAK,CAAC;IACjC,CAAC;IAED,OAAO,IAAI,CAACK,QAAQ,CAAC;MACjBP,KAAK;MACLI;IACJ,CAAC,CAAC;EACN;EAEQG,QAAQA,CAACV,MAA2B,EAAE;IAC1C,MAAM;MAAEG,KAAK;MAAEI;IAAQ,CAAC,GAAGP,MAAM;IACjC,MAAMW,GAAsB,GAAG,CAAC,CAAC;IAEjC,MAAMC,IAAI,GAAGC,MAAM,CAACD,IAAI,CAACT,KAAK,CAAyB;IACvD,IAAIS,IAAI,CAACE,MAAM,KAAK,CAAC,EAAE;MACnB,OAAOH,GAAG;IACd;IAEA,KAAK,MAAMd,GAAG,IAAIe,IAAI,EAAE;MACpB,MAAMnB,KAAK,GAAGU,KAAK,CAACN,GAAG,CAAC;MAExB,IAAID,YAAY,CAACC,GAAG,CAAC,EAAE;QACnB,IAAIH,KAAK,CAACC,OAAO,CAACF,KAAK,CAAC,EAAE;UACtBkB,GAAG,CAACd,GAAG,CAAC,GAAGJ,KAAK,CAACsB,MAAM,CAACvB,aAAa,CAAC,CAACO,GAAG,CAACiB,KAAK,IAAI;YAChD,OAAO,IAAI,CAACN,QAAQ,CAAC;cACjBP,KAAK,EAAEa,KAAK;cACZT;YACJ,CAAC,CAAC;UACN,CAAC,CAAC;QACN;QACA;MACJ,CAAC,MAAM,IAAIA,OAAO,CAACV,GAAG,CAAC,EAAE;QACrB,IAAI,CAACc,GAAG,CAACM,MAAM,EAAE;UACbN,GAAG,CAACM,MAAM,GAAG,CAAC,CAAC;QACnB;QACAN,GAAG,CAACM,MAAM,CAACpB,GAAG,CAAC,GAAGJ,KAAK;QACvB;MACJ;MAEAkB,GAAG,CAACd,GAAG,CAAC,GAAGJ,KAAK;IACpB;IAEA,OAAOkB,GAAG;EACd;AACJ;AAEA,OAAO,MAAMO,WAAW,GAAG3B,cAAc,CAAC4B,oBAAoB,CAAC;EAC3DC,cAAc,EAAEtB,eAAe;EAC/BuB,YAAY,EAAE;AAClB,CAAC,CAAC","ignoreList":[]}

package/features/whereMapper/abstractions.d.ts

@@ -0,0 +1,14 @@
+import type { CmsEntryListWhere, CmsModelField } from "../../types/index.js";
+import type { GenericRecord } from "@webiny/api/types.js";
+export interface ICmsWhereMapperParams<T extends GenericRecord> {
+    fields: Pick<CmsModelField, "fieldId">[];
+    input: T | undefined;
+}
+export interface ICmsWhereMapper {
+    map<T extends GenericRecord>(params: ICmsWhereMapperParams<T>): CmsEntryListWhere | undefined;
+}
+export declare const CmsWhereMapper: import("@webiny/di").Abstraction<ICmsWhereMapper>;
+export declare namespace CmsWhereMapper {
+    type Interface = ICmsWhereMapper;
+    type Params<T extends GenericRecord> = ICmsWhereMapperParams<T>;
+}

package/features/whereMapper/abstractions.js

@@ -0,0 +1,4 @@
+import { createAbstraction } from "@webiny/feature/api";
+export const CmsWhereMapper = createAbstraction("CmsWhereMapper");
+
+//# sourceMappingURL=abstractions.js.map

package/features/whereMapper/abstractions.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["createAbstraction","CmsWhereMapper"],"sources":["abstractions.ts"],"sourcesContent":["import { createAbstraction } from \"@webiny/feature/api\";\nimport type { CmsEntryListWhere, CmsModelField } from \"~/types/index.js\";\nimport type { GenericRecord } from \"@webiny/api/types.js\";\n\nexport interface ICmsWhereMapperParams<T extends GenericRecord> {\n    fields: Pick<CmsModelField, \"fieldId\">[];\n    input: T | undefined;\n}\n\nexport interface ICmsWhereMapper {\n    map<T extends GenericRecord>(params: ICmsWhereMapperParams<T>): CmsEntryListWhere | undefined;\n}\n\nexport const CmsWhereMapper = createAbstraction<ICmsWhereMapper>(\"CmsWhereMapper\");\n\nexport namespace CmsWhereMapper {\n    export type Interface = ICmsWhereMapper;\n    export type Params<T extends GenericRecord> = ICmsWhereMapperParams<T>;\n}\n"],"mappings":"AAAA,SAASA,iBAAiB,QAAQ,qBAAqB;AAavD,OAAO,MAAMC,cAAc,GAAGD,iBAAiB,CAAkB,gBAAgB,CAAC","ignoreList":[]}

package/features/whereMapper/feature.d.ts

@@ -0,0 +1,3 @@
+export type { ICmsWhereMapperParams, ICmsWhereMapper } from "./abstractions.js";
+export { CmsWhereMapper } from "./abstractions.js";
+export declare const CmsWhereMapperFeature: import("@webiny/feature/api/createFeature.js").FeatureDefinition<unknown>;

package/features/whereMapper/feature.js

@@ -0,0 +1,11 @@
+import { createFeature } from "@webiny/feature/api";
+import { WhereMapper } from "./WhereMapper.js";
+export { CmsWhereMapper } from "./abstractions.js";
+export const CmsWhereMapperFeature = createFeature({
+  name: "CmsWhereMapper",
+  register(container) {
+    container.register(WhereMapper).inSingletonScope();
+  }
+});
+
+//# sourceMappingURL=feature.js.map

package/features/whereMapper/feature.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["createFeature","WhereMapper","CmsWhereMapper","CmsWhereMapperFeature","name","register","container","inSingletonScope"],"sources":["feature.ts"],"sourcesContent":["import { createFeature } from \"@webiny/feature/api\";\nimport { WhereMapper } from \"./WhereMapper.js\";\n\nexport type { ICmsWhereMapperParams, ICmsWhereMapper } from \"./abstractions.js\";\n\nexport { CmsWhereMapper } from \"./abstractions.js\";\n\nexport const CmsWhereMapperFeature = createFeature({\n    name: \"CmsWhereMapper\",\n    register(container) {\n        container.register(WhereMapper).inSingletonScope();\n    }\n});\n"],"mappings":"AAAA,SAASA,aAAa,QAAQ,qBAAqB;AACnD,SAASC,WAAW;AAIpB,SAASC,cAAc;AAEvB,OAAO,MAAMC,qBAAqB,GAAGH,aAAa,CAAC;EAC/CI,IAAI,EAAE,gBAAgB;EACtBC,QAAQA,CAACC,SAAS,EAAE;IAChBA,SAAS,CAACD,QAAQ,CAACJ,WAAW,CAAC,CAACM,gBAAgB,CAAC,CAAC;EACtD;AACJ,CAAC,CAAC","ignoreList":[]}

package/fieldConverters/CmsModelDefaultFieldConverterPlugin.d.ts

@@ -1,7 +1,9 @@
-import { CmsModelFieldConverterPlugin, ConvertParams } from "../plugins/CmsModelFieldConverterPlugin";
+import type { ConvertParams } from "../plugins/CmsModelFieldConverterPlugin.js";
+import { CmsModelFieldConverterPlugin } from "../plugins/CmsModelFieldConverterPlugin.js";
+import type { GenericRecord } from "@webiny/api/types.js";
 export declare class CmsModelDefaultFieldConverterPlugin extends CmsModelFieldConverterPlugin {
     name: string;
     getFieldType(): string;
-    convertToStorage({ field, value }: ConvertParams): any;
-    convertFromStorage({ field, value }: ConvertParams): any;
+    convertToStorage({ field, value }: ConvertParams): GenericRecord;
+    convertFromStorage({ field, value }: ConvertParams): GenericRecord;
 }

package/fieldConverters/CmsModelDefaultFieldConverterPlugin.js

@@ -1,11 +1,5 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.CmsModelDefaultFieldConverterPlugin = void 0;
-var _CmsModelFieldConverterPlugin = require("../plugins/CmsModelFieldConverterPlugin");
-class CmsModelDefaultFieldConverterPlugin extends _CmsModelFieldConverterPlugin.CmsModelFieldConverterPlugin {
+import { CmsModelFieldConverterPlugin } from "../plugins/CmsModelFieldConverterPlugin.js";
+export class CmsModelDefaultFieldConverterPlugin extends CmsModelFieldConverterPlugin {
   name = "cms.field.converter.default";
   getFieldType() {
     return "*";
@@ -45,6 +39,5 @@ class CmsModelDefaultFieldConverterPlugin extends _CmsModelFieldConverterPlugin.
     };
   }
 }
-exports.CmsModelDefaultFieldConverterPlugin = CmsModelDefaultFieldConverterPlugin;
 
 //# sourceMappingURL=CmsModelDefaultFieldConverterPlugin.js.map

package/fieldConverters/CmsModelDefaultFieldConverterPlugin.js.map

@@ -1 +1 @@
-{"version":3,"names":["_CmsModelFieldConverterPlugin","require","CmsModelDefaultFieldConverterPlugin","CmsModelFieldConverterPlugin","name","getFieldType","convertToStorage","field","value","undefined","storageId","convertFromStorage","fieldId","exports"],"sources":["CmsModelDefaultFieldConverterPlugin.ts"],"sourcesContent":["import {\n    CmsModelFieldConverterPlugin,\n    ConvertParams\n} from \"~/plugins/CmsModelFieldConverterPlugin\";\n\nexport class CmsModelDefaultFieldConverterPlugin extends CmsModelFieldConverterPlugin {\n    public override name = \"cms.field.converter.default\";\n\n    public override getFieldType(): string {\n        return \"*\";\n    }\n\n    public override convertToStorage({ field, value }: ConvertParams): any {\n        /**\n         * Do not convert if no value was passed.\n         */\n        if (value === undefined) {\n            return {};\n        }\n        /**\n         * A single and multiple values field conversion;\n         */\n        return {\n            [field.storageId]: value\n        };\n    }\n\n    public override convertFromStorage({ field, value }: ConvertParams): any {\n        /**\n         * Do not convert if no value was passed.\n         */\n        if (value === undefined) {\n            return {};\n        }\n        /**\n         * A single and multiple values field conversion;\n         */\n        return {\n            [field.fieldId]: value\n        };\n    }\n}\n"],"mappings":";;;;;;AAAA,IAAAA,6BAAA,GAAAC,OAAA;AAKO,MAAMC,mCAAmC,SAASC,0DAA4B,CAAC;EAClEC,IAAI,GAAG,6BAA6B;EAEpCC,YAAYA,CAAA,EAAW;IACnC,OAAO,GAAG;EACd;EAEgBC,gBAAgBA,CAAC;IAAEC,KAAK;IAAEC;EAAqB,CAAC,EAAO;IACnE;AACR;AACA;IACQ,IAAIA,KAAK,KAAKC,SAAS,EAAE;MACrB,OAAO,CAAC,CAAC;IACb;IACA;AACR;AACA;IACQ,OAAO;MACH,CAACF,KAAK,CAACG,SAAS,GAAGF;IACvB,CAAC;EACL;EAEgBG,kBAAkBA,CAAC;IAAEJ,KAAK;IAAEC;EAAqB,CAAC,EAAO;IACrE;AACR;AACA;IACQ,IAAIA,KAAK,KAAKC,SAAS,EAAE;MACrB,OAAO,CAAC,CAAC;IACb;IACA;AACR;AACA;IACQ,OAAO;MACH,CAACF,KAAK,CAACK,OAAO,GAAGJ;IACrB,CAAC;EACL;AACJ;AAACK,OAAA,CAAAX,mCAAA,GAAAA,mCAAA","ignoreList":[]}
+{"version":3,"names":["CmsModelFieldConverterPlugin","CmsModelDefaultFieldConverterPlugin","name","getFieldType","convertToStorage","field","value","undefined","storageId","convertFromStorage","fieldId"],"sources":["CmsModelDefaultFieldConverterPlugin.ts"],"sourcesContent":["import type { ConvertParams } from \"~/plugins/CmsModelFieldConverterPlugin.js\";\nimport { CmsModelFieldConverterPlugin } from \"~/plugins/CmsModelFieldConverterPlugin.js\";\nimport type { GenericRecord } from \"@webiny/api/types.js\";\n\nexport class CmsModelDefaultFieldConverterPlugin extends CmsModelFieldConverterPlugin {\n    public override name = \"cms.field.converter.default\";\n\n    public override getFieldType(): string {\n        return \"*\";\n    }\n\n    public override convertToStorage({ field, value }: ConvertParams): GenericRecord {\n        /**\n         * Do not convert if no value was passed.\n         */\n        if (value === undefined) {\n            return {};\n        }\n        /**\n         * A single and multiple values field conversion;\n         */\n        return {\n            [field.storageId]: value\n        };\n    }\n\n    public override convertFromStorage({ field, value }: ConvertParams): GenericRecord {\n        /**\n         * Do not convert if no value was passed.\n         */\n        if (value === undefined) {\n            return {};\n        }\n        /**\n         * A single and multiple values field conversion;\n         */\n        return {\n            [field.fieldId]: value\n        };\n    }\n}\n"],"mappings":"AACA,SAASA,4BAA4B;AAGrC,OAAO,MAAMC,mCAAmC,SAASD,4BAA4B,CAAC;EAClEE,IAAI,GAAG,6BAA6B;EAEpCC,YAAYA,CAAA,EAAW;IACnC,OAAO,GAAG;EACd;EAEgBC,gBAAgBA,CAAC;IAAEC,KAAK;IAAEC;EAAqB,CAAC,EAAiB;IAC7E;AACR;AACA;IACQ,IAAIA,KAAK,KAAKC,SAAS,EAAE;MACrB,OAAO,CAAC,CAAC;IACb;IACA;AACR;AACA;IACQ,OAAO;MACH,CAACF,KAAK,CAACG,SAAS,GAAGF;IACvB,CAAC;EACL;EAEgBG,kBAAkBA,CAAC;IAAEJ,KAAK;IAAEC;EAAqB,CAAC,EAAiB;IAC/E;AACR;AACA;IACQ,IAAIA,KAAK,KAAKC,SAAS,EAAE;MACrB,OAAO,CAAC,CAAC;IACb;IACA;AACR;AACA;IACQ,OAAO;MACH,CAACF,KAAK,CAACK,OAAO,GAAGJ;IACrB,CAAC;EACL;AACJ","ignoreList":[]}

package/fieldConverters/CmsModelDynamicZoneFieldConverterPlugin.d.ts

@@ -1,5 +1,6 @@
-import { CmsModelFieldConverterPlugin, ConvertParams } from "../plugins/CmsModelFieldConverterPlugin";
-import { CmsEntryValues, CmsModelDynamicZoneField } from "../types";
+import type { ConvertParams } from "../plugins/CmsModelFieldConverterPlugin.js";
+import { CmsModelFieldConverterPlugin } from "../plugins/CmsModelFieldConverterPlugin.js";
+import type { CmsEntryValues, CmsModelDynamicZoneField } from "../types/index.js";
 export declare class CmsModelDynamicZoneFieldConverterPlugin extends CmsModelFieldConverterPlugin {
     name: string;
     getFieldType(): string;

package/fieldConverters/CmsModelDynamicZoneFieldConverterPlugin.js

@@ -1,13 +1,6 @@
-"use strict";
-
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.CmsModelDynamicZoneFieldConverterPlugin = void 0;
-var _error = _interopRequireDefault(require("@webiny/error"));
-var _CmsModelFieldConverterPlugin = require("../plugins/CmsModelFieldConverterPlugin");
-class CmsModelDynamicZoneFieldConverterPlugin extends _CmsModelFieldConverterPlugin.CmsModelFieldConverterPlugin {
+import WebinyError from "@webiny/error";
+import { CmsModelFieldConverterPlugin } from "../plugins/CmsModelFieldConverterPlugin.js";
+export class CmsModelDynamicZoneFieldConverterPlugin extends CmsModelFieldConverterPlugin {
   name = "cms.field.converter.dynamicZone";
   getFieldType() {
     return "dynamicZone";
@@ -25,23 +18,26 @@ class CmsModelDynamicZoneFieldConverterPlugin extends _CmsModelFieldConverterPlu
     if (templates.length === 0) {
       return {};
     }
-    if (field.multipleValues) {
-      const arrayValue = Array.isArray(value) ? value : [];
-      return {
-        [field.storageId]: arrayValue.map(item => {
-          return this.processToStorage({
-            templates,
-            converterCollection,
-            value: item
-          });
-        })
-      };
+    if (field.list) {
+      if (Array.isArray(value)) {
+        return {
+          [field.storageId]: value.map(item => {
+            return this.processToStorage({
+              templates,
+              converterCollection,
+              value: item
+            });
+          })
+        };
+      }
+
+      // If a multi-value dynamic zone receives anything other than an array, ignore the value.
+      return {};
     }
+
+    // If a single-value dynamic zone receives an array, ignore the value.
     if (Array.isArray(value)) {
-      throw new _error.default(`Dynamic zone field "${field.fieldId}" is expecting a non-array value.`, "DYNAMIC_ZONE_EXPECTING_NON_ARRAY_VALUE", {
-        field,
-        value
-      });
+      return {};
     }
     const processedValue = this.processToStorage({
       templates,
@@ -57,53 +53,18 @@ class CmsModelDynamicZoneFieldConverterPlugin extends _CmsModelFieldConverterPlu
       templates,
       converterCollection
     } = params;
-    let {
+    const {
       value
     } = params;
     if (value === null || value === undefined) {
       return undefined;
     }
-    /**
-     * There are two ways converter needs to work:
-     * 1. when there is a _templateId
-     * 2. when there is a key which identifies which template is the data for
-     */
-
-    /**
-     * When we have a template key, everything is simple.
-     */
     const templateId = value._templateId;
-    let graphQlName = undefined;
-    let template = undefined;
-    if (templateId) {
-      template = templates.find(t => {
-        return templateId === t.id;
-      });
-    }
-    /**
-     * When we do not have a templateId, then the template identifier is the key of the value object.
-     * But at that point, values under that key become the value we are working with later on.
-     */
-    //
-    else {
-      const keys = Object.keys(value);
-      if (keys.length === 0) {
-        return undefined;
-      } else if (keys.length > 1) {
-        throw new _error.default("There cannot be more than one dynamic zone template in a single dynamic zone field.", "DYNAMIC_ZONE_TOO_MANY_TEMPLATES", {
-          templates: keys
-        });
-      }
-      graphQlName = keys[0];
-      template = templates.find(t => t.gqlTypeName === graphQlName);
-    }
+    const template = templates.find(t => {
+      return templateId === t.id;
+    });
     if (!template) {
-      throw new _error.default("Unknown template - converting to storage.", "UNKNOWN_TEMPLATE", {
-        templateId,
-        graphQlName
-      });
-    } else if (graphQlName) {
-      value = value[graphQlName];
+      return undefined;
     }
     return template.fields.reduce((values, field) => {
       const converter = converterCollection.getConverter(field.type);
@@ -127,7 +88,7 @@ class CmsModelDynamicZoneFieldConverterPlugin extends _CmsModelFieldConverterPlu
     if (templates.length === 0) {
       return {};
     }
-    if (field.multipleValues) {
+    if (field.list) {
       const arrayValue = Array.isArray(value) ? value : [];
       return {
         [field.fieldId]: arrayValue.map(item => {
@@ -140,7 +101,7 @@ class CmsModelDynamicZoneFieldConverterPlugin extends _CmsModelFieldConverterPlu
       };
     }
     if (Array.isArray(value)) {
-      throw new _error.default(`Dynamic zone field "${field.fieldId}" is expecting a non-array value.`, "DYNAMIC_ZONE_EXPECTING_NON_ARRAY_VALUE", {
+      throw new WebinyError(`Dynamic zone field "${field.fieldId}" is expecting a non-array value.`, "DYNAMIC_ZONE_EXPECTING_NON_ARRAY_VALUE", {
         field,
         value
       });
@@ -168,7 +129,7 @@ class CmsModelDynamicZoneFieldConverterPlugin extends _CmsModelFieldConverterPlu
     } = value;
     const template = templates.find(t => t.id === _templateId);
     if (!template) {
-      throw new _error.default("Unknown template - converting from storage.", "UNKNOWN_TEMPLATE", {
+      throw new WebinyError("Unknown template - converting from storage.", "UNKNOWN_TEMPLATE", {
         templateId: _templateId
       });
     }
@@ -185,6 +146,5 @@ class CmsModelDynamicZoneFieldConverterPlugin extends _CmsModelFieldConverterPlu
     });
   }
 }
-exports.CmsModelDynamicZoneFieldConverterPlugin = CmsModelDynamicZoneFieldConverterPlugin;
 
 //# sourceMappingURL=CmsModelDynamicZoneFieldConverterPlugin.js.map

package/fieldConverters/CmsModelDynamicZoneFieldConverterPlugin.js.map

@@ -1 +1 @@
-{"version":3,"names":["_error","_interopRequireDefault","require","_CmsModelFieldConverterPlugin","CmsModelDynamicZoneFieldConverterPlugin","CmsModelFieldConverterPlugin","name","getFieldType","getTemplates","field","settings","templates","convertToStorage","params","value","converterCollection","length","multipleValues","arrayValue","Array","isArray","storageId","map","item","processToStorage","WebinyError","fieldId","processedValue","undefined","templateId","_templateId","graphQlName","template","find","t","id","keys","Object","gqlTypeName","fields","reduce","values","converter","getConverter","type","converted","assign","convertFromStorage","processFromStorage","exports"],"sources":["CmsModelDynamicZoneFieldConverterPlugin.ts"],"sourcesContent":["import WebinyError from \"@webiny/error\";\nimport {\n    CmsModelFieldConverterPlugin,\n    ConvertParams\n} from \"~/plugins/CmsModelFieldConverterPlugin\";\nimport { CmsDynamicZoneTemplate, CmsEntryValues, CmsModelDynamicZoneField } from \"~/types\";\nimport { ConverterCollection } from \"~/utils/converters/ConverterCollection\";\n\ninterface DynamicZoneValue {\n    [key: string]: any;\n}\n\ninterface ProcessValue {\n    templates: CmsDynamicZoneTemplate[];\n    value: DynamicZoneValue | null;\n    converterCollection: ConverterCollection;\n}\n\nexport class CmsModelDynamicZoneFieldConverterPlugin extends CmsModelFieldConverterPlugin {\n    public override name = \"cms.field.converter.dynamicZone\";\n\n    public override getFieldType(): string {\n        return \"dynamicZone\";\n    }\n\n    private getTemplates(field: CmsModelDynamicZoneField): CmsDynamicZoneTemplate[] {\n        return field.settings?.templates || [];\n    }\n\n    public override convertToStorage(\n        params: ConvertParams<CmsModelDynamicZoneField>\n    ): CmsEntryValues {\n        const { field, value, converterCollection } = params;\n\n        const templates = this.getTemplates(field);\n\n        if (templates.length === 0) {\n            return {};\n        }\n\n        if (field.multipleValues) {\n            const arrayValue = Array.isArray(value) ? value : [];\n\n            return {\n                [field.storageId]: arrayValue.map(item => {\n                    return this.processToStorage({\n                        templates,\n                        converterCollection,\n                        value: item\n                    });\n                })\n            };\n        }\n        if (Array.isArray(value)) {\n            throw new WebinyError(\n                `Dynamic zone field \"${field.fieldId}\" is expecting a non-array value.`,\n                \"DYNAMIC_ZONE_EXPECTING_NON_ARRAY_VALUE\",\n                {\n                    field,\n                    value\n                }\n            );\n        }\n\n        const processedValue = this.processToStorage({\n            templates,\n            converterCollection,\n            value\n        });\n        return {\n            [field.storageId]: processedValue\n        };\n    }\n\n    private processToStorage(params: ProcessValue) {\n        const { templates, converterCollection } = params;\n        let { value } = params;\n        if (value === null || value === undefined) {\n            return undefined;\n        }\n        /**\n         * There are two ways converter needs to work:\n         * 1. when there is a _templateId\n         * 2. when there is a key which identifies which template is the data for\n         */\n\n        /**\n         * When we have a template key, everything is simple.\n         */\n        const templateId = value._templateId;\n        let graphQlName: string | undefined = undefined;\n        let template: CmsDynamicZoneTemplate | undefined = undefined;\n        if (templateId) {\n            template = templates.find(t => {\n                return templateId === t.id;\n            });\n        }\n        /**\n         * When we do not have a templateId, then the template identifier is the key of the value object.\n         * But at that point, values under that key become the value we are working with later on.\n         */\n        //\n        else {\n            const keys = Object.keys(value);\n            if (keys.length === 0) {\n                return undefined;\n            } else if (keys.length > 1) {\n                throw new WebinyError(\n                    \"There cannot be more than one dynamic zone template in a single dynamic zone field.\",\n                    \"DYNAMIC_ZONE_TOO_MANY_TEMPLATES\",\n                    {\n                        templates: keys\n                    }\n                );\n            }\n            graphQlName = keys[0] as string;\n            template = templates.find(t => t.gqlTypeName === graphQlName);\n        }\n\n        if (!template) {\n            throw new WebinyError(\"Unknown template - converting to storage.\", \"UNKNOWN_TEMPLATE\", {\n                templateId,\n                graphQlName\n            });\n        } else if (graphQlName) {\n            value = value[graphQlName];\n        }\n\n        return template.fields.reduce<Record<string, any>>(\n            (values, field) => {\n                const converter = converterCollection.getConverter(field.type);\n                const converted = converter.convertToStorage({\n                    field,\n                    value: value ? value[field.fieldId] : undefined\n                });\n                Object.assign(values, converted);\n                return values;\n            },\n            {\n                _templateId: template.id\n            }\n        );\n    }\n\n    public override convertFromStorage(\n        params: ConvertParams<CmsModelDynamicZoneField>\n    ): CmsEntryValues {\n        const { field, value, converterCollection } = params;\n\n        const templates = this.getTemplates(field);\n\n        if (templates.length === 0) {\n            return {};\n        }\n\n        if (field.multipleValues) {\n            const arrayValue = Array.isArray(value) ? value : [];\n\n            return {\n                [field.fieldId]: arrayValue.map(item => {\n                    return this.processFromStorage({\n                        templates,\n                        converterCollection,\n                        value: item\n                    });\n                })\n            };\n        }\n        if (Array.isArray(value)) {\n            throw new WebinyError(\n                `Dynamic zone field \"${field.fieldId}\" is expecting a non-array value.`,\n                \"DYNAMIC_ZONE_EXPECTING_NON_ARRAY_VALUE\",\n                {\n                    field,\n                    value\n                }\n            );\n        }\n\n        const processedValue = this.processFromStorage({\n            templates,\n            converterCollection,\n            value\n        });\n        return {\n            [field.fieldId]: processedValue\n        };\n    }\n\n    private processFromStorage(params: ProcessValue) {\n        const { templates, value, converterCollection } = params;\n        if (value === null || value === undefined) {\n            return undefined;\n        }\n\n        const { _templateId } = value;\n\n        const template = templates.find(t => t.id === _templateId);\n        if (!template) {\n            throw new WebinyError(\n                \"Unknown template - converting from storage.\",\n                \"UNKNOWN_TEMPLATE\",\n                {\n                    templateId: _templateId\n                }\n            );\n        }\n\n        return template.fields.reduce<Record<string, any>>(\n            (values, field) => {\n                const converter = converterCollection.getConverter(field.type);\n                const converted = converter.convertFromStorage({\n                    field,\n                    value: value[field.storageId]\n                });\n                Object.assign(values, converted);\n                return values;\n            },\n            {\n                _templateId: template.id\n            }\n        );\n    }\n}\n"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["WebinyError","CmsModelFieldConverterPlugin","CmsModelDynamicZoneFieldConverterPlugin","name","getFieldType","getTemplates","field","settings","templates","convertToStorage","params","value","converterCollection","length","list","Array","isArray","storageId","map","item","processToStorage","processedValue","undefined","templateId","_templateId","template","find","t","id","fields","reduce","values","converter","getConverter","type","converted","fieldId","Object","assign","convertFromStorage","arrayValue","processFromStorage"],"sources":["CmsModelDynamicZoneFieldConverterPlugin.ts"],"sourcesContent":["import WebinyError from \"@webiny/error\";\nimport type { ConvertParams } from \"~/plugins/CmsModelFieldConverterPlugin.js\";\nimport { CmsModelFieldConverterPlugin } from \"~/plugins/CmsModelFieldConverterPlugin.js\";\nimport type {\n    CmsDynamicZoneTemplate,\n    CmsEntryValues,\n    CmsModelDynamicZoneField\n} from \"~/types/index.js\";\nimport type { ConverterCollection } from \"~/utils/converters/ConverterCollection.js\";\nimport type { GenericRecord } from \"@webiny/api/types.js\";\n\ntype DynamicZoneValue = GenericRecord<string>;\n\ninterface ProcessValue {\n    templates: CmsDynamicZoneTemplate[];\n    value: DynamicZoneValue | null;\n    converterCollection: ConverterCollection;\n}\n\nexport class CmsModelDynamicZoneFieldConverterPlugin extends CmsModelFieldConverterPlugin {\n    public override name = \"cms.field.converter.dynamicZone\";\n\n    public override getFieldType(): string {\n        return \"dynamicZone\";\n    }\n\n    private getTemplates(field: CmsModelDynamicZoneField): CmsDynamicZoneTemplate[] {\n        return field.settings?.templates || [];\n    }\n\n    public override convertToStorage(\n        params: ConvertParams<CmsModelDynamicZoneField>\n    ): CmsEntryValues {\n        const { field, value, converterCollection } = params;\n\n        const templates = this.getTemplates(field);\n\n        if (templates.length === 0) {\n            return {};\n        }\n\n        if (field.list) {\n            if (Array.isArray(value)) {\n                return {\n                    [field.storageId]: value.map(item => {\n                        return this.processToStorage({\n                            templates,\n                            converterCollection,\n                            value: item\n                        });\n                    })\n                };\n            }\n\n            // If a multi-value dynamic zone receives anything other than an array, ignore the value.\n            return {};\n        }\n\n        // If a single-value dynamic zone receives an array, ignore the value.\n        if (Array.isArray(value)) {\n            return {};\n        }\n\n        const processedValue = this.processToStorage({\n            templates,\n            converterCollection,\n            value\n        });\n\n        return {\n            [field.storageId]: processedValue\n        };\n    }\n\n    private processToStorage(params: ProcessValue) {\n        const { templates, converterCollection } = params;\n        const { value } = params;\n        if (value === null || value === undefined) {\n            return undefined;\n        }\n\n        const templateId = value._templateId;\n        const template = templates.find(t => {\n            return templateId === t.id;\n        });\n\n        if (!template) {\n            return undefined;\n        }\n\n        return template.fields.reduce<GenericRecord<string>>(\n            (values, field) => {\n                const converter = converterCollection.getConverter(field.type);\n                const converted = converter.convertToStorage({\n                    field,\n                    value: value ? value[field.fieldId] : undefined\n                });\n                Object.assign(values, converted);\n                return values;\n            },\n            {\n                _templateId: template.id\n            }\n        );\n    }\n\n    public override convertFromStorage(\n        params: ConvertParams<CmsModelDynamicZoneField>\n    ): CmsEntryValues {\n        const { field, value, converterCollection } = params;\n\n        const templates = this.getTemplates(field);\n\n        if (templates.length === 0) {\n            return {};\n        }\n\n        if (field.list) {\n            const arrayValue = Array.isArray(value) ? value : [];\n\n            return {\n                [field.fieldId]: arrayValue.map(item => {\n                    return this.processFromStorage({\n                        templates,\n                        converterCollection,\n                        value: item\n                    });\n                })\n            };\n        }\n\n        if (Array.isArray(value)) {\n            throw new WebinyError(\n                `Dynamic zone field \"${field.fieldId}\" is expecting a non-array value.`,\n                \"DYNAMIC_ZONE_EXPECTING_NON_ARRAY_VALUE\",\n                {\n                    field,\n                    value\n                }\n            );\n        }\n\n        const processedValue = this.processFromStorage({\n            templates,\n            converterCollection,\n            value\n        });\n\n        return {\n            [field.fieldId]: processedValue\n        };\n    }\n\n    private processFromStorage(params: ProcessValue) {\n        const { templates, value, converterCollection } = params;\n        if (value === null || value === undefined) {\n            return undefined;\n        }\n\n        const { _templateId } = value;\n\n        const template = templates.find(t => t.id === _templateId);\n        if (!template) {\n            throw new WebinyError(\n                \"Unknown template - converting from storage.\",\n                \"UNKNOWN_TEMPLATE\",\n                {\n                    templateId: _templateId\n                }\n            );\n        }\n\n        return template.fields.reduce<GenericRecord<string>>(\n            (values, field) => {\n                const converter = converterCollection.getConverter(field.type);\n                const converted = converter.convertFromStorage({\n                    field,\n                    value: value[field.storageId]\n                });\n                Object.assign(values, converted);\n                return values;\n            },\n            {\n                _templateId: template.id\n            }\n        );\n    }\n}\n"],"mappings":"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","ignoreList":[]}

package/fieldConverters/CmsModelObjectFieldConverterPlugin.d.ts

@@ -1,5 +1,6 @@
-import { CmsModelFieldConverterPlugin, ConvertParams } from "../plugins/CmsModelFieldConverterPlugin";
-import { CmsEntryValues } from "../types";
+import type { ConvertParams } from "../plugins/CmsModelFieldConverterPlugin.js";
+import { CmsModelFieldConverterPlugin } from "../plugins/CmsModelFieldConverterPlugin.js";
+import type { CmsEntryValues } from "../types/index.js";
 export declare class CmsModelObjectFieldConverterPlugin extends CmsModelFieldConverterPlugin {
     name: string;
     getFieldType(): string;

package/fieldConverters/CmsModelObjectFieldConverterPlugin.js

@@ -1,11 +1,5 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.CmsModelObjectFieldConverterPlugin = void 0;
-var _CmsModelFieldConverterPlugin = require("../plugins/CmsModelFieldConverterPlugin");
-class CmsModelObjectFieldConverterPlugin extends _CmsModelFieldConverterPlugin.CmsModelFieldConverterPlugin {
+import { CmsModelFieldConverterPlugin } from "../plugins/CmsModelFieldConverterPlugin.js";
+export class CmsModelObjectFieldConverterPlugin extends CmsModelFieldConverterPlugin {
   name = "cms.field.converter.object";
   getFieldType() {
     return "object";
@@ -27,10 +21,10 @@ class CmsModelObjectFieldConverterPlugin extends _CmsModelFieldConverterPlugin.C
     if (childFields.length === 0) {
       return {};
     }
-    if (field.multipleValues) {
+    if (field.list) {
       if (Array.isArray(value) === false) {
         return {
-          [field.storageId]: []
+          [field.storageId]: null
         };
       }
       return {
@@ -75,62 +69,18 @@ class CmsModelObjectFieldConverterPlugin extends _CmsModelFieldConverterPlugin.C
       return undefined;
     }
     return fields.reduce((output, field) => {
-      const childFields = this.getChildFields({
-        field
-      });
-      if (childFields.length > 0) {
-        if (field.multipleValues) {
-          if (Array.isArray(value[field.fieldId]) === false) {
-            return output;
-          }
-          const values = value[field.fieldId].map(childValue => {
-            return converterCollection.convertToStorage({
-              fields: childFields.map(child => {
-                return {
-                  ...child,
-                  parent: field
-                };
-              }),
-              values: childValue
-            });
-          });
-          if (values === undefined) {
-            return output;
-          }
-          return {
-            ...output,
-            [field.storageId]: values
-          };
-        }
-        /**
-         * No need to process child fields if no value is provided.
-         */
-        if (!value[field.fieldId]) {
-          return output;
-        }
-        const values = converterCollection.convertToStorage({
-          fields: childFields.map(child => {
-            return {
-              ...child,
-              parent: field
-            };
-          }),
-          values: value[field.fieldId]
-        });
-        if (values === undefined) {
-          return output;
-        }
-        return {
-          ...output,
-          [field.storageId]: values
-        };
-      }
       if (value[field.fieldId] === undefined) {
         return output;
       }
+      const converter = converterCollection.getConverter(field.type);
+      const newValue = converter.convertToStorage({
+        field,
+        value: value[field.fieldId],
+        parent: field.parent
+      });
       return {
         ...output,
-        [field.storageId]: value[field.fieldId]
+        ...newValue
       };
     }, {});
   }
@@ -146,10 +96,10 @@ class CmsModelObjectFieldConverterPlugin extends _CmsModelFieldConverterPlugin.C
     if (childFields.length === 0) {
       return {};
     }
-    if (field.multipleValues) {
+    if (field.list) {
       if (Array.isArray(value) === false) {
         return {
-          [field.fieldId]: []
+          [field.fieldId]: null
         };
       }
       return {
@@ -194,67 +144,24 @@ class CmsModelObjectFieldConverterPlugin extends _CmsModelFieldConverterPlugin.C
       return undefined;
     }
     return fields.reduce((output, field) => {
-      const childFields = this.getChildFields({
-        field
-      });
-      if (childFields.length > 0) {
-        if (field.multipleValues) {
-          const inputValues = value[field.storageId];
-          if (!inputValues || Array.isArray(inputValues) === false) {
-            return output;
-          }
-          const values = inputValues.map(childValue => {
-            return converterCollection.convertFromStorage({
-              fields: childFields.map(child => {
-                return {
-                  ...child,
-                  parent: field
-                };
-              }),
-              values: childValue
-            });
-          });
-          if (values === undefined) {
-            return output;
-          }
-          return {
-            ...output,
-            [field.fieldId]: values
-          };
-        }
-        /**
-         * No need to process child fields if no value is provided.
-         */
-        if (!value[field.storageId]) {
-          return output;
-        }
-        const values = converterCollection.convertFromStorage({
-          fields: childFields.map(child => {
-            return {
-              ...child,
-              parent: field
-            };
-          }),
-          values: value[field.storageId]
-        });
-        if (values === undefined) {
-          return output;
-        }
-        return {
-          ...output,
-          [field.fieldId]: values
-        };
-      }
       if (value[field.storageId] === undefined) {
         return output;
       }
+      const converter = converterCollection.getConverter(field.type);
+      const newValue = converter.convertFromStorage({
+        field,
+        value: value[field.storageId],
+        parent: field.parent
+      });
+      if (!newValue) {
+        return output;
+      }
       return {
         ...output,
-        [field.fieldId]: value[field.storageId]
+        ...newValue
       };
     }, {});
   }
 }
-exports.CmsModelObjectFieldConverterPlugin = CmsModelObjectFieldConverterPlugin;
 
 //# sourceMappingURL=CmsModelObjectFieldConverterPlugin.js.map