@webiny/api-headless-cms-ddb-es 0.0.0-unstable.78f581c1d2 → 0.0.0-unstable.7be00a75a9

package/operations/entry/elasticsearch/sort.js

@@ -0,0 +1,80 @@
+import { OpenSearchFieldPlugin, createSort } from "@webiny/api-opensearch";
+import { hasKeyword } from "./keyword.js";
+import { createFieldPathFactory } from "./filtering/path.js";
+import { NoValueContainer } from "../../../values/NoValueContainer.js";
+const matchField = (input)=>{
+    const valuesMatch = input.match(/^values_([a-zA-Z-0-9_]+)_(ASC|DESC)$/);
+    if (valuesMatch) {
+        const [, fieldId, order] = valuesMatch;
+        return {
+            fieldId,
+            isValues: true,
+            order: order
+        };
+    }
+    const nonValues = input.match(/^([a-zA-Z-0-9_]+)_(ASC|DESC)$/);
+    if (!nonValues) return null;
+    const [, fieldId, order] = nonValues;
+    return {
+        fieldId,
+        isValues: false,
+        order: order
+    };
+};
+const createElasticsearchSort = (params)=>{
+    const { sort, modelFields, valueSearchRegistry } = params;
+    if (!sort || 0 === sort.length) return [
+        {
+            ["id.keyword"]: {
+                order: "asc"
+            }
+        }
+    ];
+    const createFieldPath = createFieldPathFactory({
+        valueSearchRegistry
+    });
+    const fieldIdToStorageIdIdMap = {};
+    const sortPlugins = Object.values(modelFields).reduce((plugins, field)=>{
+        const isValues = 1 === field.parents.length && "values" === field.parents[0].fieldId;
+        if (field.parents.length > 0 && !isValues) return plugins;
+        const fieldId = field.field.fieldId;
+        const fieldIdPath = isValues ? `values.${fieldId}` : fieldId;
+        fieldIdToStorageIdIdMap[fieldIdPath] = fieldIdPath;
+        const { path } = createFieldPath({
+            key: field.field.storageId,
+            field,
+            value: NoValueContainer.create(),
+            keyword: false,
+            originalValue: NoValueContainer.create()
+        });
+        plugins[fieldIdPath] = new OpenSearchFieldPlugin({
+            unmappedType: field.unmappedType,
+            keyword: hasKeyword(field),
+            sortable: field.sortable,
+            searchable: field.searchable,
+            field: fieldId,
+            path
+        });
+        return plugins;
+    }, {
+        ["*"]: new OpenSearchFieldPlugin({
+            field: OpenSearchFieldPlugin.ALL,
+            keyword: false
+        })
+    });
+    const transformedSort = sort.map((value)=>{
+        const matched = matchField(value);
+        if (!matched) return null;
+        const { fieldId, order, isValues } = matched;
+        const key = isValues ? `values.${fieldId}` : fieldId;
+        if (fieldIdToStorageIdIdMap[key]) return `${fieldIdToStorageIdIdMap[key]}_${order}`;
+        return value;
+    }).filter(Boolean);
+    return createSort({
+        fieldPlugins: sortPlugins,
+        sort: transformedSort
+    });
+};
+export { createElasticsearchSort };
+
+//# sourceMappingURL=sort.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"operations/entry/elasticsearch/sort.js","sources":["../../../../src/operations/entry/elasticsearch/sort.ts"],"sourcesContent":["import type { Sort as OpenSearchSort } from \"@webiny/api-opensearch/types.js\";\nimport { createSort, OpenSearchFieldPlugin } from \"@webiny/api-opensearch\";\nimport type { CmsEntryListSort, CmsModel } from \"@webiny/api-headless-cms/types/index.js\";\nimport type { ModelFields } from \"./types.js\";\nimport { hasKeyword } from \"~/operations/entry/elasticsearch/keyword.js\";\nimport { createFieldPathFactory } from \"~/operations/entry/elasticsearch/filtering/path.js\";\nimport { NoValueContainer } from \"~/values/NoValueContainer.js\";\nimport type { CmsEntryOpenSearchValueSearchRegistry } from \"~/features/CmsEntryOpenSearchValueSearch/index.js\";\n\ninterface IMatchFieldResponse {\n    fieldId: string;\n    isValues: boolean;\n    order: \"ASC\" | \"DESC\";\n}\n\nconst matchField = (input: string): IMatchFieldResponse | null => {\n    const valuesMatch = input.match(/^values_([a-zA-Z-0-9_]+)_(ASC|DESC)$/);\n    if (valuesMatch) {\n        const [, fieldId, order] = valuesMatch;\n        return {\n            fieldId,\n            isValues: true,\n            order: order as \"ASC\" | \"DESC\"\n        };\n    }\n    const nonValues = input.match(/^([a-zA-Z-0-9_]+)_(ASC|DESC)$/);\n    if (!nonValues) {\n        return null;\n    }\n    const [, fieldId, order] = nonValues;\n    return {\n        fieldId,\n        isValues: false,\n        order: order as \"ASC\" | \"DESC\"\n    };\n};\n\ninterface Params {\n    sort?: CmsEntryListSort;\n    modelFields: ModelFields;\n    model: CmsModel;\n    valueSearchRegistry: CmsEntryOpenSearchValueSearchRegistry.Interface;\n}\n\nexport const createElasticsearchSort = (params: Params): OpenSearchSort => {\n    const { sort, modelFields, valueSearchRegistry } = params;\n\n    if (!sort || sort.length === 0) {\n        return [\n            {\n                [\"id.keyword\"]: {\n                    order: \"asc\"\n                }\n            }\n        ];\n    }\n\n    const createFieldPath = createFieldPathFactory({\n        valueSearchRegistry\n    });\n\n    const fieldIdToStorageIdIdMap: Record<string, string> = {};\n\n    const sortPlugins = Object.values(modelFields).reduce<Record<string, OpenSearchFieldPlugin>>(\n        (plugins, field) => {\n            /**\n             * We do not support sorting by nested fields.\n             */\n            const isValues = field.parents.length === 1 && field.parents[0].fieldId === \"values\";\n            if (field.parents.length > 0 && !isValues) {\n                return plugins;\n            }\n\n            const fieldId = field.field.fieldId;\n            const fieldIdPath = isValues ? `values.${fieldId}` : fieldId;\n\n            fieldIdToStorageIdIdMap[fieldIdPath] = fieldIdPath;\n\n            const { path } = createFieldPath({\n                key: field.field.storageId,\n                field,\n                value: NoValueContainer.create(),\n                keyword: false,\n                originalValue: NoValueContainer.create()\n            });\n            /**\n             * Plugins must be stored with fieldId as key because it is later used to find the sorting plugin.\n             */\n            plugins[fieldIdPath] = new OpenSearchFieldPlugin({\n                unmappedType: field.unmappedType,\n                keyword: hasKeyword(field),\n                sortable: field.sortable,\n                searchable: field.searchable,\n                field: fieldId,\n                path\n            });\n            return plugins;\n        },\n        {\n            [\"*\"]: new OpenSearchFieldPlugin({\n                field: OpenSearchFieldPlugin.ALL,\n                keyword: false\n            })\n        }\n    );\n\n    const transformedSort = sort\n        .map(value => {\n            const matched = matchField(value);\n            if (!matched) {\n                return null;\n            }\n            const { fieldId, order, isValues } = matched;\n            const key = isValues ? `values.${fieldId}` : fieldId;\n            if (fieldIdToStorageIdIdMap[key]) {\n                return `${fieldIdToStorageIdIdMap[key]}_${order}`;\n            }\n\n            return value;\n        })\n        .filter(Boolean) as string[];\n    return createSort({\n        fieldPlugins: sortPlugins,\n        sort: transformedSort\n    });\n};\n"],"names":["matchField","input","valuesMatch","fieldId","order","nonValues","createElasticsearchSort","params","sort","modelFields","valueSearchRegistry","createFieldPath","createFieldPathFactory","fieldIdToStorageIdIdMap","sortPlugins","Object","plugins","field","isValues","fieldIdPath","path","NoValueContainer","OpenSearchFieldPlugin","hasKeyword","transformedSort","value","matched","key","Boolean","createSort"],"mappings":";;;;AAeA,MAAMA,aAAa,CAACC;IAChB,MAAMC,cAAcD,MAAM,KAAK,CAAC;IAChC,IAAIC,aAAa;QACb,MAAM,GAAGC,SAASC,MAAM,GAAGF;QAC3B,OAAO;YACHC;YACA,UAAU;YACV,OAAOC;QACX;IACJ;IACA,MAAMC,YAAYJ,MAAM,KAAK,CAAC;IAC9B,IAAI,CAACI,WACD,OAAO;IAEX,MAAM,GAAGF,SAASC,MAAM,GAAGC;IAC3B,OAAO;QACHF;QACA,UAAU;QACV,OAAOC;IACX;AACJ;AASO,MAAME,0BAA0B,CAACC;IACpC,MAAM,EAAEC,IAAI,EAAEC,WAAW,EAAEC,mBAAmB,EAAE,GAAGH;IAEnD,IAAI,CAACC,QAAQA,AAAgB,MAAhBA,KAAK,MAAM,EACpB,OAAO;QACH;YACI,CAAC,aAAa,EAAE;gBACZ,OAAO;YACX;QACJ;KACH;IAGL,MAAMG,kBAAkBC,uBAAuB;QAC3CF;IACJ;IAEA,MAAMG,0BAAkD,CAAC;IAEzD,MAAMC,cAAcC,OAAO,MAAM,CAACN,aAAa,MAAM,CACjD,CAACO,SAASC;QAIN,MAAMC,WAAWD,AAAyB,MAAzBA,MAAM,OAAO,CAAC,MAAM,IAAUA,AAA6B,aAA7BA,MAAM,OAAO,CAAC,EAAE,CAAC,OAAO;QACvE,IAAIA,MAAM,OAAO,CAAC,MAAM,GAAG,KAAK,CAACC,UAC7B,OAAOF;QAGX,MAAMb,UAAUc,MAAM,KAAK,CAAC,OAAO;QACnC,MAAME,cAAcD,WAAW,CAAC,OAAO,EAAEf,SAAS,GAAGA;QAErDU,uBAAuB,CAACM,YAAY,GAAGA;QAEvC,MAAM,EAAEC,IAAI,EAAE,GAAGT,gBAAgB;YAC7B,KAAKM,MAAM,KAAK,CAAC,SAAS;YAC1BA;YACA,OAAOI,iBAAiB,MAAM;YAC9B,SAAS;YACT,eAAeA,iBAAiB,MAAM;QAC1C;QAIAL,OAAO,CAACG,YAAY,GAAG,IAAIG,sBAAsB;YAC7C,cAAcL,MAAM,YAAY;YAChC,SAASM,WAAWN;YACpB,UAAUA,MAAM,QAAQ;YACxB,YAAYA,MAAM,UAAU;YAC5B,OAAOd;YACPiB;QACJ;QACA,OAAOJ;IACX,GACA;QACI,CAAC,IAAI,EAAE,IAAIM,sBAAsB;YAC7B,OAAOA,sBAAsB,GAAG;YAChC,SAAS;QACb;IACJ;IAGJ,MAAME,kBAAkBhB,KACnB,GAAG,CAACiB,CAAAA;QACD,MAAMC,UAAU1B,WAAWyB;QAC3B,IAAI,CAACC,SACD,OAAO;QAEX,MAAM,EAAEvB,OAAO,EAAEC,KAAK,EAAEc,QAAQ,EAAE,GAAGQ;QACrC,MAAMC,MAAMT,WAAW,CAAC,OAAO,EAAEf,SAAS,GAAGA;QAC7C,IAAIU,uBAAuB,CAACc,IAAI,EAC5B,OAAO,GAAGd,uBAAuB,CAACc,IAAI,CAAC,CAAC,EAAEvB,OAAO;QAGrD,OAAOqB;IACX,GACC,MAAM,CAACG;IACZ,OAAOC,WAAW;QACd,cAAcf;QACd,MAAMU;IACV;AACJ"}

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

