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

package/utils/converters/ConverterCollection.js

@@ -1,29 +1,22 @@
-"use strict";
-
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.ConverterCollection = void 0;
-var _error = _interopRequireDefault(require("@webiny/error"));
-var _Converter = require("./Converter");
-var _plugins = require("../../plugins");
-var _getBaseFieldType = require("../getBaseFieldType");
-class ConverterCollection {
+import WebinyError from "@webiny/error";
+import { Converter } from "./Converter.js";
+import { CmsModelFieldConverterPlugin } from "../../plugins/index.js";
+import { getBaseFieldType } from "../getBaseFieldType.js";
+export class ConverterCollection {
   converters = new Map();
   constructor(params) {
     const {
       plugins
     } = params;
     const fieldGraphQLPlugins = plugins.byType("cms-model-field-to-graphql");
-    const fieldConverterPlugins = plugins.byType(_plugins.CmsModelFieldConverterPlugin.type);
+    const fieldConverterPlugins = plugins.byType(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");
+      throw new WebinyError(`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({
+      const converter = new Converter({
         type: fieldGraphQLPlugin.fieldType,
         plugin: plugin || defaultFieldConverterPlugin
       });
@@ -35,9 +28,12 @@ class ConverterCollection {
     this.converters.set(converter.getType(), converter);
   }
   getConverter(type) {
-    const converter = this.converters.get(type);
+    const baseType = getBaseFieldType({
+      type
+    });
+    const converter = this.converters.get(baseType);
     if (converter === undefined) {
-      throw new _error.default(`Missing converter for field type "${type}".`, "CONVERTER_ERROR", {
+      throw new WebinyError(`Missing converter for field type "${type}".`, "CONVERTER_ERROR", {
         type
       });
     }
@@ -53,8 +49,7 @@ class ConverterCollection {
     }
     this.attachHasOwnProperty(inputValues);
     return fields.reduce((output, field) => {
-      const baseType = (0, _getBaseFieldType.getBaseFieldType)(field);
-      const converter = this.getConverter(baseType);
+      const converter = this.getConverter(field.type);
       if (inputValues === null || inputValues.hasOwnProperty(field.fieldId) === false) {
         return output;
       }
@@ -77,8 +72,7 @@ class ConverterCollection {
       return undefined;
     }
     return fields.reduce((output, field) => {
-      const baseType = (0, _getBaseFieldType.getBaseFieldType)(field);
-      const converter = this.getConverter(baseType);
+      const converter = this.getConverter(field.type);
       if (inputValues === null || inputValues.hasOwnProperty(field.storageId) === false) {
         return output;
       }
@@ -120,6 +114,5 @@ class ConverterCollection {
     });
   }
 }
-exports.ConverterCollection = ConverterCollection;
 
 //# sourceMappingURL=ConverterCollection.js.map

package/utils/converters/ConverterCollection.js.map

@@ -1 +1 @@
-{"version":3,"names":["_error","_interopRequireDefault","require","_Converter","_plugins","_getBaseFieldType","ConverterCollection","converters","Map","constructor","params","plugins","fieldGraphQLPlugins","byType","fieldConverterPlugins","CmsModelFieldConverterPlugin","type","defaultFieldConverterPlugin","find","pl","getFieldType","undefined","WebinyError","fieldGraphQLPlugin","plugin","fieldType","converter","Converter","addConverter","setConverterCollection","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","exports"],"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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","ignoreList":[]}
+{"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":[]}

package/utils/converters/types.d.ts

@@ -0,0 +1,8 @@
+import type { ConverterCollectionConvertParams as BaseConverterCollectionConvertParams } from "../../utils/converters/ConverterCollection.js";
+import type { CmsEntryValues } from "../../types/index.js";
+/**
+ * In the first call of the converter we do not need the fields property as it will be taken directly from the model.
+ */
+export interface ConverterCollectionConvertParams<T extends CmsEntryValues = CmsEntryValues> extends Omit<BaseConverterCollectionConvertParams<T>, "fields"> {
+    fields?: BaseConverterCollectionConvertParams["fields"];
+}

package/utils/converters/types.js

@@ -0,0 +1,3 @@
+export {};
+
+//# sourceMappingURL=types.js.map

package/utils/converters/types.js.map

@@ -0,0 +1 @@
+{"version":3,"names":[],"sources":["types.ts"],"sourcesContent":["import type { ConverterCollectionConvertParams as BaseConverterCollectionConvertParams } from \"~/utils/converters/ConverterCollection.js\";\nimport type { CmsEntryValues } from \"~/types/index.js\";\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 */\nexport interface ConverterCollectionConvertParams<T extends CmsEntryValues = CmsEntryValues>\n    extends Omit<BaseConverterCollectionConvertParams<T>, \"fields\"> {\n    fields?: BaseConverterCollectionConvertParams[\"fields\"];\n}\n"],"mappings":"","ignoreList":[]}

package/utils/converters/valueKeyFromStorageConverter.d.ts

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

package/utils/converters/valueKeyFromStorageConverter.js

@@ -0,0 +1,22 @@
+import { ConverterCollection } from "./ConverterCollection.js";
+export const createValueKeyFromStorageConverter = params => {
+  const {
+    plugins,
+    model
+  } = params;
+  const converters = new ConverterCollection({
+    plugins
+  });
+  return ({
+    fields,
+    values
+  }) => {
+    const result = converters.convertFromStorage({
+      fields: fields || model.fields,
+      values
+    });
+    return result || {};
+  };
+};
+
+//# sourceMappingURL=valueKeyFromStorageConverter.js.map

package/utils/converters/valueKeyFromStorageConverter.js.map

@@ -0,0 +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":[]}

package/utils/converters/valueKeyStorageConverter.d.ts

@@ -1,14 +1,3 @@
-import { PluginsContainer } from "@webiny/plugins";
-import { CmsModelConverterCallable } from "./ConverterCollection";
-import { CmsModel, StorageOperationsCmsModel } from "../../types";
-interface Params {
-    /**
-     * We need a model to determine if the conversion feature is enabled.
-     */
-    model: CmsModel;
-    plugins: PluginsContainer;
-}
-export declare const createValueKeyToStorageConverter: (params: Params) => CmsModelConverterCallable;
-export declare const createValueKeyFromStorageConverter: (params: Params) => CmsModelConverterCallable;
-export declare const createCmsModelFieldConvertersAttachFactory: (plugins: PluginsContainer) => (model: StorageOperationsCmsModel | CmsModel) => StorageOperationsCmsModel;
-export {};
+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>;

package/utils/converters/valueKeyStorageConverter.js

@@ -1,117 +1,6 @@
-"use strict";
-
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.createValueKeyToStorageConverter = exports.createValueKeyFromStorageConverter = exports.createCmsModelFieldConvertersAttachFactory = void 0;
-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;
-  } else if (model.webinyVersion.startsWith("0.0.0")) {
-    return true;
-  }
-  return model.webinyVersion.match(/next|beta|unstable/) !== null;
-};
-const isFeatureEnabled = model => {
-  /**
-   * In case of disabled webinyVersion value, we disable this feature.
-   * This is only for testing...
-   */
-  const disableConversion = !!process.env.WEBINY_API_TEST_STORAGE_ID_CONVERSION_DISABLE;
-  if (model.webinyVersion === "disable" || disableConversion) {
-    return false;
-  }
-  /**
-   * If is a test environment, always have this turned on.
-   */
-  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;
-  }
-  /**
-   * In case feature version value is greater than the model version, feature is not enabled as it is an older model with no storageId.
-   *
-   * 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;
-};
-
-/**
- * In the first call of the converter we do not need the fields property as it will be taken directly from the model.
- */
-
-const createValueKeyToStorageConverter = params => {
-  const {
-    plugins,
-    model
-  } = params;
-  if (isFeatureEnabled(model) === false) {
-    return ({
-      values
-    }) => {
-      return values || {};
-    };
-  }
-  const converters = new _ConverterCollection.ConverterCollection({
-    plugins
-  });
-  return ({
-    fields,
-    values
-  }) => {
-    const result = converters.convertToStorage({
-      fields: fields || model.fields,
-      values
-    });
-    return result || {};
-  };
-};
-exports.createValueKeyToStorageConverter = createValueKeyToStorageConverter;
-const createValueKeyFromStorageConverter = params => {
-  const {
-    plugins,
-    model
-  } = params;
-  if (isFeatureEnabled(model) === false) {
-    return ({
-      values
-    }) => {
-      return values || {};
-    };
-  }
-  const converters = new _ConverterCollection.ConverterCollection({
-    plugins
-  });
-  return ({
-    fields,
-    values
-  }) => {
-    const result = converters.convertFromStorage({
-      fields: fields || model.fields,
-      values
-    });
-    return result || {};
-  };
-};
-exports.createValueKeyFromStorageConverter = createValueKeyFromStorageConverter;
-const createCmsModelFieldConvertersAttachFactory = plugins => {
+import { createValueKeyToStorageConverter } from "./valueKeyToStorageConverter.js";
+import { createValueKeyFromStorageConverter } from "./valueKeyFromStorageConverter.js";
+export const createCmsModelFieldConvertersAttachFactory = plugins => {
   return model => {
     const storageModel = model;
     if (!!storageModel.convertValueKeyToStorage && !!storageModel.convertValueKeyFromStorage) {
@@ -130,6 +19,5 @@ const createCmsModelFieldConvertersAttachFactory = plugins => {
     };
   };
 };
-exports.createCmsModelFieldConvertersAttachFactory = createCmsModelFieldConvertersAttachFactory;
 
 //# sourceMappingURL=valueKeyStorageConverter.js.map

package/utils/converters/valueKeyStorageConverter.js.map

@@ -1 +1 @@
-{"version":3,"names":["_ConverterCollection","require","_semver","_interopRequireDefault","featureVersion","semver","coerce","isBetaOrNext","model","webinyVersion","startsWith","match","isFeatureEnabled","disableConversion","process","env","WEBINY_API_TEST_STORAGE_ID_CONVERSION_DISABLE","nodeEnv","NODE_ENV","modelVersion","console","log","modelId","compare","createValueKeyToStorageConverter","params","plugins","values","converters","ConverterCollection","fields","result","convertToStorage","exports","createValueKeyFromStorageConverter","convertFromStorage","createCmsModelFieldConvertersAttachFactory","storageModel","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    } else if (model.webinyVersion.startsWith(\"0.0.0\")) {\n        return true;\n    }\n    return model.webinyVersion.match(/next|beta|unstable/) !== 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    const disableConversion = !!process.env.WEBINY_API_TEST_STORAGE_ID_CONVERSION_DISABLE;\n    if (model.webinyVersion === \"disable\" || disableConversion) {\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\nexport const createCmsModelFieldConvertersAttachFactory = (plugins: PluginsContainer) => {\n    return (model: StorageOperationsCmsModel | CmsModel): StorageOperationsCmsModel => {\n        const storageModel = model as Partial<StorageOperationsCmsModel>;\n        if (!!storageModel.convertValueKeyToStorage && !!storageModel.convertValueKeyFromStorage) {\n            return storageModel as StorageOperationsCmsModel;\n        }\n        return {\n            ...model,\n            convertValueKeyToStorage: createValueKeyToStorageConverter({\n                model,\n                plugins\n            }),\n            convertValueKeyFromStorage: createValueKeyFromStorageConverter({\n                model,\n                plugins\n            })\n        };\n    };\n};\n"],"mappings":"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","ignoreList":[]}
+{"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":[]}

package/utils/converters/valueKeyToStorageConverter.d.ts

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

package/utils/converters/valueKeyToStorageConverter.js

@@ -0,0 +1,22 @@
+import { ConverterCollection } from "./ConverterCollection.js";
+export const createValueKeyToStorageConverter = params => {
+  const {
+    plugins,
+    model
+  } = params;
+  const converters = new ConverterCollection({
+    plugins
+  });
+  return ({
+    fields,
+    values
+  }) => {
+    const result = converters.convertToStorage({
+      fields: fields || model.fields,
+      values
+    });
+    return result || {};
+  };
+};
+
+//# sourceMappingURL=valueKeyToStorageConverter.js.map

package/utils/converters/valueKeyToStorageConverter.js.map

@@ -0,0 +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":[]}

package/utils/createModelField.d.ts

@@ -1,7 +1,9 @@
-import { CmsModelField } from "../types";
-export interface CreateModelFieldParams extends Omit<CmsModelField, "id" | "storageId" | "fieldId"> {
+import type { CmsModelField, CmsModelFieldValidation } from "../types/index.js";
+export interface CreateModelFieldParams extends Omit<CmsModelField, "id" | "storageId" | "fieldId" | "validation" | "listValidation"> {
     id?: string;
     fieldId?: string;
     storageId?: string;
+    validation?: CmsModelFieldValidation[];
+    listValidation?: CmsModelFieldValidation[];
 }
 export declare const createModelField: (params: CreateModelFieldParams) => CmsModelField;

package/utils/createModelField.js

@@ -1,12 +1,5 @@
-"use strict";
-
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.createModelField = void 0;
-var _camelCase = _interopRequireDefault(require("lodash/camelCase"));
-const createModelField = params => {
+import camelCase from "lodash/camelCase.js";
+export const createModelField = params => {
   // We are not just spreading `params` because we want to ensure
   // a default value is set for every property of the model field.
   const {
@@ -15,23 +8,26 @@ const createModelField = params => {
     fieldId: initialFieldId,
     storageId,
     type,
-    tags,
+    tags = [],
     settings = {},
     listValidation = [],
     validation = [],
-    multipleValues = false,
+    list = false,
     predefinedValues = {
       values: [],
       enabled: false
     },
-    helpText = null,
-    placeholderText = null,
+    help = null,
+    placeholder = null,
     renderer = null
   } = params;
-  const fieldId = initialFieldId ? (0, _camelCase.default)(initialFieldId) : (0, _camelCase.default)(label);
+
+  // TODO: ideally, initialFieldId should also be passed through `camelCase` but currently this would break `wbyAco_location` field.
+  // TODO: Once this legacy field is removed, we can enable camelCase on the initialFieldId.
+  const fieldId = initialFieldId ? initialFieldId : camelCase(label);
   return {
     id: id ?? fieldId,
-    storageId: storageId ?? `${type}@${fieldId}`,
+    storageId: storageId ?? `${type}@${id ?? fieldId}`,
     fieldId,
     label,
     type,
@@ -39,13 +35,12 @@ const createModelField = params => {
     tags,
     listValidation,
     validation,
-    multipleValues,
+    list,
     predefinedValues,
-    helpText,
-    placeholderText,
+    help,
+    placeholder,
     renderer
   };
 };
-exports.createModelField = createModelField;
 
 //# sourceMappingURL=createModelField.js.map

package/utils/createModelField.js.map

@@ -1 +1 @@
-{"version":3,"names":["_camelCase","_interopRequireDefault","require","createModelField","params","id","label","fieldId","initialFieldId","storageId","type","tags","settings","listValidation","validation","multipleValues","predefinedValues","values","enabled","helpText","placeholderText","renderer","camelCase","exports"],"sources":["createModelField.ts"],"sourcesContent":["import camelCase from \"lodash/camelCase\";\nimport { CmsModelField } from \"~/types\";\n\nexport interface CreateModelFieldParams\n    extends Omit<CmsModelField, \"id\" | \"storageId\" | \"fieldId\"> {\n    id?: string;\n    fieldId?: string;\n    storageId?: string;\n}\n\nexport const createModelField = (params: CreateModelFieldParams): CmsModelField => {\n    // We are not just spreading `params` because we want to ensure\n    // a default value is set for every property of the model field.\n    const {\n        id,\n        label,\n        fieldId: initialFieldId,\n        storageId,\n        type,\n        tags,\n        settings = {},\n        listValidation = [],\n        validation = [],\n        multipleValues = false,\n        predefinedValues = {\n            values: [],\n            enabled: false\n        },\n        helpText = null,\n        placeholderText = null,\n        renderer = null\n    } = params;\n\n    const fieldId = initialFieldId ? camelCase(initialFieldId) : camelCase(label);\n\n    return {\n        id: id ?? fieldId,\n        storageId: storageId ?? `${type}@${fieldId}`,\n        fieldId,\n        label,\n        type,\n        settings,\n        tags,\n        listValidation,\n        validation,\n        multipleValues,\n        predefinedValues,\n        helpText,\n        placeholderText,\n        renderer\n    };\n};\n"],"mappings":";;;;;;;AAAA,IAAAA,UAAA,GAAAC,sBAAA,CAAAC,OAAA;AAUO,MAAMC,gBAAgB,GAAIC,MAA8B,IAAoB;EAC/E;EACA;EACA,MAAM;IACFC,EAAE;IACFC,KAAK;IACLC,OAAO,EAAEC,cAAc;IACvBC,SAAS;IACTC,IAAI;IACJC,IAAI;IACJC,QAAQ,GAAG,CAAC,CAAC;IACbC,cAAc,GAAG,EAAE;IACnBC,UAAU,GAAG,EAAE;IACfC,cAAc,GAAG,KAAK;IACtBC,gBAAgB,GAAG;MACfC,MAAM,EAAE,EAAE;MACVC,OAAO,EAAE;IACb,CAAC;IACDC,QAAQ,GAAG,IAAI;IACfC,eAAe,GAAG,IAAI;IACtBC,QAAQ,GAAG;EACf,CAAC,GAAGjB,MAAM;EAEV,MAAMG,OAAO,GAAGC,cAAc,GAAG,IAAAc,kBAAS,EAACd,cAAc,CAAC,GAAG,IAAAc,kBAAS,EAAChB,KAAK,CAAC;EAE7E,OAAO;IACHD,EAAE,EAAEA,EAAE,IAAIE,OAAO;IACjBE,SAAS,EAAEA,SAAS,IAAK,GAAEC,IAAK,IAAGH,OAAQ,EAAC;IAC5CA,OAAO;IACPD,KAAK;IACLI,IAAI;IACJE,QAAQ;IACRD,IAAI;IACJE,cAAc;IACdC,UAAU;IACVC,cAAc;IACdC,gBAAgB;IAChBG,QAAQ;IACRC,eAAe;IACfC;EACJ,CAAC;AACL,CAAC;AAACE,OAAA,CAAApB,gBAAA,GAAAA,gBAAA","ignoreList":[]}
+{"version":3,"names":["camelCase","createModelField","params","id","label","fieldId","initialFieldId","storageId","type","tags","settings","listValidation","validation","list","predefinedValues","values","enabled","help","placeholder","renderer"],"sources":["createModelField.ts"],"sourcesContent":["import camelCase from \"lodash/camelCase.js\";\nimport type { CmsModelField, CmsModelFieldValidation } from \"~/types/index.js\";\n\nexport interface CreateModelFieldParams\n    extends Omit<CmsModelField, \"id\" | \"storageId\" | \"fieldId\" | \"validation\" | \"listValidation\"> {\n    id?: string;\n    fieldId?: string;\n    storageId?: string;\n    validation?: CmsModelFieldValidation[];\n    listValidation?: CmsModelFieldValidation[];\n}\n\nexport const createModelField = (params: CreateModelFieldParams): CmsModelField => {\n    // We are not just spreading `params` because we want to ensure\n    // a default value is set for every property of the model field.\n    const {\n        id,\n        label,\n        fieldId: initialFieldId,\n        storageId,\n        type,\n        tags = [],\n        settings = {},\n        listValidation = [],\n        validation = [],\n        list = false,\n        predefinedValues = {\n            values: [],\n            enabled: false\n        },\n        help = null,\n        placeholder = null,\n        renderer = null\n    } = params;\n\n    // TODO: ideally, initialFieldId should also be passed through `camelCase` but currently this would break `wbyAco_location` field.\n    // TODO: Once this legacy field is removed, we can enable camelCase on the initialFieldId.\n    const fieldId = initialFieldId ? initialFieldId : camelCase(label);\n\n    return {\n        id: id ?? fieldId,\n        storageId: storageId ?? `${type}@${id ?? fieldId}`,\n        fieldId,\n        label,\n        type,\n        settings,\n        tags,\n        listValidation,\n        validation,\n        list,\n        predefinedValues,\n        help,\n        placeholder,\n        renderer\n    };\n};\n"],"mappings":"AAAA,OAAOA,SAAS,MAAM,qBAAqB;AAY3C,OAAO,MAAMC,gBAAgB,GAAIC,MAA8B,IAAoB;EAC/E;EACA;EACA,MAAM;IACFC,EAAE;IACFC,KAAK;IACLC,OAAO,EAAEC,cAAc;IACvBC,SAAS;IACTC,IAAI;IACJC,IAAI,GAAG,EAAE;IACTC,QAAQ,GAAG,CAAC,CAAC;IACbC,cAAc,GAAG,EAAE;IACnBC,UAAU,GAAG,EAAE;IACfC,IAAI,GAAG,KAAK;IACZC,gBAAgB,GAAG;MACfC,MAAM,EAAE,EAAE;MACVC,OAAO,EAAE;IACb,CAAC;IACDC,IAAI,GAAG,IAAI;IACXC,WAAW,GAAG,IAAI;IAClBC,QAAQ,GAAG;EACf,CAAC,GAAGjB,MAAM;;EAEV;EACA;EACA,MAAMG,OAAO,GAAGC,cAAc,GAAGA,cAAc,GAAGN,SAAS,CAACI,KAAK,CAAC;EAElE,OAAO;IACHD,EAAE,EAAEA,EAAE,IAAIE,OAAO;IACjBE,SAAS,EAAEA,SAAS,IAAI,GAAGC,IAAI,IAAIL,EAAE,IAAIE,OAAO,EAAE;IAClDA,OAAO;IACPD,KAAK;IACLI,IAAI;IACJE,QAAQ;IACRD,IAAI;IACJE,cAAc;IACdC,UAAU;IACVC,IAAI;IACJC,gBAAgB;IAChBG,IAAI;IACJC,WAAW;IACXC;EACJ,CAAC;AACL,CAAC","ignoreList":[]}

package/utils/createTypeFromFields.d.ts

@@ -1,4 +1,4 @@
-import { ApiEndpoint, CmsFieldTypePlugins, CmsModel, CmsModelField } from "../types";
+import type { ApiEndpoint, CmsFieldTypePlugins, CmsModel, CmsModelField } from "../types/index.js";
 interface TypeFromFieldParams {
     typeOfType: "type" | "input";
     models: CmsModel[];

package/utils/createTypeFromFields.js

@@ -1,12 +1,6 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.createTypeFromFields = void 0;
-var _renderFields = require("./renderFields");
-var _renderInputFields = require("./renderInputFields");
-const createTypeFromFields = params => {
+import { renderField } from "./renderFields.js";
+import { renderInputField } from "./renderInputFields.js";
+export const createTypeFromFields = params => {
   const {
     typeOfType,
     model,
@@ -28,13 +22,13 @@ const createTypeFromFields = params => {
   // 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)({
+    const result = typeOfType === "type" ? renderField({
       field,
       type,
       models,
       model,
       fieldTypePlugins
-    }) : (0, _renderInputFields.renderInputField)({
+    }) : renderInputField({
       field,
       models,
       model,
@@ -66,6 +60,5 @@ const createTypeFromFields = params => {
         `
   };
 };
-exports.createTypeFromFields = createTypeFromFields;
 
 //# sourceMappingURL=createTypeFromFields.js.map

package/utils/createTypeFromFields.js.map

@@ -1 +1 @@
-{"version":3,"names":["_renderFields","require","_renderInputFields","createTypeFromFields","params","typeOfType","model","models","type","typeNamePrefix","fields","fieldTypePlugins","typeSuffix","mTypeName","singularApiName","typeFields","nestedTypes","replace","RegExp","field","result","renderField","renderInputField","typeDefs","push","length","fieldType","join","exports"],"sources":["createTypeFromFields.ts"],"sourcesContent":["import { 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 = 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,IAAAA,aAAA,GAAAC,OAAA;AACA,IAAAC,kBAAA,GAAAD,OAAA;AAkBO,MAAME,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,CAAE,GAAEL,SAAU,GAAE,EAAE,GAAG,CAAC;EAEhD,KAAK,MAAMM,KAAK,IAAIT,MAAM,EAAE;IACxB,MAAMU,MAAM,GACRf,UAAU,KAAK,MAAM,GACf,IAAAgB,yBAAW,EAAC;MAAEF,KAAK;MAAEX,IAAI;MAAED,MAAM;MAAED,KAAK;MAAEK;IAAiB,CAAC,CAAC,GAC7D,IAAAW,mCAAgB,EAAC;MAAEH,KAAK;MAAEZ,MAAM;MAAED,KAAK;MAAEK;IAAiB,CAAC,CAAC;IAEtE,IAAI,CAACS,MAAM,EAAE;MACT;IACJ;IAEA,MAAM;MAAEV,MAAM;MAAEa;IAAS,CAAC,GAAGH,MAAM;IAEnCL,UAAU,CAACS,IAAI,CAACd,MAAM,CAACO,OAAO,CAACA,OAAO,EAAG,GAAER,cAAe,GAAE,CAAC,CAAC;IAC9D,IAAIc,QAAQ,EAAE;MACVP,WAAW,CAACQ,IAAI,CAACD,QAAQ,CAACN,OAAO,CAACA,OAAO,EAAG,GAAER,cAAe,GAAE,CAAC,CAAC;IACrE;EACJ;EAEA,IAAI,CAACM,UAAU,CAACU,MAAM,EAAE;IACpBV,UAAU,CAACS,IAAI,CAAC,gBAAgB,CAAC;EACrC;EAEA,OAAO;IACHE,SAAS,EAAG,GAAEjB,cAAe,GAAEG,UAAW,EAAC;IAC3CW,QAAQ,EAAE,aAAe;AACjC,cAAcP,WAAW,CAACW,IAAI,CAAC,IAAI,CAAE;AACrC;AACA,cAActB,UAAW,IAAGI,cAAe,GAAEG,UAAW;AACxD,kBAAkBG,UAAU,CAACY,IAAI,CAAC,IAAI,CAAE;AACxC;AACA;EACI,CAAC;AACL,CAAC;AAACC,OAAA,CAAAzB,oBAAA,GAAAA,oBAAA","ignoreList":[]}
+{"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":[]}

package/utils/createTypeName.js

@@ -1,15 +1,7 @@
-"use strict";
-
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.createTypeName = void 0;
-var _upperFirst = _interopRequireDefault(require("lodash/upperFirst"));
-var _camelCase = _interopRequireDefault(require("lodash/camelCase"));
-const createTypeName = modelId => {
-  return (0, _upperFirst.default)((0, _camelCase.default)(modelId));
+import upperFirst from "lodash/upperFirst.js";
+import camelCase from "lodash/camelCase.js";
+export const createTypeName = modelId => {
+  return upperFirst(camelCase(modelId));
 };
-exports.createTypeName = createTypeName;
 
 //# sourceMappingURL=createTypeName.js.map

package/utils/createTypeName.js.map

@@ -1 +1 @@
-{"version":3,"names":["_upperFirst","_interopRequireDefault","require","_camelCase","createTypeName","modelId","upperFirst","camelCase","exports"],"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"],"mappings":";;;;;;;AAAA,IAAAA,WAAA,GAAAC,sBAAA,CAAAC,OAAA;AACA,IAAAC,UAAA,GAAAF,sBAAA,CAAAC,OAAA;AAEO,MAAME,cAAc,GAAIC,OAAe,IAAa;EACvD,OAAO,IAAAC,mBAAU,EAAC,IAAAC,kBAAS,EAACF,OAAO,CAAC,CAAC;AACzC,CAAC;AAACG,OAAA,CAAAJ,cAAA,GAAAA,cAAA","ignoreList":[]}
+{"version":3,"names":["upperFirst","camelCase","createTypeName","modelId"],"sources":["createTypeName.ts"],"sourcesContent":["import upperFirst from \"lodash/upperFirst.js\";\nimport camelCase from \"lodash/camelCase.js\";\n\nexport const createTypeName = (modelId: string): string => {\n    return upperFirst(camelCase(modelId));\n};\n"],"mappings":"AAAA,OAAOA,UAAU,MAAM,sBAAsB;AAC7C,OAAOC,SAAS,MAAM,qBAAqB;AAE3C,OAAO,MAAMC,cAAc,GAAIC,OAAe,IAAa;EACvD,OAAOH,UAAU,CAACC,SAAS,CAACE,OAAO,CAAC,CAAC;AACzC,CAAC","ignoreList":[]}