@webiny/api-headless-cms-utils-os 0.0.0-unstable.5387e5f7c8 → 0.0.0-unstable.a85ef555b2

package/features/CmsEntryOpenSearchBodyBuilder/CmsEntryOpenSearchBodyBuilder.d.ts

@@ -1,6 +1,7 @@
 import type { SearchBody } from "@webiny/api-opensearch/types.js";
 import { OpenSearchFieldFactory } from "@webiny/api-opensearch/exports/api/opensearch.js";
 import { CmsModelFieldToGraphQLRegistry } from "@webiny/api-headless-cms/exports/api/cms/graphql.js";
+import { CmsEntrySystemField } from "@webiny/api-headless-cms/features/contentEntry/EntrySystemField/index.js";
 import { CmsEntryOpenSearchFieldIndexRegistry } from "../../features/CmsEntryOpenSearchFieldIndex/index.js";
 import { CmsEntryOpenSearchBodyModifier } from "../../features/CmsEntryOpenSearchBodyModifier/index.js";
 import { CmsEntryOpenSearchSortModifier } from "../../features/CmsEntryOpenSearchSortModifier/index.js";
@@ -21,7 +22,8 @@ declare class CmsEntryOpenSearchBodyBuilderImpl implements CmsEntryOpenSearchBod
     private readonly valueSearchRegistry;
     private readonly fullTextSearches;
     private readonly fieldFactory;
