@webiny/api-headless-cms 0.0.0-unstable.40876133bb → 0.0.0-unstable.496cf268ac

package/utils/converters/ConverterCollection.js

@@ -1,22 +1,16 @@
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
-
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.ConverterCollection = void 0;
-
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
-
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
-
 var _error = _interopRequireDefault(require("@webiny/error"));
-
 var _Converter = require("./Converter");
-
 var _plugins = require("../../plugins");
-
+var _getBaseFieldType = require("../getBaseFieldType");
 class ConverterCollection {
   constructor(params) {
     (0, _defineProperty2.default)(this, "converters", new Map());
@@ -26,11 +20,9 @@ class ConverterCollection {
     const fieldGraphQLPlugins = plugins.byType("cms-model-field-to-graphql");
     const fieldConverterPlugins = plugins.byType(_plugins.CmsModelFieldConverterPlugin.type);
     const defaultFieldConverterPlugin = fieldConverterPlugins.find(pl => pl.getFieldType() === "*");
-
     if (defaultFieldConverterPlugin === undefined) {
       throw new _error.default(`Missing default field converter plugin.`, "DEFAULT_FIELD_CONVERTER_ERROR");
     }
-
     for (const fieldGraphQLPlugin of fieldGraphQLPlugins) {
       const plugin = fieldConverterPlugins.find(pl => pl.getFieldType() === fieldGraphQLPlugin.fieldType);
       const converter = new _Converter.Converter({
@@ -40,42 +32,34 @@ class ConverterCollection {
       this.addConverter(converter);
     }
   }
-
   addConverter(converter) {
     converter.setConverterCollection(this);
     this.converters.set(converter.getType(), converter);
   }
-
   getConverter(type) {
     const converter = this.converters.get(type);
-
     if (converter === undefined) {
       throw new _error.default(`Missing converter for field type "${type}".`, "CONVERTER_ERROR", {
         type
       });
     }
-
     return converter;
   }
-
   convertToStorage(params) {
     const {
       fields,
       values: inputValues
     } = params;
-
     if (inputValues === undefined) {
       return undefined;
     }
-
     this.attachHasOwnProperty(inputValues);
     return fields.reduce((output, field) => {
-      const converter = this.getConverter(field.type);
-
+      const baseType = (0, _getBaseFieldType.getBaseFieldType)(field);
+      const converter = this.getConverter(baseType);
       if (inputValues === null || inputValues.hasOwnProperty(field.fieldId) === false) {
         return output;
       }
-
       const values = converter.convertToStorage({
         field,
         value: inputValues[field.fieldId]
@@ -83,24 +67,20 @@ class ConverterCollection {
       return (0, _objectSpread2.default)((0, _objectSpread2.default)({}, output), values);
     }, {});
   }
-
   convertFromStorage(params) {
     const {
       fields,
       values: inputValues
     } = params;
-
     if (inputValues === undefined) {
       return undefined;
     }
-
     return fields.reduce((output, field) => {
-      const converter = this.getConverter(field.type);
-
+      const baseType = (0, _getBaseFieldType.getBaseFieldType)(field);
+      const converter = this.getConverter(baseType);
       if (inputValues === null || inputValues.hasOwnProperty(field.storageId) === false) {
         return output;
       }
-
       const values = converter.convertFromStorage({
         field,
         value: inputValues[field.storageId]
@@ -108,23 +88,25 @@ class ConverterCollection {
       return (0, _objectSpread2.default)((0, _objectSpread2.default)({}, output), values);
     }, {});
   }
+
   /**
    * This method attaches hasOwnProperty when received object was created via Object.create(null) - no inheritance of Object.
    * At that point, hasOwnProperty does not exist, and we need to add it.
    *
    * TODO add more checks if required
    */
-
-
   attachHasOwnProperty(values) {
-    if ( // null or undefined?
-    values === null || values === undefined || // not an object?
-    typeof values !== "object" || // maybe it's an array?
-    Array.isArray(values) || // and in the end, check if hasOwnProperty is a function already
+    if (
+    // null or undefined?
+    values === null || values === undefined ||
+    // not an object?
+    typeof values !== "object" ||
+    // maybe it's an array?
+    Array.isArray(values) ||
+    // and in the end, check if hasOwnProperty is a function already
     typeof (values === null || values === void 0 ? void 0 : values.hasOwnProperty) === "function") {
       return;
     }
-
     Object.defineProperty(values, "hasOwnProperty", {
       enumerable: false,
       writable: false,
@@ -133,7 +115,5 @@ class ConverterCollection {
       }
     });
   }
-
 }
-
 exports.ConverterCollection = ConverterCollection;

package/utils/converters/ConverterCollection.js.map

@@ -1 +1 @@
-{"version":3,"names":["ConverterCollection","constructor","params","Map","plugins","fieldGraphQLPlugins","byType","fieldConverterPlugins","CmsModelFieldConverterPlugin","type","defaultFieldConverterPlugin","find","pl","getFieldType","undefined","WebinyError","fieldGraphQLPlugin","plugin","fieldType","converter","Converter","addConverter","setConverterCollection","converters","set","getType","getConverter","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\";\nimport { CmsEntryValues, CmsModelField, CmsModelFieldToGraphQLPlugin } from \"~/types\";\nimport { CmsModelFieldConverterPlugin } from \"~/plugins\";\nimport { PluginsContainer } from \"@webiny/plugins\";\n\nexport interface CmsModelFieldsWithParent extends CmsModelField {\n    parent?: CmsModelField | null;\n}\n\nexport interface CmsModelConverterCallable {\n    (params: ConverterCollectionConvertParams): CmsEntryValues;\n}\n\nexport interface ConverterCollectionConvertParams {\n    fields: CmsModelFieldsWithParent[];\n    values?: CmsEntryValues;\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 converter = this.converters.get(type);\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(params: ConverterCollectionConvertParams): CmsEntryValues | undefined {\n        const { fields, values: inputValues } = params;\n        if (inputValues === undefined) {\n            return undefined;\n        }\n\n        this.attachHasOwnProperty(inputValues);\n\n        return fields.reduce<CmsEntryValues>((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]\n            });\n\n            return {\n                ...output,\n                ...values\n            };\n        }, {});\n    }\n\n    public convertFromStorage(\n        params: ConverterCollectionConvertParams\n    ): CmsEntryValues | undefined {\n        const { fields, values: inputValues } = params;\n        if (inputValues === undefined) {\n            return undefined;\n        }\n\n        return fields.reduce((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]\n            });\n\n            return {\n                ...output,\n                ...values\n            };\n        }, {});\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(values: CmsEntryValues) {\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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"}
+{"version":3,"names":["ConverterCollection","constructor","params","Map","plugins","fieldGraphQLPlugins","byType","fieldConverterPlugins","CmsModelFieldConverterPlugin","type","defaultFieldConverterPlugin","find","pl","getFieldType","undefined","WebinyError","fieldGraphQLPlugin","plugin","fieldType","converter","Converter","addConverter","setConverterCollection","converters","set","getType","getConverter","get","convertToStorage","fields","values","inputValues","attachHasOwnProperty","reduce","output","field","baseType","getBaseFieldType","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\";\nimport { CmsEntryValues, CmsModelField, CmsModelFieldToGraphQLPlugin } from \"~/types\";\nimport { CmsModelFieldConverterPlugin } from \"~/plugins\";\nimport { PluginsContainer } from \"@webiny/plugins\";\nimport { getBaseFieldType } from \"~/utils/getBaseFieldType\";\n\nexport interface CmsModelFieldsWithParent extends CmsModelField {\n    parent?: CmsModelField | null;\n}\n\nexport interface CmsModelConverterCallable {\n    (params: ConverterCollectionConvertParams): CmsEntryValues;\n}\n\nexport interface ConverterCollectionConvertParams {\n    fields: CmsModelFieldsWithParent[];\n    values?: CmsEntryValues;\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 converter = this.converters.get(type);\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(params: ConverterCollectionConvertParams): CmsEntryValues | undefined {\n        const { fields, values: inputValues } = params;\n        if (inputValues === undefined) {\n            return undefined;\n        }\n\n        this.attachHasOwnProperty(inputValues);\n\n        return fields.reduce<CmsEntryValues>((output, field) => {\n            const baseType = getBaseFieldType(field);\n            const converter = this.getConverter(baseType);\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]\n            });\n\n            return {\n                ...output,\n                ...values\n            };\n        }, {});\n    }\n\n    public convertFromStorage(\n        params: ConverterCollectionConvertParams\n    ): CmsEntryValues | undefined {\n        const { fields, values: inputValues } = params;\n        if (inputValues === undefined) {\n            return undefined;\n        }\n\n        return fields.reduce((output, field) => {\n            const baseType = getBaseFieldType(field);\n            const converter = this.getConverter(baseType);\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]\n            });\n\n            return {\n                ...output,\n                ...values\n            };\n        }, {});\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(values: CmsEntryValues) {\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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"}

package/utils/converters/valueKeyStorageConverter.js

@@ -1,28 +1,20 @@
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
-
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.createValueKeyToStorageConverter = exports.createValueKeyFromStorageConverter = exports.attachCmsModelFieldConverters = void 0;
-
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
-
 var _ConverterCollection = require("./ConverterCollection");
-
 var _semver = _interopRequireDefault(require("semver"));
-
 const featureVersion = _semver.default.coerce("5.33.0");
-
 const isBetaOrNext = model => {
   if (!model.webinyVersion) {
     return false;
   }
-
   return model.webinyVersion.match(/next|beta/) !== null;
 };
-
 const isFeatureEnabled = model => {
   /**
    * In case of disabled webinyVersion value, we disable this feature.
@@ -34,16 +26,13 @@ const isFeatureEnabled = model => {
   /**
    * If is a test environment, always have this turned on.
    */
-
-
-  if (process.env.NODE_ENV === "test" || isBetaOrNext(model) === true) {
+  const nodeEnv = process.env.NODE_ENV;
+  if (nodeEnv === "test" || nodeEnv === "disable" || isBetaOrNext(model)) {
     return true;
   }
   /**
    * Possibility that the version is not defined, this means it is a quite old system where models did not change.
    */
-
-
   if (!model.webinyVersion) {
     return false;
   }
@@ -52,26 +41,20 @@ const isFeatureEnabled = model => {
    *
    * TODO change if necessary after the update to the system
    */
-
-
   const modelVersion = _semver.default.coerce(model.webinyVersion);
-
   if (!modelVersion) {
     console.log(`Warning: Model "${model.modelId}" does not have valid Webiny version set.`);
     return true;
   } else if (_semver.default.compare(modelVersion, featureVersion) === -1) {
     return false;
   }
-
   return true;
 };
-
 const createValueKeyToStorageConverter = params => {
   const {
     plugins,
     model
   } = params;
-
   if (isFeatureEnabled(model) === false) {
     return ({
       values
@@ -79,7 +62,6 @@ const createValueKeyToStorageConverter = params => {
       return values || {};
     };
   }
-
   const converters = new _ConverterCollection.ConverterCollection({
     plugins
   });
@@ -94,15 +76,12 @@ const createValueKeyToStorageConverter = params => {
     return result || {};
   };
 };
-
 exports.createValueKeyToStorageConverter = createValueKeyToStorageConverter;
-
 const createValueKeyFromStorageConverter = params => {
   const {
     plugins,
     model
   } = params;
-
   if (isFeatureEnabled(model) === false) {
     return ({
       values
@@ -110,7 +89,6 @@ const createValueKeyFromStorageConverter = params => {
       return values || {};
     };
   }
-
   const converters = new _ConverterCollection.ConverterCollection({
     plugins
   });
@@ -125,9 +103,7 @@ const createValueKeyFromStorageConverter = params => {
     return result || {};
   };
 };
-
 exports.createValueKeyFromStorageConverter = createValueKeyFromStorageConverter;
-
 const attachCmsModelFieldConverters = params => {
   const {
     model,
@@ -144,5 +120,4 @@ const attachCmsModelFieldConverters = params => {
     })
   });
 };
-
 exports.attachCmsModelFieldConverters = attachCmsModelFieldConverters;

package/utils/converters/valueKeyStorageConverter.js.map

@@ -1 +1 @@
-{"version":3,"names":["featureVersion","semver","coerce","isBetaOrNext","model","webinyVersion","match","isFeatureEnabled","process","env","NODE_ENV","modelVersion","console","log","modelId","compare","createValueKeyToStorageConverter","params","plugins","values","converters","ConverterCollection","fields","result","convertToStorage","createValueKeyFromStorageConverter","convertFromStorage","attachCmsModelFieldConverters","convertValueKeyToStorage","convertValueKeyFromStorage"],"sources":["valueKeyStorageConverter.ts"],"sourcesContent":["import { PluginsContainer } from \"@webiny/plugins\";\nimport {\n    CmsModelConverterCallable,\n    ConverterCollection,\n    ConverterCollectionConvertParams as BaseConverterCollectionConvertParams\n} from \"~/utils/converters/ConverterCollection\";\nimport { CmsModel, StorageOperationsCmsModel } from \"~/types\";\nimport semver, { SemVer } from \"semver\";\n\nconst featureVersion = semver.coerce(\"5.33.0\") as SemVer;\n\nconst isBetaOrNext = (model: CmsModel): boolean => {\n    if (!model.webinyVersion) {\n        return false;\n    }\n    return model.webinyVersion.match(/next|beta/) !== null;\n};\n\nconst isFeatureEnabled = (model: CmsModel): boolean => {\n    /**\n     * In case of disabled webinyVersion value, we disable this feature.\n     * This is only for testing...\n     */\n    if (model.webinyVersion === \"disable\") {\n        return false;\n    }\n    /**\n     * If is a test environment, always have this turned on.\n     */\n    if (process.env.NODE_ENV === \"test\" || isBetaOrNext(model) === true) {\n        return true;\n    }\n    /**\n     * Possibility that the version is not defined, this means it is a quite old system where models did not change.\n     */\n    if (!model.webinyVersion) {\n        return false;\n    }\n    /**\n     * In case feature version value is greater than the model version, feature is not enabled as it is an older model with no storageId.\n     *\n     * TODO change if necessary after the update to the system\n     */\n    const modelVersion = semver.coerce(model.webinyVersion);\n    if (!modelVersion) {\n        console.log(`Warning: Model \"${model.modelId}\" does not have valid Webiny version set.`);\n        return true;\n    } else if (semver.compare(modelVersion, featureVersion) === -1) {\n        return false;\n    }\n    return true;\n};\n\ninterface Params {\n    /**\n     * We need a model to determine if the conversion feature is enabled.\n     */\n    model: CmsModel;\n    plugins: PluginsContainer;\n}\n\n/**\n * In the first call of the converter we do not need the fields property as it will be taken directly from the model.\n */\ninterface ConverterCollectionConvertParams\n    extends Omit<BaseConverterCollectionConvertParams, \"fields\"> {\n    fields?: BaseConverterCollectionConvertParams[\"fields\"];\n}\n\nexport const createValueKeyToStorageConverter = (params: Params): CmsModelConverterCallable => {\n    const { plugins, model } = params;\n\n    if (isFeatureEnabled(model) === false) {\n        return ({ values }: ConverterCollectionConvertParams) => {\n            return values || {};\n        };\n    }\n\n    const converters = new ConverterCollection({\n        plugins\n    });\n\n    return ({ fields, values }: ConverterCollectionConvertParams) => {\n        const result = converters.convertToStorage({\n            fields: fields || model.fields,\n            values\n        });\n        return result || {};\n    };\n};\n\nexport const createValueKeyFromStorageConverter = (params: Params): CmsModelConverterCallable => {\n    const { plugins, model } = params;\n\n    if (isFeatureEnabled(model) === false) {\n        return ({ values }: ConverterCollectionConvertParams) => {\n            return values || {};\n        };\n    }\n\n    const converters = new ConverterCollection({\n        plugins\n    });\n\n    return ({ fields, values }: ConverterCollectionConvertParams) => {\n        const result = converters.convertFromStorage({\n            fields: fields || model.fields,\n            values\n        });\n        return result || {};\n    };\n};\n\ninterface AttachConvertersParams {\n    plugins: PluginsContainer;\n    model: CmsModel;\n}\nexport const attachCmsModelFieldConverters = (\n    params: AttachConvertersParams\n): StorageOperationsCmsModel => {\n    const { model, plugins } = params;\n    return {\n        ...model,\n        convertValueKeyToStorage: createValueKeyToStorageConverter({\n            model,\n            plugins\n        }),\n        convertValueKeyFromStorage: createValueKeyFromStorageConverter({\n            model,\n            plugins\n        })\n    };\n};\n"],"mappings":";;;;;;;;;;;AACA;;AAMA;;AAEA,MAAMA,cAAc,GAAGC,eAAA,CAAOC,MAAP,CAAc,QAAd,CAAvB;;AAEA,MAAMC,YAAY,GAAIC,KAAD,IAA8B;EAC/C,IAAI,CAACA,KAAK,CAACC,aAAX,EAA0B;IACtB,OAAO,KAAP;EACH;;EACD,OAAOD,KAAK,CAACC,aAAN,CAAoBC,KAApB,CAA0B,WAA1B,MAA2C,IAAlD;AACH,CALD;;AAOA,MAAMC,gBAAgB,GAAIH,KAAD,IAA8B;EACnD;AACJ;AACA;AACA;EACI,IAAIA,KAAK,CAACC,aAAN,KAAwB,SAA5B,EAAuC;IACnC,OAAO,KAAP;EACH;EACD;AACJ;AACA;;;EACI,IAAIG,OAAO,CAACC,GAAR,CAAYC,QAAZ,KAAyB,MAAzB,IAAmCP,YAAY,CAACC,KAAD,CAAZ,KAAwB,IAA/D,EAAqE;IACjE,OAAO,IAAP;EACH;EACD;AACJ;AACA;;;EACI,IAAI,CAACA,KAAK,CAACC,aAAX,EAA0B;IACtB,OAAO,KAAP;EACH;EACD;AACJ;AACA;AACA;AACA;;;EACI,MAAMM,YAAY,GAAGV,eAAA,CAAOC,MAAP,CAAcE,KAAK,CAACC,aAApB,CAArB;;EACA,IAAI,CAACM,YAAL,EAAmB;IACfC,OAAO,CAACC,GAAR,CAAa,mBAAkBT,KAAK,CAACU,OAAQ,2CAA7C;IACA,OAAO,IAAP;EACH,CAHD,MAGO,IAAIb,eAAA,CAAOc,OAAP,CAAeJ,YAAf,EAA6BX,cAA7B,MAAiD,CAAC,CAAtD,EAAyD;IAC5D,OAAO,KAAP;EACH;;EACD,OAAO,IAAP;AACH,CAjCD;;AAmDO,MAAMgB,gCAAgC,GAAIC,MAAD,IAA+C;EAC3F,MAAM;IAAEC,OAAF;IAAWd;EAAX,IAAqBa,MAA3B;;EAEA,IAAIV,gBAAgB,CAACH,KAAD,CAAhB,KAA4B,KAAhC,EAAuC;IACnC,OAAO,CAAC;MAAEe;IAAF,CAAD,KAAkD;MACrD,OAAOA,MAAM,IAAI,EAAjB;IACH,CAFD;EAGH;;EAED,MAAMC,UAAU,GAAG,IAAIC,wCAAJ,CAAwB;IACvCH;EADuC,CAAxB,CAAnB;EAIA,OAAO,CAAC;IAAEI,MAAF;IAAUH;EAAV,CAAD,KAA0D;IAC7D,MAAMI,MAAM,GAAGH,UAAU,CAACI,gBAAX,CAA4B;MACvCF,MAAM,EAAEA,MAAM,IAAIlB,KAAK,CAACkB,MADe;MAEvCH;IAFuC,CAA5B,CAAf;IAIA,OAAOI,MAAM,IAAI,EAAjB;EACH,CAND;AAOH,CApBM;;;;AAsBA,MAAME,kCAAkC,GAAIR,MAAD,IAA+C;EAC7F,MAAM;IAAEC,OAAF;IAAWd;EAAX,IAAqBa,MAA3B;;EAEA,IAAIV,gBAAgB,CAACH,KAAD,CAAhB,KAA4B,KAAhC,EAAuC;IACnC,OAAO,CAAC;MAAEe;IAAF,CAAD,KAAkD;MACrD,OAAOA,MAAM,IAAI,EAAjB;IACH,CAFD;EAGH;;EAED,MAAMC,UAAU,GAAG,IAAIC,wCAAJ,CAAwB;IACvCH;EADuC,CAAxB,CAAnB;EAIA,OAAO,CAAC;IAAEI,MAAF;IAAUH;EAAV,CAAD,KAA0D;IAC7D,MAAMI,MAAM,GAAGH,UAAU,CAACM,kBAAX,CAA8B;MACzCJ,MAAM,EAAEA,MAAM,IAAIlB,KAAK,CAACkB,MADiB;MAEzCH;IAFyC,CAA9B,CAAf;IAIA,OAAOI,MAAM,IAAI,EAAjB;EACH,CAND;AAOH,CApBM;;;;AA0BA,MAAMI,6BAA6B,GACtCV,MADyC,IAEb;EAC5B,MAAM;IAAEb,KAAF;IAASc;EAAT,IAAqBD,MAA3B;EACA,mEACOb,KADP;IAEIwB,wBAAwB,EAAEZ,gCAAgC,CAAC;MACvDZ,KADuD;MAEvDc;IAFuD,CAAD,CAF9D;IAMIW,0BAA0B,EAAEJ,kCAAkC,CAAC;MAC3DrB,KAD2D;MAE3Dc;IAF2D,CAAD;EANlE;AAWH,CAfM"}
+{"version":3,"names":["featureVersion","semver","coerce","isBetaOrNext","model","webinyVersion","match","isFeatureEnabled","nodeEnv","process","env","NODE_ENV","modelVersion","console","log","modelId","compare","createValueKeyToStorageConverter","params","plugins","values","converters","ConverterCollection","fields","result","convertToStorage","createValueKeyFromStorageConverter","convertFromStorage","attachCmsModelFieldConverters","convertValueKeyToStorage","convertValueKeyFromStorage"],"sources":["valueKeyStorageConverter.ts"],"sourcesContent":["import { PluginsContainer } from \"@webiny/plugins\";\nimport {\n    CmsModelConverterCallable,\n    ConverterCollection,\n    ConverterCollectionConvertParams as BaseConverterCollectionConvertParams\n} from \"~/utils/converters/ConverterCollection\";\nimport { CmsModel, StorageOperationsCmsModel } from \"~/types\";\nimport semver, { SemVer } from \"semver\";\n\nconst featureVersion = semver.coerce(\"5.33.0\") as SemVer;\n\nconst isBetaOrNext = (model: CmsModel): boolean => {\n    if (!model.webinyVersion) {\n        return false;\n    }\n    return model.webinyVersion.match(/next|beta/) !== null;\n};\n\nconst isFeatureEnabled = (model: CmsModel): boolean => {\n    /**\n     * In case of disabled webinyVersion value, we disable this feature.\n     * This is only for testing...\n     */\n    if (model.webinyVersion === \"disable\") {\n        return false;\n    }\n    /**\n     * If is a test environment, always have this turned on.\n     */\n    const nodeEnv = process.env.NODE_ENV as string;\n    if (nodeEnv === \"test\" || nodeEnv === \"disable\" || isBetaOrNext(model)) {\n        return true;\n    }\n    /**\n     * Possibility that the version is not defined, this means it is a quite old system where models did not change.\n     */\n    if (!model.webinyVersion) {\n        return false;\n    }\n    /**\n     * In case feature version value is greater than the model version, feature is not enabled as it is an older model with no storageId.\n     *\n     * TODO change if necessary after the update to the system\n     */\n    const modelVersion = semver.coerce(model.webinyVersion);\n    if (!modelVersion) {\n        console.log(`Warning: Model \"${model.modelId}\" does not have valid Webiny version set.`);\n        return true;\n    } else if (semver.compare(modelVersion, featureVersion) === -1) {\n        return false;\n    }\n    return true;\n};\n\ninterface Params {\n    /**\n     * We need a model to determine if the conversion feature is enabled.\n     */\n    model: CmsModel;\n    plugins: PluginsContainer;\n}\n\n/**\n * In the first call of the converter we do not need the fields property as it will be taken directly from the model.\n */\ninterface ConverterCollectionConvertParams\n    extends Omit<BaseConverterCollectionConvertParams, \"fields\"> {\n    fields?: BaseConverterCollectionConvertParams[\"fields\"];\n}\n\nexport const createValueKeyToStorageConverter = (params: Params): CmsModelConverterCallable => {\n    const { plugins, model } = params;\n\n    if (isFeatureEnabled(model) === false) {\n        return ({ values }: ConverterCollectionConvertParams) => {\n            return values || {};\n        };\n    }\n\n    const converters = new ConverterCollection({\n        plugins\n    });\n\n    return ({ fields, values }: ConverterCollectionConvertParams) => {\n        const result = converters.convertToStorage({\n            fields: fields || model.fields,\n            values\n        });\n        return result || {};\n    };\n};\n\nexport const createValueKeyFromStorageConverter = (params: Params): CmsModelConverterCallable => {\n    const { plugins, model } = params;\n\n    if (isFeatureEnabled(model) === false) {\n        return ({ values }: ConverterCollectionConvertParams) => {\n            return values || {};\n        };\n    }\n\n    const converters = new ConverterCollection({\n        plugins\n    });\n\n    return ({ fields, values }: ConverterCollectionConvertParams) => {\n        const result = converters.convertFromStorage({\n            fields: fields || model.fields,\n            values\n        });\n        return result || {};\n    };\n};\n\ninterface AttachConvertersParams {\n    plugins: PluginsContainer;\n    model: CmsModel;\n}\nexport const attachCmsModelFieldConverters = (\n    params: AttachConvertersParams\n): StorageOperationsCmsModel => {\n    const { model, plugins } = params;\n    return {\n        ...model,\n        convertValueKeyToStorage: createValueKeyToStorageConverter({\n            model,\n            plugins\n        }),\n        convertValueKeyFromStorage: createValueKeyFromStorageConverter({\n            model,\n            plugins\n        })\n    };\n};\n"],"mappings":"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"}

package/utils/createTypeFromFields.d.ts

@@ -0,0 +1,16 @@
+import { ApiEndpoint, CmsFieldTypePlugins, CmsModel, CmsModelField } from "../types";
+interface TypeFromFieldParams {
+    typeOfType: "type" | "input";
+    models: CmsModel[];
+    model: CmsModel;
+    type: ApiEndpoint;
+    typeNamePrefix: string;
+    fields: CmsModelField[];
+    fieldTypePlugins: CmsFieldTypePlugins;
+}
+interface TypeFromFieldResponse {
+    fieldType: string;
+    typeDefs: string;
+}
+export declare const createTypeFromFields: (params: TypeFromFieldParams) => TypeFromFieldResponse | null;
+export {};

package/utils/createTypeFromFields.js

@@ -0,0 +1,67 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.createTypeFromFields = void 0;
+var _createTypeName = require("./createTypeName");
+var _renderFields = require("./renderFields");
+var _renderInputFields = require("./renderInputFields");
+const createTypeFromFields = params => {
+  const {
+    typeOfType,
+    model,
+    models,
+    type,
+    typeNamePrefix,
+    fields,
+    fieldTypePlugins
+  } = params;
+  const typeSuffix = typeOfType === "input" ? "Input" : "";
+  const mTypeName = (0, _createTypeName.createTypeName)(model.singularApiName);
+  const typeFields = [];
+  const nestedTypes = [];
+
+  // Once the loop below starts, we'll be executing a recursive "object" type generation.
+  // The main trick here is that nested objects don't know who the parent is, and will generate
+  // type names using the "model", as if they're at the top level:
+  // Every time the types are returned, we need to replace the model name in the generated type name
+  // with the actual prefix which includes parent field name type.
+  const replace = new RegExp(`${mTypeName}_`, "g");
+  for (const field of fields) {
+    const result = typeOfType === "type" ? (0, _renderFields.renderField)({
+      field,
+      type,
+      models,
+      model,
+      fieldTypePlugins
+    }) : (0, _renderInputFields.renderInputField)({
+      field,
+      models,
+      model,
+      fieldTypePlugins
+    });
+    if (!result) {
+      continue;
+    }
+    const {
+      fields,
+      typeDefs
+    } = result;
+    typeFields.push(fields.replace(replace, `${typeNamePrefix}_`));
+    if (typeDefs) {
+      nestedTypes.push(typeDefs.replace(replace, `${typeNamePrefix}_`));
+    }
+  }
+  return {
+    fieldType: `${typeNamePrefix}${typeSuffix}`,
+    typeDefs: /* GraphQL */`
+            ${nestedTypes.join("\n")}
+
+            ${typeOfType} ${typeNamePrefix}${typeSuffix} {
+                ${typeFields.join("\n")}
+            }
+        `
+  };
+};
+exports.createTypeFromFields = createTypeFromFields;

package/utils/createTypeFromFields.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["createTypeFromFields","params","typeOfType","model","models","type","typeNamePrefix","fields","fieldTypePlugins","typeSuffix","mTypeName","createTypeName","singularApiName","typeFields","nestedTypes","replace","RegExp","field","result","renderField","renderInputField","typeDefs","push","fieldType","join"],"sources":["createTypeFromFields.ts"],"sourcesContent":["import { createTypeName } from \"~/utils/createTypeName\";\nimport { renderField } from \"~/utils/renderFields\";\nimport { renderInputField } from \"~/utils/renderInputFields\";\nimport { ApiEndpoint, CmsFieldTypePlugins, CmsModel, CmsModelField } from \"~/types\";\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 = createTypeName(model.singularApiName);\n\n    const typeFields = [];\n    const nestedTypes = [];\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    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"],"mappings":";;;;;;AAAA;AACA;AACA;AAkBO,MAAMA,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,GAAG,IAAAC,8BAAc,EAACR,KAAK,CAACS,eAAe,CAAC;EAEvD,MAAMC,UAAU,GAAG,EAAE;EACrB,MAAMC,WAAW,GAAG,EAAE;;EAEtB;EACA;EACA;EACA;EACA;EACA,MAAMC,OAAO,GAAG,IAAIC,MAAM,CAAE,GAAEN,SAAU,GAAE,EAAE,GAAG,CAAC;EAEhD,KAAK,MAAMO,KAAK,IAAIV,MAAM,EAAE;IACxB,MAAMW,MAAM,GACRhB,UAAU,KAAK,MAAM,GACf,IAAAiB,yBAAW,EAAC;MAAEF,KAAK;MAAEZ,IAAI;MAAED,MAAM;MAAED,KAAK;MAAEK;IAAiB,CAAC,CAAC,GAC7D,IAAAY,mCAAgB,EAAC;MAAEH,KAAK;MAAEb,MAAM;MAAED,KAAK;MAAEK;IAAiB,CAAC,CAAC;IAEtE,IAAI,CAACU,MAAM,EAAE;MACT;IACJ;IAEA,MAAM;MAAEX,MAAM;MAAEc;IAAS,CAAC,GAAGH,MAAM;IAEnCL,UAAU,CAACS,IAAI,CAACf,MAAM,CAACQ,OAAO,CAACA,OAAO,EAAG,GAAET,cAAe,GAAE,CAAC,CAAC;IAC9D,IAAIe,QAAQ,EAAE;MACVP,WAAW,CAACQ,IAAI,CAACD,QAAQ,CAACN,OAAO,CAACA,OAAO,EAAG,GAAET,cAAe,GAAE,CAAC,CAAC;IACrE;EACJ;EAEA,OAAO;IACHiB,SAAS,EAAG,GAAEjB,cAAe,GAAEG,UAAW,EAAC;IAC3CY,QAAQ,EAAE,aAAe;AACjC,cAAcP,WAAW,CAACU,IAAI,CAAC,IAAI,CAAE;AACrC;AACA,cAActB,UAAW,IAAGI,cAAe,GAAEG,UAAW;AACxD,kBAAkBI,UAAU,CAACW,IAAI,CAAC,IAAI,CAAE;AACxC;AACA;EACI,CAAC;AACL,CAAC;AAAC"}

package/utils/createTypeName.js

@@ -1,28 +1,21 @@
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
-
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.createTypeName = exports.createReadTypeName = exports.createManageTypeName = void 0;
-
 var _upperFirst = _interopRequireDefault(require("lodash/upperFirst"));
-
+var _camelCase = _interopRequireDefault(require("lodash/camelCase"));
 const createTypeName = modelId => {
-  return (0, _upperFirst.default)(modelId);
+  return (0, _upperFirst.default)((0, _camelCase.default)(modelId));
 };
-
 exports.createTypeName = createTypeName;
-
 const createReadTypeName = baseTypeName => {
   return createTypeName(baseTypeName);
 };
-
 exports.createReadTypeName = createReadTypeName;
-
 const createManageTypeName = baseTypeName => {
   return createTypeName(baseTypeName);
 };
-
 exports.createManageTypeName = createManageTypeName;

package/utils/createTypeName.js.map

@@ -1 +1 @@
-{"version":3,"names":["createTypeName","modelId","upperFirst","createReadTypeName","baseTypeName","createManageTypeName"],"sources":["createTypeName.ts"],"sourcesContent":["import upperFirst from \"lodash/upperFirst\";\n\nexport const createTypeName = (modelId: string): string => {\n    return upperFirst(modelId);\n};\n\nexport const createReadTypeName = (baseTypeName: string): string => {\n    return createTypeName(baseTypeName);\n};\n\nexport const createManageTypeName = (baseTypeName: string): string => {\n    return createTypeName(baseTypeName);\n};\n"],"mappings":";;;;;;;;;AAAA;;AAEO,MAAMA,cAAc,GAAIC,OAAD,IAA6B;EACvD,OAAO,IAAAC,mBAAA,EAAWD,OAAX,CAAP;AACH,CAFM;;;;AAIA,MAAME,kBAAkB,GAAIC,YAAD,IAAkC;EAChE,OAAOJ,cAAc,CAACI,YAAD,CAArB;AACH,CAFM;;;;AAIA,MAAMC,oBAAoB,GAAID,YAAD,IAAkC;EAClE,OAAOJ,cAAc,CAACI,YAAD,CAArB;AACH,CAFM"}
+{"version":3,"names":["createTypeName","modelId","upperFirst","camelCase","createReadTypeName","baseTypeName","createManageTypeName"],"sources":["createTypeName.ts"],"sourcesContent":["import upperFirst from \"lodash/upperFirst\";\nimport camelCase from \"lodash/camelCase\";\n\nexport const createTypeName = (modelId: string): string => {\n    return upperFirst(camelCase(modelId));\n};\n\nexport const createReadTypeName = (baseTypeName: string): string => {\n    return createTypeName(baseTypeName);\n};\n\nexport const createManageTypeName = (baseTypeName: string): string => {\n    return createTypeName(baseTypeName);\n};\n"],"mappings":";;;;;;;AAAA;AACA;AAEO,MAAMA,cAAc,GAAIC,OAAe,IAAa;EACvD,OAAO,IAAAC,mBAAU,EAAC,IAAAC,kBAAS,EAACF,OAAO,CAAC,CAAC;AACzC,CAAC;AAAC;AAEK,MAAMG,kBAAkB,GAAIC,YAAoB,IAAa;EAChE,OAAOL,cAAc,CAACK,YAAY,CAAC;AACvC,CAAC;AAAC;AAEK,MAAMC,oBAAoB,GAAID,YAAoB,IAAa;EAClE,OAAOL,cAAc,CAACK,YAAY,CAAC;AACvC,CAAC;AAAC"}

package/utils/entryStorage.js

@@ -1,59 +1,52 @@
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
-
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.entryToStorageTransform = exports.entryFromStorageTransform = exports.entryFieldFromStorageTransform = void 0;
-
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
-
 var _error = _interopRequireDefault(require("@webiny/error"));
-
 var _StorageTransformPlugin = require("../plugins/StorageTransformPlugin");
-
+var _getBaseFieldType = require("./getBaseFieldType");
 const getStoragePluginFactory = context => {
   let defaultStoragePlugin;
-  const plugins = context.plugins.byType(_StorageTransformPlugin.StorageTransformPlugin.type) // we reverse plugins because we want to get latest added only
+  const plugins = context.plugins.byType(_StorageTransformPlugin.StorageTransformPlugin.type)
+  // we reverse plugins because we want to get latest added only
   .reverse().reduce((collection, plugin) => {
-    // check if it's a default plugin
-    if (plugin.fieldType === "*" && !defaultStoragePlugin) {
+    /**
+     * Check if it's a default plugin and set it - always override the previous one.
+     */
+    if (plugin.fieldType === "*") {
       defaultStoragePlugin = plugin;
       return collection;
     }
+
     /**
-     * either existing plugin added or plugin fieldType does not exist in current model
-     * this is to iterate a bit less later
+     * We will just set the plugin for given type.
+     * The last one will override existing one - so users can override our default ones.
      */
-
-
-    if (!collection[plugin.fieldType]) {
-      collection[plugin.fieldType] = plugin;
-    }
-
+    collection[plugin.fieldType] = plugin;
     return collection;
   }, {});
   return fieldType => {
     return plugins[fieldType] || defaultStoragePlugin;
   };
 };
+
 /**
  * This should be used when transforming the whole entry.
  */
-
-
 const entryStorageTransform = async (context, model, operation, entry) => {
   const getStoragePlugin = getStoragePluginFactory(context);
   const transformedValues = {};
-
   for (const field of model.fields) {
-    const plugin = getStoragePlugin(field.type); // TODO: remove this once plugins are converted into classes
-
+    const baseType = (0, _getBaseFieldType.getBaseFieldType)(field);
+    const plugin = getStoragePlugin(baseType);
+    // TODO: remove this once plugins are converted into classes
     if (typeof plugin[operation] !== "function") {
-      throw new _error.default(`Missing "${operation}" function in storage plugin "${plugin.name}" for field type "${field.type}"`);
+      throw new _error.default(`Missing "${operation}" function in storage plugin "${plugin.name}" for field type "${baseType}"`);
     }
-
     transformedValues[field.fieldId] = await plugin[operation]({
       plugins: context.plugins,
       model,
@@ -62,32 +55,26 @@ const entryStorageTransform = async (context, model, operation, entry) => {
       getStoragePlugin
     });
   }
-
   return (0, _objectSpread2.default)((0, _objectSpread2.default)({}, entry), {}, {
     values: transformedValues
   });
 };
+
 /**
  * A function that is used in crud to transform entry into the storage type.
  */
-
-
 const entryToStorageTransform = async (context, model, entry) => {
   return entryStorageTransform(context, model, "toStorage", entry);
 };
+
 /**
  * A function that is used to transform the whole entry from storage into its native form.
  */
-
-
 exports.entryToStorageTransform = entryToStorageTransform;
-
 const entryFromStorageTransform = async (context, model, entry) => {
   return entryStorageTransform(context, model, "fromStorage", entry);
 };
-
 exports.entryFromStorageTransform = entryFromStorageTransform;
-
 /*
  * A function that is used to transform a single field from storage
  */
@@ -99,12 +86,13 @@ const entryFieldFromStorageTransform = async params => {
     value
   } = params;
   const getStoragePlugin = getStoragePluginFactory(context);
-  const plugin = getStoragePlugin(field.type); // TODO: remove this once plugins are converted into classes
+  const baseType = (0, _getBaseFieldType.getBaseFieldType)(field);
+  const plugin = getStoragePlugin(baseType);
 
+  // TODO: remove this once plugins are converted into classes
   if (typeof plugin.fromStorage !== "function") {
-    throw new _error.default(`Missing "fromStorage" function in storage plugin "${plugin.name}" for field type "${field.type}"`);
+    throw new _error.default(`Missing "fromStorage" function in storage plugin "${plugin.name}" for field type "${baseType}"`);
   }
-
   return plugin.fromStorage({
     plugins: context.plugins,
     model,
@@ -113,5 +101,4 @@ const entryFieldFromStorageTransform = async params => {
     getStoragePlugin
   });
 };
-
 exports.entryFieldFromStorageTransform = entryFieldFromStorageTransform;