@@ -0,0 +1,9 @@
+import type { CmsModelField } from "@webiny/api-headless-cms/types/index.js";
+import type { CmsEntryOpenSearchValueSearchRegistry } from "../../../features/CmsEntryOpenSearchValueSearch/index.js";
+interface Params {
+    valueSearchRegistry: CmsEntryOpenSearchValueSearchRegistry.Interface;
+    field: CmsModelField;
+    value: any;
+}
+export declare const transformValueForSearch: (params: Params) => any;
+export {};

package/operations/entry/elasticsearch/transformValueForSearch.js

@@ -0,0 +1,12 @@
+const transformValueForSearch = (params)=>{
+    const { field, valueSearchRegistry, value } = params;
+    const search = valueSearchRegistry.get(field.type);
+    if (!search) return value;
+    return search.transform({
+        field,
+        value
+    });
+};
+export { transformValueForSearch };
+
+//# sourceMappingURL=transformValueForSearch.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"operations/entry/elasticsearch/transformValueForSearch.js","sources":["../../../../src/operations/entry/elasticsearch/transformValueForSearch.ts"],"sourcesContent":["import type { CmsModelField } from \"@webiny/api-headless-cms/types/index.js\";\nimport type { CmsEntryOpenSearchValueSearchRegistry } from \"~/features/CmsEntryOpenSearchValueSearch/index.js\";\n\ninterface Params {\n    valueSearchRegistry: CmsEntryOpenSearchValueSearchRegistry.Interface;\n    field: CmsModelField;\n    value: any;\n}\n\nexport const transformValueForSearch = (params: Params): any => {\n    const { field, valueSearchRegistry, value } = params;\n    const search = valueSearchRegistry.get(field.type);\n    if (!search) {\n        return value;\n    }\n    return search.transform({ field, value });\n};\n"],"names":["transformValueForSearch","params","field","valueSearchRegistry","value","search"],"mappings":"AASO,MAAMA,0BAA0B,CAACC;IACpC,MAAM,EAAEC,KAAK,EAAEC,mBAAmB,EAAEC,KAAK,EAAE,GAAGH;IAC9C,MAAMI,SAASF,oBAAoB,GAAG,CAACD,MAAM,IAAI;IACjD,IAAI,CAACG,QACD,OAAOD;IAEX,OAAOC,OAAO,SAAS,CAAC;QAAEH;QAAOE;IAAM;AAC3C"}

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