-    constructor(execFiltering: CmsEntryOpenSearchExecFiltering.Interface, fieldPathFactory: CmsEntryOpenSearchFieldPathFactory.Interface, fieldRegistry: CmsModelFieldToGraphQLRegistry.Interface, fieldIndexRegistry: CmsEntryOpenSearchFieldIndexRegistry.Interface, bodyModifiers: CmsEntryOpenSearchBodyModifier.Interface[], sortModifiers: CmsEntryOpenSearchSortModifier.Interface[], queryModifiers: CmsEntryOpenSearchQueryModifier.Interface[], valueSearchRegistry: CmsEntryOpenSearchValueSearchRegistry.Interface, fullTextSearches: CmsEntryOpenSearchFullTextSearch.Interface[], fieldFactory: OpenSearchFieldFactory.Interface);
+    private readonly entrySystemFields;
+    constructor(execFiltering: CmsEntryOpenSearchExecFiltering.Interface, fieldPathFactory: CmsEntryOpenSearchFieldPathFactory.Interface, fieldRegistry: CmsModelFieldToGraphQLRegistry.Interface, fieldIndexRegistry: CmsEntryOpenSearchFieldIndexRegistry.Interface, bodyModifiers: CmsEntryOpenSearchBodyModifier.Interface[], sortModifiers: CmsEntryOpenSearchSortModifier.Interface[], queryModifiers: CmsEntryOpenSearchQueryModifier.Interface[], valueSearchRegistry: CmsEntryOpenSearchValueSearchRegistry.Interface, fullTextSearches: CmsEntryOpenSearchFullTextSearch.Interface[], fieldFactory: OpenSearchFieldFactory.Interface, entrySystemFields: CmsEntrySystemField.Interface[]);
     build(params: CmsEntryOpenSearchBodyBuilderAbstraction.Params): SearchBody;
 }
 export declare const CmsEntryOpenSearchBodyBuilder: typeof CmsEntryOpenSearchBodyBuilderImpl & {

package/features/CmsEntryOpenSearchBodyBuilder/CmsEntryOpenSearchBodyBuilder.js

@@ -1,5 +1,6 @@
 import { OpenSearchFieldFactory } from "@webiny/api-opensearch/exports/api/opensearch.js";
 import { CmsModelFieldToGraphQLRegistry } from "@webiny/api-headless-cms/exports/api/cms/graphql.js";
+import { CmsEntrySystemField } from "@webiny/api-headless-cms/features/contentEntry/EntrySystemField/index.js";
 import { CmsEntryOpenSearchFieldIndexRegistry } from "../CmsEntryOpenSearchFieldIndex/index.js";
 import { CmsEntryOpenSearchBodyModifier } from "../CmsEntryOpenSearchBodyModifier/index.js";
 import { CmsEntryOpenSearchSortModifier } from "../CmsEntryOpenSearchSortModifier/index.js";
@@ -16,7 +17,7 @@ import { assignMinimumShouldMatchToQuery } from "../../operations/entry/elastics
 import { createElasticsearchSort } from "./sort.js";
 import { CmsEntryOpenSearchBodyBuilder } from "./abstractions.js";
 class CmsEntryOpenSearchBodyBuilderImpl {
-    constructor(execFiltering, fieldPathFactory, fieldRegistry, fieldIndexRegistry, bodyModifiers, sortModifiers, queryModifiers, valueSearchRegistry, fullTextSearches, fieldFactory){
+    constructor(execFiltering, fieldPathFactory, fieldRegistry, fieldIndexRegistry, bodyModifiers, sortModifiers, queryModifiers, valueSearchRegistry, fullTextSearches, fieldFactory, entrySystemFields){
         this.execFiltering = execFiltering;
         this.fieldPathFactory = fieldPathFactory;
         this.fieldRegistry = fieldRegistry;
@@ -27,14 +28,16 @@ class CmsEntryOpenSearchBodyBuilderImpl {
         this.valueSearchRegistry = valueSearchRegistry;
         this.fullTextSearches = fullTextSearches;
         this.fieldFactory = fieldFactory;
+        this.entrySystemFields = entrySystemFields;
     }
     build(params) {
-        const { model } = params;
+        const { model, shared } = params;
         const { fields, search: term, where, sort: initialSort, after, limit } = params.params;
         const modelFields = createModelFields({
             model,
             fieldRegistry: this.fieldRegistry,
-            fieldIndexRegistry: this.fieldIndexRegistry
+            fieldIndexRegistry: this.fieldIndexRegistry,
+            systemFields: this.entrySystemFields.map((systemField)=>systemField.field)
         });
         const applicableQueryModifiers = this.queryModifiers.filter((m)=>!m.modelId || m.modelId === model.modelId);
         const applicableSortModifiers = this.sortModifiers.filter((m)=>!m.modelId || m.modelId === model.modelId);
@@ -46,7 +49,8 @@ class CmsEntryOpenSearchBodyBuilderImpl {
         });
         const query = createInitialQuery({
             where,
-            model
+            model,
+            shared
         });
         applyFullTextSearch({
             model,
@@ -136,7 +140,13 @@ const CmsEntryOpenSearchBodyBuilder_CmsEntryOpenSearchBodyBuilder = CmsEntryOpen
                 multiple: true
             }
         ],
-        OpenSearchFieldFactory
+        OpenSearchFieldFactory,
+        [
+            CmsEntrySystemField,
+            {
+                multiple: true
+            }
+        ]
     ]
 });
 export { CmsEntryOpenSearchBodyBuilder_CmsEntryOpenSearchBodyBuilder as CmsEntryOpenSearchBodyBuilder };

package/features/CmsEntryOpenSearchBodyBuilder/CmsEntryOpenSearchBodyBuilder.js.map

@@ -1 +1 @@
-{"version":3,"file":"features/CmsEntryOpenSearchBodyBuilder/CmsEntryOpenSearchBodyBuilder.js","sources":["../../../src/features/CmsEntryOpenSearchBodyBuilder/CmsEntryOpenSearchBodyBuilder.ts"],"sourcesContent":["import type {\n    QueryDslBoolQuery as BoolQueryConfig,\n    SearchBody\n} from \"@webiny/api-opensearch/types.js\";\nimport { OpenSearchFieldFactory } from \"@webiny/api-opensearch/exports/api/opensearch.js\";\nimport { CmsModelFieldToGraphQLRegistry } from \"@webiny/api-headless-cms/exports/api/cms/graphql.js\";\nimport { CmsEntryOpenSearchFieldIndexRegistry } from \"~/features/CmsEntryOpenSearchFieldIndex/index.js\";\nimport { CmsEntryOpenSearchBodyModifier } from \"~/features/CmsEntryOpenSearchBodyModifier/index.js\";\nimport { CmsEntryOpenSearchSortModifier } from \"~/features/CmsEntryOpenSearchSortModifier/index.js\";\nimport { CmsEntryOpenSearchQueryModifier } from \"~/features/CmsEntryOpenSearchQueryModifier/index.js\";\nimport { CmsEntryOpenSearchValueSearchRegistry } from \"~/features/CmsEntryOpenSearchValueSearch/index.js\";\nimport { CmsEntryOpenSearchFullTextSearch } from \"~/features/CmsEntryOpenSearchFullTextSearch/index.js\";\nimport { CmsEntryOpenSearchExecFiltering } from \"~/features/CmsEntryOpenSearchExecFiltering/index.js\";\nimport { CmsEntryOpenSearchFieldPathFactory } from \"~/features/CmsEntryOpenSearchFieldPathFactory/index.js\";\nimport { createModelFields } from \"~/operations/entry/elasticsearch/fields.js\";\nimport { createFullTextSearchFields } from \"~/operations/entry/elasticsearch/fullTextSearchFields.js\";\nimport { createInitialQuery } from \"~/operations/entry/elasticsearch/initialQuery.js\";\nimport { applyFullTextSearch } from \"~/operations/entry/elasticsearch/fullTextSearch.js\";\nimport { assignMinimumShouldMatchToQuery } from \"~/operations/entry/elasticsearch/assignMinimumShouldMatchToQuery.js\";\nimport { createElasticsearchSort } from \"./sort.js\";\nimport { CmsEntryOpenSearchBodyBuilder as CmsEntryOpenSearchBodyBuilderAbstraction } from \"./abstractions.js\";\n\nclass CmsEntryOpenSearchBodyBuilderImpl\n    implements CmsEntryOpenSearchBodyBuilderAbstraction.Interface\n{\n    public constructor(\n        private readonly execFiltering: CmsEntryOpenSearchExecFiltering.Interface,\n        private readonly fieldPathFactory: CmsEntryOpenSearchFieldPathFactory.Interface,\n        private readonly fieldRegistry: CmsModelFieldToGraphQLRegistry.Interface,\n        private readonly fieldIndexRegistry: CmsEntryOpenSearchFieldIndexRegistry.Interface,\n        private readonly bodyModifiers: CmsEntryOpenSearchBodyModifier.Interface[],\n        private readonly sortModifiers: CmsEntryOpenSearchSortModifier.Interface[],\n        private readonly queryModifiers: CmsEntryOpenSearchQueryModifier.Interface[],\n        private readonly valueSearchRegistry: CmsEntryOpenSearchValueSearchRegistry.Interface,\n        private readonly fullTextSearches: CmsEntryOpenSearchFullTextSearch.Interface[],\n        private readonly fieldFactory: OpenSearchFieldFactory.Interface\n    ) {}\n\n    public build(params: CmsEntryOpenSearchBodyBuilderAbstraction.Params): SearchBody {\n        const { model } = params;\n        const { fields, search: term, where, sort: initialSort, after, limit } = params.params;\n\n        const modelFields = createModelFields({\n            model,\n            fieldRegistry: this.fieldRegistry,\n            fieldIndexRegistry: this.fieldIndexRegistry\n        });\n\n        const applicableQueryModifiers = this.queryModifiers.filter(m => {\n            return !m.modelId || m.modelId === model.modelId;\n        });\n        const applicableSortModifiers = this.sortModifiers.filter(\n            m => !m.modelId || m.modelId === model.modelId\n        );\n        const applicableBodyModifiers = this.bodyModifiers.filter(m => {\n            return !m.modelId || m.modelId === model.modelId;\n        });\n\n        const fullTextSearchFields = createFullTextSearchFields({\n            fields: modelFields,\n            term,\n            targets: fields\n        });\n\n        const query = createInitialQuery({\n            where,\n            model\n        });\n\n        applyFullTextSearch({\n            model,\n            fullTextSearches: this.fullTextSearches,\n            query,\n            term,\n            fields: fullTextSearchFields\n        });\n\n        this.execFiltering.execute({\n            model,\n            fields: modelFields,\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            fieldPathFactory: this.fieldPathFactory,\n            valueSearchRegistry: this.valueSearchRegistry,\n            fieldFactory: this.fieldFactory\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}\n\nexport const CmsEntryOpenSearchBodyBuilder =\n    CmsEntryOpenSearchBodyBuilderAbstraction.createImplementation({\n        implementation: CmsEntryOpenSearchBodyBuilderImpl,\n        dependencies: [\n            CmsEntryOpenSearchExecFiltering,\n            CmsEntryOpenSearchFieldPathFactory,\n            CmsModelFieldToGraphQLRegistry,\n            CmsEntryOpenSearchFieldIndexRegistry,\n            [CmsEntryOpenSearchBodyModifier, { multiple: true }],\n            [CmsEntryOpenSearchSortModifier, { multiple: true }],\n            [CmsEntryOpenSearchQueryModifier, { multiple: true }],\n            CmsEntryOpenSearchValueSearchRegistry,\n            [CmsEntryOpenSearchFullTextSearch, { multiple: true }],\n            OpenSearchFieldFactory\n        ]\n    });\n"],"names":["CmsEntryOpenSearchBodyBuilderImpl","execFiltering","fieldPathFactory","fieldRegistry","fieldIndexRegistry","bodyModifiers","sortModifiers","queryModifiers","valueSearchRegistry","fullTextSearches","fieldFactory","params","model","fields","term","where","initialSort","after","limit","modelFields","createModelFields","applicableQueryModifiers","m","applicableSortModifiers","applicableBodyModifiers","fullTextSearchFields","createFullTextSearchFields","query","createInitialQuery","applyFullTextSearch","modifier","sort","createElasticsearchSort","boolQuery","undefined","assignMinimumShouldMatchToQuery","body","CmsEntryOpenSearchBodyBuilder","CmsEntryOpenSearchBodyBuilderAbstraction","CmsEntryOpenSearchExecFiltering","CmsEntryOpenSearchFieldPathFactory","CmsModelFieldToGraphQLRegistry","CmsEntryOpenSearchFieldIndexRegistry","CmsEntryOpenSearchBodyModifier","CmsEntryOpenSearchSortModifier","CmsEntryOpenSearchQueryModifier","CmsEntryOpenSearchValueSearchRegistry","CmsEntryOpenSearchFullTextSearch","OpenSearchFieldFactory"],"mappings":"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"}
+{"version":3,"file":"features/CmsEntryOpenSearchBodyBuilder/CmsEntryOpenSearchBodyBuilder.js","sources":["../../../src/features/CmsEntryOpenSearchBodyBuilder/CmsEntryOpenSearchBodyBuilder.ts"],"sourcesContent":["import type {\n    QueryDslBoolQuery as BoolQueryConfig,\n    SearchBody\n} from \"@webiny/api-opensearch/types.js\";\nimport { OpenSearchFieldFactory } from \"@webiny/api-opensearch/exports/api/opensearch.js\";\nimport { CmsModelFieldToGraphQLRegistry } from \"@webiny/api-headless-cms/exports/api/cms/graphql.js\";\nimport { CmsEntrySystemField } from \"@webiny/api-headless-cms/features/contentEntry/EntrySystemField/index.js\";\nimport { CmsEntryOpenSearchFieldIndexRegistry } from \"~/features/CmsEntryOpenSearchFieldIndex/index.js\";\nimport { CmsEntryOpenSearchBodyModifier } from \"~/features/CmsEntryOpenSearchBodyModifier/index.js\";\nimport { CmsEntryOpenSearchSortModifier } from \"~/features/CmsEntryOpenSearchSortModifier/index.js\";\nimport { CmsEntryOpenSearchQueryModifier } from \"~/features/CmsEntryOpenSearchQueryModifier/index.js\";\nimport { CmsEntryOpenSearchValueSearchRegistry } from \"~/features/CmsEntryOpenSearchValueSearch/index.js\";\nimport { CmsEntryOpenSearchFullTextSearch } from \"~/features/CmsEntryOpenSearchFullTextSearch/index.js\";\nimport { CmsEntryOpenSearchExecFiltering } from \"~/features/CmsEntryOpenSearchExecFiltering/index.js\";\nimport { CmsEntryOpenSearchFieldPathFactory } from \"~/features/CmsEntryOpenSearchFieldPathFactory/index.js\";\nimport { createModelFields } from \"~/operations/entry/elasticsearch/fields.js\";\nimport { createFullTextSearchFields } from \"~/operations/entry/elasticsearch/fullTextSearchFields.js\";\nimport { createInitialQuery } from \"~/operations/entry/elasticsearch/initialQuery.js\";\nimport { applyFullTextSearch } from \"~/operations/entry/elasticsearch/fullTextSearch.js\";\nimport { assignMinimumShouldMatchToQuery } from \"~/operations/entry/elasticsearch/assignMinimumShouldMatchToQuery.js\";\nimport { createElasticsearchSort } from \"./sort.js\";\nimport { CmsEntryOpenSearchBodyBuilder as CmsEntryOpenSearchBodyBuilderAbstraction } from \"./abstractions.js\";\n\nclass CmsEntryOpenSearchBodyBuilderImpl\n    implements CmsEntryOpenSearchBodyBuilderAbstraction.Interface\n{\n    public constructor(\n        private readonly execFiltering: CmsEntryOpenSearchExecFiltering.Interface,\n        private readonly fieldPathFactory: CmsEntryOpenSearchFieldPathFactory.Interface,\n        private readonly fieldRegistry: CmsModelFieldToGraphQLRegistry.Interface,\n        private readonly fieldIndexRegistry: CmsEntryOpenSearchFieldIndexRegistry.Interface,\n        private readonly bodyModifiers: CmsEntryOpenSearchBodyModifier.Interface[],\n        private readonly sortModifiers: CmsEntryOpenSearchSortModifier.Interface[],\n        private readonly queryModifiers: CmsEntryOpenSearchQueryModifier.Interface[],\n        private readonly valueSearchRegistry: CmsEntryOpenSearchValueSearchRegistry.Interface,\n        private readonly fullTextSearches: CmsEntryOpenSearchFullTextSearch.Interface[],\n        private readonly fieldFactory: OpenSearchFieldFactory.Interface,\n        private readonly entrySystemFields: CmsEntrySystemField.Interface[]\n    ) {}\n\n    public build(params: CmsEntryOpenSearchBodyBuilderAbstraction.Params): SearchBody {\n        const { model, shared } = params;\n        const { fields, search: term, where, sort: initialSort, after, limit } = params.params;\n\n        const modelFields = createModelFields({\n            model,\n            fieldRegistry: this.fieldRegistry,\n            fieldIndexRegistry: this.fieldIndexRegistry,\n            systemFields: this.entrySystemFields.map(systemField => systemField.field)\n        });\n\n        const applicableQueryModifiers = this.queryModifiers.filter(m => {\n            return !m.modelId || m.modelId === model.modelId;\n        });\n        const applicableSortModifiers = this.sortModifiers.filter(\n            m => !m.modelId || m.modelId === model.modelId\n        );\n        const applicableBodyModifiers = this.bodyModifiers.filter(m => {\n            return !m.modelId || m.modelId === model.modelId;\n        });\n\n        const fullTextSearchFields = createFullTextSearchFields({\n            fields: modelFields,\n            term,\n            targets: fields\n        });\n\n        const query = createInitialQuery({\n            where,\n            model,\n            shared\n        });\n\n        applyFullTextSearch({\n            model,\n            fullTextSearches: this.fullTextSearches,\n            query,\n            term,\n            fields: fullTextSearchFields\n        });\n\n        this.execFiltering.execute({\n            model,\n            fields: modelFields,\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            fieldPathFactory: this.fieldPathFactory,\n            valueSearchRegistry: this.valueSearchRegistry,\n            fieldFactory: this.fieldFactory\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}\n\nexport const CmsEntryOpenSearchBodyBuilder =\n    CmsEntryOpenSearchBodyBuilderAbstraction.createImplementation({\n        implementation: CmsEntryOpenSearchBodyBuilderImpl,\n        dependencies: [\n            CmsEntryOpenSearchExecFiltering,\n            CmsEntryOpenSearchFieldPathFactory,\n            CmsModelFieldToGraphQLRegistry,\n            CmsEntryOpenSearchFieldIndexRegistry,\n            [CmsEntryOpenSearchBodyModifier, { multiple: true }],\n            [CmsEntryOpenSearchSortModifier, { multiple: true }],\n            [CmsEntryOpenSearchQueryModifier, { multiple: true }],\n            CmsEntryOpenSearchValueSearchRegistry,\n            [CmsEntryOpenSearchFullTextSearch, { multiple: true }],\n            OpenSearchFieldFactory,\n            [CmsEntrySystemField, { multiple: true }]\n        ]\n    });\n"],"names":["CmsEntryOpenSearchBodyBuilderImpl","execFiltering","fieldPathFactory","fieldRegistry","fieldIndexRegistry","bodyModifiers","sortModifiers","queryModifiers","valueSearchRegistry","fullTextSearches","fieldFactory","entrySystemFields","params","model","shared","fields","term","where","initialSort","after","limit","modelFields","createModelFields","systemField","applicableQueryModifiers","m","applicableSortModifiers","applicableBodyModifiers","fullTextSearchFields","createFullTextSearchFields","query","createInitialQuery","applyFullTextSearch","modifier","sort","createElasticsearchSort","boolQuery","undefined","assignMinimumShouldMatchToQuery","body","CmsEntryOpenSearchBodyBuilder","CmsEntryOpenSearchBodyBuilderAbstraction","CmsEntryOpenSearchExecFiltering","CmsEntryOpenSearchFieldPathFactory","CmsModelFieldToGraphQLRegistry","CmsEntryOpenSearchFieldIndexRegistry","CmsEntryOpenSearchBodyModifier","CmsEntryOpenSearchSortModifier","CmsEntryOpenSearchQueryModifier","CmsEntryOpenSearchValueSearchRegistry","CmsEntryOpenSearchFullTextSearch","OpenSearchFieldFactory","CmsEntrySystemField"],"mappings":"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"}

package/features/CmsEntryOpenSearchBodyBuilder/abstractions.d.ts

@@ -3,6 +3,10 @@ import type { CmsEntryListParams, CmsEntryListWhere } from "@webiny/api-headless
 import type { PrimitiveValue, SearchBody } from "@webiny/api-opensearch/types.js";
 export interface ICmsEntryOpenSearchBodyBuilderParams {
     model: CmsModel;
+    /**
+     * Whether the model's index is shared between tenants, from CmsModelOpenSearchIndexProvider.
+     */
+    shared: boolean;
     params: Omit<CmsEntryListParams, "where" | "after"> & {
         where: CmsEntryListWhere;
         after?: PrimitiveValue[];

package/features/CmsEntryOpenSearchBodyBuilder/abstractions.js.map

@@ -1 +1 @@
-{"version":3,"file":"features/CmsEntryOpenSearchBodyBuilder/abstractions.js","sources":["../../../src/features/CmsEntryOpenSearchBodyBuilder/abstractions.ts"],"sourcesContent":["import { createAbstraction } from \"@webiny/feature/api\";\nimport type { CmsModel } from \"@webiny/api-headless-cms/types/index.js\";\nimport type {\n    CmsEntryListParams,\n    CmsEntryListWhere\n} from \"@webiny/api-headless-cms/types/index.js\";\nimport type { PrimitiveValue, SearchBody } from \"@webiny/api-opensearch/types.js\";\n\nexport interface ICmsEntryOpenSearchBodyBuilderParams {\n    model: CmsModel;\n    params: Omit<CmsEntryListParams, \"where\" | \"after\"> & {\n        where: CmsEntryListWhere;\n        after?: PrimitiveValue[];\n    };\n}\n\nexport interface ICmsEntryOpenSearchBodyBuilder {\n    build(params: ICmsEntryOpenSearchBodyBuilderParams): SearchBody;\n}\n\nexport const CmsEntryOpenSearchBodyBuilder = createAbstraction<ICmsEntryOpenSearchBodyBuilder>(\n    \"Cms/Entry/OpenSearch/BodyBuilder\"\n);\n\nexport namespace CmsEntryOpenSearchBodyBuilder {\n    export type Interface = ICmsEntryOpenSearchBodyBuilder;\n    export type Params = ICmsEntryOpenSearchBodyBuilderParams;\n}\n"],"names":["CmsEntryOpenSearchBodyBuilder","createAbstraction"],"mappings":";AAoBO,MAAMA,gCAAgCC,kBACzC"}
+{"version":3,"file":"features/CmsEntryOpenSearchBodyBuilder/abstractions.js","sources":["../../../src/features/CmsEntryOpenSearchBodyBuilder/abstractions.ts"],"sourcesContent":["import { createAbstraction } from \"@webiny/feature/api\";\nimport type { CmsModel } from \"@webiny/api-headless-cms/types/index.js\";\nimport type {\n    CmsEntryListParams,\n    CmsEntryListWhere\n} from \"@webiny/api-headless-cms/types/index.js\";\nimport type { PrimitiveValue, SearchBody } from \"@webiny/api-opensearch/types.js\";\n\nexport interface ICmsEntryOpenSearchBodyBuilderParams {\n    model: CmsModel;\n    /**\n     * Whether the model's index is shared between tenants, from CmsModelOpenSearchIndexProvider.\n     */\n    shared: boolean;\n    params: Omit<CmsEntryListParams, \"where\" | \"after\"> & {\n        where: CmsEntryListWhere;\n        after?: PrimitiveValue[];\n    };\n}\n\nexport interface ICmsEntryOpenSearchBodyBuilder {\n    build(params: ICmsEntryOpenSearchBodyBuilderParams): SearchBody;\n}\n\nexport const CmsEntryOpenSearchBodyBuilder = createAbstraction<ICmsEntryOpenSearchBodyBuilder>(\n    \"Cms/Entry/OpenSearch/BodyBuilder\"\n);\n\nexport namespace CmsEntryOpenSearchBodyBuilder {\n    export type Interface = ICmsEntryOpenSearchBodyBuilder;\n    export type Params = ICmsEntryOpenSearchBodyBuilderParams;\n}\n"],"names":["CmsEntryOpenSearchBodyBuilder","createAbstraction"],"mappings":";AAwBO,MAAMA,gCAAgCC,kBACzC"}

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

@@ -0,0 +1,7 @@
+import type { ModelFields } from "../../../../operations/entry/elasticsearch/types.js";
+import type { CmsModelField } from "@webiny/api-headless-cms/types/index.js";
+/**
+ * Filter fields for the fields registered as `CmsEntrySystemField`. The `system` object is indexed
+ * as-is (raw storage ids), so a text field resolves to `system.<path>.keyword`.
+ */
+export declare const createEntrySystemFields: (fields: CmsModelField[]) => ModelFields;

package/operations/entry/elasticsearch/fields/system.js

@@ -0,0 +1,58 @@
+import { createSystemField } from "./createSystemField.js";
+const systemParent = {
+    fieldId: "system",
+    type: "object",
+    storageId: "system"
+};
+const addFields = (result, fields, parents)=>{
+    for (const field of fields){
+        const path = [
+            ...parents.map((parent)=>parent.fieldId),
+            field.fieldId
+        ].join(".");
+        result[path] = {
+            type: field.type,
+            systemField: true,
+            searchable: true,
+            sortable: false,
+            parents,
+            field
+        };
+        const children = field.settings?.fields;
+        if (children?.length) addFields(result, children, [
+            ...parents,
+            {
+                fieldId: field.fieldId,
+                type: field.type,
+                storageId: field.storageId
+            }
+        ]);
+    }
+};
+const createEntrySystemFields = (fields)=>{
+    if (0 === fields.length) return {};
+    const result = {
+        system: {
+            type: "object",
+            systemField: true,
+            searchable: true,
+            sortable: false,
+            field: createSystemField({
+                storageId: "system",
+                fieldId: "system",
+                type: "object",
+                settings: {
+                    fields
+                }
+            }),
+            parents: []
+        }
+    };
+    addFields(result, fields, [
+        systemParent
+    ]);
+    return result;
+};
+export { createEntrySystemFields };
+
+//# sourceMappingURL=system.js.map

package/operations/entry/elasticsearch/fields/system.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"operations/entry/elasticsearch/fields/system.js","sources":["../../../../../src/operations/entry/elasticsearch/fields/system.ts"],"sourcesContent":["import type { ModelFieldParent, ModelFields } from \"~/operations/entry/elasticsearch/types.js\";\nimport type { CmsModelField } from \"@webiny/api-headless-cms/types/index.js\";\nimport { createSystemField } from \"./createSystemField.js\";\n\nconst systemParent: ModelFieldParent = {\n    fieldId: \"system\",\n    type: \"object\",\n    storageId: \"system\"\n};\n\n/**\n * ObjectFilter resolves one level at a time, so every nested object needs its own entry.\n */\nconst addFields = (result: ModelFields, fields: CmsModelField[], parents: ModelFieldParent[]) => {\n    for (const field of fields) {\n        const path = [...parents.map(parent => parent.fieldId), field.fieldId].join(\".\");\n        result[path] = {\n            type: field.type,\n            systemField: true,\n            searchable: true,\n            sortable: false,\n            parents,\n            field\n        };\n        const children = field.settings?.fields;\n        if (!children?.length) {\n            continue;\n        }\n        addFields(result, children, [\n            ...parents,\n            {\n                fieldId: field.fieldId,\n                type: field.type,\n                storageId: field.storageId\n            }\n        ]);\n    }\n};\n\n/**\n * Filter fields for the fields registered as `CmsEntrySystemField`. The `system` object is indexed\n * as-is (raw storage ids), so a text field resolves to `system.<path>.keyword`.\n */\nexport const createEntrySystemFields = (fields: CmsModelField[]): ModelFields => {\n    if (fields.length === 0) {\n        return {};\n    }\n    const result: ModelFields = {\n        system: {\n            type: \"object\",\n            systemField: true,\n            searchable: true,\n            sortable: false,\n            field: createSystemField({\n                storageId: \"system\",\n                fieldId: \"system\",\n                type: \"object\",\n                settings: {\n                    fields\n                }\n            }),\n            parents: []\n        }\n    };\n    addFields(result, fields, [systemParent]);\n    return result;\n};\n"],"names":["systemParent","addFields","result","fields","parents","field","path","parent","children","createEntrySystemFields","createSystemField"],"mappings":";AAIA,MAAMA,eAAiC;IACnC,SAAS;IACT,MAAM;IACN,WAAW;AACf;AAKA,MAAMC,YAAY,CAACC,QAAqBC,QAAyBC;IAC7D,KAAK,MAAMC,SAASF,OAAQ;QACxB,MAAMG,OAAO;eAAIF,QAAQ,GAAG,CAACG,CAAAA,SAAUA,OAAO,OAAO;YAAGF,MAAM,OAAO;SAAC,CAAC,IAAI,CAAC;QAC5EH,MAAM,CAACI,KAAK,GAAG;YACX,MAAMD,MAAM,IAAI;YAChB,aAAa;YACb,YAAY;YACZ,UAAU;YACVD;YACAC;QACJ;QACA,MAAMG,WAAWH,MAAM,QAAQ,EAAE;QACjC,IAAKG,UAAU,QAGfP,UAAUC,QAAQM,UAAU;eACrBJ;YACH;gBACI,SAASC,MAAM,OAAO;gBACtB,MAAMA,MAAM,IAAI;gBAChB,WAAWA,MAAM,SAAS;YAC9B;SACH;IACL;AACJ;AAMO,MAAMI,0BAA0B,CAACN;IACpC,IAAIA,AAAkB,MAAlBA,OAAO,MAAM,EACb,OAAO,CAAC;IAEZ,MAAMD,SAAsB;QACxB,QAAQ;YACJ,MAAM;YACN,aAAa;YACb,YAAY;YACZ,UAAU;YACV,OAAOQ,kBAAkB;gBACrB,WAAW;gBACX,SAAS;gBACT,MAAM;gBACN,UAAU;oBACNP;gBACJ;YACJ;YACA,SAAS,EAAE;QACf;IACJ;IACAF,UAAUC,QAAQC,QAAQ;QAACH;KAAa;IACxC,OAAOE;AACX"}

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

@@ -1,12 +1,14 @@
-import type { CmsModel } from "@webiny/api-headless-cms/types/index.js";
+import type { CmsModel, CmsModelField } from "@webiny/api-headless-cms/types/index.js";
 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;
+    /** Fields registered as `CmsEntrySystemField`, filterable under `system`. */
+    systemFields: CmsModelField[];
 }
-export declare const createModelFields: ({ model, fieldRegistry, fieldIndexRegistry }: ICreateModelFieldsParams) => {
+export declare const createModelFields: ({ model, fieldRegistry, fieldIndexRegistry, systemFields }: ICreateModelFieldsParams) => {
     [x: string]: import("./types.js").ModelField;
 };
 export {};

package/operations/entry/elasticsearch/fields.js

@@ -5,7 +5,8 @@ import { liveFields } from "./fields/live.js";
 import { createSystemField } from "./fields/createSystemField.js";
 import { stateFields } from "./fields/state.js";
 import { locationFields } from "./fields/location.js";
-const createSystemFields = ()=>{
+import { createEntrySystemFields } from "./fields/system.js";
+const createSystemFields = (entrySystemFields)=>{
     const onMetaFields = ENTRY_META_FIELDS.filter(isDateTimeEntryMetaField).reduce((current, fieldName)=>({
             ...current,
             [fieldName]: {
@@ -128,7 +129,8 @@ const createSystemFields = ()=>{
             parents: []
         },
         ...stateFields,
-        ...liveFields
+        ...liveFields,
+        ...createEntrySystemFields(entrySystemFields)
     };
 };
 const buildFieldsList = (params)=>{
@@ -171,7 +173,7 @@ const buildFieldsList = (params)=>{
         return result;
     }, {});
 };
-const createModelFields = ({ model, fieldRegistry, fieldIndexRegistry })=>{
+const createModelFields = ({ model, fieldRegistry, fieldIndexRegistry, systemFields })=>{
     const fields = model.fields;
     const unmappedTypes = fieldIndexRegistry.getAll().reduce((acc, fieldIndex)=>{
         if (!fieldIndex.unmappedType) return acc;
@@ -188,7 +190,7 @@ const createModelFields = ({ model, fieldRegistry, fieldIndexRegistry })=>{
         return types;
     }, {});
     return {
-        ...createSystemFields(),
+        ...createSystemFields(systemFields),
         ...buildFieldsList({
             fields,
             plugins: fieldTypePlugins,

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

@@ -1 +1 @@
-{"version":3,"file":"operations/entry/elasticsearch/fields.js","sources":["../../../../src/operations/entry/elasticsearch/fields.ts"],"sourcesContent":["import WebinyError from \"@webiny/error\";\nimport type { CmsModel, CmsModelField } from \"@webiny/api-headless-cms/types/index.js\";\nimport type { ModelFieldParent, ModelFields } from \"./types.js\";\nimport {\n    ENTRY_META_FIELDS,\n    isDateTimeEntryMetaField,\n    isIdentityEntryMetaField\n} from \"@webiny/api-headless-cms/constants.js\";\nimport { getBaseFieldType } from \"@webiny/api-headless-cms/utils/getBaseFieldType.js\";\nimport { liveFields } from \"./fields/live.js\";\nimport { createSystemField } from \"./fields/createSystemField.js\";\nimport { stateFields } from \"./fields/state.js\";\nimport { locationFields } from \"./fields/location.js\";\nimport { CmsModelFieldToGraphQLRegistry } from \"@webiny/api-headless-cms/features/graphql/index.js\";\nimport { CmsEntryOpenSearchFieldIndexRegistry } from \"~/features/CmsEntryOpenSearchFieldIndex/index.js\";\n\nconst createSystemFields = (): ModelFields => {\n    const onMetaFields = ENTRY_META_FIELDS.filter(isDateTimeEntryMetaField).reduce(\n        (current, fieldName) => {\n            return {\n                ...current,\n                [fieldName]: {\n                    type: \"date\",\n                    unmappedType: \"date\",\n                    keyword: false,\n                    systemField: true,\n                    searchable: true,\n                    sortable: true,\n                    field: createSystemField({\n                        storageId: fieldName,\n                        fieldId: fieldName,\n                        type: \"text\",\n                        settings: {\n                            type: \"dateTimeWithoutTimezone\"\n                        }\n                    }),\n                    parents: []\n                }\n            };\n        },\n        {}\n    );\n\n    const byMetaFields = ENTRY_META_FIELDS.filter(isIdentityEntryMetaField).reduce(\n        (current, fieldName) => {\n            return {\n                ...current,\n                [fieldName]: {\n                    type: \"text\",\n                    unmappedType: undefined,\n                    systemField: true,\n                    searchable: true,\n                    sortable: true,\n                    path: `${fieldName}.id`,\n                    field: createSystemField({\n                        storageId: fieldName,\n                        fieldId: fieldName,\n                        type: \"text\"\n                    }),\n                    parents: []\n                }\n            };\n        },\n        {}\n    );\n\n    return {\n        id: {\n            type: \"text\",\n            systemField: true,\n            searchable: true,\n            sortable: true,\n            field: createSystemField({\n                storageId: \"id\",\n                fieldId: \"id\",\n                type: \"text\"\n            }),\n            parents: []\n        },\n        entryId: {\n            type: \"text\",\n            systemField: true,\n            searchable: true,\n            sortable: true,\n            field: createSystemField({\n                storageId: \"entryId\",\n                fieldId: \"entryId\",\n                type: \"text\"\n            }),\n            parents: []\n        },\n\n        ...onMetaFields,\n        ...byMetaFields,\n\n        ...locationFields,\n        version: {\n            type: \"number\",\n            unmappedType: undefined,\n            keyword: false,\n            systemField: true,\n            searchable: true,\n            sortable: true,\n            field: createSystemField({\n                storageId: \"version\",\n                fieldId: \"version\",\n                type: \"number\"\n            }),\n            parents: []\n        },\n        status: {\n            type: \"string\",\n            unmappedType: undefined,\n            keyword: false,\n            systemField: true,\n            searchable: true,\n            sortable: false,\n            field: createSystemField({\n                storageId: \"status\",\n                fieldId: \"status\",\n                type: \"string\"\n            }),\n            parents: []\n        },\n        wbyDeleted: {\n            type: \"boolean\",\n            unmappedType: undefined,\n            keyword: false,\n            systemField: true,\n            searchable: true,\n            sortable: false,\n            field: createSystemField({\n                storageId: \"wbyDeleted\",\n                fieldId: \"wbyDeleted\",\n                type: \"boolean\"\n            }),\n            parents: []\n        },\n        binOriginalFolderId: {\n            type: \"text\",\n            unmappedType: undefined,\n            keyword: false,\n            systemField: true,\n            searchable: true,\n            sortable: false,\n            field: createSystemField({\n                storageId: \"binOriginalFolderId\",\n                fieldId: \"binOriginalFolderId\",\n                type: \"text\"\n            }),\n            parents: []\n        },\n        ...stateFields,\n        ...liveFields\n    };\n};\n\ninterface UnmappedFieldTypes {\n    [type: string]: (field: Pick<CmsModelField, \"fieldId\" | \"type\">) => string | undefined;\n}\n\ninterface FieldTypePlugin {\n    unmappedType?: (field: Pick<CmsModelField, \"fieldId\" | \"type\">) => string | undefined;\n    searchable: boolean;\n    sortable: boolean;\n    isFullTextSearchable?: boolean;\n}\n\ninterface FieldTypePlugins {\n    [key: string]: FieldTypePlugin;\n}\n\ninterface BuildParams {\n    plugins: FieldTypePlugins;\n    fields: CmsModelField[];\n    parents: ModelFieldParent[];\n}\n\nconst buildFieldsList = (params: BuildParams): ModelFields => {\n    const { plugins, fields, parents } = params;\n\n    return fields.reduce<ModelFields>((result, field) => {\n        const fieldType = getBaseFieldType(field);\n        const plugin = plugins[fieldType];\n        if (!plugin) {\n            throw new WebinyError(`There is no plugin for field type \"${field.type}\".`);\n        }\n\n        const { searchable, sortable, unmappedType, isFullTextSearchable: fullTextSearch } = plugin;\n        /**\n         * If a field has child fields, go through them and add them to a result.\n         */\n        const childFields = field.settings?.fields || [];\n        if (childFields.length > 0) {\n            /**\n             * Let's build all the child fields\n             */\n            const childResult = buildFieldsList({\n                fields: childFields,\n                plugins,\n                parents: [\n                    ...parents,\n                    {\n                        fieldId: field.fieldId,\n                        storageId: field.storageId,\n                        type: fieldType\n                    }\n                ]\n            });\n            Object.assign(result, childResult);\n        }\n\n        const identifier = [...parents.map(p => p.fieldId), field.fieldId].join(\".\");\n\n        result[identifier] = {\n            type: fieldType,\n            parents,\n            searchable,\n            sortable,\n            fullTextSearch,\n            unmappedType: typeof unmappedType === \"function\" ? unmappedType(field) : undefined,\n            systemField: false,\n            field\n        };\n\n        return result;\n    }, {});\n};\n\ninterface ICreateModelFieldsParams {\n    model: CmsModel;\n    fieldRegistry: CmsModelFieldToGraphQLRegistry.Interface;\n    fieldIndexRegistry: CmsEntryOpenSearchFieldIndexRegistry.Interface;\n}\n\nexport const createModelFields = ({\n    model,\n    fieldRegistry,\n    fieldIndexRegistry\n}: ICreateModelFieldsParams) => {\n    const fields = model.fields;\n    /**\n     * Collect all unmappedType from field index registry.\n     */\n    const unmappedTypes = fieldIndexRegistry\n        .getAll()\n        .reduce<UnmappedFieldTypes>((acc, fieldIndex) => {\n            if (!fieldIndex.unmappedType) {\n                return acc;\n            }\n            acc[fieldIndex.fieldType] = fieldIndex.unmappedType;\n            return acc;\n        }, {});\n    /**\n     * Collect all field types from the plugins.\n     */\n    const fieldTypePlugins = fieldRegistry.getAll().reduce<FieldTypePlugins>((types, field) => {\n        types[field.fieldType] = {\n            unmappedType: unmappedTypes[field.fieldType],\n            searchable: field.isSearchable,\n            sortable: field.isSortable,\n            isFullTextSearchable: field.isFullTextSearchable\n        };\n        return types;\n    }, {});\n\n    return {\n        ...createSystemFields(),\n        ...buildFieldsList({\n            fields,\n            plugins: fieldTypePlugins,\n            parents: [\n                {\n                    fieldId: \"values\",\n                    type: \"object\",\n                    storageId: \"values\"\n                }\n            ]\n        })\n    };\n};\n"],"names":["createSystemFields","onMetaFields","ENTRY_META_FIELDS","isDateTimeEntryMetaField","current","fieldName","createSystemField","byMetaFields","isIdentityEntryMetaField","undefined","locationFields","stateFields","liveFields","buildFieldsList","params","plugins","fields","parents","result","field","fieldType","getBaseFieldType","plugin","WebinyError","searchable","sortable","unmappedType","fullTextSearch","childFields","childResult","Object","identifier","p","createModelFields","model","fieldRegistry","fieldIndexRegistry","unmappedTypes","acc","fieldIndex","fieldTypePlugins","types"],"mappings":"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"}
+{"version":3,"file":"operations/entry/elasticsearch/fields.js","sources":["../../../../src/operations/entry/elasticsearch/fields.ts"],"sourcesContent":["import WebinyError from \"@webiny/error\";\nimport type { CmsModel, CmsModelField } from \"@webiny/api-headless-cms/types/index.js\";\nimport type { ModelFieldParent, ModelFields } from \"./types.js\";\nimport {\n    ENTRY_META_FIELDS,\n    isDateTimeEntryMetaField,\n    isIdentityEntryMetaField\n} from \"@webiny/api-headless-cms/constants.js\";\nimport { getBaseFieldType } from \"@webiny/api-headless-cms/utils/getBaseFieldType.js\";\nimport { liveFields } from \"./fields/live.js\";\nimport { createSystemField } from \"./fields/createSystemField.js\";\nimport { stateFields } from \"./fields/state.js\";\nimport { locationFields } from \"./fields/location.js\";\nimport { createEntrySystemFields } from \"./fields/system.js\";\nimport { CmsModelFieldToGraphQLRegistry } from \"@webiny/api-headless-cms/features/graphql/index.js\";\nimport { CmsEntryOpenSearchFieldIndexRegistry } from \"~/features/CmsEntryOpenSearchFieldIndex/index.js\";\n\nconst createSystemFields = (entrySystemFields: CmsModelField[]): ModelFields => {\n    const onMetaFields = ENTRY_META_FIELDS.filter(isDateTimeEntryMetaField).reduce(\n        (current, fieldName) => {\n            return {\n                ...current,\n                [fieldName]: {\n                    type: \"date\",\n                    unmappedType: \"date\",\n                    keyword: false,\n                    systemField: true,\n                    searchable: true,\n                    sortable: true,\n                    field: createSystemField({\n                        storageId: fieldName,\n                        fieldId: fieldName,\n                        type: \"text\",\n                        settings: {\n                            type: \"dateTimeWithoutTimezone\"\n                        }\n                    }),\n                    parents: []\n                }\n            };\n        },\n        {}\n    );\n\n    const byMetaFields = ENTRY_META_FIELDS.filter(isIdentityEntryMetaField).reduce(\n        (current, fieldName) => {\n            return {\n                ...current,\n                [fieldName]: {\n                    type: \"text\",\n                    unmappedType: undefined,\n                    systemField: true,\n                    searchable: true,\n                    sortable: true,\n                    path: `${fieldName}.id`,\n                    field: createSystemField({\n                        storageId: fieldName,\n                        fieldId: fieldName,\n                        type: \"text\"\n                    }),\n                    parents: []\n                }\n            };\n        },\n        {}\n    );\n\n    return {\n        id: {\n            type: \"text\",\n            systemField: true,\n            searchable: true,\n            sortable: true,\n            field: createSystemField({\n                storageId: \"id\",\n                fieldId: \"id\",\n                type: \"text\"\n            }),\n            parents: []\n        },\n        entryId: {\n            type: \"text\",\n            systemField: true,\n            searchable: true,\n            sortable: true,\n            field: createSystemField({\n                storageId: \"entryId\",\n                fieldId: \"entryId\",\n                type: \"text\"\n            }),\n            parents: []\n        },\n\n        ...onMetaFields,\n        ...byMetaFields,\n\n        ...locationFields,\n        version: {\n            type: \"number\",\n            unmappedType: undefined,\n            keyword: false,\n            systemField: true,\n            searchable: true,\n            sortable: true,\n            field: createSystemField({\n                storageId: \"version\",\n                fieldId: \"version\",\n                type: \"number\"\n            }),\n            parents: []\n        },\n        status: {\n            type: \"string\",\n            unmappedType: undefined,\n            keyword: false,\n            systemField: true,\n            searchable: true,\n            sortable: false,\n            field: createSystemField({\n                storageId: \"status\",\n                fieldId: \"status\",\n                type: \"string\"\n            }),\n            parents: []\n        },\n        wbyDeleted: {\n            type: \"boolean\",\n            unmappedType: undefined,\n            keyword: false,\n            systemField: true,\n            searchable: true,\n            sortable: false,\n            field: createSystemField({\n                storageId: \"wbyDeleted\",\n                fieldId: \"wbyDeleted\",\n                type: \"boolean\"\n            }),\n            parents: []\n        },\n        binOriginalFolderId: {\n            type: \"text\",\n            unmappedType: undefined,\n            keyword: false,\n            systemField: true,\n            searchable: true,\n            sortable: false,\n            field: createSystemField({\n                storageId: \"binOriginalFolderId\",\n                fieldId: \"binOriginalFolderId\",\n                type: \"text\"\n            }),\n            parents: []\n        },\n        ...stateFields,\n        ...liveFields,\n        ...createEntrySystemFields(entrySystemFields)\n    };\n};\n\ninterface UnmappedFieldTypes {\n    [type: string]: (field: Pick<CmsModelField, \"fieldId\" | \"type\">) => string | undefined;\n}\n\ninterface FieldTypePlugin {\n    unmappedType?: (field: Pick<CmsModelField, \"fieldId\" | \"type\">) => string | undefined;\n    searchable: boolean;\n    sortable: boolean;\n    isFullTextSearchable?: boolean;\n}\n\ninterface FieldTypePlugins {\n    [key: string]: FieldTypePlugin;\n}\n\ninterface BuildParams {\n    plugins: FieldTypePlugins;\n    fields: CmsModelField[];\n    parents: ModelFieldParent[];\n}\n\nconst buildFieldsList = (params: BuildParams): ModelFields => {\n    const { plugins, fields, parents } = params;\n\n    return fields.reduce<ModelFields>((result, field) => {\n        const fieldType = getBaseFieldType(field);\n        const plugin = plugins[fieldType];\n        if (!plugin) {\n            throw new WebinyError(`There is no plugin for field type \"${field.type}\".`);\n        }\n\n        const { searchable, sortable, unmappedType, isFullTextSearchable: fullTextSearch } = plugin;\n        /**\n         * If a field has child fields, go through them and add them to a result.\n         */\n        const childFields = field.settings?.fields || [];\n        if (childFields.length > 0) {\n            /**\n             * Let's build all the child fields\n             */\n            const childResult = buildFieldsList({\n                fields: childFields,\n                plugins,\n                parents: [\n                    ...parents,\n                    {\n                        fieldId: field.fieldId,\n                        storageId: field.storageId,\n                        type: fieldType\n                    }\n                ]\n            });\n            Object.assign(result, childResult);\n        }\n\n        const identifier = [...parents.map(p => p.fieldId), field.fieldId].join(\".\");\n\n        result[identifier] = {\n            type: fieldType,\n            parents,\n            searchable,\n            sortable,\n            fullTextSearch,\n            unmappedType: typeof unmappedType === \"function\" ? unmappedType(field) : undefined,\n            systemField: false,\n            field\n        };\n\n        return result;\n    }, {});\n};\n\ninterface ICreateModelFieldsParams {\n    model: CmsModel;\n    fieldRegistry: CmsModelFieldToGraphQLRegistry.Interface;\n    fieldIndexRegistry: CmsEntryOpenSearchFieldIndexRegistry.Interface;\n    /** Fields registered as `CmsEntrySystemField`, filterable under `system`. */\n    systemFields: CmsModelField[];\n}\n\nexport const createModelFields = ({\n    model,\n    fieldRegistry,\n    fieldIndexRegistry,\n    systemFields\n}: ICreateModelFieldsParams) => {\n    const fields = model.fields;\n    /**\n     * Collect all unmappedType from field index registry.\n     */\n    const unmappedTypes = fieldIndexRegistry\n        .getAll()\n        .reduce<UnmappedFieldTypes>((acc, fieldIndex) => {\n            if (!fieldIndex.unmappedType) {\n                return acc;\n            }\n            acc[fieldIndex.fieldType] = fieldIndex.unmappedType;\n            return acc;\n        }, {});\n    /**\n     * Collect all field types from the plugins.\n     */\n    const fieldTypePlugins = fieldRegistry.getAll().reduce<FieldTypePlugins>((types, field) => {\n        types[field.fieldType] = {\n            unmappedType: unmappedTypes[field.fieldType],\n            searchable: field.isSearchable,\n            sortable: field.isSortable,\n            isFullTextSearchable: field.isFullTextSearchable\n        };\n        return types;\n    }, {});\n\n    return {\n        ...createSystemFields(systemFields),\n        ...buildFieldsList({\n            fields,\n            plugins: fieldTypePlugins,\n            parents: [\n                {\n                    fieldId: \"values\",\n                    type: \"object\",\n                    storageId: \"values\"\n                }\n            ]\n        })\n    };\n};\n"],"names":["createSystemFields","entrySystemFields","onMetaFields","ENTRY_META_FIELDS","isDateTimeEntryMetaField","current","fieldName","createSystemField","byMetaFields","isIdentityEntryMetaField","undefined","locationFields","stateFields","liveFields","createEntrySystemFields","buildFieldsList","params","plugins","fields","parents","result","field","fieldType","getBaseFieldType","plugin","WebinyError","searchable","sortable","unmappedType","fullTextSearch","childFields","childResult","Object","identifier","p","createModelFields","model","fieldRegistry","fieldIndexRegistry","systemFields","unmappedTypes","acc","fieldIndex","fieldTypePlugins","types"],"mappings":"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"}

package/operations/entry/elasticsearch/fullTextSearch.js

@@ -5,6 +5,7 @@ const defaultFullTextSearch = {
         query.must.push({
             query_string: {
                 allow_leading_wildcard: true,
+                lenient: true,
                 fields: Object.values(fields).map(createFieldPath),
                 query: `*${prepareTerm(term)}*`,
                 default_operator: "and"
@@ -38,7 +39,15 @@ const applyFullTextSearch = (params)=>{
         createFieldPath: (field)=>{
             if ("function" == typeof field.path) return field.path(term);
             if (field.systemField) return field.path || field.field.storageId;
-            return `values.${field.path || field.field.storageId}`;
+            const parents = field.parents.length > 0 ? field.parents.map((p)=>p.storageId) : [
+                "values"
+            ];
+            const path = [
+                ...parents,
+                field.path || field.field.storageId
+            ].join(".");
+            if ("searchable-json" === field.type) return `${path}.*`;
+            return path;
         },
         fields,
         query,

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

@@ -1 +1 @@
-{"version":3,"file":"operations/entry/elasticsearch/fullTextSearch.js","sources":["../../../../src/operations/entry/elasticsearch/fullTextSearch.ts"],"sourcesContent":["import type { OpenSearchBoolQueryConfig } from \"@webiny/api-opensearch/types.js\";\nimport { normalizeValue } from \"@webiny/api-opensearch\";\nimport type { CmsModel } from \"@webiny/api-headless-cms/types/index.js\";\nimport type { CmsEntryOpenSearchFullTextSearch } from \"~/features/CmsEntryOpenSearchFullTextSearch/index.js\";\nimport type { ModelFields } from \"~/operations/entry/elasticsearch/types.js\";\n\n/**\n * Our default implementation works with the AND operator for the multiple words query string.\n */\nconst defaultFullTextSearch: CmsEntryOpenSearchFullTextSearch.Interface = {\n    apply: params => {\n        const { query, term, fields, createFieldPath, prepareTerm } = params;\n\n        query.must.push({\n            query_string: {\n                allow_leading_wildcard: true,\n                fields: Object.values(fields).map(createFieldPath),\n                query: `*${prepareTerm(term)}*`,\n                default_operator: \"and\"\n            }\n        });\n    }\n};\n\ninterface GetFullTextSearchParams {\n    fullTextSearches: CmsEntryOpenSearchFullTextSearch.Interface[];\n    model: CmsModel;\n}\nconst getFullTextSearch = (\n    params: GetFullTextSearchParams\n): CmsEntryOpenSearchFullTextSearch.Interface => {\n    const { fullTextSearches, model } = params;\n    /**\n     * We need to reverse the list, so we can take the last one first - possibility to override existing implementations.\n     */\n    const reversed = [...fullTextSearches].reverse();\n    /**\n     * We need to find the most specific implementation for the given model.\n     * Also, we need to use the first possible implementation if the specific one is not found.\n     */\n    let fallback: CmsEntryOpenSearchFullTextSearch.Interface | null = null;\n    for (const item of reversed) {\n        const models = item.models || [];\n        /**\n         * We take the first available implementation for the given model.\n         */\n        if (models.includes(model.modelId)) {\n            return item;\n        } else if (!fallback && models.length === 0) {\n            /**\n             * Then we set the first possible implementation, which has no models defined, as the default one.\n             * It is important not to set the one which has models defined as they are specifically for the targeted model.\n             */\n            fallback = item;\n        }\n    }\n\n    return fallback || defaultFullTextSearch;\n};\n\ninterface Params {\n    fullTextSearches: CmsEntryOpenSearchFullTextSearch.Interface[];\n    model: CmsModel;\n    query: OpenSearchBoolQueryConfig;\n    term?: string;\n    fields: ModelFields;\n}\nexport const applyFullTextSearch = (params: Params): void => {\n    const { fullTextSearches, query, term, fields, model } = params;\n    const keys = Object.keys(fields);\n    if (!term || term.length === 0 || keys.length === 0) {\n        return;\n    }\n\n    const fullTextSearch = getFullTextSearch({\n        fullTextSearches,\n        model\n    });\n\n    fullTextSearch.apply({\n        model,\n        createFieldPath: field => {\n            if (typeof field.path === \"function\") {\n                return field.path(term);\n            } else if (field.systemField) {\n                return field.path || field.field.storageId;\n            }\n            return `values.${field.path || field.field.storageId}`;\n        },\n        fields,\n        query,\n        term,\n        prepareTerm: normalizeValue\n    });\n};\n"],"names":["defaultFullTextSearch","params","query","term","fields","createFieldPath","prepareTerm","Object","getFullTextSearch","fullTextSearches","model","reversed","fallback","item","models","applyFullTextSearch","keys","fullTextSearch","field","normalizeValue"],"mappings":";AASA,MAAMA,wBAAoE;IACtE,OAAOC,CAAAA;QACH,MAAM,EAAEC,KAAK,EAAEC,IAAI,EAAEC,MAAM,EAAEC,eAAe,EAAEC,WAAW,EAAE,GAAGL;QAE9DC,MAAM,IAAI,CAAC,IAAI,CAAC;YACZ,cAAc;gBACV,wBAAwB;gBACxB,QAAQK,OAAO,MAAM,CAACH,QAAQ,GAAG,CAACC;gBAClC,OAAO,CAAC,CAAC,EAAEC,YAAYH,MAAM,CAAC,CAAC;gBAC/B,kBAAkB;YACtB;QACJ;IACJ;AACJ;AAMA,MAAMK,oBAAoB,CACtBP;IAEA,MAAM,EAAEQ,gBAAgB,EAAEC,KAAK,EAAE,GAAGT;IAIpC,MAAMU,WAAW;WAAIF;KAAiB,CAAC,OAAO;IAK9C,IAAIG,WAA8D;IAClE,KAAK,MAAMC,QAAQF,SAAU;QACzB,MAAMG,SAASD,KAAK,MAAM,IAAI,EAAE;QAIhC,IAAIC,OAAO,QAAQ,CAACJ,MAAM,OAAO,GAC7B,OAAOG;QACJ,IAAI,CAACD,YAAYE,AAAkB,MAAlBA,OAAO,MAAM,EAKjCF,WAAWC;IAEnB;IAEA,OAAOD,YAAYZ;AACvB;AASO,MAAMe,sBAAsB,CAACd;IAChC,MAAM,EAAEQ,gBAAgB,EAAEP,KAAK,EAAEC,IAAI,EAAEC,MAAM,EAAEM,KAAK,EAAE,GAAGT;IACzD,MAAMe,OAAOT,OAAO,IAAI,CAACH;IACzB,IAAI,CAACD,QAAQA,AAAgB,MAAhBA,KAAK,MAAM,IAAUa,AAAgB,MAAhBA,KAAK,MAAM,EACzC;IAGJ,MAAMC,iBAAiBT,kBAAkB;QACrCC;QACAC;IACJ;IAEAO,eAAe,KAAK,CAAC;QACjBP;QACA,iBAAiBQ,CAAAA;YACb,IAAI,AAAsB,cAAtB,OAAOA,MAAM,IAAI,EACjB,OAAOA,MAAM,IAAI,CAACf;YACf,IAAIe,MAAM,WAAW,EACxB,OAAOA,MAAM,IAAI,IAAIA,MAAM,KAAK,CAAC,SAAS;YAE9C,OAAO,CAAC,OAAO,EAAEA,MAAM,IAAI,IAAIA,MAAM,KAAK,CAAC,SAAS,EAAE;QAC1D;QACAd;QACAF;QACAC;QACA,aAAagB;IACjB;AACJ"}
+{"version":3,"file":"operations/entry/elasticsearch/fullTextSearch.js","sources":["../../../../src/operations/entry/elasticsearch/fullTextSearch.ts"],"sourcesContent":["import type { OpenSearchBoolQueryConfig } from \"@webiny/api-opensearch/types.js\";\nimport { normalizeValue } from \"@webiny/api-opensearch\";\nimport type { CmsModel } from \"@webiny/api-headless-cms/types/index.js\";\nimport type { CmsEntryOpenSearchFullTextSearch } from \"~/features/CmsEntryOpenSearchFullTextSearch/index.js\";\nimport type { ModelFields } from \"~/operations/entry/elasticsearch/types.js\";\n\n/**\n * Our default implementation works with the AND operator for the multiple words query string.\n */\nconst defaultFullTextSearch: CmsEntryOpenSearchFullTextSearch.Interface = {\n    apply: params => {\n        const { query, term, fields, createFieldPath, prepareTerm } = params;\n\n        query.must.push({\n            query_string: {\n                allow_leading_wildcard: true,\n                /**\n                 * Searchable JSON fields are dynamically mapped, so their subfields can be of any type (date, number, boolean...).\n                 * Wildcard queries are not allowed on those types, so we need to ignore them instead of failing the whole query.\n                 */\n                lenient: true,\n                fields: Object.values(fields).map(createFieldPath),\n                query: `*${prepareTerm(term)}*`,\n                default_operator: \"and\"\n            }\n        });\n    }\n};\n\ninterface GetFullTextSearchParams {\n    fullTextSearches: CmsEntryOpenSearchFullTextSearch.Interface[];\n    model: CmsModel;\n}\nconst getFullTextSearch = (\n    params: GetFullTextSearchParams\n): CmsEntryOpenSearchFullTextSearch.Interface => {\n    const { fullTextSearches, model } = params;\n    /**\n     * We need to reverse the list, so we can take the last one first - possibility to override existing implementations.\n     */\n    const reversed = [...fullTextSearches].reverse();\n    /**\n     * We need to find the most specific implementation for the given model.\n     * Also, we need to use the first possible implementation if the specific one is not found.\n     */\n    let fallback: CmsEntryOpenSearchFullTextSearch.Interface | null = null;\n    for (const item of reversed) {\n        const models = item.models || [];\n        /**\n         * We take the first available implementation for the given model.\n         */\n        if (models.includes(model.modelId)) {\n            return item;\n        } else if (!fallback && models.length === 0) {\n            /**\n             * Then we set the first possible implementation, which has no models defined, as the default one.\n             * It is important not to set the one which has models defined as they are specifically for the targeted model.\n             */\n            fallback = item;\n        }\n    }\n\n    return fallback || defaultFullTextSearch;\n};\n\ninterface Params {\n    fullTextSearches: CmsEntryOpenSearchFullTextSearch.Interface[];\n    model: CmsModel;\n    query: OpenSearchBoolQueryConfig;\n    term?: string;\n    fields: ModelFields;\n}\nexport const applyFullTextSearch = (params: Params): void => {\n    const { fullTextSearches, query, term, fields, model } = params;\n    const keys = Object.keys(fields);\n    if (!term || term.length === 0 || keys.length === 0) {\n        return;\n    }\n\n    const fullTextSearch = getFullTextSearch({\n        fullTextSearches,\n        model\n    });\n\n    fullTextSearch.apply({\n        model,\n        createFieldPath: field => {\n            if (typeof field.path === \"function\") {\n                return field.path(term);\n            } else if (field.systemField) {\n                return field.path || field.field.storageId;\n            }\n            /**\n             * Fields can live inside object fields, so we need to prepend the storage ids of all the parents.\n             * Root fields have the `values` parent only.\n             */\n            const parents =\n                field.parents.length > 0 ? field.parents.map(p => p.storageId) : [\"values\"];\n            const path = [...parents, field.path || field.field.storageId].join(\".\");\n            /*\n             * Searchable JSON fields are indexed as objects, so the searchable values live on the\n             * nested keys. Target all of them with a wildcard.\n             */\n            if (field.type === \"searchable-json\") {\n                return `${path}.*`;\n            }\n            return path;\n        },\n        fields,\n        query,\n        term,\n        prepareTerm: normalizeValue\n    });\n};\n"],"names":["defaultFullTextSearch","params","query","term","fields","createFieldPath","prepareTerm","Object","getFullTextSearch","fullTextSearches","model","reversed","fallback","item","models","applyFullTextSearch","keys","fullTextSearch","field","parents","p","path","normalizeValue"],"mappings":";AASA,MAAMA,wBAAoE;IACtE,OAAOC,CAAAA;QACH,MAAM,EAAEC,KAAK,EAAEC,IAAI,EAAEC,MAAM,EAAEC,eAAe,EAAEC,WAAW,EAAE,GAAGL;QAE9DC,MAAM,IAAI,CAAC,IAAI,CAAC;YACZ,cAAc;gBACV,wBAAwB;gBAKxB,SAAS;gBACT,QAAQK,OAAO,MAAM,CAACH,QAAQ,GAAG,CAACC;gBAClC,OAAO,CAAC,CAAC,EAAEC,YAAYH,MAAM,CAAC,CAAC;gBAC/B,kBAAkB;YACtB;QACJ;IACJ;AACJ;AAMA,MAAMK,oBAAoB,CACtBP;IAEA,MAAM,EAAEQ,gBAAgB,EAAEC,KAAK,EAAE,GAAGT;IAIpC,MAAMU,WAAW;WAAIF;KAAiB,CAAC,OAAO;IAK9C,IAAIG,WAA8D;IAClE,KAAK,MAAMC,QAAQF,SAAU;QACzB,MAAMG,SAASD,KAAK,MAAM,IAAI,EAAE;QAIhC,IAAIC,OAAO,QAAQ,CAACJ,MAAM,OAAO,GAC7B,OAAOG;QACJ,IAAI,CAACD,YAAYE,AAAkB,MAAlBA,OAAO,MAAM,EAKjCF,WAAWC;IAEnB;IAEA,OAAOD,YAAYZ;AACvB;AASO,MAAMe,sBAAsB,CAACd;IAChC,MAAM,EAAEQ,gBAAgB,EAAEP,KAAK,EAAEC,IAAI,EAAEC,MAAM,EAAEM,KAAK,EAAE,GAAGT;IACzD,MAAMe,OAAOT,OAAO,IAAI,CAACH;IACzB,IAAI,CAACD,QAAQA,AAAgB,MAAhBA,KAAK,MAAM,IAAUa,AAAgB,MAAhBA,KAAK,MAAM,EACzC;IAGJ,MAAMC,iBAAiBT,kBAAkB;QACrCC;QACAC;IACJ;IAEAO,eAAe,KAAK,CAAC;QACjBP;QACA,iBAAiBQ,CAAAA;YACb,IAAI,AAAsB,cAAtB,OAAOA,MAAM,IAAI,EACjB,OAAOA,MAAM,IAAI,CAACf;YACf,IAAIe,MAAM,WAAW,EACxB,OAAOA,MAAM,IAAI,IAAIA,MAAM,KAAK,CAAC,SAAS;YAM9C,MAAMC,UACFD,MAAM,OAAO,CAAC,MAAM,GAAG,IAAIA,MAAM,OAAO,CAAC,GAAG,CAACE,CAAAA,IAAKA,EAAE,SAAS,IAAI;gBAAC;aAAS;YAC/E,MAAMC,OAAO;mBAAIF;gBAASD,MAAM,IAAI,IAAIA,MAAM,KAAK,CAAC,SAAS;aAAC,CAAC,IAAI,CAAC;YAKpE,IAAIA,AAAe,sBAAfA,MAAM,IAAI,EACV,OAAO,GAAGG,KAAK,EAAE,CAAC;YAEtB,OAAOA;QACX;QACAjB;QACAF;QACAC;QACA,aAAamB;IACjB;AACJ"}

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

@@ -2,6 +2,10 @@ import type { OpenSearchBoolQueryConfig } from "@webiny/api-opensearch/types.js"
 import type { CmsEntryListWhere, CmsModel } from "@webiny/api-headless-cms/types/index.js";
 export declare const createBaseQuery: () => OpenSearchBoolQueryConfig;
 interface Params {
+    /**
+     * Whether the model's index is shared between tenants, from CmsModelOpenSearchIndexProvider.
+     */
+    shared: boolean;
     model: CmsModel;
     where: CmsEntryListWhere;
 }

package/operations/entry/elasticsearch/initialQuery.js

@@ -1,6 +1,5 @@
 import error from "@webiny/error";
 import { createLatestRecordType, createPublishedRecordType } from "../recordType.js";
-import { isSharedOpenSearchIndex } from "@webiny/api-opensearch";
 const createBaseQuery = ()=>({
         must: [],
         must_not: [],
@@ -8,10 +7,9 @@ const createBaseQuery = ()=>({
         filter: []
     });
 const createInitialQuery = (params)=>{
-    const { model, where } = params;
+    const { model, where, shared } = params;
     const query = createBaseQuery();
-    const sharedIndex = isSharedOpenSearchIndex();
-    if (sharedIndex) {
+    if (shared) {
         query.filter.push({
             term: {
                 "tenant.keyword": model.tenant

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

@@ -1 +1 @@
-{"version":3,"file":"operations/entry/elasticsearch/initialQuery.js","sources":["../../../../src/operations/entry/elasticsearch/initialQuery.ts"],"sourcesContent":["import WebinyError from \"@webiny/error\";\nimport type { OpenSearchBoolQueryConfig } from \"@webiny/api-opensearch/types.js\";\nimport type { CmsEntryListWhere, CmsModel } from \"@webiny/api-headless-cms/types/index.js\";\nimport { createLatestRecordType, createPublishedRecordType } from \"../recordType.js\";\nimport { isSharedOpenSearchIndex as isSharedElasticsearchIndex } from \"@webiny/api-opensearch\";\n\nexport const createBaseQuery = (): OpenSearchBoolQueryConfig => {\n    return {\n        must: [],\n        must_not: [],\n        should: [],\n        filter: []\n    };\n};\n\ninterface Params {\n    model: CmsModel;\n    where: CmsEntryListWhere;\n}\n/**\n * Latest and published are specific in Elasticsearch to that extend that they are tagged in the __type property.\n * We allow either published or either latest.\n * Latest is used in the manage API and published in the read API.\n *\n *\n * We add the query.filter terms because we do not need scored search here and it is a bit faster.\n */\nexport const createInitialQuery = (params: Params): OpenSearchBoolQueryConfig => {\n    const { model, where } = params;\n\n    const query = createBaseQuery();\n\n    /**\n     * When ES index is shared between tenants, we need to filter records by tenant ID\n     *\n     * TODO determine if we want to search across tenants in shared index?\n     */\n    const sharedIndex = isSharedElasticsearchIndex();\n    if (sharedIndex) {\n        /**\n         * Tenant for the filtering is taken from the model.\n         *\n         * TODO determine if we want to send it in the \"where\" parameter?\n         */\n        query.filter.push({\n            term: {\n                \"tenant.keyword\": model.tenant\n            }\n        });\n        /**\n         * Also, we must search only in selected model.\n         */\n        query.filter.push({\n            term: {\n                \"modelId.keyword\": model.modelId\n            }\n        });\n    }\n\n    /**\n     * We must transform published and latest where args into something that is understandable by our Elasticsearch\n     */\n    if (where.published === true) {\n        query.filter.push({\n            term: {\n                \"__type.keyword\": createPublishedRecordType()\n            }\n        });\n    } else if (where.latest === true) {\n        query.filter.push({\n            term: {\n                \"__type.keyword\": createLatestRecordType()\n            }\n        });\n    }\n    //\n    /**\n     * We do not allow filtering without the published or latest parameter.\n     * Also, we do not want to set the default one, as there is a large possibility for user error when filtering.\n     */\n    else {\n        throw new WebinyError(\n            `Cannot call Elasticsearch query when not setting \"published\" or \"latest\".`,\n            \"OPENSEARCH_UNSUPPORTED_QUERY\",\n            {\n                where\n            }\n        );\n    }\n    /**\n     * We need to remove fields that actually do not exist on the record - it will break otherwise.\n     * This will modify the original object, which is what we want.\n     */\n    delete where.published;\n    delete where.latest;\n\n    return query;\n};\n"],"names":["createBaseQuery","createInitialQuery","params","model","where","query","sharedIndex","isSharedElasticsearchIndex","createPublishedRecordType","createLatestRecordType","WebinyError"],"mappings":";;;AAMO,MAAMA,kBAAkB,IACpB;QACH,MAAM,EAAE;QACR,UAAU,EAAE;QACZ,QAAQ,EAAE;QACV,QAAQ,EAAE;IACd;AAeG,MAAMC,qBAAqB,CAACC;IAC/B,MAAM,EAAEC,KAAK,EAAEC,KAAK,EAAE,GAAGF;IAEzB,MAAMG,QAAQL;IAOd,MAAMM,cAAcC;IACpB,IAAID,aAAa;QAMbD,MAAM,MAAM,CAAC,IAAI,CAAC;YACd,MAAM;gBACF,kBAAkBF,MAAM,MAAM;YAClC;QACJ;QAIAE,MAAM,MAAM,CAAC,IAAI,CAAC;YACd,MAAM;gBACF,mBAAmBF,MAAM,OAAO;YACpC;QACJ;IACJ;IAKA,IAAIC,AAAoB,SAApBA,MAAM,SAAS,EACfC,MAAM,MAAM,CAAC,IAAI,CAAC;QACd,MAAM;YACF,kBAAkBG;QACtB;IACJ;SACG,IAAIJ,AAAiB,SAAjBA,MAAM,MAAM,EACnBC,MAAM,MAAM,CAAC,IAAI,CAAC;QACd,MAAM;YACF,kBAAkBI;QACtB;IACJ;SAQA,MAAM,IAAIC,MACN,6EACA,gCACA;QACIN;IACJ;IAOR,OAAOA,MAAM,SAAS;IACtB,OAAOA,MAAM,MAAM;IAEnB,OAAOC;AACX"}
+{"version":3,"file":"operations/entry/elasticsearch/initialQuery.js","sources":["../../../../src/operations/entry/elasticsearch/initialQuery.ts"],"sourcesContent":["import WebinyError from \"@webiny/error\";\nimport type { OpenSearchBoolQueryConfig } from \"@webiny/api-opensearch/types.js\";\nimport type { CmsEntryListWhere, CmsModel } from \"@webiny/api-headless-cms/types/index.js\";\nimport { createLatestRecordType, createPublishedRecordType } from \"../recordType.js\";\n\nexport const createBaseQuery = (): OpenSearchBoolQueryConfig => {\n    return {\n        must: [],\n        must_not: [],\n        should: [],\n        filter: []\n    };\n};\n\ninterface Params {\n    /**\n     * Whether the model's index is shared between tenants, from CmsModelOpenSearchIndexProvider.\n     */\n    shared: boolean;\n    model: CmsModel;\n    where: CmsEntryListWhere;\n}\n/**\n * Latest and published are specific in Elasticsearch to that extend that they are tagged in the __type property.\n * We allow either published or either latest.\n * Latest is used in the manage API and published in the read API.\n *\n *\n * We add the query.filter terms because we do not need scored search here and it is a bit faster.\n */\nexport const createInitialQuery = (params: Params): OpenSearchBoolQueryConfig => {\n    const { model, where, shared } = params;\n\n    const query = createBaseQuery();\n\n    /**\n     * When the index is shared between tenants, filter records by tenant ID. The model's index\n     * provider decides, so a decorator that isolates or shares an index per model is respected.\n     */\n    if (shared) {\n        /**\n         * Tenant for the filtering is taken from the model.\n         *\n         * TODO determine if we want to send it in the \"where\" parameter?\n         */\n        query.filter.push({\n            term: {\n                \"tenant.keyword\": model.tenant\n            }\n        });\n        /**\n         * Also, we must search only in selected model.\n         */\n        query.filter.push({\n            term: {\n                \"modelId.keyword\": model.modelId\n            }\n        });\n    }\n\n    /**\n     * We must transform published and latest where args into something that is understandable by our Elasticsearch\n     */\n    if (where.published === true) {\n        query.filter.push({\n            term: {\n                \"__type.keyword\": createPublishedRecordType()\n            }\n        });\n    } else if (where.latest === true) {\n        query.filter.push({\n            term: {\n                \"__type.keyword\": createLatestRecordType()\n            }\n        });\n    }\n    //\n    /**\n     * We do not allow filtering without the published or latest parameter.\n     * Also, we do not want to set the default one, as there is a large possibility for user error when filtering.\n     */\n    else {\n        throw new WebinyError(\n            `Cannot call Elasticsearch query when not setting \"published\" or \"latest\".`,\n            \"OPENSEARCH_UNSUPPORTED_QUERY\",\n            {\n                where\n            }\n        );\n    }\n    /**\n     * We need to remove fields that actually do not exist on the record - it will break otherwise.\n     * This will modify the original object, which is what we want.\n     */\n    delete where.published;\n    delete where.latest;\n\n    return query;\n};\n"],"names":["createBaseQuery","createInitialQuery","params","model","where","shared","query","createPublishedRecordType","createLatestRecordType","WebinyError"],"mappings":";;AAKO,MAAMA,kBAAkB,IACpB;QACH,MAAM,EAAE;QACR,UAAU,EAAE;QACZ,QAAQ,EAAE;QACV,QAAQ,EAAE;IACd;AAmBG,MAAMC,qBAAqB,CAACC;IAC/B,MAAM,EAAEC,KAAK,EAAEC,KAAK,EAAEC,MAAM,EAAE,GAAGH;IAEjC,MAAMI,QAAQN;IAMd,IAAIK,QAAQ;QAMRC,MAAM,MAAM,CAAC,IAAI,CAAC;YACd,MAAM;gBACF,kBAAkBH,MAAM,MAAM;YAClC;QACJ;QAIAG,MAAM,MAAM,CAAC,IAAI,CAAC;YACd,MAAM;gBACF,mBAAmBH,MAAM,OAAO;YACpC;QACJ;IACJ;IAKA,IAAIC,AAAoB,SAApBA,MAAM,SAAS,EACfE,MAAM,MAAM,CAAC,IAAI,CAAC;QACd,MAAM;YACF,kBAAkBC;QACtB;IACJ;SACG,IAAIH,AAAiB,SAAjBA,MAAM,MAAM,EACnBE,MAAM,MAAM,CAAC,IAAI,CAAC;QACd,MAAM;YACF,kBAAkBE;QACtB;IACJ;SAQA,MAAM,IAAIC,MACN,6EACA,gCACA;QACIL;IACJ;IAOR,OAAOA,MAAM,SAAS;IACtB,OAAOA,MAAM,MAAM;IAEnB,OAAOE;AACX"}

package/operations/entry/elasticsearch/initialQuery.test.d.ts

@@ -0,0 +1 @@
+export {};

package/operations/entry/elasticsearch/initialQuery.test.js

@@ -0,0 +1,48 @@
+import { afterEach, describe, expect, it } from "vitest";
+import { createInitialQuery } from "./initialQuery.js";
+const model = {
+    modelId: "article",
+    tenant: "acme"
+};
+const tenantFilter = {
+    term: {
+        "tenant.keyword": "acme"
+    }
+};
+const modelFilter = {
+    term: {
+        "modelId.keyword": "article"
+    }
+};
+describe("createInitialQuery", ()=>{
+    const original = process.env.OPENSEARCH_SHARED_INDEXES;
+    afterEach(()=>{
+        process.env.OPENSEARCH_SHARED_INDEXES = original;
+    });
+    it("filters by tenant and model when the index is shared, even if the variable says otherwise", ()=>{
+        process.env.OPENSEARCH_SHARED_INDEXES = "false";
+        const query = createInitialQuery({
+            model: model,
+            where: {
+                latest: true
+            },
+            shared: true
+        });
+        expect(query.filter).toContainEqual(tenantFilter);
+        expect(query.filter).toContainEqual(modelFilter);
+    });
+    it("doesn't filter by tenant when the index isn't shared, even if the variable says it is", ()=>{
+        process.env.OPENSEARCH_SHARED_INDEXES = "true";
+        const query = createInitialQuery({
+            model: model,
+            where: {
+                latest: true
+            },
+            shared: false
+        });
+        expect(query.filter).not.toContainEqual(tenantFilter);
+        expect(query.filter).not.toContainEqual(modelFilter);
+    });
+});
+
+//# sourceMappingURL=initialQuery.test.js.map

package/operations/entry/elasticsearch/initialQuery.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"operations/entry/elasticsearch/initialQuery.test.js","sources":["../../../../src/operations/entry/elasticsearch/initialQuery.test.ts"],"sourcesContent":["import { afterEach, describe, expect, it } from \"vitest\";\nimport type { CmsModel } from \"@webiny/api-headless-cms/types/index.js\";\nimport { createInitialQuery } from \"./initialQuery.js\";\n\nconst model = { modelId: \"article\", tenant: \"acme\" } as CmsModel;\n\nconst tenantFilter = { term: { \"tenant.keyword\": \"acme\" } };\nconst modelFilter = { term: { \"modelId.keyword\": \"article\" } };\n\n/*\n * Whether entries are filtered by tenant must follow the model's index (CmsModelOpenSearchIndex),\n * not the OPENSEARCH_SHARED_INDEXES variable. A decorator can isolate or share an index per model,\n * so the two can disagree.\n */\ndescribe(\"createInitialQuery\", () => {\n    const original = process.env.OPENSEARCH_SHARED_INDEXES;\n\n    afterEach(() => {\n        process.env.OPENSEARCH_SHARED_INDEXES = original;\n    });\n\n    it(\"filters by tenant and model when the index is shared, even if the variable says otherwise\", () => {\n        process.env.OPENSEARCH_SHARED_INDEXES = \"false\";\n\n        const query = createInitialQuery({ model, where: { latest: true }, shared: true });\n\n        expect(query.filter).toContainEqual(tenantFilter);\n        expect(query.filter).toContainEqual(modelFilter);\n    });\n\n    it(\"doesn't filter by tenant when the index isn't shared, even if the variable says it is\", () => {\n        process.env.OPENSEARCH_SHARED_INDEXES = \"true\";\n\n        const query = createInitialQuery({ model, where: { latest: true }, shared: false });\n\n        expect(query.filter).not.toContainEqual(tenantFilter);\n        expect(query.filter).not.toContainEqual(modelFilter);\n    });\n});\n"],"names":["model","tenantFilter","modelFilter","describe","original","process","afterEach","it","query","createInitialQuery","expect"],"mappings":";;AAIA,MAAMA,QAAQ;IAAE,SAAS;IAAW,QAAQ;AAAO;AAEnD,MAAMC,eAAe;IAAE,MAAM;QAAE,kBAAkB;IAAO;AAAE;AAC1D,MAAMC,cAAc;IAAE,MAAM;QAAE,mBAAmB;IAAU;AAAE;AAO7DC,SAAS,sBAAsB;IAC3B,MAAMC,WAAWC,QAAQ,GAAG,CAAC,yBAAyB;IAEtDC,UAAU;QACND,QAAQ,GAAG,CAAC,yBAAyB,GAAGD;IAC5C;IAEAG,GAAG,6FAA6F;QAC5FF,QAAQ,GAAG,CAAC,yBAAyB,GAAG;QAExC,MAAMG,QAAQC,mBAAmB;YAAET,OAAAA;YAAO,OAAO;gBAAE,QAAQ;YAAK;YAAG,QAAQ;QAAK;QAEhFU,OAAOF,MAAM,MAAM,EAAE,cAAc,CAACP;QACpCS,OAAOF,MAAM,MAAM,EAAE,cAAc,CAACN;IACxC;IAEAK,GAAG,yFAAyF;QACxFF,QAAQ,GAAG,CAAC,yBAAyB,GAAG;QAExC,MAAMG,QAAQC,mBAAmB;YAAET,OAAAA;YAAO,OAAO;gBAAE,QAAQ;YAAK;YAAG,QAAQ;QAAM;QAEjFU,OAAOF,MAAM,MAAM,EAAE,GAAG,CAAC,cAAc,CAACP;QACxCS,OAAOF,MAAM,MAAM,EAAE,GAAG,CAAC,cAAc,CAACN;IAC5C;AACJ"}

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@webiny/api-headless-cms-utils-os",
-	"version": "0.0.0-unstable.5387e5f7c8",
+	"version": "0.0.0-unstable.a85ef555b2",
 	"type": "module",
 	"exports": {
 		".": "./index.js",
@@ -15,14 +15,15 @@
 	"license": "MIT",
 	"author": "Webiny Ltd.",
 	"dependencies": {
-		"@webiny/api-headless-cms": "0.0.0-unstable.5387e5f7c8",
-		"@webiny/api-opensearch": "0.0.0-unstable.5387e5f7c8",
-		"@webiny/error": "0.0.0-unstable.5387e5f7c8",
-		"@webiny/feature": "0.0.0-unstable.5387e5f7c8"
+		"@webiny/api-headless-cms": "0.0.0-unstable.a85ef555b2",
+		"@webiny/api-opensearch": "0.0.0-unstable.a85ef555b2",
+		"@webiny/error": "0.0.0-unstable.a85ef555b2",
+		"@webiny/feature": "0.0.0-unstable.a85ef555b2"
 	},
 	"devDependencies": {
-		"@webiny/build-tools": "0.0.0-unstable.5387e5f7c8",
-		"typescript": "7.0.2"
+		"@webiny/build-tools": "0.0.0-unstable.a85ef555b2",
+		"typescript": "7.0.2",
+		"vitest": "4.1.11"
 	},
 	"publishConfig": {
 		"access": "public"