@webiny/api-headless-cms-ddb-es 6.0.0-alpha.5 → 6.0.0-rc.0

package/helpers/entryIndexHelpers.js

@@ -1,13 +1,7 @@
-"use strict";
-
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.prepareEntryToIndex = exports.extractEntriesFromIndex = void 0;
-var _error = _interopRequireDefault(require("@webiny/error"));
-var _fieldIdentifier = require("./fieldIdentifier");
-const prepareEntryToIndex = params => {
+import WebinyError from "@webiny/error";
+import { getFieldIdentifier, getFieldIdentifiers } from "./fieldIdentifier.js";
+import { getBaseFieldType } from "@webiny/api-headless-cms/utils/getBaseFieldType.js";
+export const prepareEntryToIndex = params => {
   const {
     plugins,
     storageEntry,
@@ -21,15 +15,21 @@ const prepareEntryToIndex = params => {
   } = setupEntriesIndexHelpers({
     plugins
   });
-  function getFieldIndexPlugin(fieldType) {
+  function getFieldIndexPlugin(type) {
+    const fieldType = getBaseFieldType({
+      type
+    });
     return fieldIndexPlugins[fieldType] || defaultIndexFieldPlugin;
   }
-  function getFieldTypePlugin(fieldType) {
+  function getFieldTypePlugin(type) {
+    const fieldType = getBaseFieldType({
+      type
+    });
     const pl = fieldTypePlugins[fieldType];
     if (pl) {
       return pl;
     }
-    throw new _error.default(`Missing field type plugin "${fieldType}". Prepare entry for index.`);
+    throw new WebinyError(`Missing field type plugin "${fieldType}". Prepare entry for index.`);
   }
 
   // These objects will contain values processed by field index plugins
@@ -38,7 +38,7 @@ const prepareEntryToIndex = params => {
 
   // We're only interested in current model fields.
   for (const field of model.fields) {
-    const identifier = (0, _fieldIdentifier.getFieldIdentifier)(storageEntry.values, field);
+    const identifier = getFieldIdentifier(storageEntry.values, field);
     if (!identifier) {
       continue;
     }
@@ -73,7 +73,6 @@ const prepareEntryToIndex = params => {
     rawValues
   };
 };
-exports.prepareEntryToIndex = prepareEntryToIndex;
 const setupEntriesIndexHelpers = ({
   plugins: pluginsContainer
 }) => {
@@ -99,7 +98,7 @@ const setupEntriesIndexHelpers = ({
     fieldTypePlugins
   };
 };
-const extractEntriesFromIndex = ({
+export const extractEntriesFromIndex = ({
   plugins,
   entries,
   model
@@ -111,10 +110,16 @@ const extractEntriesFromIndex = ({
   } = setupEntriesIndexHelpers({
     plugins
   });
-  function getFieldIndexPlugin(fieldType) {
+  function getFieldIndexPlugin(type) {
+    const fieldType = getBaseFieldType({
+      type
+    });
     return fieldIndexPlugins[fieldType] || defaultIndexFieldPlugin;
   }
-  function getFieldTypePlugin(fieldType) {
+  function getFieldTypePlugin(type) {
+    const fieldType = getBaseFieldType({
+      type
+    });
     return fieldTypePlugins[fieldType];
   }
   const list = [];
@@ -124,9 +129,9 @@ const extractEntriesFromIndex = ({
 
     // We only consider fields that are present in the model
     for (const field of model.fields) {
-      const fieldTypePlugin = fieldTypePlugins[field.type];
+      const fieldTypePlugin = getFieldTypePlugin(field.type);
       if (!fieldTypePlugin) {
-        throw new _error.default(`Missing field type plugin "${field.type}". Extract entries from index.`);
+        throw new WebinyError(`Missing field type plugin "${field.type}". Extract entries from index.`);
       }
       const targetFieldPlugin = getFieldIndexPlugin(field.type);
       if (!targetFieldPlugin || !targetFieldPlugin.fromIndex) {
@@ -135,25 +140,27 @@ const extractEntriesFromIndex = ({
       /**
        * We can safely cast as the code will not continue in case of no identifiers.
        */
-      const identifiers = (0, _fieldIdentifier.getFieldIdentifiers)(entry.values, entry.rawValues, field);
+      const identifiers = getFieldIdentifiers(entry.values, entry.rawValues, field);
       if (!identifiers) {
         continue;
       }
       try {
-        indexValues[identifiers.valueIdentifier] = targetFieldPlugin.fromIndex({
+        const key = identifiers.valueIdentifier;
+        const rawKey = identifiers.rawValueIdentifier;
+        indexValues[key] = targetFieldPlugin.fromIndex({
           plugins,
           model,
           field,
           getFieldIndexPlugin,
           getFieldTypePlugin,
-          value: entry.values[identifiers.valueIdentifier || identifiers.rawValueIdentifier],
+          value: entry.values[key || rawKey],
           /**
            * Possibly no rawValues so we must check for the existence of the field.
            */
-          rawValue: entry.rawValues ? entry.rawValues[identifiers.rawValueIdentifier || identifiers.valueIdentifier] : null
+          rawValue: entry.rawValues ? entry.rawValues[rawKey || key] : null
         });
       } catch (ex) {
-        throw new _error.default(ex.message || "Could not transform entry field from index.", ex.code || "FIELD_FROM_INDEX_ERROR", {
+        throw new WebinyError(ex.message || "Could not transform entry field from index.", ex.code || "FIELD_FROM_INDEX_ERROR", {
           field,
           entry
         });
@@ -185,6 +192,5 @@ const extractEntriesFromIndex = ({
   }
   return list;
 };
-exports.extractEntriesFromIndex = extractEntriesFromIndex;
 
 //# sourceMappingURL=entryIndexHelpers.js.map

package/helpers/entryIndexHelpers.js.map

@@ -1 +1 @@
-{"version":3,"names":["_error","_interopRequireDefault","require","_fieldIdentifier","prepareEntryToIndex","params","plugins","storageEntry","entry","model","fieldIndexPlugins","defaultIndexFieldPlugin","fieldTypePlugins","setupEntriesIndexHelpers","getFieldIndexPlugin","fieldType","getFieldTypePlugin","pl","WebinyError","values","rawValues","field","fields","identifier","getFieldIdentifier","targetFieldPlugin","type","toIndex","value","rawValue","exports","pluginsContainer","byType","plugin","reverse","find","reduce","extractEntriesFromIndex","entries","list","indexValues","fieldTypePlugin","fromIndex","identifiers","getFieldIdentifiers","valueIdentifier","rawValueIdentifier","ex","message","code","newEntry","push"],"sources":["entryIndexHelpers.ts"],"sourcesContent":["import WebinyError from \"@webiny/error\";\nimport type {\n    CmsEntry,\n    CmsModel,\n    CmsModelFieldToGraphQLPlugin\n} from \"@webiny/api-headless-cms/types\";\nimport type { CmsIndexEntry, CmsModelFieldToElasticsearchPlugin } from \"~/types\";\nimport type { PluginsContainer } from \"@webiny/plugins\";\nimport { getFieldIdentifier, getFieldIdentifiers } from \"~/helpers/fieldIdentifier\";\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        const identifier = getFieldIdentifier(storageEntry.values, field);\n        if (!identifier) {\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[identifier],\n            value: storageEntry.values[identifier],\n            getFieldIndexPlugin,\n            getFieldTypePlugin\n        });\n\n        if (typeof value !== \"undefined\") {\n            values[identifier] = value;\n        }\n\n        if (typeof rawValue !== \"undefined\") {\n            rawValues[identifier] = 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            /**\n             * We can safely cast as the code will not continue in case of no identifiers.\n             */\n            const identifiers = getFieldIdentifiers(entry.values, entry.rawValues, field);\n            if (!identifiers) {\n                continue;\n            }\n\n            try {\n                indexValues[identifiers.valueIdentifier] = targetFieldPlugin.fromIndex({\n                    plugins,\n                    model,\n                    field,\n                    getFieldIndexPlugin,\n                    getFieldTypePlugin,\n                    value: entry.values[\n                        identifiers.valueIdentifier || identifiers.rawValueIdentifier\n                    ],\n                    /**\n                     * Possibly no rawValues so we must check for the existence of the field.\n                     */\n                    rawValue: entry.rawValues\n                        ? entry.rawValues[\n                              identifiers.rawValueIdentifier || identifiers.valueIdentifier\n                          ]\n                        : 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-expect-error\n        delete newEntry[\"rawValues\"];\n        // @ts-expect-error\n        delete newEntry[\"TYPE\"];\n        // @ts-expect-error\n        delete newEntry[\"__type\"];\n        // @ts-expect-error\n        delete newEntry[\"latest\"];\n        // @ts-expect-error\n        delete newEntry[\"published\"];\n        list.push({ ...newEntry });\n    }\n\n    return list;\n};\n"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["WebinyError","getFieldIdentifier","getFieldIdentifiers","getBaseFieldType","prepareEntryToIndex","params","plugins","storageEntry","entry","model","fieldIndexPlugins","defaultIndexFieldPlugin","fieldTypePlugins","setupEntriesIndexHelpers","getFieldIndexPlugin","type","fieldType","getFieldTypePlugin","pl","values","rawValues","field","fields","identifier","targetFieldPlugin","toIndex","value","rawValue","pluginsContainer","byType","plugin","reverse","find","reduce","extractEntriesFromIndex","entries","list","indexValues","fieldTypePlugin","fromIndex","identifiers","key","valueIdentifier","rawKey","rawValueIdentifier","ex","message","code","newEntry","push"],"sources":["entryIndexHelpers.ts"],"sourcesContent":["import WebinyError from \"@webiny/error\";\nimport type {\n    CmsEntry,\n    CmsEntryValues,\n    CmsModel,\n    CmsModelFieldToGraphQLPlugin\n} from \"@webiny/api-headless-cms/types/index.js\";\nimport type { CmsIndexEntry, CmsModelFieldToElasticsearchPlugin } from \"~/types.js\";\nimport type { PluginsContainer } from \"@webiny/plugins\";\nimport { getFieldIdentifier, getFieldIdentifiers } from \"~/helpers/fieldIdentifier.js\";\nimport { getBaseFieldType } from \"@webiny/api-headless-cms/utils/getBaseFieldType.js\";\n\ninterface SetupEntriesIndexHelpersParams {\n    plugins: PluginsContainer;\n}\n\ninterface ExtractEntriesFromIndexParams<T extends CmsEntryValues = CmsEntryValues>\n    extends SetupEntriesIndexHelpersParams {\n    model: CmsModel;\n    entries: CmsIndexEntry<T>[];\n}\n\ninterface PrepareElasticsearchDataParams<T extends CmsEntryValues = CmsEntryValues>\n    extends SetupEntriesIndexHelpersParams {\n    model: CmsModel;\n    entry: CmsEntry<T>;\n    storageEntry: CmsEntry<T>;\n}\n\nexport const prepareEntryToIndex = <T extends CmsEntryValues = CmsEntryValues>(\n    params: PrepareElasticsearchDataParams<T>\n): CmsIndexEntry<T> => {\n    const { plugins, storageEntry, entry, model } = params;\n    const { fieldIndexPlugins, defaultIndexFieldPlugin, fieldTypePlugins } =\n        setupEntriesIndexHelpers({ plugins });\n\n    function getFieldIndexPlugin(type: string) {\n        const fieldType = getBaseFieldType({\n            type\n        });\n        return fieldIndexPlugins[fieldType] || defaultIndexFieldPlugin;\n    }\n\n    function getFieldTypePlugin(type: string) {\n        const fieldType = getBaseFieldType({\n            type\n        });\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: T = {} as T;\n    const rawValues: T = {} as T;\n\n    // We're only interested in current model fields.\n    for (const field of model.fields) {\n        const identifier = getFieldIdentifier(storageEntry.values, field) as keyof T;\n        if (!identifier) {\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[identifier],\n            value: storageEntry.values[identifier],\n            getFieldIndexPlugin,\n            getFieldTypePlugin\n        });\n\n        if (typeof value !== \"undefined\") {\n            values[identifier] = value;\n        }\n\n        if (typeof rawValue !== \"undefined\") {\n            rawValues[identifier] = rawValue;\n        }\n    }\n    return {\n        ...storageEntry,\n        values,\n        rawValues\n    };\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 = <T extends CmsEntryValues = CmsEntryValues>({\n    plugins,\n    entries,\n    model\n}: ExtractEntriesFromIndexParams<T>): CmsEntry<T>[] => {\n    const { fieldIndexPlugins, defaultIndexFieldPlugin, fieldTypePlugins } =\n        setupEntriesIndexHelpers({ plugins });\n\n    function getFieldIndexPlugin(type: string) {\n        const fieldType = getBaseFieldType({\n            type\n        });\n        return fieldIndexPlugins[fieldType] || defaultIndexFieldPlugin;\n    }\n\n    function getFieldTypePlugin(type: string) {\n        const fieldType = getBaseFieldType({\n            type\n        });\n        return fieldTypePlugins[fieldType];\n    }\n\n    const list: CmsEntry<T>[] = [];\n\n    for (const entry of entries) {\n        // This object will contain values processed by field index plugins\n        const indexValues: T = {} as T;\n\n        // We only consider fields that are present in the model\n        for (const field of model.fields) {\n            const fieldTypePlugin = getFieldTypePlugin(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            /**\n             * We can safely cast as the code will not continue in case of no identifiers.\n             */\n            const identifiers = getFieldIdentifiers(entry.values, entry.rawValues, field);\n            if (!identifiers) {\n                continue;\n            }\n\n            try {\n                const key = identifiers.valueIdentifier as keyof T;\n                const rawKey = identifiers.rawValueIdentifier as keyof T;\n                indexValues[key] = targetFieldPlugin.fromIndex({\n                    plugins,\n                    model,\n                    field,\n                    getFieldIndexPlugin,\n                    getFieldTypePlugin,\n                    value: entry.values[key || rawKey],\n                    /**\n                     * Possibly no rawValues so we must check for the existence of the field.\n                     */\n                    rawValue: entry.rawValues ? entry.rawValues[rawKey || key] : 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<T> = {\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-expect-error\n        delete newEntry[\"rawValues\"];\n        // @ts-expect-error\n        delete newEntry[\"TYPE\"];\n        // @ts-expect-error\n        delete newEntry[\"__type\"];\n        // @ts-expect-error\n        delete newEntry[\"latest\"];\n        // @ts-expect-error\n        delete newEntry[\"published\"];\n        list.push({\n            ...newEntry\n        });\n    }\n\n    return list;\n};\n"],"mappings":"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","ignoreList":[]}

package/helpers/fieldIdentifier.d.ts

@@ -1,4 +1,4 @@
-import type { CmsEntryValues, CmsModelField } from "@webiny/api-headless-cms/types";
+import type { CmsEntryValues, CmsModelField } from "@webiny/api-headless-cms/types/index.js";
 export declare const getFieldIdentifier: (values: CmsEntryValues | null | undefined, field: CmsModelField) => string | undefined;
 export declare const getFieldIdentifiers: (values: CmsEntryValues, rawValues: CmsEntryValues | null | undefined, field: CmsModelField) => {
     valueIdentifier: string;

package/helpers/fieldIdentifier.js

@@ -1,9 +1,3 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.getFieldIdentifiers = exports.getFieldIdentifier = void 0;
 const hasOwnProperty = (values = {}, property) => {
   if (!values) {
     return false;
@@ -12,7 +6,7 @@ const hasOwnProperty = (values = {}, property) => {
   }
   return values[property] !== undefined;
 };
-const getFieldIdentifier = (values, field) => {
+export const getFieldIdentifier = (values, field) => {
   if (field.storageId && hasOwnProperty(values, field.storageId)) {
     return field.storageId;
   } else if (hasOwnProperty(values, field.fieldId)) {
@@ -20,8 +14,7 @@ const getFieldIdentifier = (values, field) => {
   }
   return undefined;
 };
-exports.getFieldIdentifier = getFieldIdentifier;
-const getFieldIdentifiers = (values, rawValues, field) => {
+export const getFieldIdentifiers = (values, rawValues, field) => {
   let valueIdentifier = getFieldIdentifier(values, field);
   let rawValueIdentifier = getFieldIdentifier(rawValues, field);
   if (!valueIdentifier && !rawValueIdentifier) {
@@ -38,6 +31,5 @@ const getFieldIdentifiers = (values, rawValues, field) => {
     rawValueIdentifier
   };
 };
-exports.getFieldIdentifiers = getFieldIdentifiers;
 
 //# sourceMappingURL=fieldIdentifier.js.map

package/helpers/fieldIdentifier.js.map

@@ -1 +1 @@
-{"version":3,"names":["hasOwnProperty","values","property","undefined","getFieldIdentifier","field","storageId","fieldId","exports","getFieldIdentifiers","rawValues","valueIdentifier","rawValueIdentifier"],"sources":["fieldIdentifier.ts"],"sourcesContent":["import type { CmsEntryValues, CmsModelField } from \"@webiny/api-headless-cms/types\";\n\nconst hasOwnProperty = (\n    values: CmsEntryValues | null | undefined = {},\n    property: string\n): boolean => {\n    if (!values) {\n        return false;\n    } else if (values.hasOwnProperty) {\n        return values.hasOwnProperty(property);\n    }\n    return values[property] !== undefined;\n};\n\nexport const getFieldIdentifier = (\n    values: CmsEntryValues | null | undefined,\n    field: CmsModelField\n): string | undefined => {\n    if (field.storageId && hasOwnProperty(values, field.storageId)) {\n        return field.storageId;\n    } else if (hasOwnProperty(values, field.fieldId)) {\n        return field.fieldId;\n    }\n    return undefined;\n};\n\nexport const getFieldIdentifiers = (\n    values: CmsEntryValues,\n    rawValues: CmsEntryValues | null | undefined,\n    field: CmsModelField\n) => {\n    let valueIdentifier = getFieldIdentifier(values, field);\n    let rawValueIdentifier = getFieldIdentifier(rawValues, field);\n    if (!valueIdentifier && !rawValueIdentifier) {\n        return null;\n    }\n    if (!valueIdentifier) {\n        valueIdentifier = rawValueIdentifier as string;\n    }\n    if (!rawValueIdentifier) {\n        rawValueIdentifier = valueIdentifier as string;\n    }\n    return {\n        valueIdentifier,\n        rawValueIdentifier\n    };\n};\n"],"mappings":";;;;;;AAEA,MAAMA,cAAc,GAAGA,CACnBC,MAAyC,GAAG,CAAC,CAAC,EAC9CC,QAAgB,KACN;EACV,IAAI,CAACD,MAAM,EAAE;IACT,OAAO,KAAK;EAChB,CAAC,MAAM,IAAIA,MAAM,CAACD,cAAc,EAAE;IAC9B,OAAOC,MAAM,CAACD,cAAc,CAACE,QAAQ,CAAC;EAC1C;EACA,OAAOD,MAAM,CAACC,QAAQ,CAAC,KAAKC,SAAS;AACzC,CAAC;AAEM,MAAMC,kBAAkB,GAAGA,CAC9BH,MAAyC,EACzCI,KAAoB,KACC;EACrB,IAAIA,KAAK,CAACC,SAAS,IAAIN,cAAc,CAACC,MAAM,EAAEI,KAAK,CAACC,SAAS,CAAC,EAAE;IAC5D,OAAOD,KAAK,CAACC,SAAS;EAC1B,CAAC,MAAM,IAAIN,cAAc,CAACC,MAAM,EAAEI,KAAK,CAACE,OAAO,CAAC,EAAE;IAC9C,OAAOF,KAAK,CAACE,OAAO;EACxB;EACA,OAAOJ,SAAS;AACpB,CAAC;AAACK,OAAA,CAAAJ,kBAAA,GAAAA,kBAAA;AAEK,MAAMK,mBAAmB,GAAGA,CAC/BR,MAAsB,EACtBS,SAA4C,EAC5CL,KAAoB,KACnB;EACD,IAAIM,eAAe,GAAGP,kBAAkB,CAACH,MAAM,EAAEI,KAAK,CAAC;EACvD,IAAIO,kBAAkB,GAAGR,kBAAkB,CAACM,SAAS,EAAEL,KAAK,CAAC;EAC7D,IAAI,CAACM,eAAe,IAAI,CAACC,kBAAkB,EAAE;IACzC,OAAO,IAAI;EACf;EACA,IAAI,CAACD,eAAe,EAAE;IAClBA,eAAe,GAAGC,kBAA4B;EAClD;EACA,IAAI,CAACA,kBAAkB,EAAE;IACrBA,kBAAkB,GAAGD,eAAyB;EAClD;EACA,OAAO;IACHA,eAAe;IACfC;EACJ,CAAC;AACL,CAAC;AAACJ,OAAA,CAAAC,mBAAA,GAAAA,mBAAA","ignoreList":[]}
+{"version":3,"names":["hasOwnProperty","values","property","undefined","getFieldIdentifier","field","storageId","fieldId","getFieldIdentifiers","rawValues","valueIdentifier","rawValueIdentifier"],"sources":["fieldIdentifier.ts"],"sourcesContent":["import type { CmsEntryValues, CmsModelField } from \"@webiny/api-headless-cms/types/index.js\";\n\nconst hasOwnProperty = (\n    values: CmsEntryValues | null | undefined = {},\n    property: string\n): boolean => {\n    if (!values) {\n        return false;\n    } else if (values.hasOwnProperty) {\n        return values.hasOwnProperty(property);\n    }\n    return values[property] !== undefined;\n};\n\nexport const getFieldIdentifier = (\n    values: CmsEntryValues | null | undefined,\n    field: CmsModelField\n): string | undefined => {\n    if (field.storageId && hasOwnProperty(values, field.storageId)) {\n        return field.storageId;\n    } else if (hasOwnProperty(values, field.fieldId)) {\n        return field.fieldId;\n    }\n    return undefined;\n};\n\nexport const getFieldIdentifiers = (\n    values: CmsEntryValues,\n    rawValues: CmsEntryValues | null | undefined,\n    field: CmsModelField\n) => {\n    let valueIdentifier = getFieldIdentifier(values, field);\n    let rawValueIdentifier = getFieldIdentifier(rawValues, field);\n    if (!valueIdentifier && !rawValueIdentifier) {\n        return null;\n    }\n    if (!valueIdentifier) {\n        valueIdentifier = rawValueIdentifier as string;\n    }\n    if (!rawValueIdentifier) {\n        rawValueIdentifier = valueIdentifier as string;\n    }\n    return {\n        valueIdentifier,\n        rawValueIdentifier\n    };\n};\n"],"mappings":"AAEA,MAAMA,cAAc,GAAGA,CACnBC,MAAyC,GAAG,CAAC,CAAC,EAC9CC,QAAgB,KACN;EACV,IAAI,CAACD,MAAM,EAAE;IACT,OAAO,KAAK;EAChB,CAAC,MAAM,IAAIA,MAAM,CAACD,cAAc,EAAE;IAC9B,OAAOC,MAAM,CAACD,cAAc,CAACE,QAAQ,CAAC;EAC1C;EACA,OAAOD,MAAM,CAACC,QAAQ,CAAC,KAAKC,SAAS;AACzC,CAAC;AAED,OAAO,MAAMC,kBAAkB,GAAGA,CAC9BH,MAAyC,EACzCI,KAAoB,KACC;EACrB,IAAIA,KAAK,CAACC,SAAS,IAAIN,cAAc,CAACC,MAAM,EAAEI,KAAK,CAACC,SAAS,CAAC,EAAE;IAC5D,OAAOD,KAAK,CAACC,SAAS;EAC1B,CAAC,MAAM,IAAIN,cAAc,CAACC,MAAM,EAAEI,KAAK,CAACE,OAAO,CAAC,EAAE;IAC9C,OAAOF,KAAK,CAACE,OAAO;EACxB;EACA,OAAOJ,SAAS;AACpB,CAAC;AAED,OAAO,MAAMK,mBAAmB,GAAGA,CAC/BP,MAAsB,EACtBQ,SAA4C,EAC5CJ,KAAoB,KACnB;EACD,IAAIK,eAAe,GAAGN,kBAAkB,CAACH,MAAM,EAAEI,KAAK,CAAC;EACvD,IAAIM,kBAAkB,GAAGP,kBAAkB,CAACK,SAAS,EAAEJ,KAAK,CAAC;EAC7D,IAAI,CAACK,eAAe,IAAI,CAACC,kBAAkB,EAAE;IACzC,OAAO,IAAI;EACf;EACA,IAAI,CAACD,eAAe,EAAE;IAClBA,eAAe,GAAGC,kBAA4B;EAClD;EACA,IAAI,CAACA,kBAAkB,EAAE;IACrBA,kBAAkB,GAAGD,eAAyB;EAClD;EACA,OAAO;IACHA,eAAe;IACfC;EACJ,CAAC;AACL,CAAC","ignoreList":[]}

package/helpers/index.d.ts

@@ -1,2 +1,2 @@
-export * from "./entryIndexHelpers";
-export * from "./fieldIdentifier";
+export * from "./entryIndexHelpers.js";
+export * from "./fieldIdentifier.js";

package/helpers/index.js

@@ -1,29 +1,4 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-var _entryIndexHelpers = require("./entryIndexHelpers");
-Object.keys(_entryIndexHelpers).forEach(function (key) {
-  if (key === "default" || key === "__esModule") return;
-  if (key in exports && exports[key] === _entryIndexHelpers[key]) return;
-  Object.defineProperty(exports, key, {
-    enumerable: true,
-    get: function () {
-      return _entryIndexHelpers[key];
-    }
-  });
-});
-var _fieldIdentifier = require("./fieldIdentifier");
-Object.keys(_fieldIdentifier).forEach(function (key) {
-  if (key === "default" || key === "__esModule") return;
-  if (key in exports && exports[key] === _fieldIdentifier[key]) return;
-  Object.defineProperty(exports, key, {
-    enumerable: true,
-    get: function () {
-      return _fieldIdentifier[key];
-    }
-  });
-});
+export * from "./entryIndexHelpers.js";
+export * from "./fieldIdentifier.js";
 
 //# sourceMappingURL=index.js.map

package/helpers/index.js.map

@@ -1 +1 @@
-{"version":3,"names":["_entryIndexHelpers","require","Object","keys","forEach","key","exports","defineProperty","enumerable","get","_fieldIdentifier"],"sources":["index.ts"],"sourcesContent":["export * from \"./entryIndexHelpers\";\nexport * from \"./fieldIdentifier\";\n"],"mappings":";;;;;AAAA,IAAAA,kBAAA,GAAAC,OAAA;AAAAC,MAAA,CAAAC,IAAA,CAAAH,kBAAA,EAAAI,OAAA,WAAAC,GAAA;EAAA,IAAAA,GAAA,kBAAAA,GAAA;EAAA,IAAAA,GAAA,IAAAC,OAAA,IAAAA,OAAA,CAAAD,GAAA,MAAAL,kBAAA,CAAAK,GAAA;EAAAH,MAAA,CAAAK,cAAA,CAAAD,OAAA,EAAAD,GAAA;IAAAG,UAAA;IAAAC,GAAA,WAAAA,CAAA;MAAA,OAAAT,kBAAA,CAAAK,GAAA;IAAA;EAAA;AAAA;AACA,IAAAK,gBAAA,GAAAT,OAAA;AAAAC,MAAA,CAAAC,IAAA,CAAAO,gBAAA,EAAAN,OAAA,WAAAC,GAAA;EAAA,IAAAA,GAAA,kBAAAA,GAAA;EAAA,IAAAA,GAAA,IAAAC,OAAA,IAAAA,OAAA,CAAAD,GAAA,MAAAK,gBAAA,CAAAL,GAAA;EAAAH,MAAA,CAAAK,cAAA,CAAAD,OAAA,EAAAD,GAAA;IAAAG,UAAA;IAAAC,GAAA,WAAAA,CAAA;MAAA,OAAAC,gBAAA,CAAAL,GAAA;IAAA;EAAA;AAAA","ignoreList":[]}
+{"version":3,"names":[],"sources":["index.ts"],"sourcesContent":["export * from \"./entryIndexHelpers.js\";\nexport * from \"./fieldIdentifier.js\";\n"],"mappings":"AAAA;AACA","ignoreList":[]}

package/index.d.ts

@@ -1,3 +1,3 @@
-import type { StorageOperationsFactory } from "./types";
-export * from "./plugins";
+import type { StorageOperationsFactory } from "./types.js";
+export * from "./plugins/index.js";
 export declare const createStorageOperations: StorageOperationsFactory;

package/index.js

@@ -1,122 +1,90 @@
-"use strict";
-
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-var _exportNames = {
-  createStorageOperations: true
-};
-exports.createStorageOperations = void 0;
-var _filters = _interopRequireDefault(require("@webiny/db-dynamodb/plugins/filters"));
-var _elasticsearch = _interopRequireDefault(require("./elasticsearch"));
-var _dynamoDb = _interopRequireDefault(require("./dynamoDb"));
-var _system = require("./operations/system");
-var _model = require("./operations/model");
-var _entry = require("./operations/entry");
-var _types = require("./types");
-var _table = require("./definitions/table");
-var _tableElasticsearch = require("./definitions/tableElasticsearch");
-var _group = require("./definitions/group");
-var _model2 = require("./definitions/model");
-var _entry2 = require("./definitions/entry");
-var _entryElasticsearch = require("./definitions/entryElasticsearch");
-var _system2 = require("./definitions/system");
-var _createElasticsearchIndex = require("./elasticsearch/createElasticsearchIndex");
-var _plugins = require("@webiny/plugins");
-var _group2 = require("./operations/group");
-var _apiElasticsearch = require("@webiny/api-elasticsearch");
-var _indices = require("./elasticsearch/indices");
-var _deleteElasticsearchIndex = require("./elasticsearch/deleteElasticsearchIndex");
-var _plugins2 = require("./plugins");
-Object.keys(_plugins2).forEach(function (key) {
-  if (key === "default" || key === "__esModule") return;
-  if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
-  if (key in exports && exports[key] === _plugins2[key]) return;
-  Object.defineProperty(exports, key, {
-    enumerable: true,
-    get: function () {
-      return _plugins2[key];
-    }
-  });
-});
-var _plugins3 = require("./operations/entry/elasticsearch/filtering/plugins");
-var _CmsEntryFilterPlugin = require("./plugins/CmsEntryFilterPlugin");
-var _apiHeadlessCms = require("@webiny/api-headless-cms");
-var _indexes = require("./operations/system/indexes");
-var _createIndexTaskPlugin = require("./tasks/createIndexTaskPlugin");
-var _api = require("@webiny/api");
-const createStorageOperations = params => {
+import dynamoDbValueFilters from "@webiny/db-dynamodb/plugins/filters/index.js";
+import elasticsearchPlugins from "./elasticsearch/index.js";
+import dynamoDbPlugins from "./dynamoDb/index.js";
+import { createModelsStorageOperations } from "./operations/model/index.js";
+import { createEntriesStorageOperations } from "./operations/entry/index.js";
+import { ENTITIES } from "./types.js";
+import { createGroupEntity } from "./definitions/group.js";
+import { createModelEntity } from "./definitions/model.js";
+import { createEntryEntity } from "./definitions/entry.js";
+import { createElasticsearchIndex } from "./elasticsearch/createElasticsearchIndex.js";
+import { PluginsContainer } from "@webiny/plugins";
+import { createGroupsStorageOperations } from "./operations/group/index.js";
+import { createElasticsearchEntity, createElasticsearchTable, ElasticsearchQueryBuilderOperatorPlugin } from "@webiny/api-elasticsearch";
+import { elasticsearchIndexPlugins } from "./elasticsearch/indices/index.js";
+import { deleteElasticsearchIndex } from "./elasticsearch/deleteElasticsearchIndex.js";
+import { CmsElasticsearchModelFieldPlugin, CmsEntryElasticsearchBodyModifierPlugin, CmsEntryElasticsearchFullTextSearchPlugin, CmsEntryElasticsearchIndexPlugin, CmsEntryElasticsearchQueryBuilderValueSearchPlugin, CmsEntryElasticsearchQueryModifierPlugin, CmsEntryElasticsearchSortModifierPlugin, CmsEntryElasticsearchValuesModifier } from "./plugins/index.js";
+import { createFilterPlugins } from "./operations/entry/elasticsearch/filtering/plugins/index.js";
+import { CmsEntryFilterPlugin } from "./plugins/CmsEntryFilterPlugin.js";
+import { StorageOperationsCmsModelPlugin, StorageTransformPlugin } from "@webiny/api-headless-cms";
+import { createCreateIndexTask } from "./tasks/createIndexTaskPlugin.js";
+import { CompressorPlugin } from "@webiny/api";
+import { ModelAfterCreateEventHandler } from "@webiny/api-headless-cms/features/contentModel/CreateModel/index.js";
+import { ModelAfterCreateFromEventHandler } from "@webiny/api-headless-cms/features/contentModel/CreateModelFrom/events.js";
+import { ModelAfterDeleteEventHandler } from "@webiny/api-headless-cms/features/contentModel/DeleteModel/events.js";
+import { createTable } from "@webiny/db-dynamodb";
+export * from "./plugins/index.js";
+export const createStorageOperations = params => {
   const {
-    attributes,
     table,
     esTable,
     documentClient,
     elasticsearch,
     plugins: userPlugins
   } = params;
-  const tableInstance = (0, _table.createTable)({
-    table,
+  const tableInstance = createTable({
+    name: table || process.env.DB_TABLE,
     documentClient
   });
-  const tableElasticsearchInstance = (0, _tableElasticsearch.createElasticsearchTable)({
-    table: esTable,
+  const tableElasticsearchInstance = createElasticsearchTable({
+    name: esTable,
     documentClient
   });
   const entities = {
-    system: (0, _system2.createSystemEntity)({
-      entityName: _types.ENTITIES.SYSTEM,
-      table: tableInstance,
-      attributes: attributes ? attributes[_types.ENTITIES.SYSTEM] : {}
+    groups: createGroupEntity({
+      entityName: ENTITIES.GROUPS,
+      table: tableInstance
     }),
-    groups: (0, _group.createGroupEntity)({
-      entityName: _types.ENTITIES.GROUPS,
-      table: tableInstance,
-      attributes: attributes ? attributes[_types.ENTITIES.GROUPS] : {}
+    models: createModelEntity({
+      entityName: ENTITIES.MODELS,
+      table: tableInstance
     }),
-    models: (0, _model2.createModelEntity)({
-      entityName: _types.ENTITIES.MODELS,
-      table: tableInstance,
-      attributes: attributes ? attributes[_types.ENTITIES.MODELS] : {}
+    entries: createEntryEntity({
+      entityName: ENTITIES.ENTRIES,
+      table: tableInstance
     }),
-    entries: (0, _entry2.createEntryEntity)({
-      entityName: _types.ENTITIES.ENTRIES,
-      table: tableInstance,
-      attributes: attributes ? attributes[_types.ENTITIES.ENTRIES] : {}
-    }),
-    entriesEs: (0, _entryElasticsearch.createEntryElasticsearchEntity)({
-      entityName: _types.ENTITIES.ENTRIES_ES,
-      table: tableElasticsearchInstance,
-      attributes: attributes ? attributes[_types.ENTITIES.ENTRIES_ES] : {}
+    entriesEs: createElasticsearchEntity({
+      entityName: ENTITIES.ENTRIES_ES,
+      table: tableElasticsearchInstance
     })
   };
-  const plugins = new _plugins.PluginsContainer([
+  const plugins = new PluginsContainer([
   /**
    * DynamoDB filter plugins for the where conditions.
    */
-  (0, _filters.default)(),
+  dynamoDbValueFilters(),
   /**
    * Field plugins for DynamoDB.
    */
-  (0, _dynamoDb.default)(),
+  dynamoDbPlugins(),
   /**
    * Field plugins for Elasticsearch.
    */
-  (0, _elasticsearch.default)(),
+  elasticsearchPlugins(),
   /**
    * Built-in Elasticsearch index templates.
    */
-  (0, _indices.elasticsearchIndexPlugins)(),
+  elasticsearchIndexPlugins(),
   /**
    * Filter plugins used to apply filtering from where conditions to Elasticsearch query.
    */
-  (0, _plugins3.createFilterPlugins)(),
+  createFilterPlugins(),
   /**
    * User defined custom plugins.
    * They are at the end because we can then override existing plugins.
    */
   ...(userPlugins || [])]);
-  const entries = (0, _entry.createEntriesStorageOperations)({
+  const entries = createEntriesStorageOperations({
     entity: entities.entries,
     esEntity: entities.entriesEs,
     plugins,
@@ -141,17 +109,23 @@ const createStorageOperations = params => {
       if (!context.elasticsearch) {
         context.elasticsearch = elasticsearch;
       }
+
+      /**
+       * This registers the task implementation
+       */
+      createCreateIndexTask(context);
+
       /**
        * Pass the plugins to the parent context.
        */
-      context.plugins.register([(0, _dynamoDb.default)(), (0, _createIndexTaskPlugin.createIndexTaskPluginTest)(), (0, _indices.elasticsearchIndexPlugins)()]);
+      context.plugins.register([dynamoDbPlugins(), elasticsearchIndexPlugins()]);
       /**
        * We need to fetch all the plugin types in the list from the main container.
        * This way we do not need to register plugins in the storage plugins contains.
        */
-      const types = [_apiElasticsearch.ElasticsearchQueryBuilderOperatorPlugin.type,
+      const types = [ElasticsearchQueryBuilderOperatorPlugin.type,
       // Headless CMS
-      "cms-model-field-to-graphql", _CmsEntryFilterPlugin.CmsEntryFilterPlugin.type, _plugins2.CmsEntryElasticsearchBodyModifierPlugin.type, _plugins2.CmsEntryElasticsearchFullTextSearchPlugin.type, _plugins2.CmsEntryElasticsearchIndexPlugin.type, _plugins2.CmsEntryElasticsearchQueryBuilderValueSearchPlugin.type, _plugins2.CmsEntryElasticsearchQueryModifierPlugin.type, _plugins2.CmsEntryElasticsearchSortModifierPlugin.type, _plugins2.CmsElasticsearchModelFieldPlugin.type, _apiHeadlessCms.StorageOperationsCmsModelPlugin.type, _apiHeadlessCms.StorageTransformPlugin.type, _plugins2.CmsEntryElasticsearchValuesModifier.type, _api.CompressorPlugin.type];
+      "cms-model-field-to-graphql", CmsEntryFilterPlugin.type, CmsEntryElasticsearchBodyModifierPlugin.type, CmsEntryElasticsearchFullTextSearchPlugin.type, CmsEntryElasticsearchIndexPlugin.type, CmsEntryElasticsearchQueryBuilderValueSearchPlugin.type, CmsEntryElasticsearchQueryModifierPlugin.type, CmsEntryElasticsearchSortModifierPlugin.type, CmsElasticsearchModelFieldPlugin.type, StorageOperationsCmsModelPlugin.type, StorageTransformPlugin.type, CmsEntryElasticsearchValuesModifier.type, CompressorPlugin.type];
       for (const type of types) {
         plugins.mergeByType(context.plugins, type);
       }
@@ -159,67 +133,58 @@ const createStorageOperations = params => {
     },
     init: async context => {
       /**
-       * We need to create indexes on before model create and on clone (create from).
-       * Other apps create indexes on locale creation.
+       * TODO @pavel
+       * Moved operations to AFTER create/from because at in before the model does not have modelId - to create the index.
        */
-      await (0, _indexes.createElasticsearchIndexesOnLocaleAfterCreate)({
-        context,
-        client: elasticsearch,
-        plugins
-      });
-      context.cms.onModelBeforeCreate.subscribe(async ({
-        model
-      }) => {
-        await (0, _createElasticsearchIndex.createElasticsearchIndex)({
-          client: elasticsearch,
-          model,
-          plugins
-        });
-      });
-      context.cms.onModelBeforeCreateFrom.subscribe(async ({
-        model
-      }) => {
-        await (0, _createElasticsearchIndex.createElasticsearchIndex)({
-          client: elasticsearch,
-          model,
-          plugins
-        });
-      });
-      context.cms.onModelAfterDelete.subscribe(async ({
-        model
-      }) => {
-        await (0, _deleteElasticsearchIndex.deleteElasticsearchIndex)({
-          client: elasticsearch,
-          model
-        });
-      });
-      context.cms.onModelInitialize.subscribe(async ({
-        model
-      }) => {
-        await (0, _createElasticsearchIndex.createElasticsearchIndex)({
-          client: elasticsearch,
-          model,
-          plugins
-        });
-      });
+      context.container.registerFactory(ModelAfterCreateEventHandler, () => ({
+        async handle(event) {
+          const {
+            model
+          } = event.payload;
+          await createElasticsearchIndex({
+            client: elasticsearch,
+            model,
+            plugins
+          });
+        }
+      }));
+      context.container.registerFactory(ModelAfterCreateFromEventHandler, () => ({
+        async handle(event) {
+          const {
+            model
+          } = event.payload;
+          await createElasticsearchIndex({
+            client: elasticsearch,
+            model,
+            plugins
+          });
+        }
+      }));
+      context.container.registerFactory(ModelAfterDeleteEventHandler, () => ({
+        async handle(event) {
+          const {
+            model
+          } = event.payload;
+          await deleteElasticsearchIndex({
+            client: elasticsearch,
+            model
+          });
+        }
+      }));
     },
     getEntities: () => entities,
     getTable: () => tableInstance,
     getEsTable: () => tableElasticsearchInstance,
-    system: (0, _system.createSystemStorageOperations)({
-      entity: entities.system
-    }),
-    groups: (0, _group2.createGroupsStorageOperations)({
+    groups: createGroupsStorageOperations({
       entity: entities.groups,
       plugins
     }),
-    models: (0, _model.createModelsStorageOperations)({
+    models: createModelsStorageOperations({
       entity: entities.models,
       elasticsearch
     }),
     entries
   };
 };
-exports.createStorageOperations = createStorageOperations;
 
 //# sourceMappingURL=index.js.map