@webiny/api-headless-cms-ddb-es 0.0.0-mt-3 → 0.0.0-unstable.5e7233243f

package/helpers/entryIndexHelpers.js

@@ -11,9 +11,9 @@ var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/de
 
 var _error = _interopRequireDefault(require("@webiny/error"));
 
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 
 const prepareEntryToIndex = params => {
   const {
@@ -49,7 +49,7 @@ const prepareEntryToIndex = params => {
   const rawValues = {}; // We're only interested in current model fields.
 
   for (const field of model.fields) {
-    if (storageEntry.values.hasOwnProperty(field.fieldId) === false) {
+    if (storageEntry.values.hasOwnProperty(field.storageId) === false) {
       continue;
     }
 
@@ -66,18 +66,18 @@ const prepareEntryToIndex = params => {
       plugins,
       model,
       field,
-      rawValue: entry.values[field.fieldId],
-      value: storageEntry.values[field.fieldId],
+      rawValue: entry.values[field.storageId],
+      value: storageEntry.values[field.storageId],
       getFieldIndexPlugin,
       getFieldTypePlugin
     });
 
     if (typeof value !== "undefined") {
-      values[field.fieldId] = value;
+      values[field.storageId] = value;
     }
 
     if (typeof rawValue !== "undefined") {
-      rawValues[field.fieldId] = rawValue;
+      rawValues[field.storageId] = rawValue;
     }
   }
 
@@ -157,18 +157,18 @@ const extractEntriesFromIndex = ({
       }
 
       try {
-        indexValues[field.fieldId] = targetFieldPlugin.fromIndex({
+        indexValues[field.storageId] = targetFieldPlugin.fromIndex({
           plugins,
           model,
           field,
           getFieldIndexPlugin,
           getFieldTypePlugin,
-          value: entry.values[field.fieldId],
+          value: entry.values[field.storageId],
 
           /**
            * Possibly no rawValues so we must check for the existence of the field.
            */
-          rawValue: entry.rawValues ? entry.rawValues[field.fieldId] : null
+          rawValue: entry.rawValues ? entry.rawValues[field.storageId] : null
         });
       } catch (ex) {
         throw new _error.default(ex.message || "Could not transform entry field from index.", ex.code || "FIELD_FROM_INDEX_ERROR", {
@@ -177,10 +177,30 @@ const extractEntriesFromIndex = ({
         });
       }
     }
+    /**
+     * Let's have a new entry so we do not modify the original one.
+     */
 
-    list.push(_objectSpread(_objectSpread({}, entry), {}, {
+
+    const newEntry = _objectSpread(_objectSpread({}, entry), {}, {
       values: indexValues
-    }));
+    });
+    /**
+     * If we want to remove the rawValues, TYPE, latest, published and __type, we must make them optional or ignore them.
+     */
+    // @ts-ignore
+
+
+    delete newEntry["rawValues"]; // @ts-ignore
+
+    delete newEntry["TYPE"]; // @ts-ignore
+
+    delete newEntry["__type"]; // @ts-ignore
+
+    delete newEntry["latest"]; // @ts-ignore
+
+    delete newEntry["published"];
+    list.push(_objectSpread({}, newEntry));
   }
 
   return list;

package/helpers/entryIndexHelpers.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["prepareEntryToIndex","params","plugins","storageEntry","entry","model","fieldIndexPlugins","defaultIndexFieldPlugin","fieldTypePlugins","setupEntriesIndexHelpers","getFieldIndexPlugin","fieldType","getFieldTypePlugin","pl","WebinyError","values","rawValues","field","fields","hasOwnProperty","storageId","targetFieldPlugin","type","toIndex","value","rawValue","pluginsContainer","byType","plugin","reverse","find","reduce","extractEntriesFromIndex","entries","list","indexValues","fieldTypePlugin","fromIndex","ex","message","code","newEntry","push"],"sources":["entryIndexHelpers.ts"],"sourcesContent":["import WebinyError from \"@webiny/error\";\nimport { CmsEntry, CmsModel, CmsModelFieldToGraphQLPlugin } from \"@webiny/api-headless-cms/types\";\nimport { CmsIndexEntry, CmsModelFieldToElasticsearchPlugin } from \"~/types\";\nimport { PluginsContainer } from \"@webiny/plugins\";\n\ninterface SetupEntriesIndexHelpersParams {\n    plugins: PluginsContainer;\n}\n\ninterface ExtractEntriesFromIndexParams extends SetupEntriesIndexHelpersParams {\n    model: CmsModel;\n    entries: CmsIndexEntry[];\n}\n\ninterface PrepareElasticsearchDataParams extends SetupEntriesIndexHelpersParams {\n    model: CmsModel;\n    entry: CmsEntry;\n    storageEntry: CmsEntry;\n}\n\nexport const prepareEntryToIndex = (params: PrepareElasticsearchDataParams): CmsIndexEntry => {\n    const { plugins, storageEntry, entry, model } = params;\n    const { fieldIndexPlugins, defaultIndexFieldPlugin, fieldTypePlugins } =\n        setupEntriesIndexHelpers({ plugins });\n\n    function getFieldIndexPlugin(fieldType: string) {\n        return fieldIndexPlugins[fieldType] || defaultIndexFieldPlugin;\n    }\n\n    function getFieldTypePlugin(fieldType: string) {\n        const pl = fieldTypePlugins[fieldType];\n        if (pl) {\n            return pl;\n        }\n        throw new WebinyError(`Missing field type plugin \"${fieldType}\". Prepare entry for index.`);\n    }\n\n    // These objects will contain values processed by field index plugins\n    const values: Record<string, string> = {};\n    const rawValues: Record<string, string> = {};\n\n    // We're only interested in current model fields.\n    for (const field of model.fields) {\n        if (storageEntry.values.hasOwnProperty(field.storageId) === false) {\n            continue;\n        }\n\n        const targetFieldPlugin = getFieldIndexPlugin(field.type);\n\n        // TODO: remove this `if` once we convert this plugin to proper plugin class\n        if (!targetFieldPlugin || !targetFieldPlugin.toIndex) {\n            continue;\n        }\n\n        const { value, rawValue } = targetFieldPlugin.toIndex({\n            plugins,\n            model,\n            field,\n            rawValue: entry.values[field.storageId],\n            value: storageEntry.values[field.storageId],\n            getFieldIndexPlugin,\n            getFieldTypePlugin\n        });\n\n        if (typeof value !== \"undefined\") {\n            values[field.storageId] = value;\n        }\n\n        if (typeof rawValue !== \"undefined\") {\n            rawValues[field.storageId] = rawValue;\n        }\n    }\n    return {\n        ...storageEntry,\n        values,\n        rawValues\n    } as CmsIndexEntry;\n};\n\nconst setupEntriesIndexHelpers = ({\n    plugins: pluginsContainer\n}: SetupEntriesIndexHelpersParams) => {\n    const plugins = pluginsContainer.byType<CmsModelFieldToElasticsearchPlugin>(\n        \"cms-model-field-to-elastic-search\"\n    );\n\n    const fieldIndexPlugins: Record<string, CmsModelFieldToElasticsearchPlugin> = {};\n    for (const plugin of plugins.reverse()) {\n        if (fieldIndexPlugins[plugin.fieldType]) {\n            continue;\n        }\n        fieldIndexPlugins[plugin.fieldType] = plugin;\n    }\n    // we will use this plugin if no targeted plugin found\n    const defaultIndexFieldPlugin = plugins.find(plugin => plugin.fieldType === \"*\");\n\n    // CmsModelFieldToGraphQLPlugin plugins\n    const fieldTypePlugins: Record<string, CmsModelFieldToGraphQLPlugin> = pluginsContainer\n        .byType<CmsModelFieldToGraphQLPlugin>(\"cms-model-field-to-graphql\")\n        .reduce((plugins, plugin) => ({ ...plugins, [plugin.fieldType]: plugin }), {});\n\n    return {\n        fieldIndexPlugins,\n        defaultIndexFieldPlugin,\n        fieldTypePlugins\n    };\n};\n\nexport const extractEntriesFromIndex = ({\n    plugins,\n    entries,\n    model\n}: ExtractEntriesFromIndexParams): CmsEntry[] => {\n    const { fieldIndexPlugins, defaultIndexFieldPlugin, fieldTypePlugins } =\n        setupEntriesIndexHelpers({ plugins });\n\n    function getFieldIndexPlugin(fieldType: string) {\n        return fieldIndexPlugins[fieldType] || defaultIndexFieldPlugin;\n    }\n\n    function getFieldTypePlugin(fieldType: string) {\n        return fieldTypePlugins[fieldType];\n    }\n\n    const list: CmsEntry[] = [];\n\n    for (const entry of entries) {\n        // This object will contain values processed by field index plugins\n        const indexValues: Record<string, string> = {};\n\n        // We only consider fields that are present in the model\n        for (const field of model.fields) {\n            const fieldTypePlugin = fieldTypePlugins[field.type];\n            if (!fieldTypePlugin) {\n                throw new WebinyError(\n                    `Missing field type plugin \"${field.type}\". Extract entries from index.`\n                );\n            }\n\n            const targetFieldPlugin = getFieldIndexPlugin(field.type);\n            if (!targetFieldPlugin || !targetFieldPlugin.fromIndex) {\n                continue;\n            }\n            try {\n                indexValues[field.storageId] = targetFieldPlugin.fromIndex({\n                    plugins,\n                    model,\n                    field,\n                    getFieldIndexPlugin,\n                    getFieldTypePlugin,\n                    value: entry.values[field.storageId],\n                    /**\n                     * Possibly no rawValues so we must check for the existence of the field.\n                     */\n                    rawValue: entry.rawValues ? entry.rawValues[field.storageId] : null\n                });\n            } catch (ex) {\n                throw new WebinyError(\n                    ex.message || \"Could not transform entry field from index.\",\n                    ex.code || \"FIELD_FROM_INDEX_ERROR\",\n                    {\n                        field,\n                        entry\n                    }\n                );\n            }\n        }\n        /**\n         * Let's have a new entry so we do not modify the original one.\n         */\n        const newEntry: CmsEntry = {\n            ...entry,\n            values: indexValues\n        };\n        /**\n         * If we want to remove the rawValues, TYPE, latest, published and __type, we must make them optional or ignore them.\n         */\n        // @ts-ignore\n        delete newEntry[\"rawValues\"];\n        // @ts-ignore\n        delete newEntry[\"TYPE\"];\n        // @ts-ignore\n        delete newEntry[\"__type\"];\n        // @ts-ignore\n        delete newEntry[\"latest\"];\n        // @ts-ignore\n        delete newEntry[\"published\"];\n        list.push({ ...newEntry });\n    }\n\n    return list;\n};\n"],"mappings":"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"}

package/helpers/fields.d.ts

@@ -11,67 +11,9 @@ export interface ModelField {
     field: CmsModelField;
     path?: ModelFieldPath;
 }
-export declare type ModelFields = Record<string, ModelField>;
-export declare const systemFields: {
-    id: {
-        type: string;
-        isSystemField: boolean;
-        isSearchable: boolean;
-        isSortable: boolean;
-        field: CmsModelField;
-    };
-    entryId: {
-        type: string;
-        isSystemField: boolean;
-        isSearchable: boolean;
-        isSortable: boolean;
-        field: CmsModelField;
-    };
-    savedOn: {
-        type: string;
-        unmappedType: string;
-        keyword: boolean;
-        isSystemField: boolean;
-        isSearchable: boolean;
-        isSortable: boolean;
-        field: CmsModelField;
-    };
-    createdOn: {
-        type: string;
-        unmappedType: string;
-        keyword: boolean;
-        isSystemField: boolean;
-        isSearchable: boolean;
-        isSortable: boolean;
-        field: CmsModelField;
-    };
-    createdBy: {
-        type: string;
-        unmappedType: any;
-        isSystemField: boolean;
-        isSearchable: boolean;
-        isSortable: boolean;
-        path: string;
-        field: CmsModelField;
-    };
-    ownedBy: {
-        type: string;
-        unmappedType: any;
-        isSystemField: boolean;
-        isSearchable: boolean;
-        isSortable: boolean;
-        path: string;
-        field: CmsModelField;
-    };
-    version: {
-        type: string;
-        unmappedType: any;
-        keyword: boolean;
-        isSystemField: boolean;
-        isSearchable: boolean;
-        isSortable: boolean;
-        field: CmsModelField;
-    };
-};
+export interface ModelFields {
+    [fieldId: string]: ModelField;
+}
+export declare const systemFields: ModelFields;
 export declare const createModelFields: (plugins: PluginsContainer, model: CmsModel) => ModelFields;
 export {};

package/helpers/fields.js

@@ -7,11 +7,23 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.systemFields = exports.createModelFields = void 0;
 
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
+
 var _error = _interopRequireDefault(require("@webiny/error"));
 
+var _cloneDeep = _interopRequireDefault(require("lodash/cloneDeep"));
+
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+
 const createSystemField = field => {
-  if (!field.fieldId) {
-    throw new _error.default(`When creating system field it must have a "entryId".`, "SYSTEM_FIELD_ERROR", {
+  if (!field.storageId) {
+    throw new _error.default(`When creating system field it must have a "storageId".`, "SYSTEM_FIELD_ERROR", {
+      field
+    });
+  } else if (!field.fieldId) {
+    throw new _error.default(`When creating system field it must have a "fieldId".`, "SYSTEM_FIELD_ERROR", {
       field
     });
   } else if (!field.type) {
@@ -20,7 +32,10 @@ const createSystemField = field => {
     });
   }
 
-  return field;
+  return _objectSpread(_objectSpread({}, field), {}, {
+    id: field.fieldId,
+    label: field.fieldId
+  });
 };
 
 const systemFields = {
@@ -30,6 +45,7 @@ const systemFields = {
     isSearchable: true,
     isSortable: true,
     field: createSystemField({
+      storageId: "id",
       fieldId: "id",
       type: "text"
     })
@@ -40,6 +56,7 @@ const systemFields = {
     isSearchable: true,
     isSortable: true,
     field: createSystemField({
+      storageId: "entryId",
       fieldId: "entryId",
       type: "text"
     })
@@ -52,8 +69,9 @@ const systemFields = {
     isSearchable: true,
     isSortable: true,
     field: createSystemField({
+      storageId: "savedOn",
       fieldId: "savedOn",
-      type: "date",
+      type: "datetime",
       settings: {
         type: "dateTimeWithoutTimezone"
       }
@@ -67,6 +85,7 @@ const systemFields = {
     isSearchable: true,
     isSortable: true,
     field: createSystemField({
+      storageId: "createdOn",
       fieldId: "createdOn",
       type: "text",
       settings: {
@@ -82,6 +101,7 @@ const systemFields = {
     isSortable: false,
     path: "createdBy.id",
     field: createSystemField({
+      storageId: "createdBy",
       fieldId: "createdBy",
       type: "text"
     })
@@ -94,6 +114,7 @@ const systemFields = {
     isSortable: false,
     path: "ownedBy.id",
     field: createSystemField({
+      storageId: "ownedBy",
       fieldId: "ownedBy",
       type: "text"
     })
@@ -106,6 +127,7 @@ const systemFields = {
     isSearchable: true,
     isSortable: true,
     field: createSystemField({
+      storageId: "version",
       fieldId: "version",
       type: "number"
     })
@@ -168,7 +190,7 @@ const createModelFields = (plugins, model) => {
       field
     };
     return fields;
-  }, systemFields);
+  }, (0, _cloneDeep.default)(systemFields));
 };
 
 exports.createModelFields = createModelFields;

package/helpers/fields.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["createSystemField","field","storageId","WebinyError","fieldId","type","id","label","systemFields","isSystemField","isSearchable","isSortable","entryId","savedOn","unmappedType","keyword","settings","createdOn","createdBy","undefined","path","ownedBy","version","createModelFields","plugins","model","unmappedTypes","byType","reduce","acc","plugin","fieldType","fieldTypePlugins","types","fields","lodashCloneDeep"],"sources":["fields.ts"],"sourcesContent":["import {\n    CmsModel,\n    CmsModelField,\n    CmsModelFieldToGraphQLPlugin\n} from \"@webiny/api-headless-cms/types\";\nimport WebinyError from \"@webiny/error\";\nimport { CmsModelFieldToElasticsearchPlugin } from \"~/types\";\nimport { PluginsContainer } from \"@webiny/plugins\";\nimport lodashCloneDeep from \"lodash/cloneDeep\";\n\ntype ModelFieldPath = string | ((value: string) => string);\nexport interface ModelField {\n    unmappedType?: string;\n    keyword?: boolean;\n    isSearchable: boolean;\n    isSortable: boolean;\n    type: string;\n    isSystemField?: boolean;\n    field: CmsModelField;\n    path?: ModelFieldPath;\n}\n\nexport interface ModelFields {\n    [fieldId: string]: ModelField;\n}\n\ntype UnmappedFieldTypes = {\n    [type: string]: (field: CmsModelField) => string | undefined;\n};\n\ninterface FieldTypePlugin {\n    unmappedType?: (field: CmsModelField) => string | undefined;\n    isSearchable: boolean;\n    isSortable: boolean;\n}\ntype FieldTypePlugins = Record<string, FieldTypePlugin>;\n\ntype PartialCmsModelField = Partial<CmsModelField> &\n    Pick<CmsModelField, \"storageId\" | \"fieldId\" | \"type\">;\nconst createSystemField = (field: PartialCmsModelField): CmsModelField => {\n    if (!field.storageId) {\n        throw new WebinyError(\n            `When creating system field it must have a \"storageId\".`,\n            \"SYSTEM_FIELD_ERROR\",\n            {\n                field\n            }\n        );\n    } else if (!field.fieldId) {\n        throw new WebinyError(\n            `When creating system field it must have a \"fieldId\".`,\n            \"SYSTEM_FIELD_ERROR\",\n            {\n                field\n            }\n        );\n    } else if (!field.type) {\n        throw new WebinyError(\n            `When creating system field it must have a \"type\".`,\n            \"SYSTEM_FIELD_ERROR\",\n            {\n                field\n            }\n        );\n    }\n    return {\n        ...field,\n        id: field.fieldId,\n        label: field.fieldId\n    };\n};\n\nexport const systemFields: ModelFields = {\n    id: {\n        type: \"text\",\n        isSystemField: true,\n        isSearchable: true,\n        isSortable: true,\n        field: createSystemField({\n            storageId: \"id\",\n            fieldId: \"id\",\n            type: \"text\"\n        })\n    },\n    entryId: {\n        type: \"text\",\n        isSystemField: true,\n        isSearchable: true,\n        isSortable: true,\n        field: createSystemField({\n            storageId: \"entryId\",\n            fieldId: \"entryId\",\n            type: \"text\"\n        })\n    },\n    savedOn: {\n        type: \"date\",\n        unmappedType: \"date\",\n        keyword: false,\n        isSystemField: true,\n        isSearchable: true,\n        isSortable: true,\n        field: createSystemField({\n            storageId: \"savedOn\",\n            fieldId: \"savedOn\",\n            type: \"datetime\",\n            settings: {\n                type: \"dateTimeWithoutTimezone\"\n            }\n        })\n    },\n    createdOn: {\n        type: \"date\",\n        unmappedType: \"date\",\n        keyword: false,\n        isSystemField: true,\n        isSearchable: true,\n        isSortable: true,\n        field: createSystemField({\n            storageId: \"createdOn\",\n            fieldId: \"createdOn\",\n            type: \"text\",\n            settings: {\n                type: \"dateTimeWithoutTimezone\"\n            }\n        })\n    },\n    createdBy: {\n        type: \"text\",\n        unmappedType: undefined,\n        isSystemField: true,\n        isSearchable: true,\n        isSortable: false,\n        path: \"createdBy.id\",\n        field: createSystemField({\n            storageId: \"createdBy\",\n            fieldId: \"createdBy\",\n            type: \"text\"\n        })\n    },\n    ownedBy: {\n        type: \"text\",\n        unmappedType: undefined,\n        isSystemField: true,\n        isSearchable: true,\n        isSortable: false,\n        path: \"ownedBy.id\",\n        field: createSystemField({\n            storageId: \"ownedBy\",\n            fieldId: \"ownedBy\",\n            type: \"text\"\n        })\n    },\n    version: {\n        type: \"number\",\n        unmappedType: undefined,\n        keyword: false,\n        isSystemField: true,\n        isSearchable: true,\n        isSortable: true,\n        field: createSystemField({\n            storageId: \"version\",\n            fieldId: \"version\",\n            type: \"number\"\n        })\n    }\n};\n\n/*\n * Create an object with key fieldType and options for that field\n */\nexport const createModelFields = (plugins: PluginsContainer, model: CmsModel): ModelFields => {\n    // collect all unmappedType from elastic plugins\n    const unmappedTypes = plugins\n        .byType<CmsModelFieldToElasticsearchPlugin>(\"cms-model-field-to-elastic-search\")\n        .reduce((acc, plugin) => {\n            if (!plugin.unmappedType) {\n                return acc;\n            }\n            acc[plugin.fieldType] = plugin.unmappedType;\n            return acc;\n        }, {} as UnmappedFieldTypes);\n    /**\n     * collect all field types from the plugins\n     */\n    const fieldTypePlugins = plugins\n        .byType<CmsModelFieldToGraphQLPlugin>(\"cms-model-field-to-graphql\")\n        .reduce((types, plugin) => {\n            const { fieldType, isSearchable, isSortable } = plugin;\n            types[fieldType] = {\n                unmappedType: unmappedTypes[fieldType],\n                isSearchable: isSearchable === true,\n                isSortable: isSortable === true\n            };\n            return types;\n        }, {} as FieldTypePlugins);\n\n    return model.fields.reduce((fields, field) => {\n        const { fieldId, type } = field;\n        if (!fieldTypePlugins[type]) {\n            throw new WebinyError(`There is no plugin for field type \"${type}\".`);\n        }\n        const { isSearchable, isSortable, unmappedType } = fieldTypePlugins[type];\n        fields[fieldId] = {\n            type,\n            isSearchable,\n            isSortable,\n            unmappedType: typeof unmappedType === \"function\" ? unmappedType(field) : undefined,\n            isSystemField: false,\n            field\n        };\n\n        return fields;\n    }, lodashCloneDeep(systemFields));\n};\n"],"mappings":"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"}

package/helpers/index.js.map

@@ -0,0 +1 @@
+{"version":3,"names":[],"sources":["index.ts"],"sourcesContent":["export * from \"./createElasticsearchQueryBody\";\nexport * from \"./entryIndexHelpers\";\n"],"mappings":";;;;;;AAAA;;AAAA;EAAA;EAAA;EAAA;IAAA;IAAA;MAAA;IAAA;EAAA;AAAA;;AACA;;AAAA;EAAA;EAAA;EAAA;IAAA;IAAA;MAAA;IAAA;EAAA;AAAA"}

package/helpers/searchPluginsList.d.ts

@@ -1,6 +1,6 @@
-import { ElasticsearchQueryBuilderValueSearchPlugin } from "../types";
 import { PluginsContainer } from "@webiny/plugins";
+import { CmsEntryElasticsearchQueryBuilderValueSearchPlugin } from "../plugins/CmsEntryElasticsearchQueryBuilderValueSearchPlugin";
 export interface ElasticsearchQuerySearchValuePlugins {
-    [fieldType: string]: ElasticsearchQueryBuilderValueSearchPlugin;
+    [fieldType: string]: CmsEntryElasticsearchQueryBuilderValueSearchPlugin;
 }
 export declare const searchPluginsList: (plugins: PluginsContainer) => ElasticsearchQuerySearchValuePlugins;

package/helpers/searchPluginsList.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["searchPluginsList","plugins","byType","reduce","plugin","fieldType","WebinyError","name"],"sources":["searchPluginsList.ts"],"sourcesContent":["import WebinyError from \"@webiny/error\";\nimport { PluginsContainer } from \"@webiny/plugins\";\nimport { CmsEntryElasticsearchQueryBuilderValueSearchPlugin } from \"~/plugins/CmsEntryElasticsearchQueryBuilderValueSearchPlugin\";\n\nexport interface ElasticsearchQuerySearchValuePlugins {\n    [fieldType: string]: CmsEntryElasticsearchQueryBuilderValueSearchPlugin;\n}\n\nexport const searchPluginsList = (\n    plugins: PluginsContainer\n): ElasticsearchQuerySearchValuePlugins => {\n    return plugins\n        .byType<CmsEntryElasticsearchQueryBuilderValueSearchPlugin>(\n            \"cms-elastic-search-query-builder-value-search\"\n        )\n        .reduce((plugins, plugin) => {\n            if (plugins[plugin.fieldType]) {\n                throw new WebinyError(\n                    \"There is a ElasticsearchQueryBuilderValueSearchPlugin defined for the field type.\",\n                    \"PLUGIN_ALREADY_EXISTS\",\n                    {\n                        fieldType: plugin.fieldType,\n                        name: plugin.name || \"unknown\"\n                    }\n                );\n            }\n            plugins[plugin.fieldType] = plugin;\n\n            return plugins;\n        }, {} as ElasticsearchQuerySearchValuePlugins);\n};\n"],"mappings":";;;;;;;;;AAAA;;AAQO,MAAMA,iBAAiB,GAC1BC,OAD6B,IAEU;EACvC,OAAOA,OAAO,CACTC,MADE,CAEC,+CAFD,EAIFC,MAJE,CAIK,CAACF,OAAD,EAAUG,MAAV,KAAqB;IACzB,IAAIH,OAAO,CAACG,MAAM,CAACC,SAAR,CAAX,EAA+B;MAC3B,MAAM,IAAIC,cAAJ,CACF,mFADE,EAEF,uBAFE,EAGF;QACID,SAAS,EAAED,MAAM,CAACC,SADtB;QAEIE,IAAI,EAAEH,MAAM,CAACG,IAAP,IAAe;MAFzB,CAHE,CAAN;IAQH;;IACDN,OAAO,CAACG,MAAM,CAACC,SAAR,CAAP,GAA4BD,MAA5B;IAEA,OAAOH,OAAP;EACH,CAlBE,EAkBA,EAlBA,CAAP;AAmBH,CAtBM"}

package/helpers/transformValueForSearch.d.ts

@@ -1,9 +1,12 @@
 import { ElasticsearchQuerySearchValuePlugins } from "./searchPluginsList";
 import { CmsModelField } from "@webiny/api-headless-cms/types";
-interface Params {
+interface TransformValueForSearchParams {
     plugins: ElasticsearchQuerySearchValuePlugins;
     field: CmsModelField;
     value: any;
 }
-export declare const transformValueForSearch: (args: Params) => any;
+/**
+ * Transformed can be anything.
+ */
+export declare const transformValueForSearch: (args: TransformValueForSearchParams) => any;
 export {};

package/helpers/transformValueForSearch.js

@@ -5,6 +5,9 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.transformValueForSearch = void 0;
 
+/**
+ * Transformed can be anything.
+ */
 const transformValueForSearch = args => {
   const {
     field,

package/helpers/transformValueForSearch.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["transformValueForSearch","args","field","plugins","value","plugin","type","transform"],"sources":["transformValueForSearch.ts"],"sourcesContent":["import { ElasticsearchQuerySearchValuePlugins } from \"./searchPluginsList\";\nimport { CmsModelField } from \"@webiny/api-headless-cms/types\";\n\ninterface TransformValueForSearchParams {\n    plugins: ElasticsearchQuerySearchValuePlugins;\n    field: CmsModelField;\n    value: any;\n}\n\n/**\n * Transformed can be anything.\n */\nexport const transformValueForSearch = (args: TransformValueForSearchParams): any => {\n    const { field, plugins, value } = args;\n    const plugin = plugins[field.type];\n    if (!plugin) {\n        return value;\n    }\n    return plugin.transform({ field, value });\n};\n"],"mappings":";;;;;;;AASA;AACA;AACA;AACO,MAAMA,uBAAuB,GAAIC,IAAD,IAA8C;EACjF,MAAM;IAAEC,KAAF;IAASC,OAAT;IAAkBC;EAAlB,IAA4BH,IAAlC;EACA,MAAMI,MAAM,GAAGF,OAAO,CAACD,KAAK,CAACI,IAAP,CAAtB;;EACA,IAAI,CAACD,MAAL,EAAa;IACT,OAAOD,KAAP;EACH;;EACD,OAAOC,MAAM,CAACE,SAAP,CAAiB;IAAEL,KAAF;IAASE;EAAT,CAAjB,CAAP;AACH,CAPM"}

package/index.js

@@ -39,7 +39,7 @@ var _system2 = require("./definitions/system");
 
 var _settings2 = require("./definitions/settings");
 
-var _createElasticsearchTemplate = require("./operations/system/createElasticsearchTemplate");
+var _createElasticsearchIndex = require("./elasticsearch/createElasticsearchIndex");
 
 var _plugins = require("@webiny/plugins");
 
@@ -49,15 +49,18 @@ var _operators = require("@webiny/api-elasticsearch/operators");
 
 var _elasticsearchFields = require("./operations/entry/elasticsearchFields");
 
+var _indices = require("./elasticsearch/indices");
+
+var _deleteElasticsearchIndex = require("./elasticsearch/deleteElasticsearchIndex");
+
 const createStorageOperations = params => {
   const {
-    attributes = {},
+    attributes,
     table,
     esTable,
     documentClient,
     elasticsearch,
-    plugins: customPlugins,
-    modelFieldToGraphQLPlugins
+    plugins: userPlugins
   } = params;
   const tableInstance = (0, _table.createTable)({
     table,
@@ -71,43 +74,43 @@ const createStorageOperations = params => {
     settings: (0, _settings2.createSettingsEntity)({
       entityName: _types.ENTITIES.SETTINGS,
       table: tableInstance,
-      attributes: attributes[_types.ENTITIES.SETTINGS]
+      attributes: attributes ? attributes[_types.ENTITIES.SETTINGS] : {}
     }),
     system: (0, _system2.createSystemEntity)({
       entityName: _types.ENTITIES.SYSTEM,
       table: tableInstance,
-      attributes: attributes[_types.ENTITIES.SYSTEM]
+      attributes: attributes ? attributes[_types.ENTITIES.SYSTEM] : {}
     }),
     groups: (0, _group.createGroupEntity)({
       entityName: _types.ENTITIES.GROUPS,
       table: tableInstance,
-      attributes: attributes[_types.ENTITIES.GROUPS]
+      attributes: attributes ? attributes[_types.ENTITIES.GROUPS] : {}
     }),
     models: (0, _model2.createModelEntity)({
       entityName: _types.ENTITIES.MODELS,
       table: tableInstance,
-      attributes: attributes[_types.ENTITIES.MODELS]
+      attributes: attributes ? attributes[_types.ENTITIES.MODELS] : {}
     }),
     entries: (0, _entry2.createEntryEntity)({
       entityName: _types.ENTITIES.ENTRIES,
       table: tableInstance,
-      attributes: attributes[_types.ENTITIES.ENTRIES]
+      attributes: attributes ? attributes[_types.ENTITIES.ENTRIES] : {}
     }),
     entriesEs: (0, _entryElasticsearch.createEntryElasticsearchEntity)({
       entityName: _types.ENTITIES.ENTRIES_ES,
       table: tableElasticsearchInstance,
-      attributes: attributes[_types.ENTITIES.ENTRIES_ES]
+      attributes: attributes ? attributes[_types.ENTITIES.ENTRIES_ES] : {}
     })
   };
   const plugins = new _plugins.PluginsContainer([
   /**
    * User defined custom plugins.
    */
-  ...(customPlugins || []),
+  ...(userPlugins || []),
   /**
    * Plugins of type CmsModelFieldToGraphQLPlugin.
    */
-  modelFieldToGraphQLPlugins,
+
   /**
    * Elasticsearch field definitions for the entry record.
    */
@@ -127,21 +130,56 @@ const createStorageOperations = params => {
   /**
    * Field plugins for Elasticsearch.
    */
-  (0, _elasticsearch.default)()]);
+  (0, _elasticsearch.default)(),
+  /**
+   * Built-in Elasticsearch index templates.
+   */
+  (0, _indices.elasticsearchIndexPlugins)()]);
   return {
-    init: async cms => {
-      cms.onBeforeSystemInstall.subscribe(async () => {
-        await (0, _createElasticsearchTemplate.createElasticsearchTemplate)({
-          elasticsearch
+    beforeInit: async context => {
+      /**
+       * Collect all required plugins from parent context.
+       */
+      const fieldPlugins = context.plugins.byType("cms-model-field-to-graphql");
+      plugins.register(fieldPlugins);
+      /**
+       * Pass the plugins to the parent context.
+       */
+
+      context.plugins.register([(0, _dynamoDb.default)()]);
+    },
+    init: async context => {
+      /**
+       * We need to create indexes on before model create and on clone (create from).
+       * Other apps create indexes on locale creation.
+       */
+      context.cms.onBeforeModelCreate.subscribe(async ({
+        model
+      }) => {
+        await (0, _createElasticsearchIndex.createElasticsearchIndex)({
+          elasticsearch,
+          model,
+          plugins
+        });
+      });
+      context.cms.onBeforeModelCreateFrom.subscribe(async ({
+        model
+      }) => {
+        await (0, _createElasticsearchIndex.createElasticsearchIndex)({
+          elasticsearch,
+          model,
+          plugins
+        });
+      });
+      context.cms.onAfterModelDelete.subscribe(async ({
+        model
+      }) => {
+        await (0, _deleteElasticsearchIndex.deleteElasticsearchIndex)({
+          elasticsearch,
+          model
         });
       });
     },
-    plugins: [
-    /**
-     * Field plugins for DynamoDB.
-     * We must pass them to the base application.
-     */
-    (0, _dynamoDb.default)()],
     getEntities: () => entities,
     getTable: () => tableInstance,
     getEsTable: () => tableElasticsearchInstance,

package/index.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["createStorageOperations","params","attributes","table","esTable","documentClient","elasticsearch","plugins","userPlugins","tableInstance","createTable","tableElasticsearchInstance","createElasticsearchTable","entities","settings","createSettingsEntity","entityName","ENTITIES","SETTINGS","system","createSystemEntity","SYSTEM","groups","createGroupEntity","GROUPS","models","createModelEntity","MODELS","entries","createEntryEntity","ENTRIES","entriesEs","createEntryElasticsearchEntity","ENTRIES_ES","PluginsContainer","cmsEntryElasticsearchFields","dynamoDbValueFilters","getElasticsearchOperators","dynamoDbPlugins","elasticsearchPlugins","elasticsearchIndexPlugins","beforeInit","context","fieldPlugins","byType","register","init","cms","onBeforeModelCreate","subscribe","model","createElasticsearchIndex","onBeforeModelCreateFrom","onAfterModelDelete","deleteElasticsearchIndex","getEntities","getTable","getEsTable","createSystemStorageOperations","entity","createSettingsStorageOperations","createGroupsStorageOperations","createModelsStorageOperations","createEntriesStorageOperations","esEntity"],"sources":["index.ts"],"sourcesContent":["import dynamoDbValueFilters from \"@webiny/db-dynamodb/plugins/filters\";\nimport elasticsearchPlugins from \"./elasticsearch\";\nimport dynamoDbPlugins from \"./dynamoDb\";\nimport { createSettingsStorageOperations } from \"./operations/settings\";\nimport { createSystemStorageOperations } from \"./operations/system\";\nimport { createModelsStorageOperations } from \"./operations/model\";\nimport { createEntriesStorageOperations } from \"./operations/entry\";\nimport { ENTITIES, StorageOperationsFactory } from \"~/types\";\nimport { createTable } from \"~/definitions/table\";\nimport { createElasticsearchTable } from \"~/definitions/tableElasticsearch\";\nimport { createGroupEntity } from \"~/definitions/group\";\nimport { createModelEntity } from \"~/definitions/model\";\nimport { createEntryEntity } from \"~/definitions/entry\";\nimport { createEntryElasticsearchEntity } from \"~/definitions/entryElasticsearch\";\nimport { createSystemEntity } from \"~/definitions/system\";\nimport { createSettingsEntity } from \"~/definitions/settings\";\nimport { createElasticsearchIndex } from \"~/elasticsearch/createElasticsearchIndex\";\nimport { PluginsContainer } from \"@webiny/plugins\";\nimport { createGroupsStorageOperations } from \"~/operations/group\";\nimport { getElasticsearchOperators } from \"@webiny/api-elasticsearch/operators\";\nimport { elasticsearchFields as cmsEntryElasticsearchFields } from \"~/operations/entry/elasticsearchFields\";\nimport { elasticsearchIndexPlugins } from \"./elasticsearch/indices\";\nimport { deleteElasticsearchIndex } from \"./elasticsearch/deleteElasticsearchIndex\";\nimport { CmsModelFieldToGraphQLPlugin } from \"@webiny/api-headless-cms/types\";\n\nexport const createStorageOperations: StorageOperationsFactory = params => {\n    const {\n        attributes,\n        table,\n        esTable,\n        documentClient,\n        elasticsearch,\n        plugins: userPlugins\n    } = params;\n\n    const tableInstance = createTable({\n        table,\n        documentClient\n    });\n    const tableElasticsearchInstance = createElasticsearchTable({\n        table: esTable,\n        documentClient\n    });\n\n    const entities = {\n        settings: createSettingsEntity({\n            entityName: ENTITIES.SETTINGS,\n            table: tableInstance,\n            attributes: attributes ? attributes[ENTITIES.SETTINGS] : {}\n        }),\n        system: createSystemEntity({\n            entityName: ENTITIES.SYSTEM,\n            table: tableInstance,\n            attributes: attributes ? attributes[ENTITIES.SYSTEM] : {}\n        }),\n        groups: createGroupEntity({\n            entityName: ENTITIES.GROUPS,\n            table: tableInstance,\n            attributes: attributes ? attributes[ENTITIES.GROUPS] : {}\n        }),\n        models: createModelEntity({\n            entityName: ENTITIES.MODELS,\n            table: tableInstance,\n            attributes: attributes ? attributes[ENTITIES.MODELS] : {}\n        }),\n        entries: createEntryEntity({\n            entityName: ENTITIES.ENTRIES,\n            table: tableInstance,\n            attributes: attributes ? attributes[ENTITIES.ENTRIES] : {}\n        }),\n        entriesEs: createEntryElasticsearchEntity({\n            entityName: ENTITIES.ENTRIES_ES,\n            table: tableElasticsearchInstance,\n            attributes: attributes ? attributes[ENTITIES.ENTRIES_ES] : {}\n        })\n    };\n\n    const plugins = new PluginsContainer([\n        /**\n         * User defined custom plugins.\n         */\n        ...(userPlugins || []),\n        /**\n         * Plugins of type CmsModelFieldToGraphQLPlugin.\n         */\n        /**\n         * Elasticsearch field definitions for the entry record.\n         */\n        cmsEntryElasticsearchFields,\n        /**\n         * DynamoDB filter plugins for the where conditions.\n         */\n        dynamoDbValueFilters(),\n        /**\n         * Elasticsearch operators.\n         */\n        getElasticsearchOperators(),\n        /**\n         * Field plugins for DynamoDB.\n         */\n        dynamoDbPlugins(),\n        /**\n         * Field plugins for Elasticsearch.\n         */\n        elasticsearchPlugins(),\n        /**\n         * Built-in Elasticsearch index templates.\n         */\n        elasticsearchIndexPlugins()\n    ]);\n\n    return {\n        beforeInit: async context => {\n            /**\n             * Collect all required plugins from parent context.\n             */\n            const fieldPlugins = context.plugins.byType<CmsModelFieldToGraphQLPlugin>(\n                \"cms-model-field-to-graphql\"\n            );\n            plugins.register(fieldPlugins);\n\n            /**\n             * Pass the plugins to the parent context.\n             */\n            context.plugins.register([dynamoDbPlugins()]);\n        },\n        init: async context => {\n            /**\n             * We need to create indexes on before model create and on clone (create from).\n             * Other apps create indexes on locale creation.\n             */\n            context.cms.onBeforeModelCreate.subscribe(async ({ model }) => {\n                await createElasticsearchIndex({\n                    elasticsearch,\n                    model,\n                    plugins\n                });\n            });\n            context.cms.onBeforeModelCreateFrom.subscribe(async ({ model }) => {\n                await createElasticsearchIndex({\n                    elasticsearch,\n                    model,\n                    plugins\n                });\n            });\n            context.cms.onAfterModelDelete.subscribe(async ({ model }) => {\n                await deleteElasticsearchIndex({\n                    elasticsearch,\n                    model\n                });\n            });\n        },\n        getEntities: () => entities,\n        getTable: () => tableInstance,\n        getEsTable: () => tableElasticsearchInstance,\n        system: createSystemStorageOperations({\n            entity: entities.system\n        }),\n        settings: createSettingsStorageOperations({\n            entity: entities.settings\n        }),\n        groups: createGroupsStorageOperations({\n            entity: entities.groups,\n            plugins\n        }),\n        models: createModelsStorageOperations({\n            entity: entities.models,\n            elasticsearch\n        }),\n        entries: createEntriesStorageOperations({\n            entity: entities.entries,\n            esEntity: entities.entriesEs,\n            plugins,\n            elasticsearch\n        })\n    };\n};\n"],"mappings":";;;;;;;;;AAAA;;AACA;;AACA;;AACA;;AACA;;AACA;;AACA;;AACA;;AACA;;AACA;;AACA;;AACA;;AACA;;AACA;;AACA;;AACA;;AACA;;AACA;;AACA;;AACA;;AACA;;AACA;;AACA;;AAGO,MAAMA,uBAAiD,GAAGC,MAAM,IAAI;EACvE,MAAM;IACFC,UADE;IAEFC,KAFE;IAGFC,OAHE;IAIFC,cAJE;IAKFC,aALE;IAMFC,OAAO,EAAEC;EANP,IAOFP,MAPJ;EASA,MAAMQ,aAAa,GAAG,IAAAC,kBAAA,EAAY;IAC9BP,KAD8B;IAE9BE;EAF8B,CAAZ,CAAtB;EAIA,MAAMM,0BAA0B,GAAG,IAAAC,4CAAA,EAAyB;IACxDT,KAAK,EAAEC,OADiD;IAExDC;EAFwD,CAAzB,CAAnC;EAKA,MAAMQ,QAAQ,GAAG;IACbC,QAAQ,EAAE,IAAAC,+BAAA,EAAqB;MAC3BC,UAAU,EAAEC,eAAA,CAASC,QADM;MAE3Bf,KAAK,EAAEM,aAFoB;MAG3BP,UAAU,EAAEA,UAAU,GAAGA,UAAU,CAACe,eAAA,CAASC,QAAV,CAAb,GAAmC;IAH9B,CAArB,CADG;IAMbC,MAAM,EAAE,IAAAC,2BAAA,EAAmB;MACvBJ,UAAU,EAAEC,eAAA,CAASI,MADE;MAEvBlB,KAAK,EAAEM,aAFgB;MAGvBP,UAAU,EAAEA,UAAU,GAAGA,UAAU,CAACe,eAAA,CAASI,MAAV,CAAb,GAAiC;IAHhC,CAAnB,CANK;IAWbC,MAAM,EAAE,IAAAC,wBAAA,EAAkB;MACtBP,UAAU,EAAEC,eAAA,CAASO,MADC;MAEtBrB,KAAK,EAAEM,aAFe;MAGtBP,UAAU,EAAEA,UAAU,GAAGA,UAAU,CAACe,eAAA,CAASO,MAAV,CAAb,GAAiC;IAHjC,CAAlB,CAXK;IAgBbC,MAAM,EAAE,IAAAC,yBAAA,EAAkB;MACtBV,UAAU,EAAEC,eAAA,CAASU,MADC;MAEtBxB,KAAK,EAAEM,aAFe;MAGtBP,UAAU,EAAEA,UAAU,GAAGA,UAAU,CAACe,eAAA,CAASU,MAAV,CAAb,GAAiC;IAHjC,CAAlB,CAhBK;IAqBbC,OAAO,EAAE,IAAAC,yBAAA,EAAkB;MACvBb,UAAU,EAAEC,eAAA,CAASa,OADE;MAEvB3B,KAAK,EAAEM,aAFgB;MAGvBP,UAAU,EAAEA,UAAU,GAAGA,UAAU,CAACe,eAAA,CAASa,OAAV,CAAb,GAAkC;IAHjC,CAAlB,CArBI;IA0BbC,SAAS,EAAE,IAAAC,kDAAA,EAA+B;MACtChB,UAAU,EAAEC,eAAA,CAASgB,UADiB;MAEtC9B,KAAK,EAAEQ,0BAF+B;MAGtCT,UAAU,EAAEA,UAAU,GAAGA,UAAU,CAACe,eAAA,CAASgB,UAAV,CAAb,GAAqC;IAHrB,CAA/B;EA1BE,CAAjB;EAiCA,MAAM1B,OAAO,GAAG,IAAI2B,yBAAJ,CAAqB;EACjC;AACR;AACA;EACQ,IAAI1B,WAAW,IAAI,EAAnB,CAJiC;EAKjC;AACR;AACA;;EACQ;AACR;AACA;EACQ2B,wCAXiC;EAYjC;AACR;AACA;EACQ,IAAAC,gBAAA,GAfiC;EAgBjC;AACR;AACA;EACQ,IAAAC,oCAAA,GAnBiC;EAoBjC;AACR;AACA;EACQ,IAAAC,iBAAA,GAvBiC;EAwBjC;AACR;AACA;EACQ,IAAAC,sBAAA,GA3BiC;EA4BjC;AACR;AACA;EACQ,IAAAC,kCAAA,GA/BiC,CAArB,CAAhB;EAkCA,OAAO;IACHC,UAAU,EAAE,MAAMC,OAAN,IAAiB;MACzB;AACZ;AACA;MACY,MAAMC,YAAY,GAAGD,OAAO,CAACnC,OAAR,CAAgBqC,MAAhB,CACjB,4BADiB,CAArB;MAGArC,OAAO,CAACsC,QAAR,CAAiBF,YAAjB;MAEA;AACZ;AACA;;MACYD,OAAO,CAACnC,OAAR,CAAgBsC,QAAhB,CAAyB,CAAC,IAAAP,iBAAA,GAAD,CAAzB;IACH,CAdE;IAeHQ,IAAI,EAAE,MAAMJ,OAAN,IAAiB;MACnB;AACZ;AACA;AACA;MACYA,OAAO,CAACK,GAAR,CAAYC,mBAAZ,CAAgCC,SAAhC,CAA0C,OAAO;QAAEC;MAAF,CAAP,KAAqB;QAC3D,MAAM,IAAAC,kDAAA,EAAyB;UAC3B7C,aAD2B;UAE3B4C,KAF2B;UAG3B3C;QAH2B,CAAzB,CAAN;MAKH,CAND;MAOAmC,OAAO,CAACK,GAAR,CAAYK,uBAAZ,CAAoCH,SAApC,CAA8C,OAAO;QAAEC;MAAF,CAAP,KAAqB;QAC/D,MAAM,IAAAC,kDAAA,EAAyB;UAC3B7C,aAD2B;UAE3B4C,KAF2B;UAG3B3C;QAH2B,CAAzB,CAAN;MAKH,CAND;MAOAmC,OAAO,CAACK,GAAR,CAAYM,kBAAZ,CAA+BJ,SAA/B,CAAyC,OAAO;QAAEC;MAAF,CAAP,KAAqB;QAC1D,MAAM,IAAAI,kDAAA,EAAyB;UAC3BhD,aAD2B;UAE3B4C;QAF2B,CAAzB,CAAN;MAIH,CALD;IAMH,CAxCE;IAyCHK,WAAW,EAAE,MAAM1C,QAzChB;IA0CH2C,QAAQ,EAAE,MAAM/C,aA1Cb;IA2CHgD,UAAU,EAAE,MAAM9C,0BA3Cf;IA4CHQ,MAAM,EAAE,IAAAuC,qCAAA,EAA8B;MAClCC,MAAM,EAAE9C,QAAQ,CAACM;IADiB,CAA9B,CA5CL;IA+CHL,QAAQ,EAAE,IAAA8C,yCAAA,EAAgC;MACtCD,MAAM,EAAE9C,QAAQ,CAACC;IADqB,CAAhC,CA/CP;IAkDHQ,MAAM,EAAE,IAAAuC,qCAAA,EAA8B;MAClCF,MAAM,EAAE9C,QAAQ,CAACS,MADiB;MAElCf;IAFkC,CAA9B,CAlDL;IAsDHkB,MAAM,EAAE,IAAAqC,oCAAA,EAA8B;MAClCH,MAAM,EAAE9C,QAAQ,CAACY,MADiB;MAElCnB;IAFkC,CAA9B,CAtDL;IA0DHsB,OAAO,EAAE,IAAAmC,qCAAA,EAA+B;MACpCJ,MAAM,EAAE9C,QAAQ,CAACe,OADmB;MAEpCoC,QAAQ,EAAEnD,QAAQ,CAACkB,SAFiB;MAGpCxB,OAHoC;MAIpCD;IAJoC,CAA/B;EA1DN,CAAP;AAiEH,CAvJM"}

package/operations/entry/dataLoaders.d.ts

@@ -20,13 +20,13 @@ interface ClearLoaderParams {
     model: CmsModel;
     entry?: CmsEntry;
 }
-export interface Params {
+export interface DataLoadersHandlerParams {
     entity: Entity<any>;
 }
 export declare class DataLoadersHandler {
     private readonly loaders;
     private readonly entity;
-    constructor(params: any);
+    constructor(params: DataLoadersHandlerParams);
     getAllEntryRevisions(params: GetAllEntryRevisionsParams): Promise<CmsEntry[]>;
     clearAllEntryRevisions(params: ClearLoaderParams): void;
     getRevisionById(params: GetRevisionByIdParams): Promise<CmsEntry[]>;
@@ -35,6 +35,10 @@ export declare class DataLoadersHandler {
     clearPublishedRevisionByEntryId(params: ClearLoaderParams): void;
     getLatestRevisionByEntryId(params: GetLatestRevisionByEntryIdParams): Promise<CmsEntry[]>;
     clearLatestRevisionByEntryId(params: ClearLoaderParams): void;
+    /**
+     * TODO @ts-refactor
+     * Maybe pass on the generics to DataLoader definition?
+     */
     private getLoader;
     private loadMany;
     clearAll(params: Omit<ClearLoaderParams, "entry">): void;