@webiny/api-headless-cms 5.39.0-beta.0 → 5.39.0-beta.2

package/utils/converters/ConverterCollection.js

@@ -5,15 +5,13 @@ 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 {
+  converters = new Map();
   constructor(params) {
-    (0, _defineProperty2.default)(this, "converters", new Map());
     const {
       plugins
     } = params;
@@ -64,7 +62,10 @@ class ConverterCollection {
         field,
         value: inputValues[field.fieldId]
       });
-      return (0, _objectSpread2.default)((0, _objectSpread2.default)({}, output), values);
+      return {
+        ...output,
+        ...values
+      };
     }, {});
   }
   convertFromStorage(params) {
@@ -85,7 +86,10 @@ class ConverterCollection {
         field,
         value: inputValues[field.storageId]
       });
-      return (0, _objectSpread2.default)((0, _objectSpread2.default)({}, output), values);
+      return {
+        ...output,
+        ...values
+      };
     }, {});
   }
 
@@ -104,7 +108,7 @@ class ConverterCollection {
     // 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") {
+    typeof values?.hasOwnProperty === "function") {
       return;
     }
     Object.defineProperty(values, "hasOwnProperty", {

package/utils/converters/ConverterCollection.js.map

@@ -1 +1 @@
-{"version":3,"names":["_error","_interopRequireDefault","require","_Converter","_plugins","_getBaseFieldType","ConverterCollection","constructor","params","_defineProperty2","default","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","_objectSpread2","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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"}
+{"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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"}

package/utils/converters/valueKeyStorageConverter.js

@@ -5,7 +5,6 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.createValueKeyToStorageConverter = exports.createValueKeyFromStorageConverter = exports.createCmsModelFieldConvertersAttachFactory = 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");
@@ -118,7 +117,8 @@ const createCmsModelFieldConvertersAttachFactory = plugins => {
     if (!!storageModel.convertValueKeyToStorage && !!storageModel.convertValueKeyFromStorage) {
       return storageModel;
     }
-    return (0, _objectSpread2.default)((0, _objectSpread2.default)({}, model), {}, {
+    return {
+      ...model,
       convertValueKeyToStorage: createValueKeyToStorageConverter({
         model,
         plugins
@@ -127,7 +127,7 @@ const createCmsModelFieldConvertersAttachFactory = plugins => {
         model,
         plugins
       })
-    });
+    };
   };
 };
 exports.createCmsModelFieldConvertersAttachFactory = createCmsModelFieldConvertersAttachFactory;

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","_objectSpread2","default"],"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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"}
+{"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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"}

package/utils/date.d.ts

@@ -2,9 +2,9 @@
  * Should not be used by users as method is prone to breaking changes.
  * @internal
  */
-export declare const formatDate: (date?: Date | string | null) => string | undefined;
+export declare const formatDate: (date?: Date | string | null) => string | null;
 /**
  * Should not be used by users as method is prone to breaking changes.
  * @internal
  */
-export declare const getDate: <T extends string | undefined = string | undefined>(input?: Date | string | null, defaultValue?: Date | string | null) => T;
+export declare const getDate: <T extends string | null = string | null>(input?: Date | string | null, defaultValue?: Date | string | null) => T;

package/utils/date.js

@@ -10,7 +10,7 @@ exports.getDate = exports.formatDate = void 0;
  */
 const formatDate = date => {
   if (!date) {
-    return undefined;
+    return null;
   } else if (date instanceof Date) {
     return date.toISOString();
   }

package/utils/date.js.map

@@ -1 +1 @@
-{"version":3,"names":["formatDate","date","undefined","Date","toISOString","exports","getDate","input","defaultValue"],"sources":["date.ts"],"sourcesContent":["/**\n * Should not be used by users as method is prone to breaking changes.\n * @internal\n */\nexport const formatDate = (date?: Date | string | null): string | undefined => {\n    if (!date) {\n        return undefined;\n    } else if (date instanceof Date) {\n        return date.toISOString();\n    }\n    return new Date(date).toISOString();\n};\n\n/**\n * Should not be used by users as method is prone to breaking changes.\n * @internal\n */\nexport const getDate = <T extends string | undefined = string | undefined>(\n    input?: Date | string | null,\n    defaultValue?: Date | string | null\n): T => {\n    if (!input) {\n        return formatDate(defaultValue) as T;\n    }\n    if (input instanceof Date) {\n        return formatDate(input) as T;\n    }\n    return formatDate(new Date(input)) as T;\n};\n"],"mappings":";;;;;;AAAA;AACA;AACA;AACA;AACO,MAAMA,UAAU,GAAIC,IAA2B,IAAyB;EAC3E,IAAI,CAACA,IAAI,EAAE;IACP,OAAOC,SAAS;EACpB,CAAC,MAAM,IAAID,IAAI,YAAYE,IAAI,EAAE;IAC7B,OAAOF,IAAI,CAACG,WAAW,CAAC,CAAC;EAC7B;EACA,OAAO,IAAID,IAAI,CAACF,IAAI,CAAC,CAACG,WAAW,CAAC,CAAC;AACvC,CAAC;;AAED;AACA;AACA;AACA;AAHAC,OAAA,CAAAL,UAAA,GAAAA,UAAA;AAIO,MAAMM,OAAO,GAAGA,CACnBC,KAA4B,EAC5BC,YAAmC,KAC/B;EACJ,IAAI,CAACD,KAAK,EAAE;IACR,OAAOP,UAAU,CAACQ,YAAY,CAAC;EACnC;EACA,IAAID,KAAK,YAAYJ,IAAI,EAAE;IACvB,OAAOH,UAAU,CAACO,KAAK,CAAC;EAC5B;EACA,OAAOP,UAAU,CAAC,IAAIG,IAAI,CAACI,KAAK,CAAC,CAAC;AACtC,CAAC;AAACF,OAAA,CAAAC,OAAA,GAAAA,OAAA"}
+{"version":3,"names":["formatDate","date","Date","toISOString","exports","getDate","input","defaultValue"],"sources":["date.ts"],"sourcesContent":["/**\n * Should not be used by users as method is prone to breaking changes.\n * @internal\n */\nexport const formatDate = (date?: Date | string | null): string | null => {\n    if (!date) {\n        return null;\n    } else if (date instanceof Date) {\n        return date.toISOString();\n    }\n    return new Date(date).toISOString();\n};\n\n/**\n * Should not be used by users as method is prone to breaking changes.\n * @internal\n */\nexport const getDate = <T extends string | null = string | null>(\n    input?: Date | string | null,\n    defaultValue?: Date | string | null\n): T => {\n    if (!input) {\n        return formatDate(defaultValue) as T;\n    }\n    if (input instanceof Date) {\n        return formatDate(input) as T;\n    }\n    return formatDate(new Date(input)) as T;\n};\n"],"mappings":";;;;;;AAAA;AACA;AACA;AACA;AACO,MAAMA,UAAU,GAAIC,IAA2B,IAAoB;EACtE,IAAI,CAACA,IAAI,EAAE;IACP,OAAO,IAAI;EACf,CAAC,MAAM,IAAIA,IAAI,YAAYC,IAAI,EAAE;IAC7B,OAAOD,IAAI,CAACE,WAAW,CAAC,CAAC;EAC7B;EACA,OAAO,IAAID,IAAI,CAACD,IAAI,CAAC,CAACE,WAAW,CAAC,CAAC;AACvC,CAAC;;AAED;AACA;AACA;AACA;AAHAC,OAAA,CAAAJ,UAAA,GAAAA,UAAA;AAIO,MAAMK,OAAO,GAAGA,CACnBC,KAA4B,EAC5BC,YAAmC,KAC/B;EACJ,IAAI,CAACD,KAAK,EAAE;IACR,OAAON,UAAU,CAACO,YAAY,CAAC;EACnC;EACA,IAAID,KAAK,YAAYJ,IAAI,EAAE;IACvB,OAAOF,UAAU,CAACM,KAAK,CAAC;EAC5B;EACA,OAAON,UAAU,CAAC,IAAIE,IAAI,CAACI,KAAK,CAAC,CAAC;AACtC,CAAC;AAACF,OAAA,CAAAC,OAAA,GAAAA,OAAA"}

package/utils/entryStorage.js

@@ -5,7 +5,6 @@ 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");
@@ -55,9 +54,10 @@ const entryStorageTransform = async (context, model, operation, entry) => {
       getStoragePlugin
     });
   }
-  return (0, _objectSpread2.default)((0, _objectSpread2.default)({}, entry), {}, {
+  return {
+    ...entry,
     values: transformedValues
-  });
+  };
 };
 
 /**

package/utils/entryStorage.js.map

@@ -1 +1 @@
-{"version":3,"names":["_error","_interopRequireDefault","require","_StorageTransformPlugin","_getBaseFieldType","getStoragePluginFactory","context","defaultStoragePlugin","plugins","byType","StorageTransformPlugin","type","reverse","reduce","collection","plugin","fieldType","entryStorageTransform","model","operation","entry","getStoragePlugin","transformedValues","field","fields","baseType","getBaseFieldType","WebinyError","name","fieldId","value","values","_objectSpread2","default","entryToStorageTransform","exports","entryFromStorageTransform","entryFieldFromStorageTransform","params","fromStorage"],"sources":["entryStorage.ts"],"sourcesContent":["import WebinyError from \"@webiny/error\";\nimport { StorageTransformPlugin } from \"~/plugins/StorageTransformPlugin\";\nimport { CmsContext, CmsEntry, CmsModel, CmsModelField } from \"~/types\";\nimport { getBaseFieldType } from \"~/utils/getBaseFieldType\";\n\ninterface GetStoragePluginFactory {\n    (context: Pick<CmsContext, \"plugins\">): (fieldType: string) => StorageTransformPlugin<any>;\n}\n\nconst getStoragePluginFactory: GetStoragePluginFactory = context => {\n    let defaultStoragePlugin: StorageTransformPlugin;\n\n    const plugins = context.plugins\n        .byType<StorageTransformPlugin>(StorageTransformPlugin.type)\n        // we reverse plugins because we want to get latest added only\n        .reverse()\n        .reduce((collection, plugin) => {\n            /**\n             * Check if it's a default plugin and set it - always override the previous one.\n             */\n            if (plugin.fieldType === \"*\") {\n                defaultStoragePlugin = plugin;\n                return collection;\n            }\n\n            /**\n             * We will just set the plugin for given type.\n             * The last one will override existing one - so users can override our default ones.\n             */\n            collection[plugin.fieldType] = plugin;\n\n            return collection;\n        }, {} as Record<string, StorageTransformPlugin>);\n\n    return (fieldType: string) => {\n        return plugins[fieldType] || defaultStoragePlugin;\n    };\n};\n\n/**\n * This should be used when transforming the whole entry.\n */\nconst entryStorageTransform = async (\n    context: Pick<CmsContext, \"plugins\">,\n    model: CmsModel,\n    operation: \"toStorage\" | \"fromStorage\",\n    entry: CmsEntry\n): Promise<CmsEntry> => {\n    const getStoragePlugin = getStoragePluginFactory(context);\n\n    const transformedValues: Record<string, any> = {};\n    for (const field of model.fields) {\n        const baseType = getBaseFieldType(field);\n        const plugin = getStoragePlugin(baseType);\n        // TODO: remove this once plugins are converted into classes\n        if (typeof plugin[operation] !== \"function\") {\n            throw new WebinyError(\n                `Missing \"${operation}\" function in storage plugin \"${plugin.name}\" for field type \"${baseType}\"`\n            );\n        }\n\n        transformedValues[field.fieldId] = await plugin[operation]({\n            plugins: context.plugins,\n            model,\n            field,\n            value: entry.values[field.fieldId],\n            getStoragePlugin\n        });\n    }\n\n    return { ...entry, values: transformedValues };\n};\n\n/**\n * A function that is used in crud to transform entry into the storage type.\n */\nexport const entryToStorageTransform = async (\n    context: Pick<CmsContext, \"plugins\">,\n    model: CmsModel,\n    entry: CmsEntry\n): Promise<CmsEntry> => {\n    return entryStorageTransform(context, model, \"toStorage\", entry);\n};\n\n/**\n * A function that is used to transform the whole entry from storage into its native form.\n */\nexport const entryFromStorageTransform = async (\n    context: Pick<CmsContext, \"plugins\">,\n    model: CmsModel,\n    entry: CmsEntry\n): Promise<CmsEntry> => {\n    return entryStorageTransform(context, model, \"fromStorage\", entry);\n};\n\ninterface EntryFieldFromStorageTransformParams {\n    context: Pick<CmsContext, \"plugins\">;\n    model: CmsModel;\n    field: CmsModelField;\n    value: any;\n}\n/*\n * A function that is used to transform a single field from storage\n */\nexport const entryFieldFromStorageTransform = async <T = any>(\n    params: EntryFieldFromStorageTransformParams\n): Promise<T> => {\n    const { context, model, field, value } = params;\n    const getStoragePlugin = getStoragePluginFactory(context);\n\n    const baseType = getBaseFieldType(field);\n    const plugin = getStoragePlugin(baseType);\n\n    // TODO: remove this once plugins are converted into classes\n    if (typeof plugin.fromStorage !== \"function\") {\n        throw new WebinyError(\n            `Missing \"fromStorage\" function in storage plugin \"${plugin.name}\" for field type \"${baseType}\"`\n        );\n    }\n\n    return plugin.fromStorage({\n        plugins: context.plugins,\n        model,\n        field,\n        value,\n        getStoragePlugin\n    });\n};\n"],"mappings":"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"}
+{"version":3,"names":["_error","_interopRequireDefault","require","_StorageTransformPlugin","_getBaseFieldType","getStoragePluginFactory","context","defaultStoragePlugin","plugins","byType","StorageTransformPlugin","type","reverse","reduce","collection","plugin","fieldType","entryStorageTransform","model","operation","entry","getStoragePlugin","transformedValues","field","fields","baseType","getBaseFieldType","WebinyError","name","fieldId","value","values","entryToStorageTransform","exports","entryFromStorageTransform","entryFieldFromStorageTransform","params","fromStorage"],"sources":["entryStorage.ts"],"sourcesContent":["import WebinyError from \"@webiny/error\";\nimport { StorageTransformPlugin } from \"~/plugins/StorageTransformPlugin\";\nimport { CmsContext, CmsEntry, CmsModel, CmsModelField } from \"~/types\";\nimport { getBaseFieldType } from \"~/utils/getBaseFieldType\";\n\ninterface GetStoragePluginFactory {\n    (context: Pick<CmsContext, \"plugins\">): (fieldType: string) => StorageTransformPlugin<any>;\n}\n\nconst getStoragePluginFactory: GetStoragePluginFactory = context => {\n    let defaultStoragePlugin: StorageTransformPlugin;\n\n    const plugins = context.plugins\n        .byType<StorageTransformPlugin>(StorageTransformPlugin.type)\n        // we reverse plugins because we want to get latest added only\n        .reverse()\n        .reduce((collection, plugin) => {\n            /**\n             * Check if it's a default plugin and set it - always override the previous one.\n             */\n            if (plugin.fieldType === \"*\") {\n                defaultStoragePlugin = plugin;\n                return collection;\n            }\n\n            /**\n             * We will just set the plugin for given type.\n             * The last one will override existing one - so users can override our default ones.\n             */\n            collection[plugin.fieldType] = plugin;\n\n            return collection;\n        }, {} as Record<string, StorageTransformPlugin>);\n\n    return (fieldType: string) => {\n        return plugins[fieldType] || defaultStoragePlugin;\n    };\n};\n\n/**\n * This should be used when transforming the whole entry.\n */\nconst entryStorageTransform = async (\n    context: Pick<CmsContext, \"plugins\">,\n    model: CmsModel,\n    operation: \"toStorage\" | \"fromStorage\",\n    entry: CmsEntry\n): Promise<CmsEntry> => {\n    const getStoragePlugin = getStoragePluginFactory(context);\n\n    const transformedValues: Record<string, any> = {};\n    for (const field of model.fields) {\n        const baseType = getBaseFieldType(field);\n        const plugin = getStoragePlugin(baseType);\n        // TODO: remove this once plugins are converted into classes\n        if (typeof plugin[operation] !== \"function\") {\n            throw new WebinyError(\n                `Missing \"${operation}\" function in storage plugin \"${plugin.name}\" for field type \"${baseType}\"`\n            );\n        }\n\n        transformedValues[field.fieldId] = await plugin[operation]({\n            plugins: context.plugins,\n            model,\n            field,\n            value: entry.values[field.fieldId],\n            getStoragePlugin\n        });\n    }\n\n    return { ...entry, values: transformedValues };\n};\n\n/**\n * A function that is used in crud to transform entry into the storage type.\n */\nexport const entryToStorageTransform = async (\n    context: Pick<CmsContext, \"plugins\">,\n    model: CmsModel,\n    entry: CmsEntry\n): Promise<CmsEntry> => {\n    return entryStorageTransform(context, model, \"toStorage\", entry);\n};\n\n/**\n * A function that is used to transform the whole entry from storage into its native form.\n */\nexport const entryFromStorageTransform = async (\n    context: Pick<CmsContext, \"plugins\">,\n    model: CmsModel,\n    entry: CmsEntry\n): Promise<CmsEntry> => {\n    return entryStorageTransform(context, model, \"fromStorage\", entry);\n};\n\ninterface EntryFieldFromStorageTransformParams {\n    context: Pick<CmsContext, \"plugins\">;\n    model: CmsModel;\n    field: CmsModelField;\n    value: any;\n}\n/*\n * A function that is used to transform a single field from storage\n */\nexport const entryFieldFromStorageTransform = async <T = any>(\n    params: EntryFieldFromStorageTransformParams\n): Promise<T> => {\n    const { context, model, field, value } = params;\n    const getStoragePlugin = getStoragePluginFactory(context);\n\n    const baseType = getBaseFieldType(field);\n    const plugin = getStoragePlugin(baseType);\n\n    // TODO: remove this once plugins are converted into classes\n    if (typeof plugin.fromStorage !== \"function\") {\n        throw new WebinyError(\n            `Missing \"fromStorage\" function in storage plugin \"${plugin.name}\" for field type \"${baseType}\"`\n        );\n    }\n\n    return plugin.fromStorage({\n        plugins: context.plugins,\n        model,\n        field,\n        value,\n        getStoragePlugin\n    });\n};\n"],"mappings":"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"}

