@webiny/api-headless-cms-ddb-es 6.1.0-beta.3 → 6.2.0-beta.0

package/helpers/entryIndexHelpers.js.map

@@ -1 +1 @@
-{"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":[]}
+{"version":3,"names":["WebinyError","getFieldIdentifier","getFieldIdentifiers","prepareEntryToIndex","params","fieldRegistry","fieldIndexRegistry","storageEntry","entry","model","getFieldIndex","type","fieldIndexing","get","getDefault","values","rawValues","field","fields","identifier","fieldIndex","value","rawValue","toIndex","extractEntriesFromIndex","entries","list","indexValues","fieldType","identifiers","key","valueIdentifier","rawKey","rawValueIdentifier","fromIndex","ex","message","code","newEntry","push"],"sources":["entryIndexHelpers.ts"],"sourcesContent":["import { WebinyError } from \"@webiny/error\";\nimport type { CmsEntry, CmsEntryValues, CmsModel } from \"@webiny/api-headless-cms/types/index.js\";\nimport type { CmsIndexEntry } from \"~/types.js\";\nimport { getFieldIdentifier, getFieldIdentifiers } from \"~/helpers/fieldIdentifier.js\";\nimport type { CmsModelFieldToGraphQLRegistry } from \"@webiny/api-headless-cms/exports/api/cms/graphql.js\";\nimport type {\n    CmsEntryOpenSearchFieldIndex,\n    CmsEntryOpenSearchFieldIndexRegistry\n} from \"~/features/CmsEntryOpenSearchFieldIndex/index.js\";\n\ninterface SetupEntriesIndexHelpersParams {\n    fieldRegistry: CmsModelFieldToGraphQLRegistry.Interface;\n    fieldIndexRegistry: CmsEntryOpenSearchFieldIndexRegistry.Interface;\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 { fieldRegistry, fieldIndexRegistry, storageEntry, entry, model } = params;\n\n    function getFieldIndex(type: string): CmsEntryOpenSearchFieldIndex.Interface {\n        const fieldIndexing = fieldIndexRegistry.get(type);\n        if (fieldIndexing) {\n            return fieldIndexing;\n        }\n        return fieldIndexRegistry.getDefault();\n    }\n\n    // These objects will contain values processed by field index implementations\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 fieldIndex = getFieldIndex(field.type);\n\n        const { value, rawValue } = fieldIndex.toIndex({\n            fieldRegistry,\n            model,\n            field,\n            rawValue: entry.values[identifier],\n            value: storageEntry.values[identifier],\n            getFieldIndex\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\nexport const extractEntriesFromIndex = <T extends CmsEntryValues = CmsEntryValues>({\n    fieldRegistry,\n    fieldIndexRegistry,\n    entries,\n    model\n}: ExtractEntriesFromIndexParams<T>): CmsEntry<T>[] => {\n    function getFieldIndex(type: string): CmsEntryOpenSearchFieldIndex.Interface {\n        const fieldIndex = fieldIndexRegistry.get(type);\n        if (fieldIndex) {\n            return fieldIndex;\n        }\n        return fieldIndexRegistry.getDefault();\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 fieldType = fieldRegistry.get(field.type);\n            if (!fieldType) {\n                throw new WebinyError(\n                    `Missing field type \"${field.type}\". Extract entries from index.`\n                );\n            }\n\n            const fieldIndex = getFieldIndex(field.type);\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            try {\n                const key = identifiers.valueIdentifier as keyof T;\n                const rawKey = identifiers.rawValueIdentifier as keyof T;\n                indexValues[key] = fieldIndex.fromIndex({\n                    fieldRegistry,\n                    model,\n                    field,\n                    getFieldIndex,\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/index.d.ts

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

package/index.js

@@ -1,190 +1,3 @@
-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 { createOpenSearchEntity, createOpenSearchTable, OpenSearchQueryBuilderOperatorPlugin } from "@webiny/api-opensearch";
-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 {
-    table,
-    esTable,
-    documentClient,
-    elasticsearch,
-    plugins: userPlugins
-  } = params;
-  const tableInstance = createTable({
-    name: table || process.env.DB_TABLE,
-    documentClient
-  });
-  const tableElasticsearchInstance = createOpenSearchTable({
-    name: esTable,
-    documentClient
-  });
-  const entities = {
-    groups: createGroupEntity({
-      entityName: ENTITIES.GROUPS,
-      table: tableInstance
-    }),
-    models: createModelEntity({
-      entityName: ENTITIES.MODELS,
-      table: tableInstance
-    }),
-    entries: createEntryEntity({
-      entityName: ENTITIES.ENTRIES,
-      table: tableInstance
-    }),
-    entriesEs: createOpenSearchEntity({
-      entityName: ENTITIES.ENTRIES_ES,
-      table: tableElasticsearchInstance
-    })
-  };
-  const plugins = new PluginsContainer([
-  /**
-   * DynamoDB filter plugins for the where conditions.
-   */
-  dynamoDbValueFilters(),
-  /**
-   * Field plugins for DynamoDB.
-   */
-  dynamoDbPlugins(),
-  /**
-   * Field plugins for Elasticsearch.
-   */
-  elasticsearchPlugins(),
-  /**
-   * Built-in Elasticsearch index templates.
-   */
-  elasticsearchIndexPlugins(),
-  /**
-   * Filter plugins used to apply filtering from where conditions to Elasticsearch query.
-   */
-  createFilterPlugins(),
-  /**
-   * User defined custom plugins.
-   * They are at the end because we can then override existing plugins.
-   */
-  ...(userPlugins || [])]);
-  const entries = createEntriesStorageOperations({
-    entity: entities.entries,
-    esEntity: entities.entriesEs,
-    plugins,
-    elasticsearch
-  });
-  return {
-    name: "dynamodb:elasticsearch",
-    beforeInit: async context => {
-      context.db.registry.register({
-        item: entities.entries,
-        app: "cms",
-        tags: ["regular", entities.entries.name]
-      });
-      context.db.registry.register({
-        item: entities.entriesEs,
-        app: "cms",
-        tags: ["es", entities.entriesEs.name]
-      });
-      /**
-       * Attach the elasticsearch into context if it is not already attached.
-       */
-      if (!context.opensearch) {
-        context.opensearch = elasticsearch;
-      }
-
-      /**
-       * This registers the task implementation
-       */
-      createCreateIndexTask(context);
-
-      /**
-       * Pass the plugins to the parent context.
-       */
-      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 = [OpenSearchQueryBuilderOperatorPlugin.type,
-      // Headless CMS
-      "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);
-      }
-      entries.dataLoaders.clearAll();
-    },
-    init: async context => {
-      /**
-       * TODO @pavel
-       * Moved operations to AFTER create/from because at in before the model does not have modelId - to create the index.
-       */
-      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,
-    groups: createGroupsStorageOperations({
-      entity: entities.groups,
-      plugins
-    }),
-    models: createModelsStorageOperations({
-      entity: entities.models,
-      elasticsearch
-    }),
-    entries
-  };
-};
+export { registerCmsOpenSearchStorageOperations } from "./feature.js";
 
 //# sourceMappingURL=index.js.map

package/index.js.map

@@ -1 +1 @@
-{"version":3,"names":["dynamoDbValueFilters","elasticsearchPlugins","dynamoDbPlugins","createModelsStorageOperations","createEntriesStorageOperations","ENTITIES","createGroupEntity","createModelEntity","createEntryEntity","createElasticsearchIndex","PluginsContainer","createGroupsStorageOperations","createOpenSearchEntity","createOpenSearchTable","OpenSearchQueryBuilderOperatorPlugin","elasticsearchIndexPlugins","deleteElasticsearchIndex","CmsElasticsearchModelFieldPlugin","CmsEntryElasticsearchBodyModifierPlugin","CmsEntryElasticsearchFullTextSearchPlugin","CmsEntryElasticsearchIndexPlugin","CmsEntryElasticsearchQueryBuilderValueSearchPlugin","CmsEntryElasticsearchQueryModifierPlugin","CmsEntryElasticsearchSortModifierPlugin","CmsEntryElasticsearchValuesModifier","createFilterPlugins","CmsEntryFilterPlugin","StorageOperationsCmsModelPlugin","StorageTransformPlugin","createCreateIndexTask","CompressorPlugin","ModelAfterCreateEventHandler","ModelAfterCreateFromEventHandler","ModelAfterDeleteEventHandler","createTable","createStorageOperations","params","table","esTable","documentClient","elasticsearch","plugins","userPlugins","tableInstance","name","process","env","DB_TABLE","tableElasticsearchInstance","entities","groups","entityName","GROUPS","models","MODELS","entries","ENTRIES","entriesEs","ENTRIES_ES","entity","esEntity","beforeInit","context","db","registry","register","item","app","tags","opensearch","types","type","mergeByType","dataLoaders","clearAll","init","container","registerFactory","handle","event","model","payload","client","getEntities","getTable","getEsTable"],"sources":["index.ts"],"sourcesContent":["import dynamoDbValueFilters from \"@webiny/db-dynamodb/plugins/filters/index.js\";\nimport elasticsearchPlugins from \"./elasticsearch/index.js\";\nimport dynamoDbPlugins from \"./dynamoDb/index.js\";\nimport { createModelsStorageOperations } from \"./operations/model/index.js\";\nimport { createEntriesStorageOperations } from \"./operations/entry/index.js\";\nimport type { StorageOperationsFactory } from \"~/types.js\";\nimport { ENTITIES } from \"~/types.js\";\nimport { createGroupEntity } from \"~/definitions/group.js\";\nimport { createModelEntity } from \"~/definitions/model.js\";\nimport { createEntryEntity } from \"~/definitions/entry.js\";\nimport { createElasticsearchIndex } from \"~/elasticsearch/createElasticsearchIndex.js\";\nimport { PluginsContainer } from \"@webiny/plugins\";\nimport { createGroupsStorageOperations } from \"~/operations/group/index.js\";\nimport {\n    createOpenSearchEntity,\n    createOpenSearchTable,\n    OpenSearchQueryBuilderOperatorPlugin\n} from \"@webiny/api-opensearch\";\nimport { elasticsearchIndexPlugins } from \"./elasticsearch/indices/index.js\";\nimport { deleteElasticsearchIndex } from \"./elasticsearch/deleteElasticsearchIndex.js\";\nimport {\n    CmsElasticsearchModelFieldPlugin,\n    CmsEntryElasticsearchBodyModifierPlugin,\n    CmsEntryElasticsearchFullTextSearchPlugin,\n    CmsEntryElasticsearchIndexPlugin,\n    CmsEntryElasticsearchQueryBuilderValueSearchPlugin,\n    CmsEntryElasticsearchQueryModifierPlugin,\n    CmsEntryElasticsearchSortModifierPlugin,\n    CmsEntryElasticsearchValuesModifier\n} from \"~/plugins/index.js\";\nimport { createFilterPlugins } from \"~/operations/entry/elasticsearch/filtering/plugins/index.js\";\nimport { CmsEntryFilterPlugin } from \"~/plugins/CmsEntryFilterPlugin.js\";\nimport { StorageOperationsCmsModelPlugin, StorageTransformPlugin } from \"@webiny/api-headless-cms\";\nimport { createCreateIndexTask } from \"~/tasks/createIndexTaskPlugin.js\";\nimport { CompressorPlugin } from \"@webiny/api\";\nimport { ModelAfterCreateEventHandler } from \"@webiny/api-headless-cms/features/contentModel/CreateModel/index.js\";\nimport { ModelAfterCreateFromEventHandler } from \"@webiny/api-headless-cms/features/contentModel/CreateModelFrom/events.js\";\nimport { ModelAfterDeleteEventHandler } from \"@webiny/api-headless-cms/features/contentModel/DeleteModel/events.js\";\nimport { createTable } from \"@webiny/db-dynamodb\";\n\nexport * from \"./plugins/index.js\";\n\nexport const createStorageOperations: StorageOperationsFactory = params => {\n    const { table, esTable, documentClient, elasticsearch, plugins: userPlugins } = params;\n\n    const tableInstance = createTable({\n        name: table || (process.env.DB_TABLE as string),\n        documentClient\n    });\n    const tableElasticsearchInstance = createOpenSearchTable({\n        name: esTable,\n        documentClient\n    });\n\n    const entities = {\n        groups: createGroupEntity({\n            entityName: ENTITIES.GROUPS,\n            table: tableInstance\n        }),\n        models: createModelEntity({\n            entityName: ENTITIES.MODELS,\n            table: tableInstance\n        }),\n        entries: createEntryEntity({\n            entityName: ENTITIES.ENTRIES,\n            table: tableInstance\n        }),\n        entriesEs: createOpenSearchEntity({\n            entityName: ENTITIES.ENTRIES_ES,\n            table: tableElasticsearchInstance\n        })\n    };\n\n    const plugins = new PluginsContainer([\n        /**\n         * DynamoDB filter plugins for the where conditions.\n         */\n        dynamoDbValueFilters(),\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         * Filter plugins used to apply filtering from where conditions to Elasticsearch query.\n         */\n        createFilterPlugins(),\n        /**\n         * User defined custom plugins.\n         * They are at the end because we can then override existing plugins.\n         */\n        ...(userPlugins || [])\n    ]);\n\n    const entries = createEntriesStorageOperations({\n        entity: entities.entries,\n        esEntity: entities.entriesEs,\n        plugins,\n        elasticsearch\n    });\n\n    return {\n        name: \"dynamodb:elasticsearch\",\n        beforeInit: async context => {\n            context.db.registry.register({\n                item: entities.entries,\n                app: \"cms\",\n                tags: [\"regular\", entities.entries.name]\n            });\n            context.db.registry.register({\n                item: entities.entriesEs,\n                app: \"cms\",\n                tags: [\"es\", entities.entriesEs.name]\n            });\n            /**\n             * Attach the elasticsearch into context if it is not already attached.\n             */\n            if (!context.opensearch) {\n                context.opensearch = elasticsearch;\n            }\n\n            /**\n             * This registers the task implementation\n             */\n            createCreateIndexTask(context);\n\n            /**\n             * Pass the plugins to the parent context.\n             */\n            context.plugins.register([dynamoDbPlugins(), elasticsearchIndexPlugins()]);\n            /**\n             * We need to fetch all the plugin types in the list from the main container.\n             * This way we do not need to register plugins in the storage plugins contains.\n             */\n            const types: string[] = [\n                OpenSearchQueryBuilderOperatorPlugin.type,\n                // Headless CMS\n                \"cms-model-field-to-graphql\",\n                CmsEntryFilterPlugin.type,\n                CmsEntryElasticsearchBodyModifierPlugin.type,\n                CmsEntryElasticsearchFullTextSearchPlugin.type,\n                CmsEntryElasticsearchIndexPlugin.type,\n                CmsEntryElasticsearchQueryBuilderValueSearchPlugin.type,\n                CmsEntryElasticsearchQueryModifierPlugin.type,\n                CmsEntryElasticsearchSortModifierPlugin.type,\n                CmsElasticsearchModelFieldPlugin.type,\n                StorageOperationsCmsModelPlugin.type,\n                StorageTransformPlugin.type,\n                CmsEntryElasticsearchValuesModifier.type,\n                CompressorPlugin.type\n            ];\n            for (const type of types) {\n                plugins.mergeByType(context.plugins, type);\n            }\n            entries.dataLoaders.clearAll();\n        },\n        init: async context => {\n            /**\n             * TODO @pavel\n             * Moved operations to AFTER create/from because at in before the model does not have modelId - to create the index.\n             */\n            context.container.registerFactory(ModelAfterCreateEventHandler, () => ({\n                async handle(event) {\n                    const { model } = event.payload;\n                    await createElasticsearchIndex({\n                        client: elasticsearch,\n                        model,\n                        plugins\n                    });\n                }\n            }));\n\n            context.container.registerFactory(ModelAfterCreateFromEventHandler, () => ({\n                async handle(event) {\n                    const { model } = event.payload;\n                    await createElasticsearchIndex({\n                        client: elasticsearch,\n                        model,\n                        plugins\n                    });\n                }\n            }));\n\n            context.container.registerFactory(ModelAfterDeleteEventHandler, () => ({\n                async handle(event) {\n                    const { model } = event.payload;\n                    await deleteElasticsearchIndex({\n                        client: elasticsearch,\n                        model\n                    });\n                }\n            }));\n        },\n        getEntities: () => entities,\n        getTable: () => tableInstance,\n        getEsTable: () => tableElasticsearchInstance,\n        groups: createGroupsStorageOperations({\n            entity: entities.groups,\n            plugins\n        }),\n        models: createModelsStorageOperations({\n            entity: entities.models,\n            elasticsearch\n        }),\n        entries\n    };\n};\n"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["registerCmsOpenSearchStorageOperations"],"sources":["index.ts"],"sourcesContent":["export { registerCmsOpenSearchStorageOperations } from \"./feature.js\";\n"],"mappings":"AAAA,SAASA,sCAAsC","ignoreList":[]}

package/operations/entry/elasticsearch/body.d.ts

@@ -1,13 +1,29 @@
 import type { PluginsContainer } from "@webiny/plugins";
 import type { CmsEntryListParams, CmsEntryListWhere, CmsModel } from "@webiny/api-headless-cms/types/index.js";
+import type { CmsEntryOpenSearchBodyModifier } from "../../../features/CmsEntryOpenSearchBodyModifier/index.js";
+import type { CmsEntryOpenSearchSortModifier } from "../../../features/CmsEntryOpenSearchSortModifier/index.js";
+import type { CmsEntryOpenSearchQueryModifier } from "../../../features/CmsEntryOpenSearchQueryModifier/index.js";
+import type { CmsEntryOpenSearchValueSearchRegistry } from "../../../features/CmsEntryOpenSearchValueSearch/index.js";
+import type { CmsEntryOpenSearchFullTextSearch } from "../../../features/CmsEntryOpenSearchFullTextSearch/index.js";
 import type { PrimitiveValue, SearchBody } from "@webiny/api-opensearch/types.js";
-interface Params {
+import { CmsModelFieldToGraphQLRegistry } from "@webiny/api-headless-cms/features/graphql/index.js";
+import { CmsEntryOpenSearchFieldIndexRegistry } from "../../../features/CmsEntryOpenSearchFieldIndex/index.js";
+import type { CmsEntryOpenSearchFilterRegistry } from "../../../features/CmsEntryOpenSearchFilter/index.js";
+interface ICreateElasticsearchBodyParams {
     plugins: PluginsContainer;
     model: CmsModel;
+    fieldRegistry: CmsModelFieldToGraphQLRegistry.Interface;
+    fieldIndexRegistry: CmsEntryOpenSearchFieldIndexRegistry.Interface;
+    bodyModifiers: CmsEntryOpenSearchBodyModifier.Interface[];
+    sortModifiers: CmsEntryOpenSearchSortModifier.Interface[];
+    queryModifiers: CmsEntryOpenSearchQueryModifier.Interface[];
+    valueSearchRegistry: CmsEntryOpenSearchValueSearchRegistry.Interface;
+    fullTextSearches: CmsEntryOpenSearchFullTextSearch.Interface[];
+    filterRegistry: CmsEntryOpenSearchFilterRegistry.Interface;
     params: Omit<CmsEntryListParams, "where" | "after"> & {
         where: CmsEntryListWhere;
         after?: PrimitiveValue[];
     };
 }
-export declare const createElasticsearchBody: ({ plugins, model, params }: Params) => SearchBody;
+export declare const createElasticsearchBody: ({ plugins, model, params, fieldRegistry, fieldIndexRegistry, bodyModifiers, sortModifiers, queryModifiers, valueSearchRegistry, fullTextSearches, filterRegistry }: ICreateElasticsearchBodyParams) => SearchBody;
 export {};

package/operations/entry/elasticsearch/body.js

@@ -2,16 +2,21 @@ import { createModelFields } from "./fields.js";
 import { createFullTextSearchFields } from "./fullTextSearchFields.js";
 import { createInitialQuery } from "./initialQuery.js";
 import { applyFullTextSearch } from "./fullTextSearch.js";
-import { createQueryModifierPluginList } from "./plugins/queryModifier.js";
-import { createSortModifierPluginList } from "./plugins/sortModifier.js";
-import { createBodyModifierPluginList } from "./plugins/bodyModifier.js";
 import { createElasticsearchSort } from "./sort.js";
 import { createExecFiltering } from "./filtering/index.js";
 import { assignMinimumShouldMatchToQuery } from "./assignMinimumShouldMatchToQuery.js";
 export const createElasticsearchBody = ({
   plugins,
   model,
-  params
+  params,
+  fieldRegistry,
+  fieldIndexRegistry,
+  bodyModifiers,
+  sortModifiers,
+  queryModifiers,
+  valueSearchRegistry,
+  fullTextSearches,
+  filterRegistry
 }) => {
   const {
     fields,
@@ -25,30 +30,26 @@ export const createElasticsearchBody = ({
    * We need the model fields constructed as a key -> field value, so we do not need to iterate through array when we require some field.
    */
   const modelFields = createModelFields({
-    plugins,
-    model
+    model,
+    fieldRegistry,
+    fieldIndexRegistry
   });
 
   /**
-   * We need the query modifier plugins.
+   * Filter query modifiers applicable to this model.
    */
-  const queryModifierPlugins = createQueryModifierPluginList({
-    plugins,
-    model
+  const applicableQueryModifiers = queryModifiers.filter(m => {
+    return !m.modelId || m.modelId === model.modelId;
   });
   /**
-   * We need the sort modifier plugins.
+   * Filter sort modifiers applicable to this model.
    */
-  const sortModifierPlugins = createSortModifierPluginList({
-    plugins,
-    model
-  });
+  const applicableSortModifiers = sortModifiers.filter(m => !m.modelId || m.modelId === model.modelId);
   /**
-   * We need the body modifier plugins.
+   * Filter body modifiers applicable to this model.
    */
-  const bodyModifierPlugins = createBodyModifierPluginList({
-    plugins,
-    model
+  const applicableBodyModifiers = bodyModifiers.filter(m => {
+    return !m.modelId || m.modelId === model.modelId;
   });
   /**
    * We need the fields which we can search through via the full text search.
@@ -71,7 +72,7 @@ export const createElasticsearchBody = ({
    */
   applyFullTextSearch({
     model,
-    plugins,
+    fullTextSearches,
     query,
     term,
     fields: fullTextSearchFields
@@ -79,27 +80,29 @@ export const createElasticsearchBody = ({
   const execFiltering = createExecFiltering({
     model,
     fields: modelFields,
-    plugins
+    plugins,
+    valueSearchRegistry,
+    filterRegistry
   });
   execFiltering({
     where,
     query
   });
-  for (const pl of queryModifierPlugins) {
-    pl.modifyQuery({
+  for (const modifier of applicableQueryModifiers) {
+    modifier.modifyQuery({
       query,
       model,
       where
     });
   }
   const sort = createElasticsearchSort({
-    plugins,
     sort: initialSort,
     modelFields,
-    model
+    model,
+    valueSearchRegistry
   });
-  for (const pl of sortModifierPlugins) {
-    pl.modifySort({
+  for (const modifier of applicableSortModifiers) {
+    modifier.modifySort({
       sort,
       model
     });
@@ -122,8 +125,8 @@ export const createElasticsearchBody = ({
     search_after: after,
     track_total_hits: true
   };
-  for (const pl of bodyModifierPlugins) {
-    pl.modifyBody({
+  for (const modifier of applicableBodyModifiers) {
+    modifier.modifyBody({
       body,
       model,
       where

package/operations/entry/elasticsearch/body.js.map

@@ -1 +1 @@
-{"version":3,"names":["createModelFields","createFullTextSearchFields","createInitialQuery","applyFullTextSearch","createQueryModifierPluginList","createSortModifierPluginList","createBodyModifierPluginList","createElasticsearchSort","createExecFiltering","assignMinimumShouldMatchToQuery","createElasticsearchBody","plugins","model","params","fields","search","term","where","sort","initialSort","after","limit","modelFields","queryModifierPlugins","sortModifierPlugins","bodyModifierPlugins","fullTextSearchFields","targets","query","execFiltering","pl","modifyQuery","modifySort","boolQuery","must","length","undefined","must_not","should","filter","body","bool","size","search_after","track_total_hits","modifyBody"],"sources":["body.ts"],"sourcesContent":["import type { PluginsContainer } from \"@webiny/plugins\";\nimport type {\n    CmsEntryListParams,\n    CmsEntryListWhere,\n    CmsModel\n} from \"@webiny/api-headless-cms/types/index.js\";\nimport { createModelFields } from \"./fields.js\";\nimport { createFullTextSearchFields } from \"./fullTextSearchFields.js\";\nimport { createInitialQuery } from \"./initialQuery.js\";\nimport { applyFullTextSearch } from \"./fullTextSearch.js\";\nimport { createQueryModifierPluginList } from \"./plugins/queryModifier.js\";\nimport { createSortModifierPluginList } from \"./plugins/sortModifier.js\";\nimport { createBodyModifierPluginList } from \"./plugins/bodyModifier.js\";\nimport { createElasticsearchSort } from \"./sort.js\";\nimport type {\n    QueryDslBoolQuery as BoolQueryConfig,\n    PrimitiveValue,\n    SearchBody\n} from \"@webiny/api-opensearch/types.js\";\nimport { createExecFiltering } from \"./filtering/index.js\";\nimport { assignMinimumShouldMatchToQuery } from \"./assignMinimumShouldMatchToQuery.js\";\n\ninterface Params {\n    plugins: PluginsContainer;\n    model: CmsModel;\n    params: Omit<CmsEntryListParams, \"where\" | \"after\"> & {\n        where: CmsEntryListWhere;\n        after?: PrimitiveValue[];\n    };\n}\nexport const createElasticsearchBody = ({ plugins, model, params }: Params): SearchBody => {\n    const { fields, search: term, where, sort: initialSort, after, limit } = params;\n    /**\n     * We need the model fields constructed as a key -> field value, so we do not need to iterate through array when we require some field.\n     */\n    const modelFields = createModelFields({\n        plugins,\n        model\n    });\n\n    /**\n     * We need the query modifier plugins.\n     */\n    const queryModifierPlugins = createQueryModifierPluginList({\n        plugins,\n        model\n    });\n    /**\n     * We need the sort modifier plugins.\n     */\n    const sortModifierPlugins = createSortModifierPluginList({\n        plugins,\n        model\n    });\n    /**\n     * We need the body modifier plugins.\n     */\n    const bodyModifierPlugins = createBodyModifierPluginList({\n        plugins,\n        model\n    });\n    /**\n     * We need the fields which we can search through via the full text search.\n     *\n     */\n    const fullTextSearchFields = createFullTextSearchFields({\n        fields: modelFields,\n        term,\n        targets: fields\n    });\n    /**\n     * The initial elasticsearch query where we attach some default conditions we always need.\n     */\n    const query = createInitialQuery({\n        where,\n        model\n    });\n    /**\n     * Apply the full text search, if term is set.\n     */\n    applyFullTextSearch({\n        model,\n        plugins,\n        query,\n        term,\n        fields: fullTextSearchFields\n    });\n\n    const execFiltering = createExecFiltering({\n        model,\n        fields: modelFields,\n        plugins\n    });\n\n    execFiltering({\n        where,\n        query\n    });\n\n    for (const pl of queryModifierPlugins) {\n        pl.modifyQuery({ query, model, where });\n    }\n\n    const sort = createElasticsearchSort({\n        plugins,\n        sort: initialSort,\n        modelFields,\n        model\n    });\n\n    for (const pl of sortModifierPlugins) {\n        pl.modifySort({\n            sort,\n            model\n        });\n    }\n\n    const boolQuery: BoolQueryConfig = {\n        must: query.must.length > 0 ? query.must : undefined,\n        must_not: query.must_not.length > 0 ? query.must_not : undefined,\n        should: query.should.length > 0 ? query.should : undefined,\n        filter: query.filter.length > 0 ? query.filter : undefined\n    };\n\n    assignMinimumShouldMatchToQuery({\n        query: boolQuery\n    });\n\n    const body: SearchBody = {\n        query: {\n            bool: boolQuery\n        },\n        sort,\n        size: (limit || 0) + 1,\n        search_after: after,\n        track_total_hits: true\n    };\n\n    for (const pl of bodyModifierPlugins) {\n        pl.modifyBody({\n            body,\n            model,\n            where\n        });\n    }\n\n    return body;\n};\n"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["createModelFields","createFullTextSearchFields","createInitialQuery","applyFullTextSearch","createElasticsearchSort","createExecFiltering","assignMinimumShouldMatchToQuery","createElasticsearchBody","plugins","model","params","fieldRegistry","fieldIndexRegistry","bodyModifiers","sortModifiers","queryModifiers","valueSearchRegistry","fullTextSearches","filterRegistry","fields","search","term","where","sort","initialSort","after","limit","modelFields","applicableQueryModifiers","filter","m","modelId","applicableSortModifiers","applicableBodyModifiers","fullTextSearchFields","targets","query","execFiltering","modifier","modifyQuery","modifySort","boolQuery","must","length","undefined","must_not","should","body","bool","size","search_after","track_total_hits","modifyBody"],"sources":["body.ts"],"sourcesContent":["import type { PluginsContainer } from \"@webiny/plugins\";\nimport type {\n    CmsEntryListParams,\n    CmsEntryListWhere,\n    CmsModel\n} from \"@webiny/api-headless-cms/types/index.js\";\nimport { createModelFields } from \"./fields.js\";\nimport { createFullTextSearchFields } from \"./fullTextSearchFields.js\";\nimport { createInitialQuery } from \"./initialQuery.js\";\nimport { applyFullTextSearch } from \"./fullTextSearch.js\";\nimport type { CmsEntryOpenSearchBodyModifier } from \"~/features/CmsEntryOpenSearchBodyModifier/index.js\";\nimport type { CmsEntryOpenSearchSortModifier } from \"~/features/CmsEntryOpenSearchSortModifier/index.js\";\nimport type { CmsEntryOpenSearchQueryModifier } from \"~/features/CmsEntryOpenSearchQueryModifier/index.js\";\nimport type { CmsEntryOpenSearchValueSearchRegistry } from \"~/features/CmsEntryOpenSearchValueSearch/index.js\";\nimport type { CmsEntryOpenSearchFullTextSearch } from \"~/features/CmsEntryOpenSearchFullTextSearch/index.js\";\nimport { createElasticsearchSort } from \"./sort.js\";\nimport type {\n    PrimitiveValue,\n    QueryDslBoolQuery as BoolQueryConfig,\n    SearchBody\n} from \"@webiny/api-opensearch/types.js\";\nimport { createExecFiltering } from \"./filtering/index.js\";\nimport { assignMinimumShouldMatchToQuery } from \"./assignMinimumShouldMatchToQuery.js\";\nimport { CmsModelFieldToGraphQLRegistry } from \"@webiny/api-headless-cms/features/graphql/index.js\";\nimport { CmsEntryOpenSearchFieldIndexRegistry } from \"~/features/CmsEntryOpenSearchFieldIndex/index.js\";\nimport type { CmsEntryOpenSearchFilterRegistry } from \"~/features/CmsEntryOpenSearchFilter/index.js\";\n\ninterface ICreateElasticsearchBodyParams {\n    plugins: PluginsContainer;\n    model: CmsModel;\n    fieldRegistry: CmsModelFieldToGraphQLRegistry.Interface;\n    fieldIndexRegistry: CmsEntryOpenSearchFieldIndexRegistry.Interface;\n    bodyModifiers: CmsEntryOpenSearchBodyModifier.Interface[];\n    sortModifiers: CmsEntryOpenSearchSortModifier.Interface[];\n    queryModifiers: CmsEntryOpenSearchQueryModifier.Interface[];\n    valueSearchRegistry: CmsEntryOpenSearchValueSearchRegistry.Interface;\n    fullTextSearches: CmsEntryOpenSearchFullTextSearch.Interface[];\n    filterRegistry: CmsEntryOpenSearchFilterRegistry.Interface;\n    params: Omit<CmsEntryListParams, \"where\" | \"after\"> & {\n        where: CmsEntryListWhere;\n        after?: PrimitiveValue[];\n    };\n}\nexport const createElasticsearchBody = ({\n    plugins,\n    model,\n    params,\n    fieldRegistry,\n    fieldIndexRegistry,\n    bodyModifiers,\n    sortModifiers,\n    queryModifiers,\n    valueSearchRegistry,\n    fullTextSearches,\n    filterRegistry\n}: ICreateElasticsearchBodyParams): SearchBody => {\n    const { fields, search: term, where, sort: initialSort, after, limit } = params;\n    /**\n     * We need the model fields constructed as a key -> field value, so we do not need to iterate through array when we require some field.\n     */\n    const modelFields = createModelFields({\n        model,\n        fieldRegistry,\n        fieldIndexRegistry\n    });\n\n    /**\n     * Filter query modifiers applicable to this model.\n     */\n    const applicableQueryModifiers = queryModifiers.filter(m => {\n        return !m.modelId || m.modelId === model.modelId;\n    });\n    /**\n     * Filter sort modifiers applicable to this model.\n     */\n    const applicableSortModifiers = sortModifiers.filter(\n        m => !m.modelId || m.modelId === model.modelId\n    );\n    /**\n     * Filter body modifiers applicable to this model.\n     */\n    const applicableBodyModifiers = bodyModifiers.filter(m => {\n        return !m.modelId || m.modelId === model.modelId;\n    });\n    /**\n     * We need the fields which we can search through via the full text search.\n     *\n     */\n    const fullTextSearchFields = createFullTextSearchFields({\n        fields: modelFields,\n        term,\n        targets: fields\n    });\n    /**\n     * The initial elasticsearch query where we attach some default conditions we always need.\n     */\n    const query = createInitialQuery({\n        where,\n        model\n    });\n    /**\n     * Apply the full text search, if term is set.\n     */\n    applyFullTextSearch({\n        model,\n        fullTextSearches,\n        query,\n        term,\n        fields: fullTextSearchFields\n    });\n\n    const execFiltering = createExecFiltering({\n        model,\n        fields: modelFields,\n        plugins,\n        valueSearchRegistry,\n        filterRegistry\n    });\n\n    execFiltering({\n        where,\n        query\n    });\n\n    for (const modifier of applicableQueryModifiers) {\n        modifier.modifyQuery({ query, model, where });\n    }\n\n    const sort = createElasticsearchSort({\n        sort: initialSort,\n        modelFields,\n        model,\n        valueSearchRegistry\n    });\n\n    for (const modifier of applicableSortModifiers) {\n        modifier.modifySort({\n            sort,\n            model\n        });\n    }\n\n    const boolQuery: BoolQueryConfig = {\n        must: query.must.length > 0 ? query.must : undefined,\n        must_not: query.must_not.length > 0 ? query.must_not : undefined,\n        should: query.should.length > 0 ? query.should : undefined,\n        filter: query.filter.length > 0 ? query.filter : undefined\n    };\n\n    assignMinimumShouldMatchToQuery({\n        query: boolQuery\n    });\n\n    const body: SearchBody = {\n        query: {\n            bool: boolQuery\n        },\n        sort,\n        size: (limit || 0) + 1,\n        search_after: after,\n        track_total_hits: true\n    };\n\n    for (const modifier of applicableBodyModifiers) {\n        modifier.modifyBody({\n            body,\n            model,\n            where\n        });\n    }\n\n    return body;\n};\n"],"mappings":"AAMA,SAASA,iBAAiB;AAC1B,SAASC,0BAA0B;AACnC,SAASC,kBAAkB;AAC3B,SAASC,mBAAmB;AAM5B,SAASC,uBAAuB;AAMhC,SAASC,mBAAmB;AAC5B,SAASC,+BAA+B;AAqBxC,OAAO,MAAMC,uBAAuB,GAAGA,CAAC;EACpCC,OAAO;EACPC,KAAK;EACLC,MAAM;EACNC,aAAa;EACbC,kBAAkB;EAClBC,aAAa;EACbC,aAAa;EACbC,cAAc;EACdC,mBAAmB;EACnBC,gBAAgB;EAChBC;AAC4B,CAAC,KAAiB;EAC9C,MAAM;IAAEC,MAAM;IAAEC,MAAM,EAAEC,IAAI;IAAEC,KAAK;IAAEC,IAAI,EAAEC,WAAW;IAAEC,KAAK;IAAEC;EAAM,CAAC,GAAGhB,MAAM;EAC/E;AACJ;AACA;EACI,MAAMiB,WAAW,GAAG3B,iBAAiB,CAAC;IAClCS,KAAK;IACLE,aAAa;IACbC;EACJ,CAAC,CAAC;;EAEF;AACJ;AACA;EACI,MAAMgB,wBAAwB,GAAGb,cAAc,CAACc,MAAM,CAACC,CAAC,IAAI;IACxD,OAAO,CAACA,CAAC,CAACC,OAAO,IAAID,CAAC,CAACC,OAAO,KAAKtB,KAAK,CAACsB,OAAO;EACpD,CAAC,CAAC;EACF;AACJ;AACA;EACI,MAAMC,uBAAuB,GAAGlB,aAAa,CAACe,MAAM,CAChDC,CAAC,IAAI,CAACA,CAAC,CAACC,OAAO,IAAID,CAAC,CAACC,OAAO,KAAKtB,KAAK,CAACsB,OAC3C,CAAC;EACD;AACJ;AACA;EACI,MAAME,uBAAuB,GAAGpB,aAAa,CAACgB,MAAM,CAACC,CAAC,IAAI;IACtD,OAAO,CAACA,CAAC,CAACC,OAAO,IAAID,CAAC,CAACC,OAAO,KAAKtB,KAAK,CAACsB,OAAO;EACpD,CAAC,CAAC;EACF;AACJ;AACA;AACA;EACI,MAAMG,oBAAoB,GAAGjC,0BAA0B,CAAC;IACpDkB,MAAM,EAAEQ,WAAW;IACnBN,IAAI;IACJc,OAAO,EAAEhB;EACb,CAAC,CAAC;EACF;AACJ;AACA;EACI,MAAMiB,KAAK,GAAGlC,kBAAkB,CAAC;IAC7BoB,KAAK;IACLb;EACJ,CAAC,CAAC;EACF;AACJ;AACA;EACIN,mBAAmB,CAAC;IAChBM,KAAK;IACLQ,gBAAgB;IAChBmB,KAAK;IACLf,IAAI;IACJF,MAAM,EAAEe;EACZ,CAAC,CAAC;EAEF,MAAMG,aAAa,GAAGhC,mBAAmB,CAAC;IACtCI,KAAK;IACLU,MAAM,EAAEQ,WAAW;IACnBnB,OAAO;IACPQ,mBAAmB;IACnBE;EACJ,CAAC,CAAC;EAEFmB,aAAa,CAAC;IACVf,KAAK;IACLc;EACJ,CAAC,CAAC;EAEF,KAAK,MAAME,QAAQ,IAAIV,wBAAwB,EAAE;IAC7CU,QAAQ,CAACC,WAAW,CAAC;MAAEH,KAAK;MAAE3B,KAAK;MAAEa;IAAM,CAAC,CAAC;EACjD;EAEA,MAAMC,IAAI,GAAGnB,uBAAuB,CAAC;IACjCmB,IAAI,EAAEC,WAAW;IACjBG,WAAW;IACXlB,KAAK;IACLO;EACJ,CAAC,CAAC;EAEF,KAAK,MAAMsB,QAAQ,IAAIN,uBAAuB,EAAE;IAC5CM,QAAQ,CAACE,UAAU,CAAC;MAChBjB,IAAI;MACJd;IACJ,CAAC,CAAC;EACN;EAEA,MAAMgC,SAA0B,GAAG;IAC/BC,IAAI,EAAEN,KAAK,CAACM,IAAI,CAACC,MAAM,GAAG,CAAC,GAAGP,KAAK,CAACM,IAAI,GAAGE,SAAS;IACpDC,QAAQ,EAAET,KAAK,CAACS,QAAQ,CAACF,MAAM,GAAG,CAAC,GAAGP,KAAK,CAACS,QAAQ,GAAGD,SAAS;IAChEE,MAAM,EAAEV,KAAK,CAACU,MAAM,CAACH,MAAM,GAAG,CAAC,GAAGP,KAAK,CAACU,MAAM,GAAGF,SAAS;IAC1Df,MAAM,EAAEO,KAAK,CAACP,MAAM,CAACc,MAAM,GAAG,CAAC,GAAGP,KAAK,CAACP,MAAM,GAAGe;EACrD,CAAC;EAEDtC,+BAA+B,CAAC;IAC5B8B,KAAK,EAAEK;EACX,CAAC,CAAC;EAEF,MAAMM,IAAgB,GAAG;IACrBX,KAAK,EAAE;MACHY,IAAI,EAAEP;IACV,CAAC;IACDlB,IAAI;IACJ0B,IAAI,EAAE,CAACvB,KAAK,IAAI,CAAC,IAAI,CAAC;IACtBwB,YAAY,EAAEzB,KAAK;IACnB0B,gBAAgB,EAAE;EACtB,CAAC;EAED,KAAK,MAAMb,QAAQ,IAAIL,uBAAuB,EAAE;IAC5CK,QAAQ,CAACc,UAAU,CAAC;MAChBL,IAAI;MACJtC,KAAK;MACLa;IACJ,CAAC,CAAC;EACN;EAEA,OAAOyB,IAAI;AACf,CAAC","ignoreList":[]}

package/operations/entry/elasticsearch/fields.d.ts

@@ -1,10 +1,12 @@
-import type { PluginsContainer } from "@webiny/plugins";
 import type { CmsModel } from "@webiny/api-headless-cms/types/index.js";
-interface Params {
-    plugins: PluginsContainer;
+import { CmsModelFieldToGraphQLRegistry } from "@webiny/api-headless-cms/features/graphql/index.js";
+import { CmsEntryOpenSearchFieldIndexRegistry } from "../../../features/CmsEntryOpenSearchFieldIndex/index.js";
+interface ICreateModelFieldsParams {
     model: CmsModel;
+    fieldRegistry: CmsModelFieldToGraphQLRegistry.Interface;
+    fieldIndexRegistry: CmsEntryOpenSearchFieldIndexRegistry.Interface;
 }
-export declare const createModelFields: ({ plugins, model }: Params) => {
+export declare const createModelFields: ({ model, fieldRegistry, fieldIndexRegistry }: ICreateModelFieldsParams) => {
     [x: string]: import("./types.js").ModelField;
 };
 export {};

package/operations/entry/elasticsearch/fields.js

@@ -1,5 +1,4 @@
 import WebinyError from "@webiny/error";
-import { CmsElasticsearchModelFieldPlugin } from "../../../plugins/index.js";
 import { ENTRY_META_FIELDS, isDateTimeEntryMetaField, isIdentityEntryMetaField } from "@webiny/api-headless-cms/constants.js";
 import { getBaseFieldType } from "@webiny/api-headless-cms/utils/getBaseFieldType.js";
 import { liveFields } from "./fields/live.js";
@@ -136,38 +135,6 @@ const createSystemFields = () => {
     ...liveFields
   };
 };
-const buildCustomFields = params => {
-  const {
-    fields,
-    fieldTypePlugins
-  } = params;
-  return fields.reduce((collection, field) => {
-    const typePlugin = fieldTypePlugins[field.fieldType];
-    if (!typePlugin) {
-      return collection;
-    }
-    let unmappedType = undefined;
-    if (typePlugin.unmappedType) {
-      unmappedType = typePlugin.unmappedType(field);
-    }
-    collection[field.fieldId] = {
-      type: field.fieldType,
-      field: createSystemField({
-        storageId: field.fieldId,
-        fieldId: field.fieldId,
-        type: field.fieldType
-      }),
-      unmappedType,
-      fullTextSearch: field.searchable ? typePlugin.fullTextSearch : false,
-      searchable: field.searchable || typePlugin.searchable,
-      sortable: field.sortable || typePlugin.sortable,
-      systemField: false,
-      path: field.path,
-      parents: []
-    };
-    return collection;
-  }, {});
-};
 const buildFieldsList = params => {
   const {
     plugins,
@@ -184,7 +151,7 @@ const buildFieldsList = params => {
       searchable,
       sortable,
       unmappedType,
-      fullTextSearch
+      isFullTextSearchable: fullTextSearch
     } = plugin;
     /**
      * If a field has child fields, go through them and add them to a result.
@@ -220,45 +187,35 @@ const buildFieldsList = params => {
   }, {});
 };
 export const createModelFields = ({
-  plugins,
-  model
+  model,
+  fieldRegistry,
+  fieldIndexRegistry
 }) => {
   const fields = model.fields;
-  const fieldDefinitionPlugins = plugins.byType(CmsElasticsearchModelFieldPlugin.type).filter(plugin => {
-    return plugin.canBeApplied(model.modelId);
-  });
   /**
-   * Collect all unmappedType from elastic plugins.
+   * Collect all unmappedType from field index registry.
    */
-  const unmappedTypes = plugins.byType("cms-model-field-to-elastic-search").reduce((acc, plugin) => {
-    if (!plugin.unmappedType) {
+  const unmappedTypes = fieldIndexRegistry.getAll().reduce((acc, fieldIndex) => {
+    if (!fieldIndex.unmappedType) {
       return acc;
     }
-    acc[plugin.fieldType] = plugin.unmappedType;
+    acc[fieldIndex.fieldType] = fieldIndex.unmappedType;
     return acc;
   }, {});
   /**
    * Collect all field types from the plugins.
    */
-  const fieldTypePlugins = plugins.byType("cms-model-field-to-graphql").reduce((types, plugin) => {
-    const {
-      fieldType,
-      fullTextSearch
-    } = plugin;
-    types[fieldType] = {
-      unmappedType: unmappedTypes[fieldType],
-      searchable: plugin.isSearchable,
-      sortable: plugin.isSortable,
-      fullTextSearch
+  const fieldTypePlugins = fieldRegistry.getAll().reduce((types, field) => {
+    types[field.fieldType] = {
+      unmappedType: unmappedTypes[field.fieldType],
+      searchable: field.isSearchable,
+      sortable: field.isSortable,
+      isFullTextSearchable: field.isFullTextSearchable
     };
     return types;
   }, {});
   return {
     ...createSystemFields(),
-    ...buildCustomFields({
-      fields: fieldDefinitionPlugins,
-      fieldTypePlugins
-    }),
     ...buildFieldsList({
       fields,
       plugins: fieldTypePlugins,