@webiny/api-headless-cms 6.1.0 → 6.2.0-beta.0

package/utils/contentModelAst/CmsModelFieldToAstConverterFromPlugins.js

@@ -1,11 +1,11 @@
 import { CmsModelFieldToAstFromPlugin } from "./CmsModelFieldToAstFromPlugin.js";
 import { getBaseFieldType } from "../getBaseFieldType.js";
 export class CmsModelFieldToAstConverterFromPlugins {
-  constructor(plugins) {
-    this.converters = plugins.reduce((converters, plugin) => {
+  constructor(fields) {
+    this.converters = fields.reduce((converters, field) => {
       return {
         ...converters,
-        [plugin.fieldType]: new CmsModelFieldToAstFromPlugin(plugin, this)
+        [field.fieldType]: new CmsModelFieldToAstFromPlugin(field, this)
       };
     }, {});
   }

package/utils/contentModelAst/CmsModelFieldToAstConverterFromPlugins.js.map

@@ -1 +1 @@
-{"version":3,"names":["CmsModelFieldToAstFromPlugin","getBaseFieldType","CmsModelFieldToAstConverterFromPlugins","constructor","plugins","converters","reduce","plugin","fieldType","toAst","field","type","Error","fieldId"],"sources":["CmsModelFieldToAstConverterFromPlugins.ts"],"sourcesContent":["import type {\n    CmsModelField,\n    CmsModelFieldToGraphQLPlugin,\n    ICmsModelFieldToAst\n} from \"~/types/index.js\";\nimport { CmsModelFieldToAstFromPlugin } from \"./CmsModelFieldToAstFromPlugin.js\";\nimport { getBaseFieldType } from \"~/utils/getBaseFieldType.js\";\n\ntype FieldToAstConverters = Record<string, ICmsModelFieldToAst>;\n\nexport class CmsModelFieldToAstConverterFromPlugins implements ICmsModelFieldToAst {\n    private readonly converters: FieldToAstConverters;\n\n    public constructor(plugins: CmsModelFieldToGraphQLPlugin[]) {\n        this.converters = plugins.reduce<FieldToAstConverters>((converters, plugin) => {\n            return {\n                ...converters,\n                [plugin.fieldType]: new CmsModelFieldToAstFromPlugin(plugin, this)\n            };\n        }, {});\n    }\n\n    public toAst(field: CmsModelField) {\n        const type = getBaseFieldType(field);\n        if (!this.converters[type]) {\n            throw new Error(\n                `Cannot convert model field \"${field.fieldId}\" to AST. No converter found for field type \"${type}\".`\n            );\n        }\n        return this.converters[type].toAst(field);\n    }\n}\n"],"mappings":"AAKA,SAASA,4BAA4B;AACrC,SAASC,gBAAgB;AAIzB,OAAO,MAAMC,sCAAsC,CAAgC;EAGxEC,WAAWA,CAACC,OAAuC,EAAE;IACxD,IAAI,CAACC,UAAU,GAAGD,OAAO,CAACE,MAAM,CAAuB,CAACD,UAAU,EAAEE,MAAM,KAAK;MAC3E,OAAO;QACH,GAAGF,UAAU;QACb,CAACE,MAAM,CAACC,SAAS,GAAG,IAAIR,4BAA4B,CAACO,MAAM,EAAE,IAAI;MACrE,CAAC;IACL,CAAC,EAAE,CAAC,CAAC,CAAC;EACV;EAEOE,KAAKA,CAACC,KAAoB,EAAE;IAC/B,MAAMC,IAAI,GAAGV,gBAAgB,CAACS,KAAK,CAAC;IACpC,IAAI,CAAC,IAAI,CAACL,UAAU,CAACM,IAAI,CAAC,EAAE;MACxB,MAAM,IAAIC,KAAK,CACX,+BAA+BF,KAAK,CAACG,OAAO,gDAAgDF,IAAI,IACpG,CAAC;IACL;IACA,OAAO,IAAI,CAACN,UAAU,CAACM,IAAI,CAAC,CAACF,KAAK,CAACC,KAAK,CAAC;EAC7C;AACJ","ignoreList":[]}
+{"version":3,"names":["CmsModelFieldToAstFromPlugin","getBaseFieldType","CmsModelFieldToAstConverterFromPlugins","constructor","fields","converters","reduce","field","fieldType","toAst","type","Error","fieldId"],"sources":["CmsModelFieldToAstConverterFromPlugins.ts"],"sourcesContent":["import type { CmsModelField, ICmsModelFieldToAst } from \"~/types/index.js\";\nimport type { CmsModelFieldToGraphQL } from \"~/features/graphql/index.js\";\nimport { CmsModelFieldToAstFromPlugin } from \"./CmsModelFieldToAstFromPlugin.js\";\nimport { getBaseFieldType } from \"~/utils/getBaseFieldType.js\";\n\ntype FieldToAstConverters = Record<string, ICmsModelFieldToAst>;\n\nexport class CmsModelFieldToAstConverterFromPlugins implements ICmsModelFieldToAst {\n    private readonly converters: FieldToAstConverters;\n\n    public constructor(fields: CmsModelFieldToGraphQL.Interface[]) {\n        this.converters = fields.reduce<FieldToAstConverters>((converters, field) => {\n            return {\n                ...converters,\n                [field.fieldType]: new CmsModelFieldToAstFromPlugin(field, this)\n            };\n        }, {});\n    }\n\n    public toAst(field: CmsModelField) {\n        const type = getBaseFieldType(field);\n        if (!this.converters[type]) {\n            throw new Error(\n                `Cannot convert model field \"${field.fieldId}\" to AST. No converter found for field type \"${type}\".`\n            );\n        }\n        return this.converters[type].toAst(field);\n    }\n}\n"],"mappings":"AAEA,SAASA,4BAA4B;AACrC,SAASC,gBAAgB;AAIzB,OAAO,MAAMC,sCAAsC,CAAgC;EAGxEC,WAAWA,CAACC,MAA0C,EAAE;IAC3D,IAAI,CAACC,UAAU,GAAGD,MAAM,CAACE,MAAM,CAAuB,CAACD,UAAU,EAAEE,KAAK,KAAK;MACzE,OAAO;QACH,GAAGF,UAAU;QACb,CAACE,KAAK,CAACC,SAAS,GAAG,IAAIR,4BAA4B,CAACO,KAAK,EAAE,IAAI;MACnE,CAAC;IACL,CAAC,EAAE,CAAC,CAAC,CAAC;EACV;EAEOE,KAAKA,CAACF,KAAoB,EAAE;IAC/B,MAAMG,IAAI,GAAGT,gBAAgB,CAACM,KAAK,CAAC;IACpC,IAAI,CAAC,IAAI,CAACF,UAAU,CAACK,IAAI,CAAC,EAAE;MACxB,MAAM,IAAIC,KAAK,CACX,+BAA+BJ,KAAK,CAACK,OAAO,gDAAgDF,IAAI,IACpG,CAAC;IACL;IACA,OAAO,IAAI,CAACL,UAAU,CAACK,IAAI,CAAC,CAACD,KAAK,CAACF,KAAK,CAAC;EAC7C;AACJ","ignoreList":[]}

package/utils/contentModelAst/CmsModelFieldToAstFromPlugin.d.ts

@@ -1,7 +1,8 @@
-import type { CmsModelField, CmsModelFieldAstNode, CmsModelFieldToGraphQLPlugin, ICmsModelFieldToAst } from "../../types/index.js";
+import type { CmsModelField, CmsModelFieldAstNode, ICmsModelFieldToAst } from "../../types/index.js";
+import type { CmsModelFieldToGraphQL } from "../../features/graphql/index.js";
 export declare class CmsModelFieldToAstFromPlugin implements ICmsModelFieldToAst {
     private readonly converter;
-    private plugin;
-    constructor(plugin: CmsModelFieldToGraphQLPlugin, converter: ICmsModelFieldToAst);
+    private field;
+    constructor(field: CmsModelFieldToGraphQL.Interface, converter: ICmsModelFieldToAst);
     toAst(field: CmsModelField): CmsModelFieldAstNode;
 }

package/utils/contentModelAst/CmsModelFieldToAstFromPlugin.js

@@ -1,10 +1,10 @@
 export class CmsModelFieldToAstFromPlugin {
-  constructor(plugin, converter) {
+  constructor(field, converter) {
     this.converter = converter;
-    this.plugin = plugin;
+    this.field = field;
   }
   toAst(field) {
-    return this.plugin.getFieldAst ? this.plugin.getFieldAst(field, this.converter) : {
+    return this.field.getFieldAst ? this.field.getFieldAst(field, this.converter) : {
       type: "field",
       field,
       children: []

package/utils/contentModelAst/CmsModelFieldToAstFromPlugin.js.map

@@ -1 +1 @@
-{"version":3,"names":["CmsModelFieldToAstFromPlugin","constructor","plugin","converter","toAst","field","getFieldAst","type","children"],"sources":["CmsModelFieldToAstFromPlugin.ts"],"sourcesContent":["import type {\n    CmsModelField,\n    CmsModelFieldAstNode,\n    CmsModelFieldToGraphQLPlugin,\n    ICmsModelFieldToAst\n} from \"~/types/index.js\";\n\nexport class CmsModelFieldToAstFromPlugin implements ICmsModelFieldToAst {\n    private readonly converter: ICmsModelFieldToAst;\n    private plugin: CmsModelFieldToGraphQLPlugin;\n\n    constructor(plugin: CmsModelFieldToGraphQLPlugin, converter: ICmsModelFieldToAst) {\n        this.converter = converter;\n        this.plugin = plugin;\n    }\n\n    toAst(field: CmsModelField): CmsModelFieldAstNode {\n        return this.plugin.getFieldAst\n            ? this.plugin.getFieldAst(field, this.converter)\n            : { type: \"field\", field, children: [] };\n    }\n}\n"],"mappings":"AAOA,OAAO,MAAMA,4BAA4B,CAAgC;EAIrEC,WAAWA,CAACC,MAAoC,EAAEC,SAA8B,EAAE;IAC9E,IAAI,CAACA,SAAS,GAAGA,SAAS;IAC1B,IAAI,CAACD,MAAM,GAAGA,MAAM;EACxB;EAEAE,KAAKA,CAACC,KAAoB,EAAwB;IAC9C,OAAO,IAAI,CAACH,MAAM,CAACI,WAAW,GACxB,IAAI,CAACJ,MAAM,CAACI,WAAW,CAACD,KAAK,EAAE,IAAI,CAACF,SAAS,CAAC,GAC9C;MAAEI,IAAI,EAAE,OAAO;MAAEF,KAAK;MAAEG,QAAQ,EAAE;IAAG,CAAC;EAChD;AACJ","ignoreList":[]}
+{"version":3,"names":["CmsModelFieldToAstFromPlugin","constructor","field","converter","toAst","getFieldAst","type","children"],"sources":["CmsModelFieldToAstFromPlugin.ts"],"sourcesContent":["import type { CmsModelField, CmsModelFieldAstNode, ICmsModelFieldToAst } from \"~/types/index.js\";\nimport type { CmsModelFieldToGraphQL } from \"~/features/graphql/index.js\";\n\nexport class CmsModelFieldToAstFromPlugin implements ICmsModelFieldToAst {\n    private readonly converter: ICmsModelFieldToAst;\n    private field: CmsModelFieldToGraphQL.Interface;\n\n    constructor(field: CmsModelFieldToGraphQL.Interface, converter: ICmsModelFieldToAst) {\n        this.converter = converter;\n        this.field = field;\n    }\n\n    toAst(field: CmsModelField): CmsModelFieldAstNode {\n        return this.field.getFieldAst\n            ? this.field.getFieldAst(field, this.converter)\n            : { type: \"field\", field, children: [] };\n    }\n}\n"],"mappings":"AAGA,OAAO,MAAMA,4BAA4B,CAAgC;EAIrEC,WAAWA,CAACC,KAAuC,EAAEC,SAA8B,EAAE;IACjF,IAAI,CAACA,SAAS,GAAGA,SAAS;IAC1B,IAAI,CAACD,KAAK,GAAGA,KAAK;EACtB;EAEAE,KAAKA,CAACF,KAAoB,EAAwB;IAC9C,OAAO,IAAI,CAACA,KAAK,CAACG,WAAW,GACvB,IAAI,CAACH,KAAK,CAACG,WAAW,CAACH,KAAK,EAAE,IAAI,CAACC,SAAS,CAAC,GAC7C;MAAEG,IAAI,EAAE,OAAO;MAAEJ,KAAK;MAAEK,QAAQ,EAAE;IAAG,CAAC;EAChD;AACJ","ignoreList":[]}

package/utils/converters/ConverterCollection.d.ts

@@ -1,6 +1,7 @@
 import { Converter } from "./Converter.js";
 import type { CmsEntryValues, CmsModelField } from "../../types/index.js";
 import type { PluginsContainer } from "@webiny/plugins";
+import type { CmsModelFieldToGraphQLRegistry } from "../../features/graphql/index.js";
 export interface CmsModelFieldsWithParent extends CmsModelField {
     parent?: CmsModelField | null;
 }
@@ -13,6 +14,7 @@ export interface ConverterCollectionConvertParams<T extends CmsEntryValues = Cms
 }
 export interface ConverterCollectionParams {
     plugins: PluginsContainer;
+    fieldRegistry: CmsModelFieldToGraphQLRegistry.Interface;
 }
 export declare class ConverterCollection {
     private readonly converters;

package/utils/converters/ConverterCollection.js

@@ -6,9 +6,10 @@ export class ConverterCollection {
   converters = new Map();
   constructor(params) {
     const {
-      plugins
+      plugins,
+      fieldRegistry
     } = params;
-    const fieldGraphQLPlugins = plugins.byType("cms-model-field-to-graphql");
+    const fieldGraphQLPlugins = fieldRegistry.getAll();
     const fieldConverterPlugins = plugins.byType(CmsModelFieldConverterPlugin.type);
     const defaultFieldConverterPlugin = fieldConverterPlugins.find(pl => pl.getFieldType() === "*");
     if (defaultFieldConverterPlugin === undefined) {

package/utils/converters/ConverterCollection.js.map

@@ -1 +1 @@
-{"version":3,"names":["WebinyError","Converter","CmsModelFieldConverterPlugin","getBaseFieldType","ConverterCollection","converters","Map","constructor","params","plugins","fieldGraphQLPlugins","byType","fieldConverterPlugins","type","defaultFieldConverterPlugin","find","pl","getFieldType","undefined","fieldGraphQLPlugin","plugin","fieldType","converter","addConverter","setConverterCollection","set","getType","getConverter","baseType","get","convertToStorage","fields","values","inputValues","attachHasOwnProperty","reduce","output","field","hasOwnProperty","fieldId","value","convertFromStorage","storageId","Array","isArray","Object","defineProperty","enumerable","writable","property"],"sources":["ConverterCollection.ts"],"sourcesContent":["import WebinyError from \"@webiny/error\";\nimport { Converter } from \"./Converter.js\";\nimport type { CmsEntryValues, CmsModelField, CmsModelFieldToGraphQLPlugin } from \"~/types/index.js\";\nimport { CmsModelFieldConverterPlugin } from \"~/plugins/index.js\";\nimport type { PluginsContainer } from \"@webiny/plugins\";\nimport { getBaseFieldType } from \"~/utils/getBaseFieldType.js\";\n\nexport interface CmsModelFieldsWithParent extends CmsModelField {\n    parent?: CmsModelField | null;\n}\n\nexport interface CmsModelConverterCallable<T extends CmsEntryValues = CmsEntryValues> {\n    (params: ConverterCollectionConvertParams<T>): T;\n}\n\nexport interface ConverterCollectionConvertParams<T extends CmsEntryValues = CmsEntryValues> {\n    fields: CmsModelFieldsWithParent[];\n    values?: T;\n}\n\nexport interface ConverterCollectionParams {\n    plugins: PluginsContainer;\n}\n\nexport class ConverterCollection {\n    private readonly converters: Map<string, Converter> = new Map();\n\n    public constructor(params: ConverterCollectionParams) {\n        const { plugins } = params;\n        const fieldGraphQLPlugins = plugins.byType<CmsModelFieldToGraphQLPlugin>(\n            \"cms-model-field-to-graphql\"\n        );\n        const fieldConverterPlugins = plugins.byType<CmsModelFieldConverterPlugin>(\n            CmsModelFieldConverterPlugin.type\n        );\n        const defaultFieldConverterPlugin = fieldConverterPlugins.find(\n            pl => pl.getFieldType() === \"*\"\n        );\n        if (defaultFieldConverterPlugin === undefined) {\n            throw new WebinyError(\n                `Missing default field converter plugin.`,\n                \"DEFAULT_FIELD_CONVERTER_ERROR\"\n            );\n        }\n        for (const fieldGraphQLPlugin of fieldGraphQLPlugins) {\n            const plugin = fieldConverterPlugins.find(\n                pl => pl.getFieldType() === fieldGraphQLPlugin.fieldType\n            );\n            const converter = new Converter({\n                type: fieldGraphQLPlugin.fieldType,\n                plugin: plugin || defaultFieldConverterPlugin\n            });\n\n            this.addConverter(converter);\n        }\n    }\n\n    public addConverter(converter: Converter): void {\n        converter.setConverterCollection(this);\n        this.converters.set(converter.getType(), converter);\n    }\n\n    public getConverter(type: string): Converter {\n        const baseType = getBaseFieldType({ type });\n        const converter = this.converters.get(baseType);\n        if (converter === undefined) {\n            throw new WebinyError(\n                `Missing converter for field type \"${type}\".`,\n                \"CONVERTER_ERROR\",\n                {\n                    type\n                }\n            );\n        }\n        return converter;\n    }\n\n    public convertToStorage<T extends CmsEntryValues = CmsEntryValues>(\n        params: ConverterCollectionConvertParams<T>\n    ): T | undefined {\n        const { fields, values: inputValues } = params;\n        if (inputValues === undefined) {\n            return undefined;\n        }\n\n        this.attachHasOwnProperty<T>(inputValues);\n\n        return fields.reduce<T>((output, field) => {\n            const converter = this.getConverter(field.type);\n            if (inputValues === null || inputValues.hasOwnProperty(field.fieldId) === false) {\n                return output;\n            }\n            const values = converter.convertToStorage({\n                field,\n                value: inputValues[field.fieldId as keyof T]\n            });\n\n            return {\n                ...output,\n                ...values\n            };\n        }, {} as T);\n    }\n\n    public convertFromStorage<T extends CmsEntryValues = CmsEntryValues>(\n        params: ConverterCollectionConvertParams<T>\n    ): T | undefined {\n        const { fields, values: inputValues } = params;\n        if (inputValues === undefined) {\n            return undefined;\n        }\n\n        return fields.reduce<T>((output, field) => {\n            const converter = this.getConverter(field.type);\n            if (inputValues === null || inputValues.hasOwnProperty(field.storageId) === false) {\n                return output;\n            }\n            const values = converter.convertFromStorage({\n                field,\n                value: inputValues[field.storageId as keyof T]\n            });\n\n            return {\n                ...output,\n                ...values\n            };\n        }, {} as T);\n    }\n\n    /**\n     * This method attaches hasOwnProperty when received object was created via Object.create(null) - no inheritance of Object.\n     * At that point, hasOwnProperty does not exist, and we need to add it.\n     *\n     * TODO add more checks if required\n     */\n    private attachHasOwnProperty<T extends CmsEntryValues = CmsEntryValues>(values: T) {\n        if (\n            // null or undefined?\n            values === null ||\n            values === undefined ||\n            // not an object?\n            typeof values !== \"object\" ||\n            // maybe it's an array?\n            Array.isArray(values) ||\n            // and in the end, check if hasOwnProperty is a function already\n            typeof values?.hasOwnProperty === \"function\"\n        ) {\n            return;\n        }\n        Object.defineProperty(values, \"hasOwnProperty\", {\n            enumerable: false,\n            writable: false,\n            value: function (property: string) {\n                return this[property] !== undefined;\n            }\n        });\n    }\n}\n"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["WebinyError","Converter","CmsModelFieldConverterPlugin","getBaseFieldType","ConverterCollection","converters","Map","constructor","params","plugins","fieldRegistry","fieldGraphQLPlugins","getAll","fieldConverterPlugins","byType","type","defaultFieldConverterPlugin","find","pl","getFieldType","undefined","fieldGraphQLPlugin","plugin","fieldType","converter","addConverter","setConverterCollection","set","getType","getConverter","baseType","get","convertToStorage","fields","values","inputValues","attachHasOwnProperty","reduce","output","field","hasOwnProperty","fieldId","value","convertFromStorage","storageId","Array","isArray","Object","defineProperty","enumerable","writable","property"],"sources":["ConverterCollection.ts"],"sourcesContent":["import WebinyError from \"@webiny/error\";\nimport { Converter } from \"./Converter.js\";\nimport type { CmsEntryValues, CmsModelField } from \"~/types/index.js\";\nimport { CmsModelFieldConverterPlugin } from \"~/plugins/index.js\";\nimport type { PluginsContainer } from \"@webiny/plugins\";\nimport { getBaseFieldType } from \"~/utils/getBaseFieldType.js\";\nimport type { CmsModelFieldToGraphQLRegistry } from \"~/features/graphql/index.js\";\n\nexport interface CmsModelFieldsWithParent extends CmsModelField {\n    parent?: CmsModelField | null;\n}\n\nexport interface CmsModelConverterCallable<T extends CmsEntryValues = CmsEntryValues> {\n    (params: ConverterCollectionConvertParams<T>): T;\n}\n\nexport interface ConverterCollectionConvertParams<T extends CmsEntryValues = CmsEntryValues> {\n    fields: CmsModelFieldsWithParent[];\n    values?: T;\n}\n\nexport interface ConverterCollectionParams {\n    plugins: PluginsContainer;\n    fieldRegistry: CmsModelFieldToGraphQLRegistry.Interface;\n}\n\nexport class ConverterCollection {\n    private readonly converters: Map<string, Converter> = new Map();\n\n    public constructor(params: ConverterCollectionParams) {\n        const { plugins, fieldRegistry } = params;\n        const fieldGraphQLPlugins = fieldRegistry.getAll();\n        const fieldConverterPlugins = plugins.byType<CmsModelFieldConverterPlugin>(\n            CmsModelFieldConverterPlugin.type\n        );\n        const defaultFieldConverterPlugin = fieldConverterPlugins.find(\n            pl => pl.getFieldType() === \"*\"\n        );\n        if (defaultFieldConverterPlugin === undefined) {\n            throw new WebinyError(\n                `Missing default field converter plugin.`,\n                \"DEFAULT_FIELD_CONVERTER_ERROR\"\n            );\n        }\n        for (const fieldGraphQLPlugin of fieldGraphQLPlugins) {\n            const plugin = fieldConverterPlugins.find(\n                pl => pl.getFieldType() === fieldGraphQLPlugin.fieldType\n            );\n            const converter = new Converter({\n                type: fieldGraphQLPlugin.fieldType,\n                plugin: plugin || defaultFieldConverterPlugin\n            });\n\n            this.addConverter(converter);\n        }\n    }\n\n    public addConverter(converter: Converter): void {\n        converter.setConverterCollection(this);\n        this.converters.set(converter.getType(), converter);\n    }\n\n    public getConverter(type: string): Converter {\n        const baseType = getBaseFieldType({ type });\n        const converter = this.converters.get(baseType);\n        if (converter === undefined) {\n            throw new WebinyError(\n                `Missing converter for field type \"${type}\".`,\n                \"CONVERTER_ERROR\",\n                {\n                    type\n                }\n            );\n        }\n        return converter;\n    }\n\n    public convertToStorage<T extends CmsEntryValues = CmsEntryValues>(\n        params: ConverterCollectionConvertParams<T>\n    ): T | undefined {\n        const { fields, values: inputValues } = params;\n        if (inputValues === undefined) {\n            return undefined;\n        }\n\n        this.attachHasOwnProperty<T>(inputValues);\n\n        return fields.reduce<T>((output, field) => {\n            const converter = this.getConverter(field.type);\n            if (inputValues === null || inputValues.hasOwnProperty(field.fieldId) === false) {\n                return output;\n            }\n            const values = converter.convertToStorage({\n                field,\n                value: inputValues[field.fieldId as keyof T]\n            });\n\n            return {\n                ...output,\n                ...values\n            };\n        }, {} as T);\n    }\n\n    public convertFromStorage<T extends CmsEntryValues = CmsEntryValues>(\n        params: ConverterCollectionConvertParams<T>\n    ): T | undefined {\n        const { fields, values: inputValues } = params;\n        if (inputValues === undefined) {\n            return undefined;\n        }\n\n        return fields.reduce<T>((output, field) => {\n            const converter = this.getConverter(field.type);\n            if (inputValues === null || inputValues.hasOwnProperty(field.storageId) === false) {\n                return output;\n            }\n            const values = converter.convertFromStorage({\n                field,\n                value: inputValues[field.storageId as keyof T]\n            });\n\n            return {\n                ...output,\n                ...values\n            };\n        }, {} as T);\n    }\n\n    /**\n     * This method attaches hasOwnProperty when received object was created via Object.create(null) - no inheritance of Object.\n     * At that point, hasOwnProperty does not exist, and we need to add it.\n     *\n     * TODO add more checks if required\n     */\n    private attachHasOwnProperty<T extends CmsEntryValues = CmsEntryValues>(values: T) {\n        if (\n            // null or undefined?\n            values === null ||\n            values === undefined ||\n            // not an object?\n            typeof values !== \"object\" ||\n            // maybe it's an array?\n            Array.isArray(values) ||\n            // and in the end, check if hasOwnProperty is a function already\n            typeof values?.hasOwnProperty === \"function\"\n        ) {\n            return;\n        }\n        Object.defineProperty(values, \"hasOwnProperty\", {\n            enumerable: false,\n            writable: false,\n            value: function (property: string) {\n                return this[property] !== undefined;\n            }\n        });\n    }\n}\n"],"mappings":"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","ignoreList":[]}

package/utils/converters/valueKeyFromStorageConverter.d.ts

@@ -1,9 +1,11 @@
 import type { PluginsContainer } from "@webiny/plugins";
 import type { CmsModelConverterCallable } from "./ConverterCollection.js";
 import type { CmsEntryValues, CmsModel } from "../../types/index.js";
+import type { CmsModelFieldToGraphQLRegistry } from "../../features/graphql/index.js";
 interface Params {
     model: Pick<CmsModel, "fields">;
     plugins: PluginsContainer;
+    fieldRegistry: CmsModelFieldToGraphQLRegistry.Interface;
 }
 export declare const createValueKeyFromStorageConverter: <T extends CmsEntryValues = CmsEntryValues>(params: Params) => CmsModelConverterCallable<T>;
 export {};

package/utils/converters/valueKeyFromStorageConverter.js

@@ -2,10 +2,12 @@ import { ConverterCollection } from "./ConverterCollection.js";
 export const createValueKeyFromStorageConverter = params => {
   const {
     plugins,
-    model
+    model,
+    fieldRegistry
   } = params;
   const converters = new ConverterCollection({
-    plugins
+    plugins,
+    fieldRegistry
   });
   return ({
     fields,

package/utils/converters/valueKeyFromStorageConverter.js.map

@@ -1 +1 @@
-{"version":3,"names":["ConverterCollection","createValueKeyFromStorageConverter","params","plugins","model","converters","fields","values","result","convertFromStorage"],"sources":["valueKeyFromStorageConverter.ts"],"sourcesContent":["import type { PluginsContainer } from \"@webiny/plugins\";\nimport type { CmsModelConverterCallable } from \"./ConverterCollection.js\";\nimport { ConverterCollection } from \"./ConverterCollection.js\";\nimport type { CmsEntryValues, CmsModel } from \"~/types/index.js\";\nimport type { ConverterCollectionConvertParams } from \"./types.js\";\n\ninterface Params {\n    model: Pick<CmsModel, \"fields\">;\n    plugins: PluginsContainer;\n}\n\nexport const createValueKeyFromStorageConverter = <T extends CmsEntryValues = CmsEntryValues>(\n    params: Params\n): CmsModelConverterCallable<T> => {\n    const { plugins, model } = params;\n\n    const converters = new ConverterCollection({\n        plugins\n    });\n\n    return <T extends CmsEntryValues = CmsEntryValues>({\n        fields,\n        values\n    }: ConverterCollectionConvertParams<T>) => {\n        const result = converters.convertFromStorage<T>({\n            fields: fields || model.fields,\n            values\n        });\n        return result || ({} as T);\n    };\n};\n"],"mappings":"AAEA,SAASA,mBAAmB;AAS5B,OAAO,MAAMC,kCAAkC,GAC3CC,MAAc,IACiB;EAC/B,MAAM;IAAEC,OAAO;IAAEC;EAAM,CAAC,GAAGF,MAAM;EAEjC,MAAMG,UAAU,GAAG,IAAIL,mBAAmB,CAAC;IACvCG;EACJ,CAAC,CAAC;EAEF,OAAO,CAA4C;IAC/CG,MAAM;IACNC;EACiC,CAAC,KAAK;IACvC,MAAMC,MAAM,GAAGH,UAAU,CAACI,kBAAkB,CAAI;MAC5CH,MAAM,EAAEA,MAAM,IAAIF,KAAK,CAACE,MAAM;MAC9BC;IACJ,CAAC,CAAC;IACF,OAAOC,MAAM,IAAK,CAAC,CAAO;EAC9B,CAAC;AACL,CAAC","ignoreList":[]}
+{"version":3,"names":["ConverterCollection","createValueKeyFromStorageConverter","params","plugins","model","fieldRegistry","converters","fields","values","result","convertFromStorage"],"sources":["valueKeyFromStorageConverter.ts"],"sourcesContent":["import type { PluginsContainer } from \"@webiny/plugins\";\nimport type { CmsModelConverterCallable } from \"./ConverterCollection.js\";\nimport { ConverterCollection } from \"./ConverterCollection.js\";\nimport type { CmsEntryValues, CmsModel } from \"~/types/index.js\";\nimport type { ConverterCollectionConvertParams } from \"./types.js\";\nimport type { CmsModelFieldToGraphQLRegistry } from \"~/features/graphql/index.js\";\n\ninterface Params {\n    model: Pick<CmsModel, \"fields\">;\n    plugins: PluginsContainer;\n    fieldRegistry: CmsModelFieldToGraphQLRegistry.Interface;\n}\n\nexport const createValueKeyFromStorageConverter = <T extends CmsEntryValues = CmsEntryValues>(\n    params: Params\n): CmsModelConverterCallable<T> => {\n    const { plugins, model, fieldRegistry } = params;\n\n    const converters = new ConverterCollection({\n        plugins,\n        fieldRegistry\n    });\n\n    return <T extends CmsEntryValues = CmsEntryValues>({\n        fields,\n        values\n    }: ConverterCollectionConvertParams<T>) => {\n        const result = converters.convertFromStorage<T>({\n            fields: fields || model.fields,\n            values\n        });\n        return result || ({} as T);\n    };\n};\n"],"mappings":"AAEA,SAASA,mBAAmB;AAW5B,OAAO,MAAMC,kCAAkC,GAC3CC,MAAc,IACiB;EAC/B,MAAM;IAAEC,OAAO;IAAEC,KAAK;IAAEC;EAAc,CAAC,GAAGH,MAAM;EAEhD,MAAMI,UAAU,GAAG,IAAIN,mBAAmB,CAAC;IACvCG,OAAO;IACPE;EACJ,CAAC,CAAC;EAEF,OAAO,CAA4C;IAC/CE,MAAM;IACNC;EACiC,CAAC,KAAK;IACvC,MAAMC,MAAM,GAAGH,UAAU,CAACI,kBAAkB,CAAI;MAC5CH,MAAM,EAAEA,MAAM,IAAIH,KAAK,CAACG,MAAM;MAC9BC;IACJ,CAAC,CAAC;IACF,OAAOC,MAAM,IAAK,CAAC,CAAO;EAC9B,CAAC;AACL,CAAC","ignoreList":[]}

package/utils/converters/valueKeyStorageConverter.d.ts

@@ -1,3 +1,2 @@
-import type { PluginsContainer } from "@webiny/plugins";
-import type { CmsEntryValues, CmsModel, StorageOperationsCmsModel } from "../../types/index.js";
-export declare const createCmsModelFieldConvertersAttachFactory: (plugins: PluginsContainer) => <T extends CmsEntryValues = CmsEntryValues>(model: StorageOperationsCmsModel | CmsModel) => StorageOperationsCmsModel<T>;
+import type { CmsContext, CmsEntryValues, CmsModel, StorageOperationsCmsModel } from "../../types/index.js";
+export declare const createCmsModelFieldConvertersAttachFactory: (context: CmsContext) => <T extends CmsEntryValues = CmsEntryValues>(model: StorageOperationsCmsModel | CmsModel) => StorageOperationsCmsModel<T>;

package/utils/converters/valueKeyStorageConverter.js

@@ -1,20 +1,24 @@
 import { createValueKeyToStorageConverter } from "./valueKeyToStorageConverter.js";
 import { createValueKeyFromStorageConverter } from "./valueKeyFromStorageConverter.js";
-export const createCmsModelFieldConvertersAttachFactory = plugins => {
+import { CmsModelFieldToGraphQLRegistry } from "../../features/graphql/index.js";
+export const createCmsModelFieldConvertersAttachFactory = context => {
   return model => {
     const storageModel = model;
     if (!!storageModel.convertValueKeyToStorage && !!storageModel.convertValueKeyFromStorage) {
       return storageModel;
     }
+    const fieldRegistry = context.container.resolve(CmsModelFieldToGraphQLRegistry);
     return {
       ...model,
       convertValueKeyToStorage: createValueKeyToStorageConverter({
         model,
-        plugins
+        plugins: context.plugins,
+        fieldRegistry
       }),
       convertValueKeyFromStorage: createValueKeyFromStorageConverter({
         model,
-        plugins
+        plugins: context.plugins,
+        fieldRegistry
       })
     };
   };

package/utils/converters/valueKeyStorageConverter.js.map

@@ -1 +1 @@
-{"version":3,"names":["createValueKeyToStorageConverter","createValueKeyFromStorageConverter","createCmsModelFieldConvertersAttachFactory","plugins","model","storageModel","convertValueKeyToStorage","convertValueKeyFromStorage"],"sources":["valueKeyStorageConverter.ts"],"sourcesContent":["import type { PluginsContainer } from \"@webiny/plugins\";\nimport type { CmsEntryValues, CmsModel, StorageOperationsCmsModel } from \"~/types/index.js\";\nimport { createValueKeyToStorageConverter } from \"./valueKeyToStorageConverter.js\";\nimport { createValueKeyFromStorageConverter } from \"./valueKeyFromStorageConverter.js\";\n\nexport const createCmsModelFieldConvertersAttachFactory = (plugins: PluginsContainer) => {\n    return <T extends CmsEntryValues = CmsEntryValues>(\n        model: StorageOperationsCmsModel | CmsModel\n    ): StorageOperationsCmsModel<T> => {\n        const storageModel = model as Partial<StorageOperationsCmsModel<T>>;\n        if (!!storageModel.convertValueKeyToStorage && !!storageModel.convertValueKeyFromStorage) {\n            return storageModel as StorageOperationsCmsModel<T>;\n        }\n        return {\n            ...model,\n            convertValueKeyToStorage: createValueKeyToStorageConverter<T>({\n                model,\n                plugins\n            }),\n            convertValueKeyFromStorage: createValueKeyFromStorageConverter<T>({\n                model,\n                plugins\n            })\n        };\n    };\n};\n"],"mappings":"AAEA,SAASA,gCAAgC;AACzC,SAASC,kCAAkC;AAE3C,OAAO,MAAMC,0CAA0C,GAAIC,OAAyB,IAAK;EACrF,OACIC,KAA2C,IACZ;IAC/B,MAAMC,YAAY,GAAGD,KAA8C;IACnE,IAAI,CAAC,CAACC,YAAY,CAACC,wBAAwB,IAAI,CAAC,CAACD,YAAY,CAACE,0BAA0B,EAAE;MACtF,OAAOF,YAAY;IACvB;IACA,OAAO;MACH,GAAGD,KAAK;MACRE,wBAAwB,EAAEN,gCAAgC,CAAI;QAC1DI,KAAK;QACLD;MACJ,CAAC,CAAC;MACFI,0BAA0B,EAAEN,kCAAkC,CAAI;QAC9DG,KAAK;QACLD;MACJ,CAAC;IACL,CAAC;EACL,CAAC;AACL,CAAC","ignoreList":[]}
+{"version":3,"names":["createValueKeyToStorageConverter","createValueKeyFromStorageConverter","CmsModelFieldToGraphQLRegistry","createCmsModelFieldConvertersAttachFactory","context","model","storageModel","convertValueKeyToStorage","convertValueKeyFromStorage","fieldRegistry","container","resolve","plugins"],"sources":["valueKeyStorageConverter.ts"],"sourcesContent":["import type {\n    CmsContext,\n    CmsEntryValues,\n    CmsModel,\n    StorageOperationsCmsModel\n} from \"~/types/index.js\";\nimport { createValueKeyToStorageConverter } from \"./valueKeyToStorageConverter.js\";\nimport { createValueKeyFromStorageConverter } from \"./valueKeyFromStorageConverter.js\";\nimport { CmsModelFieldToGraphQLRegistry } from \"~/features/graphql/index.js\";\n\nexport const createCmsModelFieldConvertersAttachFactory = (context: CmsContext) => {\n    return <T extends CmsEntryValues = CmsEntryValues>(\n        model: StorageOperationsCmsModel | CmsModel\n    ): StorageOperationsCmsModel<T> => {\n        const storageModel = model as Partial<StorageOperationsCmsModel<T>>;\n        if (!!storageModel.convertValueKeyToStorage && !!storageModel.convertValueKeyFromStorage) {\n            return storageModel as StorageOperationsCmsModel<T>;\n        }\n\n        const fieldRegistry = context.container.resolve(CmsModelFieldToGraphQLRegistry);\n        return {\n            ...model,\n            convertValueKeyToStorage: createValueKeyToStorageConverter<T>({\n                model,\n                plugins: context.plugins,\n                fieldRegistry\n            }),\n            convertValueKeyFromStorage: createValueKeyFromStorageConverter<T>({\n                model,\n                plugins: context.plugins,\n                fieldRegistry\n            })\n        };\n    };\n};\n"],"mappings":"AAMA,SAASA,gCAAgC;AACzC,SAASC,kCAAkC;AAC3C,SAASC,8BAA8B;AAEvC,OAAO,MAAMC,0CAA0C,GAAIC,OAAmB,IAAK;EAC/E,OACIC,KAA2C,IACZ;IAC/B,MAAMC,YAAY,GAAGD,KAA8C;IACnE,IAAI,CAAC,CAACC,YAAY,CAACC,wBAAwB,IAAI,CAAC,CAACD,YAAY,CAACE,0BAA0B,EAAE;MACtF,OAAOF,YAAY;IACvB;IAEA,MAAMG,aAAa,GAAGL,OAAO,CAACM,SAAS,CAACC,OAAO,CAACT,8BAA8B,CAAC;IAC/E,OAAO;MACH,GAAGG,KAAK;MACRE,wBAAwB,EAAEP,gCAAgC,CAAI;QAC1DK,KAAK;QACLO,OAAO,EAAER,OAAO,CAACQ,OAAO;QACxBH;MACJ,CAAC,CAAC;MACFD,0BAA0B,EAAEP,kCAAkC,CAAI;QAC9DI,KAAK;QACLO,OAAO,EAAER,OAAO,CAACQ,OAAO;QACxBH;MACJ,CAAC;IACL,CAAC;EACL,CAAC;AACL,CAAC","ignoreList":[]}

package/utils/converters/valueKeyToStorageConverter.d.ts

@@ -1,9 +1,11 @@
 import type { PluginsContainer } from "@webiny/plugins";
 import type { CmsModelConverterCallable } from "./ConverterCollection.js";
 import type { CmsEntryValues, CmsModel } from "../../types/index.js";
+import type { CmsModelFieldToGraphQLRegistry } from "../../features/graphql/index.js";
 interface Params {
     model: Pick<CmsModel, "fields">;
     plugins: PluginsContainer;
+    fieldRegistry: CmsModelFieldToGraphQLRegistry.Interface;
 }
 export declare const createValueKeyToStorageConverter: <T extends CmsEntryValues = CmsEntryValues>(params: Params) => CmsModelConverterCallable<T>;
 export {};

package/utils/converters/valueKeyToStorageConverter.js

@@ -2,10 +2,12 @@ import { ConverterCollection } from "./ConverterCollection.js";
 export const createValueKeyToStorageConverter = params => {
   const {
     plugins,
-    model
+    model,
+    fieldRegistry
   } = params;
   const converters = new ConverterCollection({
-    plugins
+    plugins,
+    fieldRegistry
   });
   return ({
     fields,

package/utils/converters/valueKeyToStorageConverter.js.map

@@ -1 +1 @@
-{"version":3,"names":["ConverterCollection","createValueKeyToStorageConverter","params","plugins","model","converters","fields","values","result","convertToStorage"],"sources":["valueKeyToStorageConverter.ts"],"sourcesContent":["import type { PluginsContainer } from \"@webiny/plugins\";\nimport type { CmsModelConverterCallable } from \"./ConverterCollection.js\";\nimport { ConverterCollection } from \"./ConverterCollection.js\";\nimport type { CmsEntryValues, CmsModel } from \"~/types/index.js\";\nimport type { ConverterCollectionConvertParams } from \"./types.js\";\n\ninterface Params {\n    model: Pick<CmsModel, \"fields\">;\n    plugins: PluginsContainer;\n}\n\nexport const createValueKeyToStorageConverter = <T extends CmsEntryValues = CmsEntryValues>(\n    params: Params\n): CmsModelConverterCallable<T> => {\n    const { plugins, model } = params;\n\n    const converters = new ConverterCollection({\n        plugins\n    });\n\n    return <T extends CmsEntryValues = CmsEntryValues>({\n        fields,\n        values\n    }: ConverterCollectionConvertParams<T>) => {\n        const result = converters.convertToStorage<T>({\n            fields: fields || model.fields,\n            values\n        });\n        return result || ({} as T);\n    };\n};\n"],"mappings":"AAEA,SAASA,mBAAmB;AAS5B,OAAO,MAAMC,gCAAgC,GACzCC,MAAc,IACiB;EAC/B,MAAM;IAAEC,OAAO;IAAEC;EAAM,CAAC,GAAGF,MAAM;EAEjC,MAAMG,UAAU,GAAG,IAAIL,mBAAmB,CAAC;IACvCG;EACJ,CAAC,CAAC;EAEF,OAAO,CAA4C;IAC/CG,MAAM;IACNC;EACiC,CAAC,KAAK;IACvC,MAAMC,MAAM,GAAGH,UAAU,CAACI,gBAAgB,CAAI;MAC1CH,MAAM,EAAEA,MAAM,IAAIF,KAAK,CAACE,MAAM;MAC9BC;IACJ,CAAC,CAAC;IACF,OAAOC,MAAM,IAAK,CAAC,CAAO;EAC9B,CAAC;AACL,CAAC","ignoreList":[]}
+{"version":3,"names":["ConverterCollection","createValueKeyToStorageConverter","params","plugins","model","fieldRegistry","converters","fields","values","result","convertToStorage"],"sources":["valueKeyToStorageConverter.ts"],"sourcesContent":["import type { PluginsContainer } from \"@webiny/plugins\";\nimport type { CmsModelConverterCallable } from \"./ConverterCollection.js\";\nimport { ConverterCollection } from \"./ConverterCollection.js\";\nimport type { CmsEntryValues, CmsModel } from \"~/types/index.js\";\nimport type { ConverterCollectionConvertParams } from \"./types.js\";\nimport type { CmsModelFieldToGraphQLRegistry } from \"~/features/graphql/index.js\";\n\ninterface Params {\n    model: Pick<CmsModel, \"fields\">;\n    plugins: PluginsContainer;\n    fieldRegistry: CmsModelFieldToGraphQLRegistry.Interface;\n}\n\nexport const createValueKeyToStorageConverter = <T extends CmsEntryValues = CmsEntryValues>(\n    params: Params\n): CmsModelConverterCallable<T> => {\n    const { plugins, model, fieldRegistry } = params;\n\n    const converters = new ConverterCollection({\n        plugins,\n        fieldRegistry\n    });\n\n    return <T extends CmsEntryValues = CmsEntryValues>({\n        fields,\n        values\n    }: ConverterCollectionConvertParams<T>) => {\n        const result = converters.convertToStorage<T>({\n            fields: fields || model.fields,\n            values\n        });\n        return result || ({} as T);\n    };\n};\n"],"mappings":"AAEA,SAASA,mBAAmB;AAW5B,OAAO,MAAMC,gCAAgC,GACzCC,MAAc,IACiB;EAC/B,MAAM;IAAEC,OAAO;IAAEC,KAAK;IAAEC;EAAc,CAAC,GAAGH,MAAM;EAEhD,MAAMI,UAAU,GAAG,IAAIN,mBAAmB,CAAC;IACvCG,OAAO;IACPE;EACJ,CAAC,CAAC;EAEF,OAAO,CAA4C;IAC/CE,MAAM;IACNC;EACiC,CAAC,KAAK;IACvC,MAAMC,MAAM,GAAGH,UAAU,CAACI,gBAAgB,CAAI;MAC1CH,MAAM,EAAEA,MAAM,IAAIH,KAAK,CAACG,MAAM;MAC9BC;IACJ,CAAC,CAAC;IACF,OAAOC,MAAM,IAAK,CAAC,CAAO;EAC9B,CAAC;AACL,CAAC","ignoreList":[]}

package/utils/createTypeFromFields.d.ts

@@ -1,4 +1,5 @@
-import type { ApiEndpoint, CmsFieldTypePlugins, CmsModel, CmsModelField } from "../types/index.js";
+import type { ApiEndpoint, CmsModel, CmsModelField } from "../types/index.js";
+import type { CmsModelFieldToGraphQLRegistry } from "../features/graphql/index.js";
 interface TypeFromFieldParams {
     typeOfType: "type" | "input";
     models: CmsModel[];
@@ -6,7 +7,7 @@ interface TypeFromFieldParams {
     type: ApiEndpoint;
     typeNamePrefix: string;
     fields: CmsModelField[];
-    fieldTypePlugins: CmsFieldTypePlugins;
+    fieldRegistry: CmsModelFieldToGraphQLRegistry.Interface;
 }
 interface TypeFromFieldResponse {
     fieldType: string;

package/utils/createTypeFromFields.js

@@ -8,7 +8,7 @@ export const createTypeFromFields = params => {
     type,
     typeNamePrefix,
     fields,
-    fieldTypePlugins
+    fieldRegistry
   } = params;
   const typeSuffix = typeOfType === "input" ? "Input" : "";
   const mTypeName = model.singularApiName;
@@ -27,12 +27,12 @@ export const createTypeFromFields = params => {
       type,
       models,
       model,
-      fieldTypePlugins
+      fieldRegistry
     }) : renderInputField({
       field,
       models,
       model,
-      fieldTypePlugins
+      fieldRegistry
     });
     if (!result) {
       continue;

package/utils/createTypeFromFields.js.map

@@ -1 +1 @@
-{"version":3,"names":["renderField","renderInputField","createTypeFromFields","params","typeOfType","model","models","type","typeNamePrefix","fields","fieldTypePlugins","typeSuffix","mTypeName","singularApiName","typeFields","nestedTypes","replace","RegExp","field","result","typeDefs","push","length","fieldType","join"],"sources":["createTypeFromFields.ts"],"sourcesContent":["import { renderField } from \"~/utils/renderFields.js\";\nimport { renderInputField } from \"~/utils/renderInputFields.js\";\nimport type { ApiEndpoint, CmsFieldTypePlugins, CmsModel, CmsModelField } from \"~/types/index.js\";\n\ninterface TypeFromFieldParams {\n    typeOfType: \"type\" | \"input\";\n    models: CmsModel[];\n    model: CmsModel;\n    type: ApiEndpoint;\n    typeNamePrefix: string;\n    fields: CmsModelField[];\n    fieldTypePlugins: CmsFieldTypePlugins;\n}\n\ninterface TypeFromFieldResponse {\n    fieldType: string;\n    typeDefs: string;\n}\n\nexport const createTypeFromFields = (params: TypeFromFieldParams): TypeFromFieldResponse | null => {\n    const { typeOfType, model, models, type, typeNamePrefix, fields, fieldTypePlugins } = params;\n    const typeSuffix = typeOfType === \"input\" ? \"Input\" : \"\";\n    const mTypeName = model.singularApiName;\n\n    const typeFields: string[] = [];\n    const nestedTypes: string[] = [];\n\n    // Once the loop below starts, we'll be executing a recursive \"object\" type generation.\n    // The main trick here is that nested objects don't know who the parent is, and will generate\n    // type names using the \"model\", as if they're at the top level:\n    // Every time the types are returned, we need to replace the model name in the generated type name\n    // with the actual prefix which includes parent field name type.\n    const replace = new RegExp(`${mTypeName}_`, \"g\");\n\n    for (const field of fields) {\n        const result =\n            typeOfType === \"type\"\n                ? renderField({ field, type, models, model, fieldTypePlugins })\n                : renderInputField({ field, models, model, fieldTypePlugins });\n\n        if (!result) {\n            continue;\n        }\n\n        const { fields, typeDefs } = result;\n\n        typeFields.push(fields.replace(replace, `${typeNamePrefix}_`));\n        if (typeDefs) {\n            nestedTypes.push(typeDefs.replace(replace, `${typeNamePrefix}_`));\n        }\n    }\n\n    if (!typeFields.length) {\n        typeFields.push(\"_empty: String\");\n    }\n\n    return {\n        fieldType: `${typeNamePrefix}${typeSuffix}`,\n        typeDefs: /* GraphQL */ `\n            ${nestedTypes.join(\"\\n\")}\n\n            ${typeOfType} ${typeNamePrefix}${typeSuffix} {\n                ${typeFields.join(\"\\n\")}\n            }\\n\n        `\n    };\n};\n"],"mappings":"AAAA,SAASA,WAAW;AACpB,SAASC,gBAAgB;AAkBzB,OAAO,MAAMC,oBAAoB,GAAIC,MAA2B,IAAmC;EAC/F,MAAM;IAAEC,UAAU;IAAEC,KAAK;IAAEC,MAAM;IAAEC,IAAI;IAAEC,cAAc;IAAEC,MAAM;IAAEC;EAAiB,CAAC,GAAGP,MAAM;EAC5F,MAAMQ,UAAU,GAAGP,UAAU,KAAK,OAAO,GAAG,OAAO,GAAG,EAAE;EACxD,MAAMQ,SAAS,GAAGP,KAAK,CAACQ,eAAe;EAEvC,MAAMC,UAAoB,GAAG,EAAE;EAC/B,MAAMC,WAAqB,GAAG,EAAE;;EAEhC;EACA;EACA;EACA;EACA;EACA,MAAMC,OAAO,GAAG,IAAIC,MAAM,CAAC,GAAGL,SAAS,GAAG,EAAE,GAAG,CAAC;EAEhD,KAAK,MAAMM,KAAK,IAAIT,MAAM,EAAE;IACxB,MAAMU,MAAM,GACRf,UAAU,KAAK,MAAM,GACfJ,WAAW,CAAC;MAAEkB,KAAK;MAAEX,IAAI;MAAED,MAAM;MAAED,KAAK;MAAEK;IAAiB,CAAC,CAAC,GAC7DT,gBAAgB,CAAC;MAAEiB,KAAK;MAAEZ,MAAM;MAAED,KAAK;MAAEK;IAAiB,CAAC,CAAC;IAEtE,IAAI,CAACS,MAAM,EAAE;MACT;IACJ;IAEA,MAAM;MAAEV,MAAM;MAAEW;IAAS,CAAC,GAAGD,MAAM;IAEnCL,UAAU,CAACO,IAAI,CAACZ,MAAM,CAACO,OAAO,CAACA,OAAO,EAAE,GAAGR,cAAc,GAAG,CAAC,CAAC;IAC9D,IAAIY,QAAQ,EAAE;MACVL,WAAW,CAACM,IAAI,CAACD,QAAQ,CAACJ,OAAO,CAACA,OAAO,EAAE,GAAGR,cAAc,GAAG,CAAC,CAAC;IACrE;EACJ;EAEA,IAAI,CAACM,UAAU,CAACQ,MAAM,EAAE;IACpBR,UAAU,CAACO,IAAI,CAAC,gBAAgB,CAAC;EACrC;EAEA,OAAO;IACHE,SAAS,EAAE,GAAGf,cAAc,GAAGG,UAAU,EAAE;IAC3CS,QAAQ,EAAE,aAAc;AAChC,cAAcL,WAAW,CAACS,IAAI,CAAC,IAAI,CAAC;AACpC;AACA,cAAcpB,UAAU,IAAII,cAAc,GAAGG,UAAU;AACvD,kBAAkBG,UAAU,CAACU,IAAI,CAAC,IAAI,CAAC;AACvC;AACA;EACI,CAAC;AACL,CAAC","ignoreList":[]}
+{"version":3,"names":["renderField","renderInputField","createTypeFromFields","params","typeOfType","model","models","type","typeNamePrefix","fields","fieldRegistry","typeSuffix","mTypeName","singularApiName","typeFields","nestedTypes","replace","RegExp","field","result","typeDefs","push","length","fieldType","join"],"sources":["createTypeFromFields.ts"],"sourcesContent":["import { renderField } from \"~/utils/renderFields.js\";\nimport { renderInputField } from \"~/utils/renderInputFields.js\";\nimport type { ApiEndpoint, CmsModel, CmsModelField } from \"~/types/index.js\";\nimport type { CmsModelFieldToGraphQLRegistry } from \"~/features/graphql/index.js\";\n\ninterface TypeFromFieldParams {\n    typeOfType: \"type\" | \"input\";\n    models: CmsModel[];\n    model: CmsModel;\n    type: ApiEndpoint;\n    typeNamePrefix: string;\n    fields: CmsModelField[];\n    fieldRegistry: CmsModelFieldToGraphQLRegistry.Interface;\n}\n\ninterface TypeFromFieldResponse {\n    fieldType: string;\n    typeDefs: string;\n}\n\nexport const createTypeFromFields = (params: TypeFromFieldParams): TypeFromFieldResponse | null => {\n    const { typeOfType, model, models, type, typeNamePrefix, fields, fieldRegistry } = params;\n    const typeSuffix = typeOfType === \"input\" ? \"Input\" : \"\";\n    const mTypeName = model.singularApiName;\n\n    const typeFields: string[] = [];\n    const nestedTypes: string[] = [];\n\n    // Once the loop below starts, we'll be executing a recursive \"object\" type generation.\n    // The main trick here is that nested objects don't know who the parent is, and will generate\n    // type names using the \"model\", as if they're at the top level:\n    // Every time the types are returned, we need to replace the model name in the generated type name\n    // with the actual prefix which includes parent field name type.\n    const replace = new RegExp(`${mTypeName}_`, \"g\");\n\n    for (const field of fields) {\n        const result =\n            typeOfType === \"type\"\n                ? renderField({ field, type, models, model, fieldRegistry })\n                : renderInputField({ field, models, model, fieldRegistry });\n\n        if (!result) {\n            continue;\n        }\n\n        const { fields, typeDefs } = result;\n\n        typeFields.push(fields.replace(replace, `${typeNamePrefix}_`));\n        if (typeDefs) {\n            nestedTypes.push(typeDefs.replace(replace, `${typeNamePrefix}_`));\n        }\n    }\n\n    if (!typeFields.length) {\n        typeFields.push(\"_empty: String\");\n    }\n\n    return {\n        fieldType: `${typeNamePrefix}${typeSuffix}`,\n        typeDefs: /* GraphQL */ `\n            ${nestedTypes.join(\"\\n\")}\n\n            ${typeOfType} ${typeNamePrefix}${typeSuffix} {\n                ${typeFields.join(\"\\n\")}\n            }\\n\n        `\n    };\n};\n"],"mappings":"AAAA,SAASA,WAAW;AACpB,SAASC,gBAAgB;AAmBzB,OAAO,MAAMC,oBAAoB,GAAIC,MAA2B,IAAmC;EAC/F,MAAM;IAAEC,UAAU;IAAEC,KAAK;IAAEC,MAAM;IAAEC,IAAI;IAAEC,cAAc;IAAEC,MAAM;IAAEC;EAAc,CAAC,GAAGP,MAAM;EACzF,MAAMQ,UAAU,GAAGP,UAAU,KAAK,OAAO,GAAG,OAAO,GAAG,EAAE;EACxD,MAAMQ,SAAS,GAAGP,KAAK,CAACQ,eAAe;EAEvC,MAAMC,UAAoB,GAAG,EAAE;EAC/B,MAAMC,WAAqB,GAAG,EAAE;;EAEhC;EACA;EACA;EACA;EACA;EACA,MAAMC,OAAO,GAAG,IAAIC,MAAM,CAAC,GAAGL,SAAS,GAAG,EAAE,GAAG,CAAC;EAEhD,KAAK,MAAMM,KAAK,IAAIT,MAAM,EAAE;IACxB,MAAMU,MAAM,GACRf,UAAU,KAAK,MAAM,GACfJ,WAAW,CAAC;MAAEkB,KAAK;MAAEX,IAAI;MAAED,MAAM;MAAED,KAAK;MAAEK;IAAc,CAAC,CAAC,GAC1DT,gBAAgB,CAAC;MAAEiB,KAAK;MAAEZ,MAAM;MAAED,KAAK;MAAEK;IAAc,CAAC,CAAC;IAEnE,IAAI,CAACS,MAAM,EAAE;MACT;IACJ;IAEA,MAAM;MAAEV,MAAM;MAAEW;IAAS,CAAC,GAAGD,MAAM;IAEnCL,UAAU,CAACO,IAAI,CAACZ,MAAM,CAACO,OAAO,CAACA,OAAO,EAAE,GAAGR,cAAc,GAAG,CAAC,CAAC;IAC9D,IAAIY,QAAQ,EAAE;MACVL,WAAW,CAACM,IAAI,CAACD,QAAQ,CAACJ,OAAO,CAACA,OAAO,EAAE,GAAGR,cAAc,GAAG,CAAC,CAAC;IACrE;EACJ;EAEA,IAAI,CAACM,UAAU,CAACQ,MAAM,EAAE;IACpBR,UAAU,CAACO,IAAI,CAAC,gBAAgB,CAAC;EACrC;EAEA,OAAO;IACHE,SAAS,EAAE,GAAGf,cAAc,GAAGG,UAAU,EAAE;IAC3CS,QAAQ,EAAE,aAAc;AAChC,cAAcL,WAAW,CAACS,IAAI,CAAC,IAAI,CAAC;AACpC;AACA,cAAcpB,UAAU,IAAII,cAAc,GAAGG,UAAU;AACvD,kBAAkBG,UAAU,CAACU,IAAI,CAAC,IAAI,CAAC;AACvC;AACA;EACI,CAAC;AACL,CAAC","ignoreList":[]}

package/utils/entryStorage.d.ts

@@ -1,29 +1,22 @@
-import { StorageTransformPlugin } from "../plugins/StorageTransformPlugin.js";
-import type { CmsContext, CmsEntry, CmsEntryValues, CmsModel, CmsModelField } from "../types/index.js";
-export interface GetStoragePluginFactory {
-    (context: Pick<CmsContext, "plugins">): (fieldType: string) => StorageTransformPlugin<any>;
+import type { CmsContext, CmsEntry, CmsModel, CmsModelField } from "../types/index.js";
+import { StorageTransform } from "../features/storage/index.js";
+export interface GetStorageTransformFactory {
+    (context: Pick<CmsContext, "container">): (fieldType: string) => StorageTransform.Interface;
 }
-export declare const getStoragePluginFactory: GetStoragePluginFactory;
+export declare const getStorageTransformFactory: GetStorageTransformFactory;
 /**
  * A function that is used in crud to transform entry into the storage type.
  */
-export declare const entryToStorageTransform: (context: Pick<CmsContext, "plugins">, model: CmsModel, entry: CmsEntry) => Promise<CmsEntry>;
+export declare const entryToStorageTransform: (context: Pick<CmsContext, "container">, model: CmsModel, entry: CmsEntry) => Promise<CmsEntry>;
 /**
  * A function that is used to transform the whole entry from storage into its native form.
  */
-export declare const entryFromStorageTransform: (context: Pick<CmsContext, "plugins">, model: CmsModel, entry: CmsEntry) => Promise<CmsEntry>;
+export declare const entryFromStorageTransform: (context: Pick<CmsContext, "container">, model: CmsModel, entry: CmsEntry) => Promise<CmsEntry>;
 interface EntryFieldFromStorageTransformParams {
-    context: Pick<CmsContext, "plugins">;
+    context: Pick<CmsContext, "container">;
     model: CmsModel;
     field: CmsModelField;
     value: any;
 }
 export declare const entryFieldFromStorageTransform: <T = any>(params: EntryFieldFromStorageTransformParams) => Promise<T>;
-export interface ICreateTransformEntryCallable {
-    context: Pick<CmsContext, "plugins">;
-}
-export interface ITransformEntryCallable<T extends CmsEntryValues = CmsEntryValues> {
-    (model: CmsModel, entry: CmsEntry): Promise<CmsEntry<T>>;
-}
-export declare const createTransformEntryCallable: (params: ICreateTransformEntryCallable) => ITransformEntryCallable;
 export {};

package/utils/entryStorage.js

@@ -1,28 +1,21 @@
-import WebinyError from "@webiny/error";
-import { StorageTransformPlugin } from "../plugins/StorageTransformPlugin.js";
 import { getBaseFieldType } from "./getBaseFieldType.js";
-export const getStoragePluginFactory = context => {
-  let defaultStoragePlugin;
-  const plugins = context.plugins.byType(StorageTransformPlugin.type)
-  // we reverse plugins because we want to get latest added only
-  .reverse().reduce((collection, plugin) => {
-    /**
-     * Check if it's a default plugin and set it - always override the previous one.
-     */
-    if (plugin.fieldType === "*") {
-      defaultStoragePlugin = plugin;
-      return collection;
+import { StorageTransformRegistry } from "../features/storage/index.js";
+export const getStorageTransformFactory = context => {
+  const registry = context.container.resolve(StorageTransformRegistry);
+  const result = {};
+  let defaultStorageTransform;
+  const storageTransforms = registry.getAll().toReversed();
+  for (const storageTransform of storageTransforms) {
+    if (storageTransform.fieldType === "*") {
+      defaultStorageTransform = storageTransform;
     }
-
-    /**
-     * We will just set the plugin for given type.
-     * The last one will override existing one - so users can override our default ones.
-     */
-    collection[plugin.fieldType] = plugin;
-    return collection;
-  }, {});
-  return fieldType => {
-    return plugins[fieldType] || defaultStoragePlugin;
+    result[storageTransform.fieldType] = storageTransform;
+  }
+  return type => {
+    const fieldType = getBaseFieldType({
+      type
+    });
+    return result[fieldType] || defaultStorageTransform;
   };
 };
 const doNotTouchProperty = Symbol("__DO_NOT_TOUCH_AS_WE_USE_IT_TO_SKIP_UNNECESSARY_OPERATIONS");
@@ -38,31 +31,24 @@ const entryStorageTransform = async (context, model, operation, entry) => {
   if (entry[doNotTouchProperty] === operation) {
     return entry;
   }
-  const getStoragePlugin = getStoragePluginFactory(context);
-  const transformedValues = {};
-  for (const field of model.fields) {
-    /**
-     * We can safely skip fields that are not present in the entry values.
-     */
-    if (entry.values.hasOwnProperty(field.fieldId) === false) {
-      continue;
-    }
+  const getStorageTransform = getStorageTransformFactory(context);
+  const fieldValues = model.fields.filter(field => {
+    return entry.values.hasOwnProperty(field.fieldId);
+  }).map(async field => {
     const key = field.fieldId;
     const value = entry.values[key];
     const baseType = getBaseFieldType(field);
-    const plugin = getStoragePlugin(baseType);
-    // TODO: remove this once plugins are converted into classes
-    if (typeof plugin[operation] !== "function") {
-      throw new WebinyError(`Missing "${operation}" function in storage plugin "${plugin.name}" for field type "${baseType}"`);
-    }
-    transformedValues[key] = await plugin[operation]({
-      plugins: context.plugins,
+    const storageTransform = getStorageTransform(baseType);
+    const transformed = await storageTransform[operation]({
       model,
       field,
       value,
-      getStoragePlugin
+      getStorageTransform
     });
-  }
+    return [key, transformed];
+  });
+  const results = await Promise.all(fieldValues);
+  const transformedValues = Object.fromEntries(results);
   const result = {
     ...entry,
     values: transformedValues
@@ -101,29 +87,15 @@ export const entryFieldFromStorageTransform = async params => {
     field,
     value
   } = params;
-  const getStoragePlugin = getStoragePluginFactory(context);
+  const getStorageTransform = getStorageTransformFactory(context);
   const baseType = getBaseFieldType(field);
-  const plugin = getStoragePlugin(baseType);
-
-  // TODO: remove this once plugins are converted into classes
-  if (typeof plugin.fromStorage !== "function") {
-    throw new WebinyError(`Missing "fromStorage" function in storage plugin "${plugin.name}" for field type "${baseType}"`);
-  }
-  return plugin.fromStorage({
-    plugins: context.plugins,
+  const storageTransform = getStorageTransform(baseType);
+  return storageTransform.fromStorage({
     model,
     field,
     value,
-    getStoragePlugin
+    getStorageTransform
   });
 };
-export const createTransformEntryCallable = params => {
-  const {
-    context
-  } = params;
-  return async (model, entry) => {
-    return entryFromStorageTransform(context, model, entry);
-  };
-};
 
 //# sourceMappingURL=entryStorage.js.map

package/utils/entryStorage.js.map

@@ -1 +1 @@
-{"version":3,"names":["WebinyError","StorageTransformPlugin","getBaseFieldType","getStoragePluginFactory","context","defaultStoragePlugin","plugins","byType","type","reverse","reduce","collection","plugin","fieldType","doNotTouchProperty","Symbol","entryStorageTransform","model","operation","entry","getStoragePlugin","transformedValues","field","fields","values","hasOwnProperty","fieldId","key","value","baseType","name","result","Object","defineProperty","enumerable","configurable","entryToStorageTransform","entryFromStorageTransform","entryFieldFromStorageTransform","params","fromStorage","createTransformEntryCallable"],"sources":["entryStorage.ts"],"sourcesContent":["import WebinyError from \"@webiny/error\";\nimport { StorageTransformPlugin } from \"~/plugins/StorageTransformPlugin.js\";\nimport type {\n    CmsContext,\n    CmsEntry,\n    CmsEntryValues,\n    CmsModel,\n    CmsModelField\n} from \"~/types/index.js\";\nimport { getBaseFieldType } from \"~/utils/getBaseFieldType.js\";\n\nexport interface GetStoragePluginFactory {\n    (context: Pick<CmsContext, \"plugins\">): (fieldType: string) => StorageTransformPlugin<any>;\n}\n\nexport const getStoragePluginFactory: GetStoragePluginFactory = context => {\n    let defaultStoragePlugin: StorageTransformPlugin;\n\n    const plugins = context.plugins\n        .byType<StorageTransformPlugin>(StorageTransformPlugin.type)\n        // we reverse plugins because we want to get latest added only\n        .reverse()\n        .reduce(\n            (collection, plugin) => {\n                /**\n                 * Check if it's a default plugin and set it - always override the previous one.\n                 */\n                if (plugin.fieldType === \"*\") {\n                    defaultStoragePlugin = plugin;\n                    return collection;\n                }\n\n                /**\n                 * We will just set the plugin for given type.\n                 * The last one will override existing one - so users can override our default ones.\n                 */\n                collection[plugin.fieldType] = plugin;\n\n                return collection;\n            },\n            {} as Record<string, StorageTransformPlugin>\n        );\n\n    return (fieldType: string) => {\n        return plugins[fieldType] || defaultStoragePlugin;\n    };\n};\n\nconst doNotTouchProperty = Symbol(\"__DO_NOT_TOUCH_AS_WE_USE_IT_TO_SKIP_UNNECESSARY_OPERATIONS\");\n\n/**\n * This should be used when transforming the whole entry.\n */\nconst entryStorageTransform = async <T extends CmsEntryValues = CmsEntryValues>(\n    context: Pick<CmsContext, \"plugins\">,\n    model: CmsModel,\n    operation: \"toStorage\" | \"fromStorage\",\n    entry: CmsEntry<T>\n): Promise<CmsEntry<T>> => {\n    /**\n     * We use this property to skip unnecessary operations.\n     */\n    // @ts-expect-error\n    if (entry[doNotTouchProperty] === operation) {\n        return entry;\n    }\n\n    const getStoragePlugin = getStoragePluginFactory(context);\n\n    const transformedValues: T = {} as T;\n    for (const field of model.fields) {\n        /**\n         * We can safely skip fields that are not present in the entry values.\n         */\n        if (entry.values.hasOwnProperty(field.fieldId) === false) {\n            continue;\n        }\n        const key = field.fieldId as keyof T;\n        const value = entry.values[key];\n\n        const baseType = getBaseFieldType(field);\n        const plugin = getStoragePlugin(baseType);\n        // TODO: remove this once plugins are converted into classes\n        if (typeof plugin[operation] !== \"function\") {\n            throw new WebinyError(\n                `Missing \"${operation}\" function in storage plugin \"${plugin.name}\" for field type \"${baseType}\"`\n            );\n        }\n\n        transformedValues[key] = await plugin[operation]({\n            plugins: context.plugins,\n            model,\n            field,\n            value,\n            getStoragePlugin\n        });\n    }\n\n    const result = {\n        ...entry,\n        values: transformedValues\n    };\n    /**\n     * We need to assign the variable so that we can skip unnecessary operations next time.\n     */\n    Object.defineProperty(result, doNotTouchProperty, {\n        enumerable: false,\n        value: operation,\n        configurable: true\n    });\n\n    return result;\n};\n\n/**\n * A function that is used in crud to transform entry into the storage type.\n */\nexport const entryToStorageTransform = async (\n    context: Pick<CmsContext, \"plugins\">,\n    model: CmsModel,\n    entry: CmsEntry\n): Promise<CmsEntry> => {\n    return entryStorageTransform(context, model, \"toStorage\", entry);\n};\n\n/**\n * A function that is used to transform the whole entry from storage into its native form.\n */\nexport const entryFromStorageTransform = async (\n    context: Pick<CmsContext, \"plugins\">,\n    model: CmsModel,\n    entry: CmsEntry\n): Promise<CmsEntry> => {\n    return entryStorageTransform(context, model, \"fromStorage\", entry);\n};\n\ninterface EntryFieldFromStorageTransformParams {\n    context: Pick<CmsContext, \"plugins\">;\n    model: CmsModel;\n    field: CmsModelField;\n    value: any;\n}\n/*\n * A function that is used to transform a single field from storage\n */\nexport const entryFieldFromStorageTransform = async <T = any>(\n    params: EntryFieldFromStorageTransformParams\n): Promise<T> => {\n    const { context, model, field, value } = params;\n    const getStoragePlugin = getStoragePluginFactory(context);\n\n    const baseType = getBaseFieldType(field);\n    const plugin = getStoragePlugin(baseType);\n\n    // TODO: remove this once plugins are converted into classes\n    if (typeof plugin.fromStorage !== \"function\") {\n        throw new WebinyError(\n            `Missing \"fromStorage\" function in storage plugin \"${plugin.name}\" for field type \"${baseType}\"`\n        );\n    }\n\n    return plugin.fromStorage({\n        plugins: context.plugins,\n        model,\n        field,\n        value,\n        getStoragePlugin\n    });\n};\n\nexport interface ICreateTransformEntryCallable {\n    context: Pick<CmsContext, \"plugins\">;\n}\n\nexport interface ITransformEntryCallable<T extends CmsEntryValues = CmsEntryValues> {\n    (model: CmsModel, entry: CmsEntry): Promise<CmsEntry<T>>;\n}\n\nexport const createTransformEntryCallable = (\n    params: ICreateTransformEntryCallable\n): ITransformEntryCallable => {\n    const { context } = params;\n\n    return async (model, entry) => {\n        return entryFromStorageTransform(context, model, entry);\n    };\n};\n"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["getBaseFieldType","StorageTransformRegistry","getStorageTransformFactory","context","registry","container","resolve","result","defaultStorageTransform","storageTransforms","getAll","toReversed","storageTransform","fieldType","type","doNotTouchProperty","Symbol","entryStorageTransform","model","operation","entry","getStorageTransform","fieldValues","fields","filter","field","values","hasOwnProperty","fieldId","map","key","value","baseType","transformed","results","Promise","all","transformedValues","Object","fromEntries","defineProperty","enumerable","configurable","entryToStorageTransform","entryFromStorageTransform","entryFieldFromStorageTransform","params","fromStorage"],"sources":["entryStorage.ts"],"sourcesContent":["import type {\n    CmsContext,\n    CmsEntry,\n    CmsEntryValues,\n    CmsModel,\n    CmsModelField\n} from \"~/types/index.js\";\nimport { getBaseFieldType } from \"~/utils/getBaseFieldType.js\";\nimport { StorageTransform, StorageTransformRegistry } from \"~/features/storage/index.js\";\nimport type { GenericRecord } from \"@webiny/api/types.js\";\n\nexport interface GetStorageTransformFactory {\n    (context: Pick<CmsContext, \"container\">): (fieldType: string) => StorageTransform.Interface;\n}\n\nexport const getStorageTransformFactory: GetStorageTransformFactory = context => {\n    const registry = context.container.resolve(StorageTransformRegistry);\n\n    const result: GenericRecord<string, StorageTransform.Interface> = {};\n    let defaultStorageTransform: StorageTransform.Interface;\n\n    const storageTransforms = registry.getAll().toReversed();\n\n    for (const storageTransform of storageTransforms) {\n        if (storageTransform.fieldType === \"*\") {\n            defaultStorageTransform = storageTransform;\n        }\n        result[storageTransform.fieldType] = storageTransform;\n    }\n\n    return (type: string) => {\n        const fieldType = getBaseFieldType({\n            type\n        });\n        return result[fieldType] || defaultStorageTransform;\n    };\n};\n\nconst doNotTouchProperty = Symbol(\"__DO_NOT_TOUCH_AS_WE_USE_IT_TO_SKIP_UNNECESSARY_OPERATIONS\");\n\n/**\n * This should be used when transforming the whole entry.\n */\nconst entryStorageTransform = async <T extends CmsEntryValues = CmsEntryValues>(\n    context: Pick<CmsContext, \"container\">,\n    model: CmsModel,\n    operation: \"toStorage\" | \"fromStorage\",\n    entry: CmsEntry<T>\n): Promise<CmsEntry<T>> => {\n    /**\n     * We use this property to skip unnecessary operations.\n     */\n    // @ts-expect-error\n    if (entry[doNotTouchProperty] === operation) {\n        return entry;\n    }\n\n    const getStorageTransform = getStorageTransformFactory(context);\n\n    const fieldValues = model.fields\n        .filter(field => {\n            return entry.values.hasOwnProperty(field.fieldId);\n        })\n        .map(async field => {\n            const key = field.fieldId as keyof T;\n            const value = entry.values[key];\n            const baseType = getBaseFieldType(field);\n            const storageTransform = getStorageTransform(baseType);\n            const transformed = await storageTransform[operation]({\n                model,\n                field,\n                value,\n                getStorageTransform\n            });\n            return [key, transformed] as const;\n        });\n\n    const results = await Promise.all(fieldValues);\n    const transformedValues = Object.fromEntries(results) as T;\n\n    const result = {\n        ...entry,\n        values: transformedValues\n    };\n    /**\n     * We need to assign the variable so that we can skip unnecessary operations next time.\n     */\n    Object.defineProperty(result, doNotTouchProperty, {\n        enumerable: false,\n        value: operation,\n        configurable: true\n    });\n\n    return result;\n};\n\n/**\n * A function that is used in crud to transform entry into the storage type.\n */\nexport const entryToStorageTransform = async (\n    context: Pick<CmsContext, \"container\">,\n    model: CmsModel,\n    entry: CmsEntry\n): Promise<CmsEntry> => {\n    return entryStorageTransform(context, model, \"toStorage\", entry);\n};\n\n/**\n * A function that is used to transform the whole entry from storage into its native form.\n */\nexport const entryFromStorageTransform = async (\n    context: Pick<CmsContext, \"container\">,\n    model: CmsModel,\n    entry: CmsEntry\n): Promise<CmsEntry> => {\n    return entryStorageTransform(context, model, \"fromStorage\", entry);\n};\n\ninterface EntryFieldFromStorageTransformParams {\n    context: Pick<CmsContext, \"container\">;\n    model: CmsModel;\n    field: CmsModelField;\n    value: any;\n}\n/*\n * A function that is used to transform a single field from storage\n */\nexport const entryFieldFromStorageTransform = async <T = any>(\n    params: EntryFieldFromStorageTransformParams\n): Promise<T> => {\n    const { context, model, field, value } = params;\n    const getStorageTransform = getStorageTransformFactory(context);\n\n    const baseType = getBaseFieldType(field);\n    const storageTransform = getStorageTransform(baseType);\n\n    return storageTransform.fromStorage({\n        model,\n        field,\n        value,\n        getStorageTransform\n    });\n};\n"],"mappings":"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","ignoreList":[]}

package/utils/getBaseFieldType.js

@@ -1,4 +1,7 @@
 export const getBaseFieldType = field => {
+  if (field.type.includes(":") === false) {
+    return field.type;
+  }
   return field.type.split(":")[0];
 };
 

package/utils/getBaseFieldType.js.map

@@ -1 +1 @@
-{"version":3,"names":["getBaseFieldType","field","type","split"],"sources":["getBaseFieldType.ts"],"sourcesContent":["import type { CmsModelField } from \"~/types/index.js\";\n\nexport const getBaseFieldType = (field: Pick<CmsModelField, \"type\">) => {\n    return field.type.split(\":\")[0];\n};\n"],"mappings":"AAEA,OAAO,MAAMA,gBAAgB,GAAIC,KAAkC,IAAK;EACpE,OAAOA,KAAK,CAACC,IAAI,CAACC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;AACnC,CAAC","ignoreList":[]}
+{"version":3,"names":["getBaseFieldType","field","type","includes","split"],"sources":["getBaseFieldType.ts"],"sourcesContent":["import type { CmsModelField } from \"~/types/index.js\";\n\nexport const getBaseFieldType = (field: Pick<CmsModelField, \"type\">) => {\n    if (field.type.includes(\":\") === false) {\n        return field.type;\n    }\n    return field.type.split(\":\")[0];\n};\n"],"mappings":"AAEA,OAAO,MAAMA,gBAAgB,GAAIC,KAAkC,IAAK;EACpE,IAAIA,KAAK,CAACC,IAAI,CAACC,QAAQ,CAAC,GAAG,CAAC,KAAK,KAAK,EAAE;IACpC,OAAOF,KAAK,CAACC,IAAI;EACrB;EACA,OAAOD,KAAK,CAACC,IAAI,CAACE,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;AACnC,CAAC","ignoreList":[]}