package/utils/identity.d.ts

@@ -0,0 +1,2 @@
+import { SecurityIdentity } from "@webiny/api-security/types";
+export declare const getIdentity: <T extends import("@webiny/api-authentication/types").Identity | null>(input: SecurityIdentity | null | undefined, defaultValue?: T | null) => T;

package/utils/identity.js

@@ -0,0 +1,20 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.getIdentity = void 0;
+const getIdentity = (input, defaultValue = null) => {
+  const identity = input?.id && input?.displayName && input?.type ? input : defaultValue;
+  if (!identity) {
+    return null;
+  }
+  return {
+    id: identity.id,
+    displayName: identity.displayName,
+    type: identity.type
+  };
+};
+exports.getIdentity = getIdentity;
+
+//# sourceMappingURL=identity.js.map

package/utils/identity.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["getIdentity","input","defaultValue","identity","id","displayName","type","exports"],"sources":["identity.ts"],"sourcesContent":["import { SecurityIdentity } from \"@webiny/api-security/types\";\n\nexport const getIdentity = <T extends SecurityIdentity | null>(\n    input: SecurityIdentity | null | undefined,\n    defaultValue: T | null = null\n): T => {\n    const identity = input?.id && input?.displayName && input?.type ? input : defaultValue;\n    if (!identity) {\n        return null as T;\n    }\n    return {\n        id: identity.id,\n        displayName: identity.displayName,\n        type: identity.type\n    } as T;\n};\n"],"mappings":";;;;;;AAEO,MAAMA,WAAW,GAAGA,CACvBC,KAA0C,EAC1CC,YAAsB,GAAG,IAAI,KACzB;EACJ,MAAMC,QAAQ,GAAGF,KAAK,EAAEG,EAAE,IAAIH,KAAK,EAAEI,WAAW,IAAIJ,KAAK,EAAEK,IAAI,GAAGL,KAAK,GAAGC,YAAY;EACtF,IAAI,CAACC,QAAQ,EAAE;IACX,OAAO,IAAI;EACf;EACA,OAAO;IACHC,EAAE,EAAED,QAAQ,CAACC,EAAE;IACfC,WAAW,EAAEF,QAAQ,CAACE,WAAW;IACjCC,IAAI,EAAEH,QAAQ,CAACG;EACnB,CAAC;AACL,CAAC;AAACC,OAAA,CAAAP,WAAA,GAAAA,WAAA"}

package/utils/permissions/ModelsPermissions.js