@@ -0,0 +1,34 @@
+import type { OpenSearchQueryBuilderOperatorPlugin } from "@webiny/api-opensearch";
+import type { CmsModelField } from "@webiny/api-headless-cms/types/index.js";
+/**
+ * ./fields
+ */
+type ModelFieldPath = string | ((value: string) => string);
+export type FieldType = "text" | "date" | "datetime" | "time" | "number" | "boolean" | string;
+export interface ModelFieldParent {
+    fieldId: string;
+    storageId: string;
+    type: FieldType;
+}
+export interface ModelField {
+    unmappedType?: string;
+    keyword?: boolean;
+    searchable: boolean;
+    sortable: boolean;
+    type: FieldType;
+    systemField?: boolean;
+    field: CmsModelField;
+    path?: ModelFieldPath;
+    fullTextSearch?: boolean;
+    parents: ModelFieldParent[];
+}
+export interface ModelFields {
+    [fieldId: string]: ModelField;
+}
+/**
+ * ./plugins/operator
+ */
+export interface OpenSearchQueryBuilderOperatorPlugins {
+    [key: string]: OpenSearchQueryBuilderOperatorPlugin;
+}
+export {};

package/operations/entry/index.d.ts

@@ -1,13 +1,32 @@
-import { CmsEntryStorageOperations } from "@webiny/api-headless-cms/types";
-import { Entity } from "dynamodb-toolbox";
-import { Client } from "@elastic/elasticsearch";
-import { PluginsContainer } from "@webiny/plugins";
-export declare const createLatestType: () => string;
-export declare const createPublishedType: () => string;
+import type { Client } from "@webiny/api-opensearch";
+import { type IOpenSearchEntity as IElasticsearchEntity } from "@webiny/api-opensearch";
+import type { PluginsContainer } from "@webiny/plugins";
+import type { CmsEntryStorageOperations } from "../../types.js";
+import type { IEntryEntity } from "../../definitions/types.js";
+import type { CmsModelFieldToGraphQLRegistry } from "@webiny/api-headless-cms/exports/api/cms/graphql.js";
+import { CompressionHandler } from "@webiny/utils/features/compression/abstractions/CompressionHandler.js";
+import type { CmsEntryOpenSearchBodyModifier } from "../../features/CmsEntryOpenSearchBodyModifier/index.js";
+import type { CmsEntryOpenSearchSortModifier } from "../../features/CmsEntryOpenSearchSortModifier/index.js";
+import type { CmsEntryOpenSearchValuesModifier } from "../../features/CmsEntryOpenSearchValuesModifier/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 { CmsEntryOpenSearchFieldIndexRegistry } from "../../features/CmsEntryOpenSearchFieldIndex/index.js";
+import type { CmsEntryOpenSearchFilterRegistry } from "../../features/CmsEntryOpenSearchFilter/index.js";
 export interface CreateEntriesStorageOperationsParams {
-    entity: Entity<any>;
-    esEntity: Entity<any>;
+    entity: IEntryEntity;
+    esEntity: IElasticsearchEntity;
     elasticsearch: Client;
     plugins: PluginsContainer;
+    fieldRegistry: CmsModelFieldToGraphQLRegistry.Interface;
+    fieldIndexRegistry: CmsEntryOpenSearchFieldIndexRegistry.Interface;
+    compressionHandler: CompressionHandler.Interface;
+    bodyModifiers: CmsEntryOpenSearchBodyModifier.Interface[];
+    sortModifiers: CmsEntryOpenSearchSortModifier.Interface[];
+    queryModifiers: CmsEntryOpenSearchQueryModifier.Interface[];
+    valueSearchRegistry: CmsEntryOpenSearchValueSearchRegistry.Interface;
+    fullTextSearches: CmsEntryOpenSearchFullTextSearch.Interface[];
+    valuesModifiers: CmsEntryOpenSearchValuesModifier.Interface[];
+    filterRegistry: CmsEntryOpenSearchFilterRegistry.Interface;
 }
 export declare const createEntriesStorageOperations: (params: CreateEntriesStorageOperationsParams) => CmsEntryStorageOperations;