@webiny/api-headless-cms-ddb-es 6.3.0 → 6.4.0-beta.0

package/operations/entry/elasticsearch/filtering/exec.js

@@ -1,4 +1,4 @@
-import WebinyError from "@webiny/error";
+import error from "@webiny/error";
 import { createOperatorPluginList } from "../plugins/operator.js";
 import { createBaseQuery } from "../initialQuery.js";
 import { parseWhereKey } from "@webiny/api-opensearch";
@@ -6,120 +6,91 @@ import { getWhereValues } from "./values.js";
 import { getPopulated } from "./populated.js";
 import { createApplyFiltering } from "./applyFiltering.js";
 import { assignMinimumShouldMatchToQuery } from "../assignMinimumShouldMatchToQuery.js";
-export const createExecFiltering = params => {
-  const {
-    fields,
-    plugins,
-    model,
-    valueSearchRegistry,
-    filterRegistry
-  } = params;
-  const operatorPlugins = createOperatorPluginList({
-    plugins
-  });
-  const applyFiltering = createApplyFiltering({
-    operatorPlugins,
-    valueSearchRegistry
-  });
-  const getFilter = type => {
-    return filterRegistry.get(type);
-  };
-  const execFiltering = params => {
-    const {
-      where: initialWhere,
-      query,
-      isValues = false
-    } = params;
-    const keys = Object.keys(initialWhere);
-    if (keys.length === 0) {
-      return;
-    }
-    const where = structuredClone(initialWhere);
-    for (const key in where) {
-      const value = where[key];
-      if (value === undefined) {
-        continue;
-      } else if (key === "AND") {
-        const childWhereList = getWhereValues(value, "AND");
-        const childQuery = createBaseQuery();
-        for (const childWhere of childWhereList) {
-          execFiltering({
-            query: childQuery,
-            where: childWhere,
-            isValues
-          });
+const createExecFiltering = (params)=>{
+    const { fields, plugins, model, valueSearchRegistry, filterRegistry } = params;
+    const operatorPlugins = createOperatorPluginList({
+        plugins
+    });
+    const applyFiltering = createApplyFiltering({
+        operatorPlugins,
+        valueSearchRegistry
+    });
+    const getFilter = (type)=>filterRegistry.get(type);
+    const execFiltering = (params)=>{
+        const { where: initialWhere, query, isValues = false } = params;
+        const keys = Object.keys(initialWhere);
+        if (0 === keys.length) return;
+        const where = structuredClone(initialWhere);
+        for(const key in where){
+            const value = where[key];
+            if (void 0 === value) continue;
+            if ("AND" === key) {
+                const childWhereList = getWhereValues(value, "AND");
+                const childQuery = createBaseQuery();
+                for (const childWhere of childWhereList)execFiltering({
+                    query: childQuery,
+                    where: childWhere,
+                    isValues
+                });
+                const childQueryBool = getPopulated(childQuery);
+                if (0 === Object.keys(childQueryBool).length) continue;
+                query.filter.push({
+                    bool: childQueryBool
+                });
+                continue;
+            }
+            if ("OR" === key) {
+                const childWhereList = getWhereValues(value, "OR");
+                const should = [];
+                for (const childWhere of childWhereList){
+                    const childQuery = createBaseQuery();
+                    execFiltering({
+                        query: childQuery,
+                        where: childWhere,
+                        isValues
+                    });
+                    const childQueryBool = getPopulated(childQuery);
+                    if (0 !== Object.keys(childQueryBool).length) should.push({
+                        bool: childQueryBool
+                    });
+                }
+                if (0 === should.length) continue;
+                query.should.push(...should);
+                assignMinimumShouldMatchToQuery({
+                    query
+                });
+                continue;
+            } else if ("values" === key) {
+                execFiltering({
+                    query,
+                    where: where[key],
+                    isValues: true
+                });
+                continue;
+            }
+            const { field: whereFieldId, operator } = parseWhereKey(key);
+            let fieldId = isValues ? `values.${whereFieldId}` : whereFieldId;
+            const cmsModelField = model.fields.find((f)=>f.fieldId === fieldId);
+            if (cmsModelField || fields[fieldId]) {
+                if (cmsModelField) fieldId = cmsModelField.fieldId;
+            } else throw new error(`There is no CMS Model Field "${fieldId}".`);
+            const field = fields[fieldId];
+            if (!field) throw new error(`There is no field "${fieldId}".`, "EXEC_FILTERING_ERROR");
+            const filter = getFilter(field.type);
+            filter.exec({
+                applyFiltering,
+                getFilter,
+                key,
+                value,
+                operator,
+                field,
+                fields,
+                query
+            });
         }
-        const childQueryBool = getPopulated(childQuery);
-        if (Object.keys(childQueryBool).length === 0) {
-          continue;
-        }
-        query.filter.push({
-          bool: childQueryBool
-        });
-        continue;
-      } else if (key === "OR") {
-        const childWhereList = getWhereValues(value, "OR");
-        const should = [];
-        for (const childWhere of childWhereList) {
-          const childQuery = createBaseQuery();
-          execFiltering({
-            query: childQuery,
-            where: childWhere,
-            isValues
-          });
-          const childQueryBool = getPopulated(childQuery);
-          if (Object.keys(childQueryBool).length === 0) {
-            continue;
-          }
-          should.push({
-            bool: childQueryBool
-          });
-        }
-        if (should.length === 0) {
-          continue;
-        }
-        query.should.push(...should);
-        assignMinimumShouldMatchToQuery({
-          query
-        });
-        continue;
-      } else if (key === "values") {
-        execFiltering({
-          query,
-          where: where[key],
-          isValues: true
-        });
-        continue;
-      }
-      const {
-        field: whereFieldId,
-        operator
-      } = parseWhereKey(key);
-      let fieldId = isValues ? `values.${whereFieldId}` : whereFieldId;
-      const cmsModelField = model.fields.find(f => f.fieldId === fieldId);
-      if (!cmsModelField && !fields[fieldId]) {
-        throw new WebinyError(`There is no CMS Model Field "${fieldId}".`);
-      } else if (cmsModelField) {
-        fieldId = cmsModelField.fieldId;
-      }
-      const field = fields[fieldId];
-      if (!field) {
-        throw new WebinyError(`There is no field "${fieldId}".`, "EXEC_FILTERING_ERROR");
-      }
-      const filter = getFilter(field.type);
-      filter.exec({
-        applyFiltering,
-        getFilter,
-        key,
-        value,
-        operator,
-        field,
-        fields,
-        query
-      });
-    }
-  };
-  return execFiltering;
+    };
+    return execFiltering;
 };
+export { createExecFiltering };
 
 //# sourceMappingURL=exec.js.map

package/operations/entry/elasticsearch/filtering/exec.js.map

@@ -1 +1 @@
-{"version":3,"names":["WebinyError","createOperatorPluginList","createBaseQuery","parseWhereKey","getWhereValues","getPopulated","createApplyFiltering","assignMinimumShouldMatchToQuery","createExecFiltering","params","fields","plugins","model","valueSearchRegistry","filterRegistry","operatorPlugins","applyFiltering","getFilter","type","get","execFiltering","where","initialWhere","query","isValues","keys","Object","length","structuredClone","key","value","undefined","childWhereList","childQuery","childWhere","childQueryBool","filter","push","bool","should","field","whereFieldId","operator","fieldId","cmsModelField","find","f","exec"],"sources":["exec.ts"],"sourcesContent":["import WebinyError from \"@webiny/error\";\nimport type { CmsEntryListWhere, CmsModel } from \"@webiny/api-headless-cms/types/index.js\";\nimport type { ModelFields } from \"~/operations/entry/elasticsearch/types.js\";\nimport type { PluginsContainer } from \"@webiny/plugins\";\nimport type {\n    OpenSearchBoolQueryConfig,\n    QueryDslQueryContainer as Query\n} from \"@webiny/api-opensearch/types.js\";\nimport { createOperatorPluginList } from \"~/operations/entry/elasticsearch/plugins/operator.js\";\nimport { createBaseQuery } from \"~/operations/entry/elasticsearch/initialQuery.js\";\nimport { parseWhereKey } from \"@webiny/api-opensearch\";\nimport { getWhereValues } from \"./values.js\";\nimport { getPopulated } from \"./populated.js\";\nimport { createApplyFiltering } from \"./applyFiltering.js\";\nimport { assignMinimumShouldMatchToQuery } from \"~/operations/entry/elasticsearch/assignMinimumShouldMatchToQuery.js\";\nimport type { CmsEntryOpenSearchValueSearchRegistry } from \"~/features/CmsEntryOpenSearchValueSearch/index.js\";\nimport type { CmsEntryOpenSearchFilterRegistry } from \"~/features/CmsEntryOpenSearchFilter/index.js\";\n\nexport interface CreateExecParams {\n    model: CmsModel;\n    fields: ModelFields;\n    plugins: PluginsContainer;\n    valueSearchRegistry: CmsEntryOpenSearchValueSearchRegistry.Interface;\n    filterRegistry: CmsEntryOpenSearchFilterRegistry.Interface;\n}\nexport interface IExecParams {\n    where: CmsEntryListWhere;\n    query: OpenSearchBoolQueryConfig;\n    isValues?: boolean;\n}\nexport interface CreateExecFilteringResponse {\n    (params: IExecParams): void;\n}\nexport const createExecFiltering = (params: CreateExecParams): CreateExecFilteringResponse => {\n    const { fields, plugins, model, valueSearchRegistry, filterRegistry } = params;\n\n    const operatorPlugins = createOperatorPluginList({\n        plugins\n    });\n\n    const applyFiltering = createApplyFiltering({\n        operatorPlugins,\n        valueSearchRegistry\n    });\n\n    const getFilter = (type: string) => {\n        return filterRegistry.get(type);\n    };\n\n    const execFiltering = (params: IExecParams) => {\n        const { where: initialWhere, query, isValues = false } = params;\n        const keys = Object.keys(initialWhere);\n        if (keys.length === 0) {\n            return;\n        }\n        const where = structuredClone(initialWhere);\n\n        for (const key in where) {\n            const value = where[key as keyof typeof where];\n            if (value === undefined) {\n                continue;\n            } else if (key === \"AND\") {\n                const childWhereList = getWhereValues(value, \"AND\");\n                const childQuery = createBaseQuery();\n                for (const childWhere of childWhereList) {\n                    execFiltering({ query: childQuery, where: childWhere, isValues });\n                }\n                const childQueryBool = getPopulated(childQuery);\n                if (Object.keys(childQueryBool).length === 0) {\n                    continue;\n                }\n                query.filter.push({ bool: childQueryBool });\n                continue;\n            } else if (key === \"OR\") {\n                const childWhereList = getWhereValues(value, \"OR\");\n                const should: Query[] = [];\n                for (const childWhere of childWhereList) {\n                    const childQuery = createBaseQuery();\n                    execFiltering({ query: childQuery, where: childWhere, isValues });\n                    const childQueryBool = getPopulated(childQuery);\n                    if (Object.keys(childQueryBool).length === 0) {\n                        continue;\n                    }\n                    should.push({ bool: childQueryBool });\n                }\n                if (should.length === 0) {\n                    continue;\n                }\n                query.should.push(...should);\n                assignMinimumShouldMatchToQuery({ query });\n                continue;\n            } else if (key === \"values\") {\n                execFiltering({\n                    query,\n                    where: where[key] as CmsEntryListWhere,\n                    isValues: true\n                });\n                continue;\n            }\n            const { field: whereFieldId, operator } = parseWhereKey(key);\n            let fieldId: string = isValues ? `values.${whereFieldId}` : whereFieldId;\n\n            const cmsModelField = model.fields.find(f => f.fieldId === fieldId);\n            if (!cmsModelField && !fields[fieldId]) {\n                throw new WebinyError(`There is no CMS Model Field \"${fieldId}\".`);\n            } else if (cmsModelField) {\n                fieldId = cmsModelField.fieldId;\n            }\n\n            const field = fields[fieldId];\n            if (!field) {\n                throw new WebinyError(`There is no field \"${fieldId}\".`, \"EXEC_FILTERING_ERROR\");\n            }\n            const filter = getFilter(field.type);\n\n            filter.exec({\n                applyFiltering,\n                getFilter,\n                key,\n                value,\n                operator,\n                field,\n                fields,\n                query\n            });\n        }\n    };\n\n    return execFiltering;\n};\n"],"mappings":"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","ignoreList":[]}
+{"version":3,"file":"operations/entry/elasticsearch/filtering/exec.js","sources":["../../../../../src/operations/entry/elasticsearch/filtering/exec.ts"],"sourcesContent":["import WebinyError from \"@webiny/error\";\nimport type { CmsEntryListWhere, CmsModel } from \"@webiny/api-headless-cms/types/index.js\";\nimport type { ModelFields } from \"~/operations/entry/elasticsearch/types.js\";\nimport type { PluginsContainer } from \"@webiny/plugins\";\nimport type {\n    OpenSearchBoolQueryConfig,\n    QueryDslQueryContainer as Query\n} from \"@webiny/api-opensearch/types.js\";\nimport { createOperatorPluginList } from \"~/operations/entry/elasticsearch/plugins/operator.js\";\nimport { createBaseQuery } from \"~/operations/entry/elasticsearch/initialQuery.js\";\nimport { parseWhereKey } from \"@webiny/api-opensearch\";\nimport { getWhereValues } from \"./values.js\";\nimport { getPopulated } from \"./populated.js\";\nimport { createApplyFiltering } from \"./applyFiltering.js\";\nimport { assignMinimumShouldMatchToQuery } from \"~/operations/entry/elasticsearch/assignMinimumShouldMatchToQuery.js\";\nimport type { CmsEntryOpenSearchValueSearchRegistry } from \"~/features/CmsEntryOpenSearchValueSearch/index.js\";\nimport type { CmsEntryOpenSearchFilterRegistry } from \"~/features/CmsEntryOpenSearchFilter/index.js\";\n\nexport interface CreateExecParams {\n    model: CmsModel;\n    fields: ModelFields;\n    plugins: PluginsContainer;\n    valueSearchRegistry: CmsEntryOpenSearchValueSearchRegistry.Interface;\n    filterRegistry: CmsEntryOpenSearchFilterRegistry.Interface;\n}\nexport interface IExecParams {\n    where: CmsEntryListWhere;\n    query: OpenSearchBoolQueryConfig;\n    isValues?: boolean;\n}\nexport interface CreateExecFilteringResponse {\n    (params: IExecParams): void;\n}\nexport const createExecFiltering = (params: CreateExecParams): CreateExecFilteringResponse => {\n    const { fields, plugins, model, valueSearchRegistry, filterRegistry } = params;\n\n    const operatorPlugins = createOperatorPluginList({\n        plugins\n    });\n\n    const applyFiltering = createApplyFiltering({\n        operatorPlugins,\n        valueSearchRegistry\n    });\n\n    const getFilter = (type: string) => {\n        return filterRegistry.get(type);\n    };\n\n    const execFiltering = (params: IExecParams) => {\n        const { where: initialWhere, query, isValues = false } = params;\n        const keys = Object.keys(initialWhere);\n        if (keys.length === 0) {\n            return;\n        }\n        const where = structuredClone(initialWhere);\n\n        for (const key in where) {\n            const value = where[key as keyof typeof where];\n            if (value === undefined) {\n                continue;\n            } else if (key === \"AND\") {\n                const childWhereList = getWhereValues(value, \"AND\");\n                const childQuery = createBaseQuery();\n                for (const childWhere of childWhereList) {\n                    execFiltering({ query: childQuery, where: childWhere, isValues });\n                }\n                const childQueryBool = getPopulated(childQuery);\n                if (Object.keys(childQueryBool).length === 0) {\n                    continue;\n                }\n                query.filter.push({ bool: childQueryBool });\n                continue;\n            } else if (key === \"OR\") {\n                const childWhereList = getWhereValues(value, \"OR\");\n                const should: Query[] = [];\n                for (const childWhere of childWhereList) {\n                    const childQuery = createBaseQuery();\n                    execFiltering({ query: childQuery, where: childWhere, isValues });\n                    const childQueryBool = getPopulated(childQuery);\n                    if (Object.keys(childQueryBool).length === 0) {\n                        continue;\n                    }\n                    should.push({ bool: childQueryBool });\n                }\n                if (should.length === 0) {\n                    continue;\n                }\n                query.should.push(...should);\n                assignMinimumShouldMatchToQuery({ query });\n                continue;\n            } else if (key === \"values\") {\n                execFiltering({\n                    query,\n                    where: where[key] as CmsEntryListWhere,\n                    isValues: true\n                });\n                continue;\n            }\n            const { field: whereFieldId, operator } = parseWhereKey(key);\n            let fieldId: string = isValues ? `values.${whereFieldId}` : whereFieldId;\n\n            const cmsModelField = model.fields.find(f => f.fieldId === fieldId);\n            if (!cmsModelField && !fields[fieldId]) {\n                throw new WebinyError(`There is no CMS Model Field \"${fieldId}\".`);\n            } else if (cmsModelField) {\n                fieldId = cmsModelField.fieldId;\n            }\n\n            const field = fields[fieldId];\n            if (!field) {\n                throw new WebinyError(`There is no field \"${fieldId}\".`, \"EXEC_FILTERING_ERROR\");\n            }\n            const filter = getFilter(field.type);\n\n            filter.exec({\n                applyFiltering,\n                getFilter,\n                key,\n                value,\n                operator,\n                field,\n                fields,\n                query\n            });\n        }\n    };\n\n    return execFiltering;\n};\n"],"names":["createExecFiltering","params","fields","plugins","model","valueSearchRegistry","filterRegistry","operatorPlugins","createOperatorPluginList","applyFiltering","createApplyFiltering","getFilter","type","execFiltering","initialWhere","query","isValues","keys","Object","where","structuredClone","key","value","undefined","childWhereList","getWhereValues","childQuery","createBaseQuery","childWhere","childQueryBool","getPopulated","should","assignMinimumShouldMatchToQuery","whereFieldId","operator","parseWhereKey","fieldId","cmsModelField","f","WebinyError","field","filter"],"mappings":";;;;;;;;AAiCO,MAAMA,sBAAsB,CAACC;IAChC,MAAM,EAAEC,MAAM,EAAEC,OAAO,EAAEC,KAAK,EAAEC,mBAAmB,EAAEC,cAAc,EAAE,GAAGL;IAExE,MAAMM,kBAAkBC,yBAAyB;QAC7CL;IACJ;IAEA,MAAMM,iBAAiBC,qBAAqB;QACxCH;QACAF;IACJ;IAEA,MAAMM,YAAY,CAACC,OACRN,eAAe,GAAG,CAACM;IAG9B,MAAMC,gBAAgB,CAACZ;QACnB,MAAM,EAAE,OAAOa,YAAY,EAAEC,KAAK,EAAEC,WAAW,KAAK,EAAE,GAAGf;QACzD,MAAMgB,OAAOC,OAAO,IAAI,CAACJ;QACzB,IAAIG,AAAgB,MAAhBA,KAAK,MAAM,EACX;QAEJ,MAAME,QAAQC,gBAAgBN;QAE9B,IAAK,MAAMO,OAAOF,MAAO;YACrB,MAAMG,QAAQH,KAAK,CAACE,IAA0B;YAC9C,IAAIC,AAAUC,WAAVD,OACA;YACG,IAAID,AAAQ,UAARA,KAAe;gBACtB,MAAMG,iBAAiBC,eAAeH,OAAO;gBAC7C,MAAMI,aAAaC;gBACnB,KAAK,MAAMC,cAAcJ,eACrBX,cAAc;oBAAE,OAAOa;oBAAY,OAAOE;oBAAYZ;gBAAS;gBAEnE,MAAMa,iBAAiBC,aAAaJ;gBACpC,IAAIR,AAAuC,MAAvCA,OAAO,IAAI,CAACW,gBAAgB,MAAM,EAClC;gBAEJd,MAAM,MAAM,CAAC,IAAI,CAAC;oBAAE,MAAMc;gBAAe;gBACzC;YACJ;YAAO,IAAIR,AAAQ,SAARA,KAAc;gBACrB,MAAMG,iBAAiBC,eAAeH,OAAO;gBAC7C,MAAMS,SAAkB,EAAE;gBAC1B,KAAK,MAAMH,cAAcJ,eAAgB;oBACrC,MAAME,aAAaC;oBACnBd,cAAc;wBAAE,OAAOa;wBAAY,OAAOE;wBAAYZ;oBAAS;oBAC/D,MAAMa,iBAAiBC,aAAaJ;oBACpC,IAAIR,AAAuC,MAAvCA,OAAO,IAAI,CAACW,gBAAgB,MAAM,EAGtCE,OAAO,IAAI,CAAC;wBAAE,MAAMF;oBAAe;gBACvC;gBACA,IAAIE,AAAkB,MAAlBA,OAAO,MAAM,EACb;gBAEJhB,MAAM,MAAM,CAAC,IAAI,IAAIgB;gBACrBC,gCAAgC;oBAAEjB;gBAAM;gBACxC;YACJ,OAAO,IAAIM,AAAQ,aAARA,KAAkB;gBACzBR,cAAc;oBACVE;oBACA,OAAOI,KAAK,CAACE,IAAI;oBACjB,UAAU;gBACd;gBACA;YACJ;YACA,MAAM,EAAE,OAAOY,YAAY,EAAEC,QAAQ,EAAE,GAAGC,cAAcd;YACxD,IAAIe,UAAkBpB,WAAW,CAAC,OAAO,EAAEiB,cAAc,GAAGA;YAE5D,MAAMI,gBAAgBjC,MAAM,MAAM,CAAC,IAAI,CAACkC,CAAAA,IAAKA,EAAE,OAAO,KAAKF;YAC3D,IAAI,AAACC,iBAAkBnC,MAAM,CAACkC,QAAQ,EAE/B;gBAAA,IAAIC,eACPD,UAAUC,cAAc,OAAO;YACnC,OAHI,MAAM,IAAIE,MAAY,CAAC,6BAA6B,EAAEH,QAAQ,EAAE,CAAC;YAKrE,MAAMI,QAAQtC,MAAM,CAACkC,QAAQ;YAC7B,IAAI,CAACI,OACD,MAAM,IAAID,MAAY,CAAC,mBAAmB,EAAEH,QAAQ,EAAE,CAAC,EAAE;YAE7D,MAAMK,SAAS9B,UAAU6B,MAAM,IAAI;YAEnCC,OAAO,IAAI,CAAC;gBACRhC;gBACAE;gBACAU;gBACAC;gBACAY;gBACAM;gBACAtC;gBACAa;YACJ;QACJ;IACJ;IAEA,OAAOF;AACX"}

package/operations/entry/elasticsearch/filtering/index.js

@@ -1,3 +1 @@
 export * from "./exec.js";
-
-//# sourceMappingURL=index.js.map

package/operations/entry/elasticsearch/filtering/path.js

@@ -1,36 +1,27 @@
-export const createFieldPathFactory = ({
-  valueSearchRegistry
-}) => {
-  return params => {
-    const {
-      field,
-      key,
-      value,
-      keyword,
-      originalValue
-    } = params;
-    const search = valueSearchRegistry.get(field.type);
-    let fieldPath = null;
-    if (search) {
-      fieldPath = search.createPath({
-        field: field.field,
-        value,
-        key,
-        originalValue
-      });
-    }
-    if (!fieldPath) {
-      fieldPath = field.field.storageId;
-      if (field.path) {
-        fieldPath = typeof field.path === "function" ? field.path(value) : field.path;
-      }
-    }
-    const result = field.parents.map(p => p.storageId).concat([fieldPath]);
-    return {
-      basePath: result.join("."),
-      path: result.concat(keyword ? ["keyword"] : []).join(".")
+const createFieldPathFactory = ({ valueSearchRegistry })=>(params)=>{
+        const { field, key, value, keyword, originalValue } = params;
+        const search = valueSearchRegistry.get(field.type);
+        let fieldPath = null;
+        if (search) fieldPath = search.createPath({
+            field: field.field,
+            value,
+            key,
+            originalValue
+        });
+        if (!fieldPath) {
+            fieldPath = field.field.storageId;
+            if (field.path) fieldPath = "function" == typeof field.path ? field.path(value) : field.path;
+        }
+        const result = field.parents.map((p)=>p.storageId).concat([
+            fieldPath
+        ]);
+        return {
+            basePath: result.join("."),
+            path: result.concat(keyword ? [
+                "keyword"
+            ] : []).join(".")
+        };
     };
-  };
-};
+export { createFieldPathFactory };
 
 //# sourceMappingURL=path.js.map

package/operations/entry/elasticsearch/filtering/path.js.map

@@ -1 +1 @@
-{"version":3,"names":["createFieldPathFactory","valueSearchRegistry","params","field","key","value","keyword","originalValue","search","get","type","fieldPath","createPath","storageId","path","result","parents","map","p","concat","basePath","join"],"sources":["path.ts"],"sourcesContent":["import type { ModelField } from \"~/operations/entry/elasticsearch/types.js\";\nimport type { CmsEntryOpenSearchValueSearchRegistry } from \"~/features/CmsEntryOpenSearchValueSearch/index.js\";\n\ninterface FieldPathFactoryParams {\n    valueSearchRegistry: CmsEntryOpenSearchValueSearchRegistry.Interface;\n}\ninterface FieldPathParams {\n    field: ModelField;\n    key: string;\n    value: any;\n    originalValue: any;\n    keyword: boolean;\n}\n\nexport const createFieldPathFactory = ({ valueSearchRegistry }: FieldPathFactoryParams) => {\n    return (params: FieldPathParams) => {\n        const { field, key, value, keyword, originalValue } = params;\n        const search = valueSearchRegistry.get(field.type);\n\n        let fieldPath: string | null = null;\n        if (search) {\n            fieldPath = search.createPath({ field: field.field, value, key, originalValue });\n        }\n        if (!fieldPath) {\n            fieldPath = field.field.storageId;\n            if (field.path) {\n                fieldPath = typeof field.path === \"function\" ? field.path(value) : field.path;\n            }\n        }\n\n        const result: string[] = field.parents.map(p => p.storageId).concat([fieldPath]);\n\n        return {\n            basePath: result.join(\".\"),\n            path: result.concat(keyword ? [\"keyword\"] : []).join(\".\")\n        };\n    };\n};\n"],"mappings":"AAcA,OAAO,MAAMA,sBAAsB,GAAGA,CAAC;EAAEC;AAA4C,CAAC,KAAK;EACvF,OAAQC,MAAuB,IAAK;IAChC,MAAM;MAAEC,KAAK;MAAEC,GAAG;MAAEC,KAAK;MAAEC,OAAO;MAAEC;IAAc,CAAC,GAAGL,MAAM;IAC5D,MAAMM,MAAM,GAAGP,mBAAmB,CAACQ,GAAG,CAACN,KAAK,CAACO,IAAI,CAAC;IAElD,IAAIC,SAAwB,GAAG,IAAI;IACnC,IAAIH,MAAM,EAAE;MACRG,SAAS,GAAGH,MAAM,CAACI,UAAU,CAAC;QAAET,KAAK,EAAEA,KAAK,CAACA,KAAK;QAAEE,KAAK;QAAED,GAAG;QAAEG;MAAc,CAAC,CAAC;IACpF;IACA,IAAI,CAACI,SAAS,EAAE;MACZA,SAAS,GAAGR,KAAK,CAACA,KAAK,CAACU,SAAS;MACjC,IAAIV,KAAK,CAACW,IAAI,EAAE;QACZH,SAAS,GAAG,OAAOR,KAAK,CAACW,IAAI,KAAK,UAAU,GAAGX,KAAK,CAACW,IAAI,CAACT,KAAK,CAAC,GAAGF,KAAK,CAACW,IAAI;MACjF;IACJ;IAEA,MAAMC,MAAgB,GAAGZ,KAAK,CAACa,OAAO,CAACC,GAAG,CAACC,CAAC,IAAIA,CAAC,CAACL,SAAS,CAAC,CAACM,MAAM,CAAC,CAACR,SAAS,CAAC,CAAC;IAEhF,OAAO;MACHS,QAAQ,EAAEL,MAAM,CAACM,IAAI,CAAC,GAAG,CAAC;MAC1BP,IAAI,EAAEC,MAAM,CAACI,MAAM,CAACb,OAAO,GAAG,CAAC,SAAS,CAAC,GAAG,EAAE,CAAC,CAACe,IAAI,CAAC,GAAG;IAC5D,CAAC;EACL,CAAC;AACL,CAAC","ignoreList":[]}
+{"version":3,"file":"operations/entry/elasticsearch/filtering/path.js","sources":["../../../../../src/operations/entry/elasticsearch/filtering/path.ts"],"sourcesContent":["import type { ModelField } from \"~/operations/entry/elasticsearch/types.js\";\nimport type { CmsEntryOpenSearchValueSearchRegistry } from \"~/features/CmsEntryOpenSearchValueSearch/index.js\";\n\ninterface FieldPathFactoryParams {\n    valueSearchRegistry: CmsEntryOpenSearchValueSearchRegistry.Interface;\n}\ninterface FieldPathParams {\n    field: ModelField;\n    key: string;\n    value: any;\n    originalValue: any;\n    keyword: boolean;\n}\n\nexport const createFieldPathFactory = ({ valueSearchRegistry }: FieldPathFactoryParams) => {\n    return (params: FieldPathParams) => {\n        const { field, key, value, keyword, originalValue } = params;\n        const search = valueSearchRegistry.get(field.type);\n\n        let fieldPath: string | null = null;\n        if (search) {\n            fieldPath = search.createPath({ field: field.field, value, key, originalValue });\n        }\n        if (!fieldPath) {\n            fieldPath = field.field.storageId;\n            if (field.path) {\n                fieldPath = typeof field.path === \"function\" ? field.path(value) : field.path;\n            }\n        }\n\n        const result: string[] = field.parents.map(p => p.storageId).concat([fieldPath]);\n\n        return {\n            basePath: result.join(\".\"),\n            path: result.concat(keyword ? [\"keyword\"] : []).join(\".\")\n        };\n    };\n};\n"],"names":["createFieldPathFactory","valueSearchRegistry","params","field","key","value","keyword","originalValue","search","fieldPath","result","p"],"mappings":"AAcO,MAAMA,yBAAyB,CAAC,EAAEC,mBAAmB,EAA0B,GAC3E,CAACC;QACJ,MAAM,EAAEC,KAAK,EAAEC,GAAG,EAAEC,KAAK,EAAEC,OAAO,EAAEC,aAAa,EAAE,GAAGL;QACtD,MAAMM,SAASP,oBAAoB,GAAG,CAACE,MAAM,IAAI;QAEjD,IAAIM,YAA2B;QAC/B,IAAID,QACAC,YAAYD,OAAO,UAAU,CAAC;YAAE,OAAOL,MAAM,KAAK;YAAEE;YAAOD;YAAKG;QAAc;QAElF,IAAI,CAACE,WAAW;YACZA,YAAYN,MAAM,KAAK,CAAC,SAAS;YACjC,IAAIA,MAAM,IAAI,EACVM,YAAY,AAAsB,cAAtB,OAAON,MAAM,IAAI,GAAkBA,MAAM,IAAI,CAACE,SAASF,MAAM,IAAI;QAErF;QAEA,MAAMO,SAAmBP,MAAM,OAAO,CAAC,GAAG,CAACQ,CAAAA,IAAKA,EAAE,SAAS,EAAE,MAAM,CAAC;YAACF;SAAU;QAE/E,OAAO;YACH,UAAUC,OAAO,IAAI,CAAC;YACtB,MAAMA,OAAO,MAAM,CAACJ,UAAU;gBAAC;aAAU,GAAG,EAAE,EAAE,IAAI,CAAC;QACzD;IACJ"}

package/operations/entry/elasticsearch/filtering/populated.js

@@ -1,18 +1,12 @@
-export const getPopulated = query => {
-  const result = {};
-  let key;
-  for (key in query) {
-    const value = query[key];
-    if (value === undefined || Array.isArray(value) && value.length === 0) {
-      continue;
+const getPopulated = (query)=>{
+    const result = {};
+    let key;
+    for(key in query){
+        const value = query[key];
+        if (!(void 0 === value || Array.isArray(value) && 0 === value.length)) result[key] = value;
     }
-    /**
-     * TODO figure out better types.
-     */
-    // @ts-expect-error
-    result[key] = value;
-  }
-  return result;
+    return result;
 };
+export { getPopulated };
 
 //# sourceMappingURL=populated.js.map

package/operations/entry/elasticsearch/filtering/populated.js.map

@@ -1 +1 @@
-{"version":3,"names":["getPopulated","query","result","key","value","undefined","Array","isArray","length"],"sources":["populated.ts"],"sourcesContent":["import type { OpenSearchBoolQueryConfig } from \"@webiny/api-opensearch/types.js\";\n\nexport const getPopulated = (\n    query: OpenSearchBoolQueryConfig\n): Partial<OpenSearchBoolQueryConfig> => {\n    const result: Partial<OpenSearchBoolQueryConfig> = {};\n    let key: keyof OpenSearchBoolQueryConfig;\n    for (key in query) {\n        const value = query[key];\n        if (value === undefined || (Array.isArray(value) && value.length === 0)) {\n            continue;\n        }\n        /**\n         * TODO figure out better types.\n         */\n        // @ts-expect-error\n        result[key] = value;\n    }\n    return result;\n};\n"],"mappings":"AAEA,OAAO,MAAMA,YAAY,GACrBC,KAAgC,IACK;EACrC,MAAMC,MAA0C,GAAG,CAAC,CAAC;EACrD,IAAIC,GAAoC;EACxC,KAAKA,GAAG,IAAIF,KAAK,EAAE;IACf,MAAMG,KAAK,GAAGH,KAAK,CAACE,GAAG,CAAC;IACxB,IAAIC,KAAK,KAAKC,SAAS,IAAKC,KAAK,CAACC,OAAO,CAACH,KAAK,CAAC,IAAIA,KAAK,CAACI,MAAM,KAAK,CAAE,EAAE;MACrE;IACJ;IACA;AACR;AACA;IACQ;IACAN,MAAM,CAACC,GAAG,CAAC,GAAGC,KAAK;EACvB;EACA,OAAOF,MAAM;AACjB,CAAC","ignoreList":[]}
+{"version":3,"file":"operations/entry/elasticsearch/filtering/populated.js","sources":["../../../../../src/operations/entry/elasticsearch/filtering/populated.ts"],"sourcesContent":["import type { OpenSearchBoolQueryConfig } from \"@webiny/api-opensearch/types.js\";\n\nexport const getPopulated = (\n    query: OpenSearchBoolQueryConfig\n): Partial<OpenSearchBoolQueryConfig> => {\n    const result: Partial<OpenSearchBoolQueryConfig> = {};\n    let key: keyof OpenSearchBoolQueryConfig;\n    for (key in query) {\n        const value = query[key];\n        if (value === undefined || (Array.isArray(value) && value.length === 0)) {\n            continue;\n        }\n        /**\n         * TODO figure out better types.\n         */\n        // @ts-expect-error\n        result[key] = value;\n    }\n    return result;\n};\n"],"names":["getPopulated","query","result","key","value","undefined","Array"],"mappings":"AAEO,MAAMA,eAAe,CACxBC;IAEA,MAAMC,SAA6C,CAAC;IACpD,IAAIC;IACJ,IAAKA,OAAOF,MAAO;QACf,MAAMG,QAAQH,KAAK,CAACE,IAAI;QACxB,KAAIC,CAAAA,AAAUC,WAAVD,SAAwBE,MAAM,OAAO,CAACF,UAAUA,AAAiB,MAAjBA,MAAM,MAAM,AAAK,GAOrEF,MAAM,CAACC,IAAI,GAAGC;IAClB;IACA,OAAOF;AACX"}

package/operations/entry/elasticsearch/filtering/values.js

@@ -1,16 +1,15 @@
-import WebinyError from "@webiny/error";
-export const getWhereValues = (value, condition) => {
-  const values = value;
-  if (!Array.isArray(values)) {
-    throw new WebinyError(`Trying to run filtering with "${condition}", but the value sent is not an array.`, `MALFORMED_${condition}_CONDITION`, {
-      value
+import error from "@webiny/error";
+const getWhereValues = (value, condition)=>{
+    const values = value;
+    if (Array.isArray(values)) {
+        if (0 === values.length) throw new error(`Trying to run filtering with "${condition}", but the value sent is empty array.`, `MALFORMED_${condition}_CONDITION`, {
+            value
+        });
+    } else throw new error(`Trying to run filtering with "${condition}", but the value sent is not an array.`, `MALFORMED_${condition}_CONDITION`, {
+        value
     });
-  } else if (values.length === 0) {
-    throw new WebinyError(`Trying to run filtering with "${condition}", but the value sent is empty array.`, `MALFORMED_${condition}_CONDITION`, {
-      value
-    });
-  }
-  return values;
+    return values;
 };
+export { getWhereValues };
 
 //# sourceMappingURL=values.js.map

package/operations/entry/elasticsearch/filtering/values.js.map

@@ -1 +1 @@
-{"version":3,"names":["WebinyError","getWhereValues","value","condition","values","Array","isArray","length"],"sources":["values.ts"],"sourcesContent":["import type { CmsEntryListWhere } from \"@webiny/api-headless-cms/types/index.js\";\nimport WebinyError from \"@webiny/error\";\n\nexport const getWhereValues = (value: unknown, condition: \"AND\" | \"OR\") => {\n    const values = value as CmsEntryListWhere[] | undefined;\n    if (!Array.isArray(values)) {\n        throw new WebinyError(\n            `Trying to run filtering with \"${condition}\", but the value sent is not an array.`,\n            `MALFORMED_${condition}_CONDITION`,\n            {\n                value\n            }\n        );\n    } else if (values.length === 0) {\n        throw new WebinyError(\n            `Trying to run filtering with \"${condition}\", but the value sent is empty array.`,\n            `MALFORMED_${condition}_CONDITION`,\n            {\n                value\n            }\n        );\n    }\n    return values;\n};\n"],"mappings":"AACA,OAAOA,WAAW,MAAM,eAAe;AAEvC,OAAO,MAAMC,cAAc,GAAGA,CAACC,KAAc,EAAEC,SAAuB,KAAK;EACvE,MAAMC,MAAM,GAAGF,KAAwC;EACvD,IAAI,CAACG,KAAK,CAACC,OAAO,CAACF,MAAM,CAAC,EAAE;IACxB,MAAM,IAAIJ,WAAW,CACjB,iCAAiCG,SAAS,wCAAwC,EAClF,aAAaA,SAAS,YAAY,EAClC;MACID;IACJ,CACJ,CAAC;EACL,CAAC,MAAM,IAAIE,MAAM,CAACG,MAAM,KAAK,CAAC,EAAE;IAC5B,MAAM,IAAIP,WAAW,CACjB,iCAAiCG,SAAS,uCAAuC,EACjF,aAAaA,SAAS,YAAY,EAClC;MACID;IACJ,CACJ,CAAC;EACL;EACA,OAAOE,MAAM;AACjB,CAAC","ignoreList":[]}
+{"version":3,"file":"operations/entry/elasticsearch/filtering/values.js","sources":["../../../../../src/operations/entry/elasticsearch/filtering/values.ts"],"sourcesContent":["import type { CmsEntryListWhere } from \"@webiny/api-headless-cms/types/index.js\";\nimport WebinyError from \"@webiny/error\";\n\nexport const getWhereValues = (value: unknown, condition: \"AND\" | \"OR\") => {\n    const values = value as CmsEntryListWhere[] | undefined;\n    if (!Array.isArray(values)) {\n        throw new WebinyError(\n            `Trying to run filtering with \"${condition}\", but the value sent is not an array.`,\n            `MALFORMED_${condition}_CONDITION`,\n            {\n                value\n            }\n        );\n    } else if (values.length === 0) {\n        throw new WebinyError(\n            `Trying to run filtering with \"${condition}\", but the value sent is empty array.`,\n            `MALFORMED_${condition}_CONDITION`,\n            {\n                value\n            }\n        );\n    }\n    return values;\n};\n"],"names":["getWhereValues","value","condition","values","Array","WebinyError"],"mappings":";AAGO,MAAMA,iBAAiB,CAACC,OAAgBC;IAC3C,MAAMC,SAASF;IACf,IAAKG,MAAM,OAAO,CAACD,SAQZ;QAAA,IAAIA,AAAkB,MAAlBA,OAAO,MAAM,EACpB,MAAM,IAAIE,MACN,CAAC,8BAA8B,EAAEH,UAAU,qCAAqC,CAAC,EACjF,CAAC,UAAU,EAAEA,UAAU,UAAU,CAAC,EAClC;YACID;QACJ;IAER,OAfI,MAAM,IAAII,MACN,CAAC,8BAA8B,EAAEH,UAAU,sCAAsC,CAAC,EAClF,CAAC,UAAU,EAAEA,UAAU,UAAU,CAAC,EAClC;QACID;IACJ;IAWR,OAAOE;AACX"}

package/operations/entry/elasticsearch/fullTextSearch.js

@@ -1,88 +1,51 @@
 import { normalizeValue } from "@webiny/api-opensearch";
-/**
- * Our default implementation works with the AND operator for the multiple words query string.
- */
 const defaultFullTextSearch = {
-  apply: params => {
-    const {
-      query,
-      term,
-      fields,
-      createFieldPath,
-      prepareTerm
-    } = params;
-    query.must.push({
-      query_string: {
-        allow_leading_wildcard: true,
-        fields: Object.values(fields).map(createFieldPath),
-        query: `*${prepareTerm(term)}*`,
-        default_operator: "and"
-      }
-    });
-  }
+    apply: (params)=>{
+        const { query, term, fields, createFieldPath, prepareTerm } = params;
+        query.must.push({
+            query_string: {
+                allow_leading_wildcard: true,
+                fields: Object.values(fields).map(createFieldPath),
+                query: `*${prepareTerm(term)}*`,
+                default_operator: "and"
+            }
+        });
+    }
 };
-const getFullTextSearch = params => {
-  const {
-    fullTextSearches,
-    model
-  } = params;
-  /**
-   * We need to reverse the list, so we can take the last one first - possibility to override existing implementations.
-   */
-  const reversed = [...fullTextSearches].reverse();
-  /**
-   * We need to find the most specific implementation for the given model.
-   * Also, we need to use the first possible implementation if the specific one is not found.
-   */
-  let fallback = null;
-  for (const item of reversed) {
-    const models = item.models || [];
-    /**
-     * We take the first available implementation for the given model.
-     */
-    if (models.includes(model.modelId)) {
-      return item;
-    } else if (!fallback && models.length === 0) {
-      /**
-       * Then we set the first possible implementation, which has no models defined, as the default one.
-       * It is important not to set the one which has models defined as they are specifically for the targeted model.
-       */
-      fallback = item;
+const getFullTextSearch = (params)=>{
+    const { fullTextSearches, model } = params;
+    const reversed = [
+        ...fullTextSearches
+    ].reverse();
+    let fallback = null;
+    for (const item of reversed){
+        const models = item.models || [];
+        if (models.includes(model.modelId)) return item;
+        if (!fallback && 0 === models.length) fallback = item;
     }
-  }
-  return fallback || defaultFullTextSearch;
+    return fallback || defaultFullTextSearch;
 };
-export const applyFullTextSearch = params => {
-  const {
-    fullTextSearches,
-    query,
-    term,
-    fields,
-    model
-  } = params;
-  const keys = Object.keys(fields);
-  if (!term || term.length === 0 || keys.length === 0) {
-    return;
-  }
-  const fullTextSearch = getFullTextSearch({
-    fullTextSearches,
-    model
-  });
-  fullTextSearch.apply({
-    model,
-    createFieldPath: field => {
-      if (typeof field.path === "function") {
-        return field.path(term);
-      } else if (field.systemField) {
-        return field.path || field.field.storageId;
-      }
-      return `values.${field.path || field.field.storageId}`;
-    },
-    fields,
-    query,
-    term,
-    prepareTerm: normalizeValue
-  });
+const applyFullTextSearch = (params)=>{
+    const { fullTextSearches, query, term, fields, model } = params;
+    const keys = Object.keys(fields);
+    if (!term || 0 === term.length || 0 === keys.length) return;
+    const fullTextSearch = getFullTextSearch({
+        fullTextSearches,
+        model
+    });
+    fullTextSearch.apply({
+        model,
+        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}`;
+        },
+        fields,
+        query,
+        term,
+        prepareTerm: normalizeValue
+    });
 };
+export { applyFullTextSearch };
 
 //# sourceMappingURL=fullTextSearch.js.map

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

@@ -1 +1 @@
-{"version":3,"names":["normalizeValue","defaultFullTextSearch","apply","params","query","term","fields","createFieldPath","prepareTerm","must","push","query_string","allow_leading_wildcard","Object","values","map","default_operator","getFullTextSearch","fullTextSearches","model","reversed","reverse","fallback","item","models","includes","modelId","length","applyFullTextSearch","keys","fullTextSearch","field","path","systemField","storageId"],"sources":["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"],"mappings":"AACA,SAASA,cAAc,QAAQ,wBAAwB;AAKvD;AACA;AACA;AACA,MAAMC,qBAAiE,GAAG;EACtEC,KAAK,EAAEC,MAAM,IAAI;IACb,MAAM;MAAEC,KAAK;MAAEC,IAAI;MAAEC,MAAM;MAAEC,eAAe;MAAEC;IAAY,CAAC,GAAGL,MAAM;IAEpEC,KAAK,CAACK,IAAI,CAACC,IAAI,CAAC;MACZC,YAAY,EAAE;QACVC,sBAAsB,EAAE,IAAI;QAC5BN,MAAM,EAAEO,MAAM,CAACC,MAAM,CAACR,MAAM,CAAC,CAACS,GAAG,CAACR,eAAe,CAAC;QAClDH,KAAK,EAAE,IAAII,WAAW,CAACH,IAAI,CAAC,GAAG;QAC/BW,gBAAgB,EAAE;MACtB;IACJ,CAAC,CAAC;EACN;AACJ,CAAC;AAMD,MAAMC,iBAAiB,GACnBd,MAA+B,IACc;EAC7C,MAAM;IAAEe,gBAAgB;IAAEC;EAAM,CAAC,GAAGhB,MAAM;EAC1C;AACJ;AACA;EACI,MAAMiB,QAAQ,GAAG,CAAC,GAAGF,gBAAgB,CAAC,CAACG,OAAO,CAAC,CAAC;EAChD;AACJ;AACA;AACA;EACI,IAAIC,QAA2D,GAAG,IAAI;EACtE,KAAK,MAAMC,IAAI,IAAIH,QAAQ,EAAE;IACzB,MAAMI,MAAM,GAAGD,IAAI,CAACC,MAAM,IAAI,EAAE;IAChC;AACR;AACA;IACQ,IAAIA,MAAM,CAACC,QAAQ,CAACN,KAAK,CAACO,OAAO,CAAC,EAAE;MAChC,OAAOH,IAAI;IACf,CAAC,MAAM,IAAI,CAACD,QAAQ,IAAIE,MAAM,CAACG,MAAM,KAAK,CAAC,EAAE;MACzC;AACZ;AACA;AACA;MACYL,QAAQ,GAAGC,IAAI;IACnB;EACJ;EAEA,OAAOD,QAAQ,IAAIrB,qBAAqB;AAC5C,CAAC;AASD,OAAO,MAAM2B,mBAAmB,GAAIzB,MAAc,IAAW;EACzD,MAAM;IAAEe,gBAAgB;IAAEd,KAAK;IAAEC,IAAI;IAAEC,MAAM;IAAEa;EAAM,CAAC,GAAGhB,MAAM;EAC/D,MAAM0B,IAAI,GAAGhB,MAAM,CAACgB,IAAI,CAACvB,MAAM,CAAC;EAChC,IAAI,CAACD,IAAI,IAAIA,IAAI,CAACsB,MAAM,KAAK,CAAC,IAAIE,IAAI,CAACF,MAAM,KAAK,CAAC,EAAE;IACjD;EACJ;EAEA,MAAMG,cAAc,GAAGb,iBAAiB,CAAC;IACrCC,gBAAgB;IAChBC;EACJ,CAAC,CAAC;EAEFW,cAAc,CAAC5B,KAAK,CAAC;IACjBiB,KAAK;IACLZ,eAAe,EAAEwB,KAAK,IAAI;MACtB,IAAI,OAAOA,KAAK,CAACC,IAAI,KAAK,UAAU,EAAE;QAClC,OAAOD,KAAK,CAACC,IAAI,CAAC3B,IAAI,CAAC;MAC3B,CAAC,MAAM,IAAI0B,KAAK,CAACE,WAAW,EAAE;QAC1B,OAAOF,KAAK,CAACC,IAAI,IAAID,KAAK,CAACA,KAAK,CAACG,SAAS;MAC9C;MACA,OAAO,UAAUH,KAAK,CAACC,IAAI,IAAID,KAAK,CAACA,KAAK,CAACG,SAAS,EAAE;IAC1D,CAAC;IACD5B,MAAM;IACNF,KAAK;IACLC,IAAI;IACJG,WAAW,EAAER;EACjB,CAAC,CAAC;AACN,CAAC","ignoreList":[]}
+{"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"}

package/operations/entry/elasticsearch/fullTextSearchFields.js

@@ -1,20 +1,10 @@
-export const createFullTextSearchFields = params => {
-  const {
-    term,
-    targets,
-    fields
-  } = params;
-  if (!targets?.length || !term || term.trim().length === 0) {
-    return {};
-  }
-  const result = {};
-  for (const key in fields) {
-    if (targets.includes(key) === false) {
-      continue;
-    }
-    result[key] = fields[key];
-  }
-  return result;
+const createFullTextSearchFields = (params)=>{
+    const { term, targets, fields } = params;
+    if (!targets?.length || !term || 0 === term.trim().length) return {};
+    const result = {};
+    for(const key in fields)if (false !== targets.includes(key)) result[key] = fields[key];
+    return result;
 };
+export { createFullTextSearchFields };
 
 //# sourceMappingURL=fullTextSearchFields.js.map