@@ -1,16 +1,13 @@
 "use strict";
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.ModelsPermissions = void 0;
-var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _apiSecurity = require("@webiny/api-security");
 class ModelsPermissions extends _apiSecurity.AppPermissions {
   constructor(params) {
     super(params);
-    (0, _defineProperty2.default)(this, "modelGroupsPermissions", void 0);
     this.modelGroupsPermissions = params.modelGroupsPermissions;
   }
   async canAccessModel({

package/utils/permissions/ModelsPermissions.js.map

@@ -1 +1 @@
-{"version":3,"names":["_apiSecurity","require","ModelsPermissions","AppPermissions","constructor","params","_defineProperty2","default","modelGroupsPermissions","canAccessModel","model","hasFullAccess","modelsPermissions","canReadGroups","ensure","rwd","throw","canReadModels","modelGroupsPermissionsList","getPermissions","modelsPermissionsList","locale","i","length","modelGroupPermission","groups","j","modelPermission","models","Array","isArray","includes","group","id","modelId","ensureCanAccessModel","NotAuthorizedError","data","reason","exports"],"sources":["ModelsPermissions.ts"],"sourcesContent":["import { AppPermissions, AppPermissionsParams, NotAuthorizedError } from \"@webiny/api-security\";\nimport {\n    CmsGroupPermission,\n    CmsModel as BaseCmsModel,\n    CmsModelGroup as BaseCmsModelGroup,\n    CmsModelPermission\n} from \"~/types\";\nimport { ModelGroupsPermissions } from \"~/utils/permissions/ModelGroupsPermissions\";\n\nexport interface ModelsPermissionsParams extends AppPermissionsParams<CmsGroupPermission> {\n    modelGroupsPermissions: ModelGroupsPermissions;\n}\n\ninterface PickedCmsModel extends Pick<BaseCmsModel, \"modelId\" | \"locale\"> {\n    group: Pick<BaseCmsModelGroup, \"id\">;\n}\n\nexport interface CanAccessModelParams {\n    model: PickedCmsModel;\n}\n\nexport interface EnsureModelAccessParams {\n    model: PickedCmsModel;\n}\n\nexport class ModelsPermissions extends AppPermissions<CmsModelPermission> {\n    private readonly modelGroupsPermissions: ModelGroupsPermissions;\n\n    public constructor(params: ModelsPermissionsParams) {\n        super(params);\n        this.modelGroupsPermissions = params.modelGroupsPermissions;\n    }\n\n    public async canAccessModel({ model }: CanAccessModelParams) {\n        if (await this.hasFullAccess()) {\n            return true;\n        }\n\n        const modelGroupsPermissions = this.modelGroupsPermissions;\n\n        // eslint-disable-next-line\n        const modelsPermissions = this;\n\n        const canReadGroups = await modelGroupsPermissions.ensure({ rwd: \"r\" }, { throw: false });\n        if (!canReadGroups) {\n            return false;\n        }\n\n        const canReadModels = await modelsPermissions.ensure({ rwd: \"r\" }, { throw: false });\n        if (!canReadModels) {\n            return false;\n        }\n\n        const modelGroupsPermissionsList = await modelGroupsPermissions.getPermissions();\n        const modelsPermissionsList = await this.getPermissions();\n\n        const locale = model.locale;\n\n        for (let i = 0; i < modelGroupsPermissionsList.length; i++) {\n            const modelGroupPermission = modelGroupsPermissionsList[i];\n\n            const { groups } = modelGroupPermission;\n\n            for (let j = 0; j < modelsPermissionsList.length; j++) {\n                const modelPermission = modelsPermissionsList[j];\n\n                const { models } = modelPermission;\n                // when no models or groups defined on permission\n                // it means user has access to everything\n                if (!models && !groups) {\n                    return true;\n                }\n\n                // Does the model belong to a group for which user has permission?\n                if (groups) {\n                    if (\n                        Array.isArray(groups[locale]) === false ||\n                        groups[locale].includes(model.group.id) === false\n                    ) {\n                        continue;\n                    }\n                }\n\n                // Does the user have access to the specific model?\n                if (models) {\n                    if (\n                        Array.isArray(models[locale]) === false ||\n                        models[locale].includes(model.modelId) === false\n                    ) {\n                        continue;\n                    }\n                }\n\n                return true;\n            }\n        }\n\n        return false;\n    }\n\n    public async ensureCanAccessModel(params: EnsureModelAccessParams) {\n        const canAccessModel = await this.canAccessModel(params);\n        if (canAccessModel) {\n            return;\n        }\n\n        throw new NotAuthorizedError({\n            data: {\n                reason: `Not allowed to access model \"${params.model.modelId}\".`\n            }\n        });\n    }\n}\n"],"mappings":";;;;;;;;AAAA,IAAAA,YAAA,GAAAC,OAAA;AAyBO,MAAMC,iBAAiB,SAASC,2BAAc,CAAqB;EAG/DC,WAAWA,CAACC,MAA+B,EAAE;IAChD,KAAK,CAACA,MAAM,CAAC;IAAC,IAAAC,gBAAA,CAAAC,OAAA;IACd,IAAI,CAACC,sBAAsB,GAAGH,MAAM,CAACG,sBAAsB;EAC/D;EAEA,MAAaC,cAAcA,CAAC;IAAEC;EAA4B,CAAC,EAAE;IACzD,IAAI,MAAM,IAAI,CAACC,aAAa,CAAC,CAAC,EAAE;MAC5B,OAAO,IAAI;IACf;IAEA,MAAMH,sBAAsB,GAAG,IAAI,CAACA,sBAAsB;;IAE1D;IACA,MAAMI,iBAAiB,GAAG,IAAI;IAE9B,MAAMC,aAAa,GAAG,MAAML,sBAAsB,CAACM,MAAM,CAAC;MAAEC,GAAG,EAAE;IAAI,CAAC,EAAE;MAAEC,KAAK,EAAE;IAAM,CAAC,CAAC;IACzF,IAAI,CAACH,aAAa,EAAE;MAChB,OAAO,KAAK;IAChB;IAEA,MAAMI,aAAa,GAAG,MAAML,iBAAiB,CAACE,MAAM,CAAC;MAAEC,GAAG,EAAE;IAAI,CAAC,EAAE;MAAEC,KAAK,EAAE;IAAM,CAAC,CAAC;IACpF,IAAI,CAACC,aAAa,EAAE;MAChB,OAAO,KAAK;IAChB;IAEA,MAAMC,0BAA0B,GAAG,MAAMV,sBAAsB,CAACW,cAAc,CAAC,CAAC;IAChF,MAAMC,qBAAqB,GAAG,MAAM,IAAI,CAACD,cAAc,CAAC,CAAC;IAEzD,MAAME,MAAM,GAAGX,KAAK,CAACW,MAAM;IAE3B,KAAK,IAAIC,CAAC,GAAG,CAAC,EAAEA,CAAC,GAAGJ,0BAA0B,CAACK,MAAM,EAAED,CAAC,EAAE,EAAE;MACxD,MAAME,oBAAoB,GAAGN,0BAA0B,CAACI,CAAC,CAAC;MAE1D,MAAM;QAAEG;MAAO,CAAC,GAAGD,oBAAoB;MAEvC,KAAK,IAAIE,CAAC,GAAG,CAAC,EAAEA,CAAC,GAAGN,qBAAqB,CAACG,MAAM,EAAEG,CAAC,EAAE,EAAE;QACnD,MAAMC,eAAe,GAAGP,qBAAqB,CAACM,CAAC,CAAC;QAEhD,MAAM;UAAEE;QAAO,CAAC,GAAGD,eAAe;QAClC;QACA;QACA,IAAI,CAACC,MAAM,IAAI,CAACH,MAAM,EAAE;UACpB,OAAO,IAAI;QACf;;QAEA;QACA,IAAIA,MAAM,EAAE;UACR,IACII,KAAK,CAACC,OAAO,CAACL,MAAM,CAACJ,MAAM,CAAC,CAAC,KAAK,KAAK,IACvCI,MAAM,CAACJ,MAAM,CAAC,CAACU,QAAQ,CAACrB,KAAK,CAACsB,KAAK,CAACC,EAAE,CAAC,KAAK,KAAK,EACnD;YACE;UACJ;QACJ;;QAEA;QACA,IAAIL,MAAM,EAAE;UACR,IACIC,KAAK,CAACC,OAAO,CAACF,MAAM,CAACP,MAAM,CAAC,CAAC,KAAK,KAAK,IACvCO,MAAM,CAACP,MAAM,CAAC,CAACU,QAAQ,CAACrB,KAAK,CAACwB,OAAO,CAAC,KAAK,KAAK,EAClD;YACE;UACJ;QACJ;QAEA,OAAO,IAAI;MACf;IACJ;IAEA,OAAO,KAAK;EAChB;EAEA,MAAaC,oBAAoBA,CAAC9B,MAA+B,EAAE;IAC/D,MAAMI,cAAc,GAAG,MAAM,IAAI,CAACA,cAAc,CAACJ,MAAM,CAAC;IACxD,IAAII,cAAc,EAAE;MAChB;IACJ;IAEA,MAAM,IAAI2B,+BAAkB,CAAC;MACzBC,IAAI,EAAE;QACFC,MAAM,EAAG,gCAA+BjC,MAAM,CAACK,KAAK,CAACwB,OAAQ;MACjE;IACJ,CAAC,CAAC;EACN;AACJ;AAACK,OAAA,CAAArC,iBAAA,GAAAA,iBAAA"}
+{"version":3,"names":["_apiSecurity","require","ModelsPermissions","AppPermissions","constructor","params","modelGroupsPermissions","canAccessModel","model","hasFullAccess","modelsPermissions","canReadGroups","ensure","rwd","throw","canReadModels","modelGroupsPermissionsList","getPermissions","modelsPermissionsList","locale","i","length","modelGroupPermission","groups","j","modelPermission","models","Array","isArray","includes","group","id","modelId","ensureCanAccessModel","NotAuthorizedError","data","reason","exports"],"sources":["ModelsPermissions.ts"],"sourcesContent":["import { AppPermissions, AppPermissionsParams, NotAuthorizedError } from \"@webiny/api-security\";\nimport {\n    CmsGroupPermission,\n    CmsModel as BaseCmsModel,\n    CmsModelGroup as BaseCmsModelGroup,\n    CmsModelPermission\n} from \"~/types\";\nimport { ModelGroupsPermissions } from \"~/utils/permissions/ModelGroupsPermissions\";\n\nexport interface ModelsPermissionsParams extends AppPermissionsParams<CmsGroupPermission> {\n    modelGroupsPermissions: ModelGroupsPermissions;\n}\n\ninterface PickedCmsModel extends Pick<BaseCmsModel, \"modelId\" | \"locale\"> {\n    group: Pick<BaseCmsModelGroup, \"id\">;\n}\n\nexport interface CanAccessModelParams {\n    model: PickedCmsModel;\n}\n\nexport interface EnsureModelAccessParams {\n    model: PickedCmsModel;\n}\n\nexport class ModelsPermissions extends AppPermissions<CmsModelPermission> {\n    private readonly modelGroupsPermissions: ModelGroupsPermissions;\n\n    public constructor(params: ModelsPermissionsParams) {\n        super(params);\n        this.modelGroupsPermissions = params.modelGroupsPermissions;\n    }\n\n    public async canAccessModel({ model }: CanAccessModelParams) {\n        if (await this.hasFullAccess()) {\n            return true;\n        }\n\n        const modelGroupsPermissions = this.modelGroupsPermissions;\n\n        // eslint-disable-next-line\n        const modelsPermissions = this;\n\n        const canReadGroups = await modelGroupsPermissions.ensure({ rwd: \"r\" }, { throw: false });\n        if (!canReadGroups) {\n            return false;\n        }\n\n        const canReadModels = await modelsPermissions.ensure({ rwd: \"r\" }, { throw: false });\n        if (!canReadModels) {\n            return false;\n        }\n\n        const modelGroupsPermissionsList = await modelGroupsPermissions.getPermissions();\n        const modelsPermissionsList = await this.getPermissions();\n\n        const locale = model.locale;\n\n        for (let i = 0; i < modelGroupsPermissionsList.length; i++) {\n            const modelGroupPermission = modelGroupsPermissionsList[i];\n\n            const { groups } = modelGroupPermission;\n\n            for (let j = 0; j < modelsPermissionsList.length; j++) {\n                const modelPermission = modelsPermissionsList[j];\n\n                const { models } = modelPermission;\n                // when no models or groups defined on permission\n                // it means user has access to everything\n                if (!models && !groups) {\n                    return true;\n                }\n\n                // Does the model belong to a group for which user has permission?\n                if (groups) {\n                    if (\n                        Array.isArray(groups[locale]) === false ||\n                        groups[locale].includes(model.group.id) === false\n                    ) {\n                        continue;\n                    }\n                }\n\n                // Does the user have access to the specific model?\n                if (models) {\n                    if (\n                        Array.isArray(models[locale]) === false ||\n                        models[locale].includes(model.modelId) === false\n                    ) {\n                        continue;\n                    }\n                }\n\n                return true;\n            }\n        }\n\n        return false;\n    }\n\n    public async ensureCanAccessModel(params: EnsureModelAccessParams) {\n        const canAccessModel = await this.canAccessModel(params);\n        if (canAccessModel) {\n            return;\n        }\n\n        throw new NotAuthorizedError({\n            data: {\n                reason: `Not allowed to access model \"${params.model.modelId}\".`\n            }\n        });\n    }\n}\n"],"mappings":"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"}

package/utils/renderGetFilterFields.js

@@ -11,7 +11,6 @@ const renderGetFilterFields = ({
 }) => {
   const filters = ["id: ID", "entryId: String"];
   for (const field of fields) {
-    var _plugin$read;
     // Every time a client updates content model's fields, we check the type of each field. If a field plugin
     // for a particular "field.type" doesn't exist on the backend yet, we throw an error. But still, we also
     // want to be careful when accessing the field plugin here too. It is still possible to have a content model
@@ -19,10 +18,10 @@ const renderGetFilterFields = ({
     // could've just removed the plugin from the backend.
     const baseType = (0, _getBaseFieldType.getBaseFieldType)(field);
     const plugin = fieldTypePlugins[baseType];
-    if (!(plugin !== null && plugin !== void 0 && plugin.isSearchable)) {
+    if (!plugin?.isSearchable) {
       continue;
     }
-    const createGetFilters = (_plugin$read = plugin.read) === null || _plugin$read === void 0 ? void 0 : _plugin$read.createGetFilters;
+    const createGetFilters = plugin.read?.createGetFilters;
     if (typeof createGetFilters !== "function") {
       continue;
     }

package/utils/renderGetFilterFields.js.map

@@ -1 +1 @@
-{"version":3,"names":["_getBaseFieldType","require","renderGetFilterFields","fields","fieldTypePlugins","filters","field","_plugin$read","baseType","getBaseFieldType","plugin","isSearchable","createGetFilters","read","push","filter","Boolean","join","exports"],"sources":["renderGetFilterFields.ts"],"sourcesContent":["import { CmsFieldTypePlugins, CmsModelField } from \"~/types\";\nimport { getBaseFieldType } from \"~/utils/getBaseFieldType\";\n\ninterface RenderGetFilterFieldsParams {\n    fields: CmsModelField[];\n    fieldTypePlugins: CmsFieldTypePlugins;\n}\ninterface RenderGetFilterFields {\n    (params: RenderGetFilterFieldsParams): string;\n}\n\nexport const renderGetFilterFields: RenderGetFilterFields = ({ fields, fieldTypePlugins }) => {\n    const filters: string[] = [\"id: ID\", \"entryId: String\"];\n\n    for (const field of fields) {\n        // Every time a client updates content model's fields, we check the type of each field. If a field plugin\n        // for a particular \"field.type\" doesn't exist on the backend yet, we throw an error. But still, we also\n        // want to be careful when accessing the field plugin here too. It is still possible to have a content model\n        // that contains a field, for which we don't have a plugin registered on the backend. For example, user\n        // could've just removed the plugin from the backend.\n        const baseType = getBaseFieldType(field);\n        const plugin = fieldTypePlugins[baseType];\n        if (!plugin?.isSearchable) {\n            continue;\n        }\n        const createGetFilters = plugin.read?.createGetFilters;\n        if (typeof createGetFilters !== \"function\") {\n            continue;\n        }\n        filters.push(createGetFilters({ field }));\n    }\n\n    return filters.filter(Boolean).join(\"\\n\");\n};\n"],"mappings":";;;;;;AACA,IAAAA,iBAAA,GAAAC,OAAA;AAUO,MAAMC,qBAA4C,GAAGA,CAAC;EAAEC,MAAM;EAAEC;AAAiB,CAAC,KAAK;EAC1F,MAAMC,OAAiB,GAAG,CAAC,QAAQ,EAAE,iBAAiB,CAAC;EAEvD,KAAK,MAAMC,KAAK,IAAIH,MAAM,EAAE;IAAA,IAAAI,YAAA;IACxB;IACA;IACA;IACA;IACA;IACA,MAAMC,QAAQ,GAAG,IAAAC,kCAAgB,EAACH,KAAK,CAAC;IACxC,MAAMI,MAAM,GAAGN,gBAAgB,CAACI,QAAQ,CAAC;IACzC,IAAI,EAACE,MAAM,aAANA,MAAM,eAANA,MAAM,CAAEC,YAAY,GAAE;MACvB;IACJ;IACA,MAAMC,gBAAgB,IAAAL,YAAA,GAAGG,MAAM,CAACG,IAAI,cAAAN,YAAA,uBAAXA,YAAA,CAAaK,gBAAgB;IACtD,IAAI,OAAOA,gBAAgB,KAAK,UAAU,EAAE;MACxC;IACJ;IACAP,OAAO,CAACS,IAAI,CAACF,gBAAgB,CAAC;MAAEN;IAAM,CAAC,CAAC,CAAC;EAC7C;EAEA,OAAOD,OAAO,CAACU,MAAM,CAACC,OAAO,CAAC,CAACC,IAAI,CAAC,IAAI,CAAC;AAC7C,CAAC;AAACC,OAAA,CAAAhB,qBAAA,GAAAA,qBAAA"}
+{"version":3,"names":["_getBaseFieldType","require","renderGetFilterFields","fields","fieldTypePlugins","filters","field","baseType","getBaseFieldType","plugin","isSearchable","createGetFilters","read","push","filter","Boolean","join","exports"],"sources":["renderGetFilterFields.ts"],"sourcesContent":["import { CmsFieldTypePlugins, CmsModelField } from \"~/types\";\nimport { getBaseFieldType } from \"~/utils/getBaseFieldType\";\n\ninterface RenderGetFilterFieldsParams {\n    fields: CmsModelField[];\n    fieldTypePlugins: CmsFieldTypePlugins;\n}\ninterface RenderGetFilterFields {\n    (params: RenderGetFilterFieldsParams): string;\n}\n\nexport const renderGetFilterFields: RenderGetFilterFields = ({ fields, fieldTypePlugins }) => {\n    const filters: string[] = [\"id: ID\", \"entryId: String\"];\n\n    for (const field of fields) {\n        // Every time a client updates content model's fields, we check the type of each field. If a field plugin\n        // for a particular \"field.type\" doesn't exist on the backend yet, we throw an error. But still, we also\n        // want to be careful when accessing the field plugin here too. It is still possible to have a content model\n        // that contains a field, for which we don't have a plugin registered on the backend. For example, user\n        // could've just removed the plugin from the backend.\n        const baseType = getBaseFieldType(field);\n        const plugin = fieldTypePlugins[baseType];\n        if (!plugin?.isSearchable) {\n            continue;\n        }\n        const createGetFilters = plugin.read?.createGetFilters;\n        if (typeof createGetFilters !== \"function\") {\n            continue;\n        }\n        filters.push(createGetFilters({ field }));\n    }\n\n    return filters.filter(Boolean).join(\"\\n\");\n};\n"],"mappings":";;;;;;AACA,IAAAA,iBAAA,GAAAC,OAAA;AAUO,MAAMC,qBAA4C,GAAGA,CAAC;EAAEC,MAAM;EAAEC;AAAiB,CAAC,KAAK;EAC1F,MAAMC,OAAiB,GAAG,CAAC,QAAQ,EAAE,iBAAiB,CAAC;EAEvD,KAAK,MAAMC,KAAK,IAAIH,MAAM,EAAE;IACxB;IACA;IACA;IACA;IACA;IACA,MAAMI,QAAQ,GAAG,IAAAC,kCAAgB,EAACF,KAAK,CAAC;IACxC,MAAMG,MAAM,GAAGL,gBAAgB,CAACG,QAAQ,CAAC;IACzC,IAAI,CAACE,MAAM,EAAEC,YAAY,EAAE;MACvB;IACJ;IACA,MAAMC,gBAAgB,GAAGF,MAAM,CAACG,IAAI,EAAED,gBAAgB;IACtD,IAAI,OAAOA,gBAAgB,KAAK,UAAU,EAAE;MACxC;IACJ;IACAN,OAAO,CAACQ,IAAI,CAACF,gBAAgB,CAAC;MAAEL;IAAM,CAAC,CAAC,CAAC;EAC7C;EAEA,OAAOD,OAAO,CAACS,MAAM,CAACC,OAAO,CAAC,CAACC,IAAI,CAAC,IAAI,CAAC;AAC7C,CAAC;AAACC,OAAA,CAAAf,qBAAA,GAAAA,qBAAA"}

package/utils/renderListFilterFields.js

@@ -5,6 +5,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.renderListFilterFields = void 0;
 var _getBaseFieldType = require("./getBaseFieldType");
+var _constants = require("../constants");
 const renderListFilterFields = params => {
   const {
     model,
@@ -13,7 +14,13 @@ const renderListFilterFields = params => {
     fieldTypePlugins,
     excludeFields = []
   } = params;
-  const result = ["id: ID", "id_not: ID", "id_in: [ID!]", "id_not_in: [ID!]", "entryId: String", "entryId_not: String", "entryId_in: [String!]", "entryId_not_in: [String!]", "createdOn: DateTime", "createdOn_gt: DateTime", "createdOn_gte: DateTime", "createdOn_lt: DateTime", "createdOn_lte: DateTime", "createdOn_between: [DateTime!]", "createdOn_not_between: [DateTime!]", "savedOn: DateTime", "savedOn_gt: DateTime", "savedOn_gte: DateTime", "savedOn_lt: DateTime", "savedOn_lte: DateTime", "savedOn_between: [DateTime!]", "savedOn_not_between: [DateTime!]", "publishedOn: DateTime", "publishedOn_gt: DateTime", "publishedOn_gte: DateTime", "publishedOn_lt: DateTime", "publishedOn_lte: DateTime", "publishedOn_between: [DateTime!]", "publishedOn_not_between: [DateTime!]", "createdBy: String", "createdBy_not: String", "createdBy_in: [String!]", "createdBy_not_in: [String!]", "ownedBy: String", "ownedBy_not: String", "ownedBy_in: [String!]", "ownedBy_not_in: [String!]"];
+  const result = ["id: ID", "id_not: ID", "id_in: [ID!]", "id_not_in: [ID!]", "entryId: String", "entryId_not: String", "entryId_in: [String!]", "entryId_not_in: [String!]", ..._constants.ENTRY_META_FIELDS.map(field => {
+    if ((0, _constants.isDateTimeEntryMetaField)(field)) {
+      return [`${field}: DateTime`, `${field}_gt: DateTime`, `${field}_gte: DateTime`, `${field}_lt: DateTime`, `${field}_lte: DateTime`, `${field}_between: [DateTime!]`, `${field}_not_between: [DateTime!]`];
+    }
+    return [`${field}: ID`, `${field}_not: ID`, `${field}_in: [ID!]`, `${field}_not_in: [ID!]`];
+  }).flat()];
+
   /**
    * We can find different statuses only in the manage API endpoint.
    */
@@ -26,14 +33,13 @@ const renderListFilterFields = params => {
     });
   });
   for (const field of fields) {
-    var _fieldTypePlugins$bas;
     // Every time a client updates content model's fields, we check the type of each field. If a field plugin
     // for a particular "field.type" doesn't exist on the backend yet, we throw an error. But still, we also
     // want to be careful when accessing the field plugin here too. It is still possible to have a content model
     // that contains a field, for which we don't have a plugin registered on the backend. For example, user
     // could've just removed the plugin from the backend.
     const baseType = (0, _getBaseFieldType.getBaseFieldType)(field);
-    const createListFilters = (_fieldTypePlugins$bas = fieldTypePlugins[baseType]) === null || _fieldTypePlugins$bas === void 0 || (_fieldTypePlugins$bas = _fieldTypePlugins$bas[type]) === null || _fieldTypePlugins$bas === void 0 ? void 0 : _fieldTypePlugins$bas.createListFilters;
+    const createListFilters = fieldTypePlugins[baseType]?.[type]?.createListFilters;
     if (typeof createListFilters !== "function") {
       continue;
     }

package/utils/renderListFilterFields.js.map

@@ -1 +1 @@
-{"version":3,"names":["_getBaseFieldType","require","renderListFilterFields","params","model","fields","type","fieldTypePlugins","excludeFields","result","push","finalFields","filter","field","some","excl","startsWith","_fieldTypePlugins$bas","baseType","getBaseFieldType","createListFilters","plugins","Boolean","join","exports"],"sources":["renderListFilterFields.ts"],"sourcesContent":["import {\n    ApiEndpoint,\n    CmsFieldTypePlugins,\n    CmsModel,\n    CmsModelField,\n    CmsModelFieldToGraphQLPlugin\n} from \"~/types\";\nimport { getBaseFieldType } from \"~/utils/getBaseFieldType\";\n\ninterface RenderListFilterFieldsParams {\n    model: CmsModel;\n    fields: CmsModelField[];\n    type: ApiEndpoint;\n    fieldTypePlugins: CmsFieldTypePlugins;\n    excludeFields?: string[];\n}\ninterface RenderListFilterFields {\n    (params: RenderListFilterFieldsParams): string;\n}\n\ntype CreateListFiltersType =\n    | CmsModelFieldToGraphQLPlugin[\"read\"][\"createListFilters\"]\n    | CmsModelFieldToGraphQLPlugin[\"manage\"][\"createListFilters\"];\n\nexport const renderListFilterFields: RenderListFilterFields = (params): string => {\n    const { model, fields, type, fieldTypePlugins, excludeFields = [] } = params;\n    const result: string[] = [\n        \"id: ID\",\n        \"id_not: ID\",\n        \"id_in: [ID!]\",\n        \"id_not_in: [ID!]\",\n        \"entryId: String\",\n        \"entryId_not: String\",\n        \"entryId_in: [String!]\",\n        \"entryId_not_in: [String!]\",\n        \"createdOn: DateTime\",\n        \"createdOn_gt: DateTime\",\n        \"createdOn_gte: DateTime\",\n        \"createdOn_lt: DateTime\",\n        \"createdOn_lte: DateTime\",\n        \"createdOn_between: [DateTime!]\",\n        \"createdOn_not_between: [DateTime!]\",\n        \"savedOn: DateTime\",\n        \"savedOn_gt: DateTime\",\n        \"savedOn_gte: DateTime\",\n        \"savedOn_lt: DateTime\",\n        \"savedOn_lte: DateTime\",\n        \"savedOn_between: [DateTime!]\",\n        \"savedOn_not_between: [DateTime!]\",\n        \"publishedOn: DateTime\",\n        \"publishedOn_gt: DateTime\",\n        \"publishedOn_gte: DateTime\",\n        \"publishedOn_lt: DateTime\",\n        \"publishedOn_lte: DateTime\",\n        \"publishedOn_between: [DateTime!]\",\n        \"publishedOn_not_between: [DateTime!]\",\n        \"createdBy: String\",\n        \"createdBy_not: String\",\n        \"createdBy_in: [String!]\",\n        \"createdBy_not_in: [String!]\",\n        \"ownedBy: String\",\n        \"ownedBy_not: String\",\n        \"ownedBy_in: [String!]\",\n        \"ownedBy_not_in: [String!]\"\n    ];\n    /**\n     * We can find different statuses only in the manage API endpoint.\n     */\n    if (type === \"manage\") {\n        result.push(\n            \"status: String\",\n            \"status_not: String\",\n            \"status_in: [String!]\",\n            \"status_not_in: [String!]\"\n        );\n    }\n\n    const finalFields = result.filter(field => {\n        return !excludeFields.some(excl => {\n            return field.startsWith(`${excl}_`) || field.startsWith(`${excl}: `);\n        });\n    });\n\n    for (const field of fields) {\n        // Every time a client updates content model's fields, we check the type of each field. If a field plugin\n        // for a particular \"field.type\" doesn't exist on the backend yet, we throw an error. But still, we also\n        // want to be careful when accessing the field plugin here too. It is still possible to have a content model\n        // that contains a field, for which we don't have a plugin registered on the backend. For example, user\n        // could've just removed the plugin from the backend.\n        const baseType = getBaseFieldType(field);\n        const createListFilters: CreateListFiltersType | undefined =\n            fieldTypePlugins[baseType]?.[type]?.createListFilters;\n        if (typeof createListFilters !== \"function\") {\n            continue;\n        }\n        finalFields.push(createListFilters({ model, field, plugins: fieldTypePlugins }));\n    }\n\n    return finalFields.filter(Boolean).join(\"\\n\");\n};\n"],"mappings":";;;;;;AAOA,IAAAA,iBAAA,GAAAC,OAAA;AAiBO,MAAMC,sBAA8C,GAAIC,MAAM,IAAa;EAC9E,MAAM;IAAEC,KAAK;IAAEC,MAAM;IAAEC,IAAI;IAAEC,gBAAgB;IAAEC,aAAa,GAAG;EAAG,CAAC,GAAGL,MAAM;EAC5E,MAAMM,MAAgB,GAAG,CACrB,QAAQ,EACR,YAAY,EACZ,cAAc,EACd,kBAAkB,EAClB,iBAAiB,EACjB,qBAAqB,EACrB,uBAAuB,EACvB,2BAA2B,EAC3B,qBAAqB,EACrB,wBAAwB,EACxB,yBAAyB,EACzB,wBAAwB,EACxB,yBAAyB,EACzB,gCAAgC,EAChC,oCAAoC,EACpC,mBAAmB,EACnB,sBAAsB,EACtB,uBAAuB,EACvB,sBAAsB,EACtB,uBAAuB,EACvB,8BAA8B,EAC9B,kCAAkC,EAClC,uBAAuB,EACvB,0BAA0B,EAC1B,2BAA2B,EAC3B,0BAA0B,EAC1B,2BAA2B,EAC3B,kCAAkC,EAClC,sCAAsC,EACtC,mBAAmB,EACnB,uBAAuB,EACvB,yBAAyB,EACzB,6BAA6B,EAC7B,iBAAiB,EACjB,qBAAqB,EACrB,uBAAuB,EACvB,2BAA2B,CAC9B;EACD;AACJ;AACA;EACI,IAAIH,IAAI,KAAK,QAAQ,EAAE;IACnBG,MAAM,CAACC,IAAI,CACP,gBAAgB,EAChB,oBAAoB,EACpB,sBAAsB,EACtB,0BACJ,CAAC;EACL;EAEA,MAAMC,WAAW,GAAGF,MAAM,CAACG,MAAM,CAACC,KAAK,IAAI;IACvC,OAAO,CAACL,aAAa,CAACM,IAAI,CAACC,IAAI,IAAI;MAC/B,OAAOF,KAAK,CAACG,UAAU,CAAE,GAAED,IAAK,GAAE,CAAC,IAAIF,KAAK,CAACG,UAAU,CAAE,GAAED,IAAK,IAAG,CAAC;IACxE,CAAC,CAAC;EACN,CAAC,CAAC;EAEF,KAAK,MAAMF,KAAK,IAAIR,MAAM,EAAE;IAAA,IAAAY,qBAAA;IACxB;IACA;IACA;IACA;IACA;IACA,MAAMC,QAAQ,GAAG,IAAAC,kCAAgB,EAACN,KAAK,CAAC;IACxC,MAAMO,iBAAoD,IAAAH,qBAAA,GACtDV,gBAAgB,CAACW,QAAQ,CAAC,cAAAD,qBAAA,gBAAAA,qBAAA,GAA1BA,qBAAA,CAA6BX,IAAI,CAAC,cAAAW,qBAAA,uBAAlCA,qBAAA,CAAoCG,iBAAiB;IACzD,IAAI,OAAOA,iBAAiB,KAAK,UAAU,EAAE;MACzC;IACJ;IACAT,WAAW,CAACD,IAAI,CAACU,iBAAiB,CAAC;MAAEhB,KAAK;MAAES,KAAK;MAAEQ,OAAO,EAAEd;IAAiB,CAAC,CAAC,CAAC;EACpF;EAEA,OAAOI,WAAW,CAACC,MAAM,CAACU,OAAO,CAAC,CAACC,IAAI,CAAC,IAAI,CAAC;AACjD,CAAC;AAACC,OAAA,CAAAtB,sBAAA,GAAAA,sBAAA"}
+{"version":3,"names":["_getBaseFieldType","require","_constants","renderListFilterFields","params","model","fields","type","fieldTypePlugins","excludeFields","result","ENTRY_META_FIELDS","map","field","isDateTimeEntryMetaField","flat","push","finalFields","filter","some","excl","startsWith","baseType","getBaseFieldType","createListFilters","plugins","Boolean","join","exports"],"sources":["renderListFilterFields.ts"],"sourcesContent":["import {\n    ApiEndpoint,\n    CmsFieldTypePlugins,\n    CmsModel,\n    CmsModelField,\n    CmsModelFieldToGraphQLPlugin\n} from \"~/types\";\nimport { getBaseFieldType } from \"~/utils/getBaseFieldType\";\nimport { ENTRY_META_FIELDS, isDateTimeEntryMetaField } from \"~/constants\";\n\ninterface RenderListFilterFieldsParams {\n    model: CmsModel;\n    fields: CmsModelField[];\n    type: ApiEndpoint;\n    fieldTypePlugins: CmsFieldTypePlugins;\n    excludeFields?: string[];\n}\n\ninterface RenderListFilterFields {\n    (params: RenderListFilterFieldsParams): string;\n}\n\ntype CreateListFiltersType =\n    | CmsModelFieldToGraphQLPlugin[\"read\"][\"createListFilters\"]\n    | CmsModelFieldToGraphQLPlugin[\"manage\"][\"createListFilters\"];\n\nexport const renderListFilterFields: RenderListFilterFields = (params): string => {\n    const { model, fields, type, fieldTypePlugins, excludeFields = [] } = params;\n    const result: string[] = [\n        \"id: ID\",\n        \"id_not: ID\",\n        \"id_in: [ID!]\",\n        \"id_not_in: [ID!]\",\n        \"entryId: String\",\n        \"entryId_not: String\",\n        \"entryId_in: [String!]\",\n        \"entryId_not_in: [String!]\",\n\n        ...ENTRY_META_FIELDS.map(field => {\n            if (isDateTimeEntryMetaField(field)) {\n                return [\n                    `${field}: DateTime`,\n                    `${field}_gt: DateTime`,\n                    `${field}_gte: DateTime`,\n                    `${field}_lt: DateTime`,\n                    `${field}_lte: DateTime`,\n                    `${field}_between: [DateTime!]`,\n                    `${field}_not_between: [DateTime!]`\n                ];\n            }\n\n            return [\n                `${field}: ID`,\n                `${field}_not: ID`,\n                `${field}_in: [ID!]`,\n                `${field}_not_in: [ID!]`\n            ];\n        }).flat()\n    ];\n\n    /**\n     * We can find different statuses only in the manage API endpoint.\n     */\n    if (type === \"manage\") {\n        result.push(\n            \"status: String\",\n            \"status_not: String\",\n            \"status_in: [String!]\",\n            \"status_not_in: [String!]\"\n        );\n    }\n\n    const finalFields = result.filter(field => {\n        return !excludeFields.some(excl => {\n            return field.startsWith(`${excl}_`) || field.startsWith(`${excl}: `);\n        });\n    });\n\n    for (const field of fields) {\n        // Every time a client updates content model's fields, we check the type of each field. If a field plugin\n        // for a particular \"field.type\" doesn't exist on the backend yet, we throw an error. But still, we also\n        // want to be careful when accessing the field plugin here too. It is still possible to have a content model\n        // that contains a field, for which we don't have a plugin registered on the backend. For example, user\n        // could've just removed the plugin from the backend.\n        const baseType = getBaseFieldType(field);\n        const createListFilters: CreateListFiltersType | undefined =\n            fieldTypePlugins[baseType]?.[type]?.createListFilters;\n        if (typeof createListFilters !== \"function\") {\n            continue;\n        }\n        finalFields.push(createListFilters({ model, field, plugins: fieldTypePlugins }));\n    }\n\n    return finalFields.filter(Boolean).join(\"\\n\");\n};\n"],"mappings":";;;;;;AAOA,IAAAA,iBAAA,GAAAC,OAAA;AACA,IAAAC,UAAA,GAAAD,OAAA;AAkBO,MAAME,sBAA8C,GAAIC,MAAM,IAAa;EAC9E,MAAM;IAAEC,KAAK;IAAEC,MAAM;IAAEC,IAAI;IAAEC,gBAAgB;IAAEC,aAAa,GAAG;EAAG,CAAC,GAAGL,MAAM;EAC5E,MAAMM,MAAgB,GAAG,CACrB,QAAQ,EACR,YAAY,EACZ,cAAc,EACd,kBAAkB,EAClB,iBAAiB,EACjB,qBAAqB,EACrB,uBAAuB,EACvB,2BAA2B,EAE3B,GAAGC,4BAAiB,CAACC,GAAG,CAACC,KAAK,IAAI;IAC9B,IAAI,IAAAC,mCAAwB,EAACD,KAAK,CAAC,EAAE;MACjC,OAAO,CACF,GAAEA,KAAM,YAAW,EACnB,GAAEA,KAAM,eAAc,EACtB,GAAEA,KAAM,gBAAe,EACvB,GAAEA,KAAM,eAAc,EACtB,GAAEA,KAAM,gBAAe,EACvB,GAAEA,KAAM,uBAAsB,EAC9B,GAAEA,KAAM,2BAA0B,CACtC;IACL;IAEA,OAAO,CACF,GAAEA,KAAM,MAAK,EACb,GAAEA,KAAM,UAAS,EACjB,GAAEA,KAAM,YAAW,EACnB,GAAEA,KAAM,gBAAe,CAC3B;EACL,CAAC,CAAC,CAACE,IAAI,CAAC,CAAC,CACZ;;EAED;AACJ;AACA;EACI,IAAIR,IAAI,KAAK,QAAQ,EAAE;IACnBG,MAAM,CAACM,IAAI,CACP,gBAAgB,EAChB,oBAAoB,EACpB,sBAAsB,EACtB,0BACJ,CAAC;EACL;EAEA,MAAMC,WAAW,GAAGP,MAAM,CAACQ,MAAM,CAACL,KAAK,IAAI;IACvC,OAAO,CAACJ,aAAa,CAACU,IAAI,CAACC,IAAI,IAAI;MAC/B,OAAOP,KAAK,CAACQ,UAAU,CAAE,GAAED,IAAK,GAAE,CAAC,IAAIP,KAAK,CAACQ,UAAU,CAAE,GAAED,IAAK,IAAG,CAAC;IACxE,CAAC,CAAC;EACN,CAAC,CAAC;EAEF,KAAK,MAAMP,KAAK,IAAIP,MAAM,EAAE;IACxB;IACA;IACA;IACA;IACA;IACA,MAAMgB,QAAQ,GAAG,IAAAC,kCAAgB,EAACV,KAAK,CAAC;IACxC,MAAMW,iBAAoD,GACtDhB,gBAAgB,CAACc,QAAQ,CAAC,GAAGf,IAAI,CAAC,EAAEiB,iBAAiB;IACzD,IAAI,OAAOA,iBAAiB,KAAK,UAAU,EAAE;MACzC;IACJ;IACAP,WAAW,CAACD,IAAI,CAACQ,iBAAiB,CAAC;MAAEnB,KAAK;MAAEQ,KAAK;MAAEY,OAAO,EAAEjB;IAAiB,CAAC,CAAC,CAAC;EACpF;EAEA,OAAOS,WAAW,CAACC,MAAM,CAACQ,OAAO,CAAC,CAACC,IAAI,CAAC,IAAI,CAAC;AACjD,CAAC;AAACC,OAAA,CAAAzB,sBAAA,GAAAA,sBAAA"}

package/utils/renderSortEnum.js

@@ -5,13 +5,14 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.renderSortEnum = void 0;
 var _getBaseFieldType = require("./getBaseFieldType");
+var _constants = require("../constants");
 const renderSortEnum = ({
   model,
   fields,
   fieldTypePlugins,
   sorterPlugins
 }) => {
-  let sorters = [`id_ASC`, `id_DESC`, "savedOn_ASC", "savedOn_DESC", "createdOn_ASC", "createdOn_DESC"];
+  let sorters = [`id_ASC`, `id_DESC`, ..._constants.ENTRY_META_FIELDS.filter(_constants.isDateTimeEntryMetaField).map(field => [`${field}_ASC`, `${field}_DESC`]).flat()];
   for (const field of fields) {
     const plugin = fieldTypePlugins[(0, _getBaseFieldType.getBaseFieldType)(field)];
     if (!plugin) {

package/utils/renderSortEnum.js.map

@@ -1 +1 @@
-{"version":3,"names":["_getBaseFieldType","require","renderSortEnum","model","fields","fieldTypePlugins","sorterPlugins","sorters","field","plugin","getBaseFieldType","createSorters","result","isSortable","push","fieldId","join","reduce","createSorter","exports"],"sources":["renderSortEnum.ts"],"sourcesContent":["import { CmsFieldTypePlugins, CmsModel, CmsModelField } from \"~/types\";\nimport { getBaseFieldType } from \"~/utils/getBaseFieldType\";\nimport { CmsGraphQLSchemaSorterPlugin } from \"~/plugins/CmsGraphQLSchemaSorterPlugin\";\n\ninterface RenderSortEnumParams {\n    model: CmsModel;\n    fields: CmsModelField[];\n    fieldTypePlugins: CmsFieldTypePlugins;\n    sorterPlugins?: CmsGraphQLSchemaSorterPlugin[];\n}\ninterface RenderSortEnum {\n    (params: RenderSortEnumParams): string;\n}\n\nexport const renderSortEnum: RenderSortEnum = ({\n    model,\n    fields,\n    fieldTypePlugins,\n    sorterPlugins\n}): string => {\n    let sorters: string[] = [\n        `id_ASC`,\n        `id_DESC`,\n        \"savedOn_ASC\",\n        \"savedOn_DESC\",\n        \"createdOn_ASC\",\n        \"createdOn_DESC\"\n    ];\n\n    for (const field of fields) {\n        const plugin = fieldTypePlugins[getBaseFieldType(field)];\n        if (!plugin) {\n            continue;\n        } else if (plugin.createSorters) {\n            const result = plugin.createSorters({\n                model,\n                field,\n                sorters\n            });\n            if (result) {\n                sorters = result;\n                continue;\n            }\n        }\n        if (!plugin.isSortable) {\n            continue;\n        }\n        sorters.push(`${field.fieldId}_ASC`);\n        sorters.push(`${field.fieldId}_DESC`);\n    }\n    if (!sorterPlugins) {\n        return sorters.join(\"\\n\");\n    }\n\n    return sorterPlugins\n        .reduce((result, plugin) => {\n            return plugin.createSorter({\n                model,\n                sorters: result\n            });\n        }, sorters)\n        .join(\"\\n\");\n};\n"],"mappings":";;;;;;AACA,IAAAA,iBAAA,GAAAC,OAAA;AAaO,MAAMC,cAA8B,GAAGA,CAAC;EAC3CC,KAAK;EACLC,MAAM;EACNC,gBAAgB;EAChBC;AACJ,CAAC,KAAa;EACV,IAAIC,OAAiB,GAAG,CACnB,QAAO,EACP,SAAQ,EACT,aAAa,EACb,cAAc,EACd,eAAe,EACf,gBAAgB,CACnB;EAED,KAAK,MAAMC,KAAK,IAAIJ,MAAM,EAAE;IACxB,MAAMK,MAAM,GAAGJ,gBAAgB,CAAC,IAAAK,kCAAgB,EAACF,KAAK,CAAC,CAAC;IACxD,IAAI,CAACC,MAAM,EAAE;MACT;IACJ,CAAC,MAAM,IAAIA,MAAM,CAACE,aAAa,EAAE;MAC7B,MAAMC,MAAM,GAAGH,MAAM,CAACE,aAAa,CAAC;QAChCR,KAAK;QACLK,KAAK;QACLD;MACJ,CAAC,CAAC;MACF,IAAIK,MAAM,EAAE;QACRL,OAAO,GAAGK,MAAM;QAChB;MACJ;IACJ;IACA,IAAI,CAACH,MAAM,CAACI,UAAU,EAAE;MACpB;IACJ;IACAN,OAAO,CAACO,IAAI,CAAE,GAAEN,KAAK,CAACO,OAAQ,MAAK,CAAC;IACpCR,OAAO,CAACO,IAAI,CAAE,GAAEN,KAAK,CAACO,OAAQ,OAAM,CAAC;EACzC;EACA,IAAI,CAACT,aAAa,EAAE;IAChB,OAAOC,OAAO,CAACS,IAAI,CAAC,IAAI,CAAC;EAC7B;EAEA,OAAOV,aAAa,CACfW,MAAM,CAAC,CAACL,MAAM,EAAEH,MAAM,KAAK;IACxB,OAAOA,MAAM,CAACS,YAAY,CAAC;MACvBf,KAAK;MACLI,OAAO,EAAEK;IACb,CAAC,CAAC;EACN,CAAC,EAAEL,OAAO,CAAC,CACVS,IAAI,CAAC,IAAI,CAAC;AACnB,CAAC;AAACG,OAAA,CAAAjB,cAAA,GAAAA,cAAA"}
+{"version":3,"names":["_getBaseFieldType","require","_constants","renderSortEnum","model","fields","fieldTypePlugins","sorterPlugins","sorters","ENTRY_META_FIELDS","filter","isDateTimeEntryMetaField","map","field","flat","plugin","getBaseFieldType","createSorters","result","isSortable","push","fieldId","join","reduce","createSorter","exports"],"sources":["renderSortEnum.ts"],"sourcesContent":["import { CmsFieldTypePlugins, CmsModel, CmsModelField } from \"~/types\";\nimport { getBaseFieldType } from \"~/utils/getBaseFieldType\";\nimport { CmsGraphQLSchemaSorterPlugin } from \"~/plugins/CmsGraphQLSchemaSorterPlugin\";\nimport { ENTRY_META_FIELDS, isDateTimeEntryMetaField } from \"~/constants\";\n\ninterface RenderSortEnumParams {\n    model: CmsModel;\n    fields: CmsModelField[];\n    fieldTypePlugins: CmsFieldTypePlugins;\n    sorterPlugins?: CmsGraphQLSchemaSorterPlugin[];\n}\n\ninterface RenderSortEnum {\n    (params: RenderSortEnumParams): string;\n}\n\nexport const renderSortEnum: RenderSortEnum = ({\n    model,\n    fields,\n    fieldTypePlugins,\n    sorterPlugins\n}): string => {\n    let sorters: string[] = [\n        `id_ASC`,\n        `id_DESC`,\n\n        ...ENTRY_META_FIELDS.filter(isDateTimeEntryMetaField)\n            .map(field => [`${field}_ASC`, `${field}_DESC`])\n            .flat()\n    ];\n\n    for (const field of fields) {\n        const plugin = fieldTypePlugins[getBaseFieldType(field)];\n        if (!plugin) {\n            continue;\n        } else if (plugin.createSorters) {\n            const result = plugin.createSorters({\n                model,\n                field,\n                sorters\n            });\n            if (result) {\n                sorters = result;\n                continue;\n            }\n        }\n        if (!plugin.isSortable) {\n            continue;\n        }\n        sorters.push(`${field.fieldId}_ASC`);\n        sorters.push(`${field.fieldId}_DESC`);\n    }\n    if (!sorterPlugins) {\n        return sorters.join(\"\\n\");\n    }\n\n    return sorterPlugins\n        .reduce((result, plugin) => {\n            return plugin.createSorter({\n                model,\n                sorters: result\n            });\n        }, sorters)\n        .join(\"\\n\");\n};\n"],"mappings":";;;;;;AACA,IAAAA,iBAAA,GAAAC,OAAA;AAEA,IAAAC,UAAA,GAAAD,OAAA;AAaO,MAAME,cAA8B,GAAGA,CAAC;EAC3CC,KAAK;EACLC,MAAM;EACNC,gBAAgB;EAChBC;AACJ,CAAC,KAAa;EACV,IAAIC,OAAiB,GAAG,CACnB,QAAO,EACP,SAAQ,EAET,GAAGC,4BAAiB,CAACC,MAAM,CAACC,mCAAwB,CAAC,CAChDC,GAAG,CAACC,KAAK,IAAI,CAAE,GAAEA,KAAM,MAAK,EAAG,GAAEA,KAAM,OAAM,CAAC,CAAC,CAC/CC,IAAI,CAAC,CAAC,CACd;EAED,KAAK,MAAMD,KAAK,IAAIR,MAAM,EAAE;IACxB,MAAMU,MAAM,GAAGT,gBAAgB,CAAC,IAAAU,kCAAgB,EAACH,KAAK,CAAC,CAAC;IACxD,IAAI,CAACE,MAAM,EAAE;MACT;IACJ,CAAC,MAAM,IAAIA,MAAM,CAACE,aAAa,EAAE;MAC7B,MAAMC,MAAM,GAAGH,MAAM,CAACE,aAAa,CAAC;QAChCb,KAAK;QACLS,KAAK;QACLL;MACJ,CAAC,CAAC;MACF,IAAIU,MAAM,EAAE;QACRV,OAAO,GAAGU,MAAM;QAChB;MACJ;IACJ;IACA,IAAI,CAACH,MAAM,CAACI,UAAU,EAAE;MACpB;IACJ;IACAX,OAAO,CAACY,IAAI,CAAE,GAAEP,KAAK,CAACQ,OAAQ,MAAK,CAAC;IACpCb,OAAO,CAACY,IAAI,CAAE,GAAEP,KAAK,CAACQ,OAAQ,OAAM,CAAC;EACzC;EACA,IAAI,CAACd,aAAa,EAAE;IAChB,OAAOC,OAAO,CAACc,IAAI,CAAC,IAAI,CAAC;EAC7B;EAEA,OAAOf,aAAa,CACfgB,MAAM,CAAC,CAACL,MAAM,EAAEH,MAAM,KAAK;IACxB,OAAOA,MAAM,CAACS,YAAY,CAAC;MACvBpB,KAAK;MACLI,OAAO,EAAEU;IACb,CAAC,CAAC;EACN,CAAC,EAAEV,OAAO,CAAC,CACVc,IAAI,CAAC,IAAI,CAAC;AACnB,CAAC;AAACG,OAAA,CAAAtB,cAAA,GAAAA,cAAA"}

package/validators/gte.js

@@ -15,8 +15,7 @@ const createGteValidator = () => {
         value,
         validator
       }) {
-        var _validator$settings;
-        const gteValue = (_validator$settings = validator.settings) === null || _validator$settings === void 0 ? void 0 : _validator$settings.value;
+        const gteValue = validator.settings?.value;
         if (typeof gteValue !== "undefined") {
           return _validation.validation.validate(value, `gte:${gteValue}`).then(v => v === true).catch(() => false);
         }

package/validators/gte.js.map

@@ -1 +1 @@
-{"version":3,"names":["_validation","require","createGteValidator","type","name","validator","validate","value","_validator$settings","gteValue","settings","validation","then","v","catch","Promise","resolve","exports"],"sources":["gte.ts"],"sourcesContent":["import { validation } from \"@webiny/validation\";\nimport { CmsModelFieldValidatorPlugin } from \"~/types\";\n\nexport const createGteValidator = (): CmsModelFieldValidatorPlugin => {\n    return {\n        type: \"cms-model-field-validator\",\n        name: \"cms-model-field-validator-gte\",\n        validator: {\n            name: \"gte\",\n            validate({ value, validator }) {\n                const gteValue = validator.settings?.value;\n                if (typeof gteValue !== \"undefined\") {\n                    return validation\n                        .validate(value, `gte:${gteValue}`)\n                        .then(v => v === true)\n                        .catch(() => false);\n                }\n                return Promise.resolve(true);\n            }\n        }\n    };\n};\n"],"mappings":";;;;;;AAAA,IAAAA,WAAA,GAAAC,OAAA;AAGO,MAAMC,kBAAkB,GAAGA,CAAA,KAAoC;EAClE,OAAO;IACHC,IAAI,EAAE,2BAA2B;IACjCC,IAAI,EAAE,+BAA+B;IACrCC,SAAS,EAAE;MACPD,IAAI,EAAE,KAAK;MACXE,QAAQA,CAAC;QAAEC,KAAK;QAAEF;MAAU,CAAC,EAAE;QAAA,IAAAG,mBAAA;QAC3B,MAAMC,QAAQ,IAAAD,mBAAA,GAAGH,SAAS,CAACK,QAAQ,cAAAF,mBAAA,uBAAlBA,mBAAA,CAAoBD,KAAK;QAC1C,IAAI,OAAOE,QAAQ,KAAK,WAAW,EAAE;UACjC,OAAOE,sBAAU,CACZL,QAAQ,CAACC,KAAK,EAAG,OAAME,QAAS,EAAC,CAAC,CAClCG,IAAI,CAACC,CAAC,IAAIA,CAAC,KAAK,IAAI,CAAC,CACrBC,KAAK,CAAC,MAAM,KAAK,CAAC;QAC3B;QACA,OAAOC,OAAO,CAACC,OAAO,CAAC,IAAI,CAAC;MAChC;IACJ;EACJ,CAAC;AACL,CAAC;AAACC,OAAA,CAAAf,kBAAA,GAAAA,kBAAA"}
+{"version":3,"names":["_validation","require","createGteValidator","type","name","validator","validate","value","gteValue","settings","validation","then","v","catch","Promise","resolve","exports"],"sources":["gte.ts"],"sourcesContent":["import { validation } from \"@webiny/validation\";\nimport { CmsModelFieldValidatorPlugin } from \"~/types\";\n\nexport const createGteValidator = (): CmsModelFieldValidatorPlugin => {\n    return {\n        type: \"cms-model-field-validator\",\n        name: \"cms-model-field-validator-gte\",\n        validator: {\n            name: \"gte\",\n            validate({ value, validator }) {\n                const gteValue = validator.settings?.value;\n                if (typeof gteValue !== \"undefined\") {\n                    return validation\n                        .validate(value, `gte:${gteValue}`)\n                        .then(v => v === true)\n                        .catch(() => false);\n                }\n                return Promise.resolve(true);\n            }\n        }\n    };\n};\n"],"mappings":";;;;;;AAAA,IAAAA,WAAA,GAAAC,OAAA;AAGO,MAAMC,kBAAkB,GAAGA,CAAA,KAAoC;EAClE,OAAO;IACHC,IAAI,EAAE,2BAA2B;IACjCC,IAAI,EAAE,+BAA+B;IACrCC,SAAS,EAAE;MACPD,IAAI,EAAE,KAAK;MACXE,QAAQA,CAAC;QAAEC,KAAK;QAAEF;MAAU,CAAC,EAAE;QAC3B,MAAMG,QAAQ,GAAGH,SAAS,CAACI,QAAQ,EAAEF,KAAK;QAC1C,IAAI,OAAOC,QAAQ,KAAK,WAAW,EAAE;UACjC,OAAOE,sBAAU,CACZJ,QAAQ,CAACC,KAAK,EAAG,OAAMC,QAAS,EAAC,CAAC,CAClCG,IAAI,CAACC,CAAC,IAAIA,CAAC,KAAK,IAAI,CAAC,CACrBC,KAAK,CAAC,MAAM,KAAK,CAAC;QAC3B;QACA,OAAOC,OAAO,CAACC,OAAO,CAAC,IAAI,CAAC;MAChC;IACJ;EACJ,CAAC;AACL,CAAC;AAACC,OAAA,CAAAd,kBAAA,GAAAA,kBAAA"}

package/validators/in.js

@@ -15,8 +15,7 @@ const createInValidator = () => {
         value,
         validator
       }) {
-        var _validator$settings;
-        const values = (_validator$settings = validator.settings) === null || _validator$settings === void 0 ? void 0 : _validator$settings.values;
+        const values = validator.settings?.values;
         if (Array.isArray(values)) {
           return _validation.validation.validate(value, `in:${values.join(":")}`).then(v => v === true).catch(() => false);
         }

package/validators/in.js.map

@@ -1 +1 @@
-{"version":3,"names":["_validation","require","createInValidator","type","name","validator","validate","value","_validator$settings","values","settings","Array","isArray","validation","join","then","v","catch","Promise","resolve","exports"],"sources":["in.ts"],"sourcesContent":["import { validation } from \"@webiny/validation\";\nimport { CmsModelFieldValidatorPlugin } from \"~/types\";\n\nexport const createInValidator = (): CmsModelFieldValidatorPlugin => {\n    return {\n        type: \"cms-model-field-validator\",\n        name: \"cms-model-field-validator-in\",\n        validator: {\n            name: \"in\",\n            validate({ value, validator }) {\n                const values = validator.settings?.values;\n                if (Array.isArray(values)) {\n                    return validation\n                        .validate(value, `in:${values.join(\":\")}`)\n                        .then(v => v === true)\n                        .catch(() => false);\n                }\n\n                return Promise.resolve(true);\n            }\n        }\n    };\n};\n"],"mappings":";;;;;;AAAA,IAAAA,WAAA,GAAAC,OAAA;AAGO,MAAMC,iBAAiB,GAAGA,CAAA,KAAoC;EACjE,OAAO;IACHC,IAAI,EAAE,2BAA2B;IACjCC,IAAI,EAAE,8BAA8B;IACpCC,SAAS,EAAE;MACPD,IAAI,EAAE,IAAI;MACVE,QAAQA,CAAC;QAAEC,KAAK;QAAEF;MAAU,CAAC,EAAE;QAAA,IAAAG,mBAAA;QAC3B,MAAMC,MAAM,IAAAD,mBAAA,GAAGH,SAAS,CAACK,QAAQ,cAAAF,mBAAA,uBAAlBA,mBAAA,CAAoBC,MAAM;QACzC,IAAIE,KAAK,CAACC,OAAO,CAACH,MAAM,CAAC,EAAE;UACvB,OAAOI,sBAAU,CACZP,QAAQ,CAACC,KAAK,EAAG,MAAKE,MAAM,CAACK,IAAI,CAAC,GAAG,CAAE,EAAC,CAAC,CACzCC,IAAI,CAACC,CAAC,IAAIA,CAAC,KAAK,IAAI,CAAC,CACrBC,KAAK,CAAC,MAAM,KAAK,CAAC;QAC3B;QAEA,OAAOC,OAAO,CAACC,OAAO,CAAC,IAAI,CAAC;MAChC;IACJ;EACJ,CAAC;AACL,CAAC;AAACC,OAAA,CAAAlB,iBAAA,GAAAA,iBAAA"}
+{"version":3,"names":["_validation","require","createInValidator","type","name","validator","validate","value","values","settings","Array","isArray","validation","join","then","v","catch","Promise","resolve","exports"],"sources":["in.ts"],"sourcesContent":["import { validation } from \"@webiny/validation\";\nimport { CmsModelFieldValidatorPlugin } from \"~/types\";\n\nexport const createInValidator = (): CmsModelFieldValidatorPlugin => {\n    return {\n        type: \"cms-model-field-validator\",\n        name: \"cms-model-field-validator-in\",\n        validator: {\n            name: \"in\",\n            validate({ value, validator }) {\n                const values = validator.settings?.values;\n                if (Array.isArray(values)) {\n                    return validation\n                        .validate(value, `in:${values.join(\":\")}`)\n                        .then(v => v === true)\n                        .catch(() => false);\n                }\n\n                return Promise.resolve(true);\n            }\n        }\n    };\n};\n"],"mappings":";;;;;;AAAA,IAAAA,WAAA,GAAAC,OAAA;AAGO,MAAMC,iBAAiB,GAAGA,CAAA,KAAoC;EACjE,OAAO;IACHC,IAAI,EAAE,2BAA2B;IACjCC,IAAI,EAAE,8BAA8B;IACpCC,SAAS,EAAE;MACPD,IAAI,EAAE,IAAI;MACVE,QAAQA,CAAC;QAAEC,KAAK;QAAEF;MAAU,CAAC,EAAE;QAC3B,MAAMG,MAAM,GAAGH,SAAS,CAACI,QAAQ,EAAED,MAAM;QACzC,IAAIE,KAAK,CAACC,OAAO,CAACH,MAAM,CAAC,EAAE;UACvB,OAAOI,sBAAU,CACZN,QAAQ,CAACC,KAAK,EAAG,MAAKC,MAAM,CAACK,IAAI,CAAC,GAAG,CAAE,EAAC,CAAC,CACzCC,IAAI,CAACC,CAAC,IAAIA,CAAC,KAAK,IAAI,CAAC,CACrBC,KAAK,CAAC,MAAM,KAAK,CAAC;QAC3B;QAEA,OAAOC,OAAO,CAACC,OAAO,CAAC,IAAI,CAAC;MAChC;IACJ;EACJ,CAAC;AACL,CAAC;AAACC,OAAA,CAAAjB,iBAAA,GAAAA,iBAAA"}

package/validators/lte.js

@@ -15,8 +15,7 @@ const createLteValidator = () => {
         value,
         validator
       }) {
-        var _validator$settings;
-        const lteValue = (_validator$settings = validator.settings) === null || _validator$settings === void 0 ? void 0 : _validator$settings.value;
+        const lteValue = validator.settings?.value;
         if (typeof lteValue !== "undefined") {
           return _validation.validation.validate(value, `lte:${lteValue}`).then(v => v === true).catch(() => false);
         }

package/validators/lte.js.map

@@ -1 +1 @@
-{"version":3,"names":["_validation","require","createLteValidator","type","name","validator","validate","value","_validator$settings","lteValue","settings","validation","then","v","catch","Promise","resolve","exports"],"sources":["lte.ts"],"sourcesContent":["import { validation } from \"@webiny/validation\";\nimport { CmsModelFieldValidatorPlugin } from \"~/types\";\n\nexport const createLteValidator = (): CmsModelFieldValidatorPlugin => {\n    return {\n        type: \"cms-model-field-validator\",\n        name: \"cms-model-field-validator-lte\",\n        validator: {\n            name: \"lte\",\n            validate({ value, validator }) {\n                const lteValue = validator.settings?.value;\n                if (typeof lteValue !== \"undefined\") {\n                    return validation\n                        .validate(value, `lte:${lteValue}`)\n                        .then(v => v === true)\n                        .catch(() => false);\n                }\n                return Promise.resolve(true);\n            }\n        }\n    };\n};\n"],"mappings":";;;;;;AAAA,IAAAA,WAAA,GAAAC,OAAA;AAGO,MAAMC,kBAAkB,GAAGA,CAAA,KAAoC;EAClE,OAAO;IACHC,IAAI,EAAE,2BAA2B;IACjCC,IAAI,EAAE,+BAA+B;IACrCC,SAAS,EAAE;MACPD,IAAI,EAAE,KAAK;MACXE,QAAQA,CAAC;QAAEC,KAAK;QAAEF;MAAU,CAAC,EAAE;QAAA,IAAAG,mBAAA;QAC3B,MAAMC,QAAQ,IAAAD,mBAAA,GAAGH,SAAS,CAACK,QAAQ,cAAAF,mBAAA,uBAAlBA,mBAAA,CAAoBD,KAAK;QAC1C,IAAI,OAAOE,QAAQ,KAAK,WAAW,EAAE;UACjC,OAAOE,sBAAU,CACZL,QAAQ,CAACC,KAAK,EAAG,OAAME,QAAS,EAAC,CAAC,CAClCG,IAAI,CAACC,CAAC,IAAIA,CAAC,KAAK,IAAI,CAAC,CACrBC,KAAK,CAAC,MAAM,KAAK,CAAC;QAC3B;QACA,OAAOC,OAAO,CAACC,OAAO,CAAC,IAAI,CAAC;MAChC;IACJ;EACJ,CAAC;AACL,CAAC;AAACC,OAAA,CAAAf,kBAAA,GAAAA,kBAAA"}
+{"version":3,"names":["_validation","require","createLteValidator","type","name","validator","validate","value","lteValue","settings","validation","then","v","catch","Promise","resolve","exports"],"sources":["lte.ts"],"sourcesContent":["import { validation } from \"@webiny/validation\";\nimport { CmsModelFieldValidatorPlugin } from \"~/types\";\n\nexport const createLteValidator = (): CmsModelFieldValidatorPlugin => {\n    return {\n        type: \"cms-model-field-validator\",\n        name: \"cms-model-field-validator-lte\",\n        validator: {\n            name: \"lte\",\n            validate({ value, validator }) {\n                const lteValue = validator.settings?.value;\n                if (typeof lteValue !== \"undefined\") {\n                    return validation\n                        .validate(value, `lte:${lteValue}`)\n                        .then(v => v === true)\n                        .catch(() => false);\n                }\n                return Promise.resolve(true);\n            }\n        }\n    };\n};\n"],"mappings":";;;;;;AAAA,IAAAA,WAAA,GAAAC,OAAA;AAGO,MAAMC,kBAAkB,GAAGA,CAAA,KAAoC;EAClE,OAAO;IACHC,IAAI,EAAE,2BAA2B;IACjCC,IAAI,EAAE,+BAA+B;IACrCC,SAAS,EAAE;MACPD,IAAI,EAAE,KAAK;MACXE,QAAQA,CAAC;QAAEC,KAAK;QAAEF;MAAU,CAAC,EAAE;QAC3B,MAAMG,QAAQ,GAAGH,SAAS,CAACI,QAAQ,EAAEF,KAAK;QAC1C,IAAI,OAAOC,QAAQ,KAAK,WAAW,EAAE;UACjC,OAAOE,sBAAU,CACZJ,QAAQ,CAACC,KAAK,EAAG,OAAMC,QAAS,EAAC,CAAC,CAClCG,IAAI,CAACC,CAAC,IAAIA,CAAC,KAAK,IAAI,CAAC,CACrBC,KAAK,CAAC,MAAM,KAAK,CAAC;QAC3B;QACA,OAAOC,OAAO,CAACC,OAAO,CAAC,IAAI,CAAC;MAChC;IACJ;EACJ,CAAC;AACL,CAAC;AAACC,OAAA,CAAAd,kBAAA,GAAAA,kBAAA"}

package/validators/maxLength.js

@@ -15,8 +15,7 @@ const createMaxLengthValidator = () => {
         value,
         validator
       }) {
-        var _validator$settings;
-        const maxLengthValue = (_validator$settings = validator.settings) === null || _validator$settings === void 0 ? void 0 : _validator$settings.value;
+        const maxLengthValue = validator.settings?.value;
         if (typeof maxLengthValue !== "undefined") {
           return _validation.validation.validate(value, `maxLength:${maxLengthValue}`).then(v => v === true).catch(() => false);
         }