@webiny/api-headless-cms-ddb-es 0.0.0-unstable.97a151f74d → 0.0.0-unstable.aad28a72ae

package/dynamoDb/storage/longText.js

@@ -80,6 +80,13 @@ const createLongTextStorageTransformPlugin = () => {
     toStorage: async ({
       value: initialValue
     }) => {
+      /**
+       * There is a possibility that we are trying to compress already compressed value.
+       */
+      if (initialValue && initialValue.hasOwnProperty("compression") === true) {
+        return initialValue;
+      }
+
       const isArray = Array.isArray(initialValue);
       const value = isArray ? JSON.stringify(initialValue) : initialValue;
       const compressedValue = await (0, _gzip.compress)(value);

package/dynamoDb/storage/longText.js.map

@@ -1 +1 @@
-{"version":3,"names":["GZIP","TO_STORAGE_ENCODING","FROM_STORAGE_ENCODING","convertToBuffer","value","Buffer","from","createLongTextStorageTransformPlugin","StorageTransformPlugin","fieldType","fromStorage","field","storageValue","typeOf","Array","isArray","WebinyError","storageId","fieldId","compression","JSON","stringify","buf","ungzip","result","toString","parse","ex","console","log","message","toStorage","initialValue","compressedValue","gzip"],"sources":["longText.ts"],"sourcesContent":["/**\n * File is @internal\n */\n\nimport WebinyError from \"@webiny/error\";\nimport { compress as gzip, decompress as ungzip } from \"@webiny/utils/compression/gzip\";\nimport { StorageTransformPlugin } from \"@webiny/api-headless-cms\";\n\nconst GZIP = \"gzip\";\nconst TO_STORAGE_ENCODING = \"base64\";\nconst FROM_STORAGE_ENCODING = \"utf8\";\n\nconst convertToBuffer = (value: string | Buffer): Buffer => {\n    if (typeof value === \"string\") {\n        return Buffer.from(value, TO_STORAGE_ENCODING);\n    }\n    return value;\n};\n\nexport interface StorageValue {\n    compression: string;\n    value: string;\n    isArray?: boolean;\n}\n\nexport const createLongTextStorageTransformPlugin = () => {\n    return new StorageTransformPlugin<string | string[], StorageValue>({\n        fieldType: \"long-text\",\n        fromStorage: async ({ field, value: storageValue }) => {\n            const typeOf = typeof storageValue;\n            if (\n                !storageValue ||\n                typeOf === \"string\" ||\n                typeOf === \"number\" ||\n                Array.isArray(storageValue) === true\n            ) {\n                return storageValue as unknown as string | string[];\n            } else if (typeOf !== \"object\") {\n                throw new WebinyError(\n                    `LongText value received in \"fromStorage\" function is not an object in field \"${field.storageId}\" - ${field.fieldId}.`\n                );\n            }\n            const { compression, value, isArray } = storageValue;\n            /**\n             * Check if possibly undefined, null, empty...\n             */\n            if (!compression) {\n                throw new WebinyError(\n                    `Missing compression in \"fromStorage\" function in field \"${\n                        field.storageId\n                    }\" - ${field.fieldId}.\": ${JSON.stringify(storageValue)}.`,\n                    \"MISSING_COMPRESSION\",\n                    {\n                        value: storageValue\n                    }\n                );\n            } else if (compression !== GZIP) {\n                throw new WebinyError(\n                    `This plugin cannot transform something not compressed with \"GZIP\".`,\n                    \"WRONG_COMPRESSION\",\n                    {\n                        compression\n                    }\n                );\n            }\n            try {\n                const buf = await ungzip(convertToBuffer(value));\n                const result = buf.toString(FROM_STORAGE_ENCODING);\n                if (!isArray) {\n                    return result;\n                }\n                return JSON.parse(result);\n            } catch (ex) {\n                console.log(\"Error while transforming long-text.\");\n                console.log(ex.message);\n                return \"\";\n            }\n        },\n        toStorage: async ({ value: initialValue }) => {\n            const isArray = Array.isArray(initialValue);\n            const value = isArray ? JSON.stringify(initialValue) : initialValue;\n            const compressedValue = await gzip(value);\n\n            const result: StorageValue = {\n                compression: GZIP,\n                value: compressedValue.toString(TO_STORAGE_ENCODING)\n            };\n            if (!isArray) {\n                return result;\n            }\n            result.isArray = isArray;\n            return result;\n        }\n    });\n};\n"],"mappings":";;;;;;;;;AAIA;;AACA;;AACA;;AANA;AACA;AACA;AAMA,MAAMA,IAAI,GAAG,MAAb;AACA,MAAMC,mBAAmB,GAAG,QAA5B;AACA,MAAMC,qBAAqB,GAAG,MAA9B;;AAEA,MAAMC,eAAe,GAAIC,KAAD,IAAoC;EACxD,IAAI,OAAOA,KAAP,KAAiB,QAArB,EAA+B;IAC3B,OAAOC,MAAM,CAACC,IAAP,CAAYF,KAAZ,EAAmBH,mBAAnB,CAAP;EACH;;EACD,OAAOG,KAAP;AACH,CALD;;AAaO,MAAMG,oCAAoC,GAAG,MAAM;EACtD,OAAO,IAAIC,sCAAJ,CAA4D;IAC/DC,SAAS,EAAE,WADoD;IAE/DC,WAAW,EAAE,OAAO;MAAEC,KAAF;MAASP,KAAK,EAAEQ;IAAhB,CAAP,KAA0C;MACnD,MAAMC,MAAM,GAAG,OAAOD,YAAtB;;MACA,IACI,CAACA,YAAD,IACAC,MAAM,KAAK,QADX,IAEAA,MAAM,KAAK,QAFX,IAGAC,KAAK,CAACC,OAAN,CAAcH,YAAd,MAAgC,IAJpC,EAKE;QACE,OAAOA,YAAP;MACH,CAPD,MAOO,IAAIC,MAAM,KAAK,QAAf,EAAyB;QAC5B,MAAM,IAAIG,cAAJ,CACD,gFAA+EL,KAAK,CAACM,SAAU,OAAMN,KAAK,CAACO,OAAQ,GADlH,CAAN;MAGH;;MACD,MAAM;QAAEC,WAAF;QAAef,KAAf;QAAsBW;MAAtB,IAAkCH,YAAxC;MACA;AACZ;AACA;;MACY,IAAI,CAACO,WAAL,EAAkB;QACd,MAAM,IAAIH,cAAJ,CACD,2DACGL,KAAK,CAACM,SACT,OAAMN,KAAK,CAACO,OAAQ,OAAME,IAAI,CAACC,SAAL,CAAeT,YAAf,CAA6B,GAHtD,EAIF,qBAJE,EAKF;UACIR,KAAK,EAAEQ;QADX,CALE,CAAN;MASH,CAVD,MAUO,IAAIO,WAAW,KAAKnB,IAApB,EAA0B;QAC7B,MAAM,IAAIgB,cAAJ,CACD,oEADC,EAEF,mBAFE,EAGF;UACIG;QADJ,CAHE,CAAN;MAOH;;MACD,IAAI;QACA,MAAMG,GAAG,GAAG,MAAM,IAAAC,gBAAA,EAAOpB,eAAe,CAACC,KAAD,CAAtB,CAAlB;QACA,MAAMoB,MAAM,GAAGF,GAAG,CAACG,QAAJ,CAAavB,qBAAb,CAAf;;QACA,IAAI,CAACa,OAAL,EAAc;UACV,OAAOS,MAAP;QACH;;QACD,OAAOJ,IAAI,CAACM,KAAL,CAAWF,MAAX,CAAP;MACH,CAPD,CAOE,OAAOG,EAAP,EAAW;QACTC,OAAO,CAACC,GAAR,CAAY,qCAAZ;QACAD,OAAO,CAACC,GAAR,CAAYF,EAAE,CAACG,OAAf;QACA,OAAO,EAAP;MACH;IACJ,CAnD8D;IAoD/DC,SAAS,EAAE,OAAO;MAAE3B,KAAK,EAAE4B;IAAT,CAAP,KAAmC;MAC1C,MAAMjB,OAAO,GAAGD,KAAK,CAACC,OAAN,CAAciB,YAAd,CAAhB;MACA,MAAM5B,KAAK,GAAGW,OAAO,GAAGK,IAAI,CAACC,SAAL,CAAeW,YAAf,CAAH,GAAkCA,YAAvD;MACA,MAAMC,eAAe,GAAG,MAAM,IAAAC,cAAA,EAAK9B,KAAL,CAA9B;MAEA,MAAMoB,MAAoB,GAAG;QACzBL,WAAW,EAAEnB,IADY;QAEzBI,KAAK,EAAE6B,eAAe,CAACR,QAAhB,CAAyBxB,mBAAzB;MAFkB,CAA7B;;MAIA,IAAI,CAACc,OAAL,EAAc;QACV,OAAOS,MAAP;MACH;;MACDA,MAAM,CAACT,OAAP,GAAiBA,OAAjB;MACA,OAAOS,MAAP;IACH;EAlE8D,CAA5D,CAAP;AAoEH,CArEM"}
+{"version":3,"names":["GZIP","TO_STORAGE_ENCODING","FROM_STORAGE_ENCODING","convertToBuffer","value","Buffer","from","createLongTextStorageTransformPlugin","StorageTransformPlugin","fieldType","fromStorage","field","storageValue","typeOf","Array","isArray","WebinyError","storageId","fieldId","compression","JSON","stringify","buf","ungzip","result","toString","parse","ex","console","log","message","toStorage","initialValue","hasOwnProperty","compressedValue","gzip"],"sources":["longText.ts"],"sourcesContent":["/**\n * File is @internal\n */\n\nimport WebinyError from \"@webiny/error\";\nimport { compress as gzip, decompress as ungzip } from \"@webiny/utils/compression/gzip\";\nimport { StorageTransformPlugin } from \"@webiny/api-headless-cms\";\n\nconst GZIP = \"gzip\";\nconst TO_STORAGE_ENCODING = \"base64\";\nconst FROM_STORAGE_ENCODING = \"utf8\";\n\nconst convertToBuffer = (value: string | Buffer): Buffer => {\n    if (typeof value === \"string\") {\n        return Buffer.from(value, TO_STORAGE_ENCODING);\n    }\n    return value;\n};\n\nexport interface StorageValue {\n    compression: string;\n    value: string;\n    isArray?: boolean;\n}\n\nexport const createLongTextStorageTransformPlugin = () => {\n    return new StorageTransformPlugin<string | string[], StorageValue>({\n        fieldType: \"long-text\",\n        fromStorage: async ({ field, value: storageValue }) => {\n            const typeOf = typeof storageValue;\n            if (\n                !storageValue ||\n                typeOf === \"string\" ||\n                typeOf === \"number\" ||\n                Array.isArray(storageValue) === true\n            ) {\n                return storageValue as unknown as string | string[];\n            } else if (typeOf !== \"object\") {\n                throw new WebinyError(\n                    `LongText value received in \"fromStorage\" function is not an object in field \"${field.storageId}\" - ${field.fieldId}.`\n                );\n            }\n            const { compression, value, isArray } = storageValue;\n            /**\n             * Check if possibly undefined, null, empty...\n             */\n            if (!compression) {\n                throw new WebinyError(\n                    `Missing compression in \"fromStorage\" function in field \"${\n                        field.storageId\n                    }\" - ${field.fieldId}.\": ${JSON.stringify(storageValue)}.`,\n                    \"MISSING_COMPRESSION\",\n                    {\n                        value: storageValue\n                    }\n                );\n            } else if (compression !== GZIP) {\n                throw new WebinyError(\n                    `This plugin cannot transform something not compressed with \"GZIP\".`,\n                    \"WRONG_COMPRESSION\",\n                    {\n                        compression\n                    }\n                );\n            }\n            try {\n                const buf = await ungzip(convertToBuffer(value));\n                const result = buf.toString(FROM_STORAGE_ENCODING);\n                if (!isArray) {\n                    return result;\n                }\n                return JSON.parse(result);\n            } catch (ex) {\n                console.log(\"Error while transforming long-text.\");\n                console.log(ex.message);\n                return \"\";\n            }\n        },\n        toStorage: async ({ value: initialValue }) => {\n            /**\n             * There is a possibility that we are trying to compress already compressed value.\n             */\n            if (initialValue && initialValue.hasOwnProperty(\"compression\") === true) {\n                return initialValue as any;\n            }\n            const isArray = Array.isArray(initialValue);\n            const value = isArray ? JSON.stringify(initialValue) : initialValue;\n            const compressedValue = await gzip(value);\n\n            const result: StorageValue = {\n                compression: GZIP,\n                value: compressedValue.toString(TO_STORAGE_ENCODING)\n            };\n            if (!isArray) {\n                return result;\n            }\n            result.isArray = isArray;\n            return result;\n        }\n    });\n};\n"],"mappings":"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"}

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

@@ -0,0 +1,18 @@
+import { BoolQueryConfig } from "@webiny/api-elasticsearch/types";
+/**
+ * This function will assign a minimum_should_match for the query if conditions are met:
+ * * should is an array
+ * * it is not empty
+ * * minimum_should_match is not already set
+ *
+ *
+ * By the default we set it to 1 as we want at least one OR condition to produce results.
+ *
+ * Users can modify minimum_should_match value via the body or query modification plugins.
+ */
+interface Params {
+    query: BoolQueryConfig;
+    value?: number;
+}
+export declare const assignMinimumShouldMatchToQuery: ({ query, value }: Params) => void;
+export {};

package/operations/entry/elasticsearch/assignMinimumShouldMatchToQuery.js

@@ -0,0 +1,34 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.assignMinimumShouldMatchToQuery = void 0;
+
+/**
+ * This function will assign a minimum_should_match for the query if conditions are met:
+ * * should is an array
+ * * it is not empty
+ * * minimum_should_match is not already set
+ *
+ *
+ * By the default we set it to 1 as we want at least one OR condition to produce results.
+ *
+ * Users can modify minimum_should_match value via the body or query modification plugins.
+ */
+const assignMinimumShouldMatchToQuery = ({
+  query,
+  value = 1
+}) => {
+  if (!Array.isArray(query.should)) {
+    return;
+  } else if (query.should.length === 0) {
+    return;
+  } else if (query.minimum_should_match) {
+    return;
+  }
+
+  query.minimum_should_match = value > 0 ? value : 1;
+};
+
+exports.assignMinimumShouldMatchToQuery = assignMinimumShouldMatchToQuery;

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

@@ -0,0 +1 @@
+{"version":3,"names":["assignMinimumShouldMatchToQuery","query","value","Array","isArray","should","length","minimum_should_match"],"sources":["assignMinimumShouldMatchToQuery.ts"],"sourcesContent":["import { BoolQueryConfig } from \"@webiny/api-elasticsearch/types\";\n\n/**\n * This function will assign a minimum_should_match for the query if conditions are met:\n * * should is an array\n * * it is not empty\n * * minimum_should_match is not already set\n *\n *\n * By the default we set it to 1 as we want at least one OR condition to produce results.\n *\n * Users can modify minimum_should_match value via the body or query modification plugins.\n */\ninterface Params {\n    query: BoolQueryConfig;\n    value?: number;\n}\nexport const assignMinimumShouldMatchToQuery = ({ query, value = 1 }: Params): void => {\n    if (!Array.isArray(query.should)) {\n        return;\n    } else if (query.should.length === 0) {\n        return;\n    } else if (query.minimum_should_match) {\n        return;\n    }\n    query.minimum_should_match = value > 0 ? value : 1;\n};\n"],"mappings":";;;;;;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AAKO,MAAMA,+BAA+B,GAAG,CAAC;EAAEC,KAAF;EAASC,KAAK,GAAG;AAAjB,CAAD,KAAwC;EACnF,IAAI,CAACC,KAAK,CAACC,OAAN,CAAcH,KAAK,CAACI,MAApB,CAAL,EAAkC;IAC9B;EACH,CAFD,MAEO,IAAIJ,KAAK,CAACI,MAAN,CAAaC,MAAb,KAAwB,CAA5B,EAA+B;IAClC;EACH,CAFM,MAEA,IAAIL,KAAK,CAACM,oBAAV,EAAgC;IACnC;EACH;;EACDN,KAAK,CAACM,oBAAN,GAA6BL,KAAK,GAAG,CAAR,GAAYA,KAAZ,GAAoB,CAAjD;AACH,CATM"}

package/operations/entry/elasticsearch/body.js

@@ -23,6 +23,8 @@ var _sort = require("./sort");
 
 var _filtering = require("./filtering");
 
+var _assignMinimumShouldMatchToQuery = require("./assignMinimumShouldMatchToQuery");
+
 const createElasticsearchBody = ({
   plugins,
   model,
@@ -133,11 +135,9 @@ const createElasticsearchBody = ({
     should: query.should.length > 0 ? query.should : undefined,
     filter: query.filter.length > 0 ? query.filter : undefined
   };
-
-  if (Array.isArray(boolQuery.should) && boolQuery.should.length > 1 && !boolQuery.minimum_should_match) {
-    boolQuery.minimum_should_match = 1;
-  }
-
+  (0, _assignMinimumShouldMatchToQuery.assignMinimumShouldMatchToQuery)({
+    query: boolQuery
+  });
   const body = {
     query: {
       bool: boolQuery

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

@@ -1 +1 @@
-{"version":3,"names":["createElasticsearchBody","plugins","model","params","fields","search","term","where","sort","initialSort","after","limit","modelFields","createModelFields","queryModifierPlugins","createQueryModifierPluginList","sortModifierPlugins","createSortModifierPluginList","bodyModifierPlugins","createBodyModifierPluginList","fullTextSearchFields","createFullTextSearchFields","query","createInitialQuery","applyFullTextSearch","execFiltering","createExecFiltering","pl","modifyQuery","createElasticsearchSort","modifySort","boolQuery","must","length","undefined","must_not","should","filter","Array","isArray","minimum_should_match","body","bool","size","search_after","track_total_hits","modifyBody"],"sources":["body.ts"],"sourcesContent":["import { PluginsContainer } from \"@webiny/plugins\";\nimport { CmsEntryListParams, CmsEntryListWhere, CmsModel } from \"@webiny/api-headless-cms/types\";\nimport { createModelFields } from \"./fields\";\nimport { createFullTextSearchFields } from \"./fullTextSearchFields\";\nimport { createInitialQuery } from \"./initialQuery\";\nimport { applyFullTextSearch } from \"./fullTextSearch\";\nimport { createQueryModifierPluginList } from \"./plugins/queryModifier\";\nimport { createSortModifierPluginList } from \"./plugins/sortModifier\";\nimport { createBodyModifierPluginList } from \"./plugins/bodyModifier\";\nimport { createElasticsearchSort } from \"./sort\";\nimport { PrimitiveValue, SearchBody, BoolQueryConfig } from \"@webiny/api-elasticsearch/types\";\nimport { createExecFiltering } from \"./filtering\";\n\ninterface Params {\n    plugins: PluginsContainer;\n    model: CmsModel;\n    params: Omit<CmsEntryListParams, \"where\" | \"after\"> & {\n        where: CmsEntryListWhere;\n        after?: PrimitiveValue[];\n    };\n}\nexport const createElasticsearchBody = ({ plugins, model, params }: Params): SearchBody => {\n    const { fields, search: term, where, sort: initialSort, after, limit } = params;\n    /**\n     * We need the model fields constructed as a key -> field value, so we do not need to iterate through array when we require some field.\n     */\n    const modelFields = createModelFields({\n        plugins,\n        fields: model.fields\n    });\n\n    /**\n     * We need the query modifier plugins.\n     */\n    const queryModifierPlugins = createQueryModifierPluginList({\n        plugins,\n        model\n    });\n    /**\n     * We need the sort modifier plugins.\n     */\n    const sortModifierPlugins = createSortModifierPluginList({\n        plugins,\n        model\n    });\n    /**\n     * We need the body modifier plugins.\n     */\n    const bodyModifierPlugins = createBodyModifierPluginList({\n        plugins,\n        model\n    });\n    /**\n     * We need the fields which we can search through via the full text search.\n     *\n     */\n    const fullTextSearchFields = createFullTextSearchFields({\n        model,\n        term,\n        fields\n    });\n    /**\n     * The initial elasticsearch query where we attach some default conditions we always need.\n     */\n    const query = createInitialQuery({\n        where,\n        model\n    });\n    /**\n     * Apply the full text search, if term is set.\n     */\n    applyFullTextSearch({\n        query,\n        term,\n        fields: fullTextSearchFields\n    });\n\n    const execFiltering = createExecFiltering({\n        model,\n        fields: modelFields,\n        plugins\n    });\n\n    execFiltering({\n        where,\n        query\n    });\n\n    for (const pl of queryModifierPlugins) {\n        pl.modifyQuery({ query, model, where });\n    }\n\n    const sort = createElasticsearchSort({\n        plugins,\n        sort: initialSort,\n        modelFields,\n        model\n    });\n\n    for (const pl of sortModifierPlugins) {\n        pl.modifySort({\n            sort,\n            model\n        });\n    }\n\n    const boolQuery: BoolQueryConfig = {\n        must: query.must.length > 0 ? query.must : undefined,\n        must_not: query.must_not.length > 0 ? query.must_not : undefined,\n        should: query.should.length > 0 ? query.should : undefined,\n        filter: query.filter.length > 0 ? query.filter : undefined\n    };\n    if (\n        Array.isArray(boolQuery.should) &&\n        boolQuery.should.length > 1 &&\n        !boolQuery.minimum_should_match\n    ) {\n        boolQuery.minimum_should_match = 1;\n    }\n\n    const body: SearchBody = {\n        query: {\n            bool: boolQuery\n        },\n        sort,\n        size: (limit || 0) + 1,\n        search_after: after,\n        track_total_hits: true\n    };\n\n    for (const pl of bodyModifierPlugins) {\n        pl.modifyBody({\n            body,\n            model,\n            where\n        });\n    }\n\n    return body;\n};\n"],"mappings":"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"}
+{"version":3,"names":["createElasticsearchBody","plugins","model","params","fields","search","term","where","sort","initialSort","after","limit","modelFields","createModelFields","queryModifierPlugins","createQueryModifierPluginList","sortModifierPlugins","createSortModifierPluginList","bodyModifierPlugins","createBodyModifierPluginList","fullTextSearchFields","createFullTextSearchFields","query","createInitialQuery","applyFullTextSearch","execFiltering","createExecFiltering","pl","modifyQuery","createElasticsearchSort","modifySort","boolQuery","must","length","undefined","must_not","should","filter","assignMinimumShouldMatchToQuery","body","bool","size","search_after","track_total_hits","modifyBody"],"sources":["body.ts"],"sourcesContent":["import { PluginsContainer } from \"@webiny/plugins\";\nimport { CmsEntryListParams, CmsEntryListWhere, CmsModel } from \"@webiny/api-headless-cms/types\";\nimport { createModelFields } from \"./fields\";\nimport { createFullTextSearchFields } from \"./fullTextSearchFields\";\nimport { createInitialQuery } from \"./initialQuery\";\nimport { applyFullTextSearch } from \"./fullTextSearch\";\nimport { createQueryModifierPluginList } from \"./plugins/queryModifier\";\nimport { createSortModifierPluginList } from \"./plugins/sortModifier\";\nimport { createBodyModifierPluginList } from \"./plugins/bodyModifier\";\nimport { createElasticsearchSort } from \"./sort\";\nimport { PrimitiveValue, SearchBody, BoolQueryConfig } from \"@webiny/api-elasticsearch/types\";\nimport { createExecFiltering } from \"./filtering\";\nimport { assignMinimumShouldMatchToQuery } from \"./assignMinimumShouldMatchToQuery\";\n\ninterface Params {\n    plugins: PluginsContainer;\n    model: CmsModel;\n    params: Omit<CmsEntryListParams, \"where\" | \"after\"> & {\n        where: CmsEntryListWhere;\n        after?: PrimitiveValue[];\n    };\n}\nexport const createElasticsearchBody = ({ plugins, model, params }: Params): SearchBody => {\n    const { fields, search: term, where, sort: initialSort, after, limit } = params;\n    /**\n     * We need the model fields constructed as a key -> field value, so we do not need to iterate through array when we require some field.\n     */\n    const modelFields = createModelFields({\n        plugins,\n        fields: model.fields\n    });\n\n    /**\n     * We need the query modifier plugins.\n     */\n    const queryModifierPlugins = createQueryModifierPluginList({\n        plugins,\n        model\n    });\n    /**\n     * We need the sort modifier plugins.\n     */\n    const sortModifierPlugins = createSortModifierPluginList({\n        plugins,\n        model\n    });\n    /**\n     * We need the body modifier plugins.\n     */\n    const bodyModifierPlugins = createBodyModifierPluginList({\n        plugins,\n        model\n    });\n    /**\n     * We need the fields which we can search through via the full text search.\n     *\n     */\n    const fullTextSearchFields = createFullTextSearchFields({\n        model,\n        term,\n        fields\n    });\n    /**\n     * The initial elasticsearch query where we attach some default conditions we always need.\n     */\n    const query = createInitialQuery({\n        where,\n        model\n    });\n    /**\n     * Apply the full text search, if term is set.\n     */\n    applyFullTextSearch({\n        query,\n        term,\n        fields: fullTextSearchFields\n    });\n\n    const execFiltering = createExecFiltering({\n        model,\n        fields: modelFields,\n        plugins\n    });\n\n    execFiltering({\n        where,\n        query\n    });\n\n    for (const pl of queryModifierPlugins) {\n        pl.modifyQuery({ query, model, where });\n    }\n\n    const sort = createElasticsearchSort({\n        plugins,\n        sort: initialSort,\n        modelFields,\n        model\n    });\n\n    for (const pl of sortModifierPlugins) {\n        pl.modifySort({\n            sort,\n            model\n        });\n    }\n\n    const boolQuery: BoolQueryConfig = {\n        must: query.must.length > 0 ? query.must : undefined,\n        must_not: query.must_not.length > 0 ? query.must_not : undefined,\n        should: query.should.length > 0 ? query.should : undefined,\n        filter: query.filter.length > 0 ? query.filter : undefined\n    };\n\n    assignMinimumShouldMatchToQuery({\n        query: boolQuery\n    });\n\n    const body: SearchBody = {\n        query: {\n            bool: boolQuery\n        },\n        sort,\n        size: (limit || 0) + 1,\n        search_after: after,\n        track_total_hits: true\n    };\n\n    for (const pl of bodyModifierPlugins) {\n        pl.modifyBody({\n            body,\n            model,\n            where\n        });\n    }\n\n    return body;\n};\n"],"mappings":"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"}

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

@@ -27,6 +27,8 @@ var _applyFiltering = require("./applyFiltering");
 
 var _CmsEntryFilterPlugin = require("../../../../plugins/CmsEntryFilterPlugin");
 
+var _assignMinimumShouldMatchToQuery = require("../assignMinimumShouldMatchToQuery");
+
 const createExecFiltering = params => {
   const {
     fields,
@@ -147,7 +149,7 @@ const createExecFiltering = params => {
           }
 
           should.push({
-            bool: (0, _objectSpread2.default)({}, childQueryBool)
+            bool: childQueryBool
           });
         }
 
@@ -161,10 +163,9 @@ const createExecFiltering = params => {
          * Of course, do not override if it's already set.
          */
 
-        if (query.should.length > 0 && !query.minimum_should_match) {
-          query.minimum_should_match = 1;
-        }
-
+        (0, _assignMinimumShouldMatchToQuery.assignMinimumShouldMatchToQuery)({
+          query
+        });
         continue;
       }
 

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

@@ -1 +1 @@
-{"version":3,"names":["createExecFiltering","params","fields","plugins","model","searchPlugins","createSearchPluginList","operatorPlugins","createOperatorPluginList","locale","applyFiltering","createApplyFiltering","filteringPlugins","byType","CmsEntryFilterPlugin","type","reduce","collection","plugin","fieldType","getFilterPlugin","WebinyError","execFiltering","where","initialWhere","query","keys","Object","length","key","value","undefined","childWhereList","getWhereValues","childQuery","createBaseQuery","childWhere","childQueryBool","getPopulated","filter","push","bool","should","minimum_should_match","field","whereFieldId","operator","parseWhereKey","fieldId","cmsModelField","find","f","filterPlugin","exec"],"sources":["exec.ts"],"sourcesContent":["import WebinyError from \"@webiny/error\";\nimport { CmsEntryListWhere, CmsModel } from \"@webiny/api-headless-cms/types\";\nimport { ModelFields } from \"~/operations/entry/elasticsearch/types\";\nimport { PluginsContainer } from \"@webiny/plugins\";\nimport { ElasticsearchBoolQueryConfig, Query } from \"@webiny/api-elasticsearch/types\";\nimport { createSearchPluginList } from \"~/operations/entry/elasticsearch/plugins/search\";\nimport { createOperatorPluginList } from \"~/operations/entry/elasticsearch/plugins/operator\";\nimport { createBaseQuery } from \"~/operations/entry/elasticsearch/initialQuery\";\nimport { parseWhereKey } from \"@webiny/api-elasticsearch\";\nimport { getWhereValues } from \"./values\";\nimport { getPopulated } from \"./populated\";\nimport { createApplyFiltering } from \"./applyFiltering\";\nimport { CmsEntryFilterPlugin } from \"~/plugins/CmsEntryFilterPlugin\";\n\nexport interface CreateExecParams {\n    model: CmsModel;\n    fields: ModelFields;\n    plugins: PluginsContainer;\n}\nexport interface ExecParams {\n    where: CmsEntryListWhere;\n    query: ElasticsearchBoolQueryConfig;\n}\nexport interface CreateExecFilteringResponse {\n    (params: ExecParams): void;\n}\nexport const createExecFiltering = (params: CreateExecParams): CreateExecFilteringResponse => {\n    const { fields, plugins, model } = params;\n\n    /**\n     * We need the search plugins as key -> plugin value, so it is easy to find plugin we need, without iterating through array.\n     */\n    const searchPlugins = createSearchPluginList({\n        plugins\n    });\n    /**\n     * We need the operator plugins, which we execute on our where conditions.\n     */\n    const operatorPlugins = createOperatorPluginList({\n        plugins,\n        locale: model.locale\n    });\n\n    const applyFiltering = createApplyFiltering({\n        operatorPlugins,\n        searchPlugins\n    });\n\n    const filteringPlugins = plugins\n        .byType<CmsEntryFilterPlugin>(CmsEntryFilterPlugin.type)\n        .reduce<Record<string, CmsEntryFilterPlugin>>((collection, plugin) => {\n            collection[plugin.fieldType] = plugin;\n\n            return collection;\n        }, {});\n\n    const getFilterPlugin = (type: string) => {\n        const plugin = filteringPlugins[type] || filteringPlugins[\"*\"];\n        if (plugin) {\n            return plugin;\n        }\n        throw new WebinyError(\n            `There is no filtering plugin for the given field type \"${type}\".`,\n            \"FILTERING_PLUGIN_ERROR\",\n            {\n                type\n            }\n        );\n    };\n\n    const execFiltering = (params: ExecParams) => {\n        const { where: initialWhere, query } = params;\n        /**\n         * No point in continuing if no \"where\" conditions exist.\n         */\n        const keys = Object.keys(initialWhere);\n        if (keys.length === 0) {\n            return;\n        }\n        const where: CmsEntryListWhere = {\n            ...initialWhere\n        };\n\n        for (const key in where) {\n            const value = where[key] as unknown as any;\n            /**\n             * We always skip if no value is defined.\n             * Only skip undefined value, null is valid.\n             */\n            if (value === undefined) {\n                continue;\n            }\n            //\n            /**\n             * When we are running with AND, the \"value\" MUST be an array.\n             */\n            else if (key === \"AND\") {\n                const childWhereList = getWhereValues(value, \"AND\");\n\n                const childQuery = createBaseQuery();\n\n                for (const childWhere of childWhereList) {\n                    execFiltering({\n                        query: childQuery,\n                        where: childWhere\n                    });\n                }\n                const childQueryBool = getPopulated(childQuery);\n                if (Object.keys(childQueryBool).length === 0) {\n                    continue;\n                }\n                query.filter.push({\n                    bool: childQueryBool\n                });\n\n                continue;\n            }\n            //\n            /**\n             * When we are running with OR, the \"value\" must be an array.\n             */\n            else if (key === \"OR\") {\n                const childWhereList = getWhereValues(value, \"OR\");\n                /**\n                 * Each of the conditions MUST produce it's own should section.\n                 */\n                const should: Query[] = [];\n                for (const childWhere of childWhereList) {\n                    const childQuery = createBaseQuery();\n                    execFiltering({\n                        query: childQuery,\n                        where: childWhere\n                    });\n                    const childQueryBool = getPopulated(childQuery);\n                    if (Object.keys(childQueryBool).length === 0) {\n                        continue;\n                    }\n                    should.push({\n                        bool: {\n                            ...childQueryBool\n                        }\n                    });\n                }\n                if (should.length === 0) {\n                    continue;\n                }\n                query.should.push(...should);\n                /**\n                 * If there are any should, minimum to have is 1.\n                 * Of course, do not override if it's already set.\n                 */\n                if (query.should.length > 0 && !query.minimum_should_match) {\n                    query.minimum_should_match = 1;\n                }\n\n                continue;\n            }\n            const { field: whereFieldId, operator } = parseWhereKey(key);\n\n            let fieldId: string = whereFieldId;\n\n            /**\n             * TODO This will be required until the storage operations receive the fieldId instead of field storageId.\n             * TODO For this to work without field searching, we need to refactor how the query looks like.\n             *\n             * Storage operations should NEVER receive an field storageId, only alias - fieldId.\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 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}\".`);\n            }\n            const filterPlugin = getFilterPlugin(field.type);\n\n            filterPlugin.exec({\n                applyFiltering,\n                getFilterPlugin,\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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"}
+{"version":3,"names":["createExecFiltering","params","fields","plugins","model","searchPlugins","createSearchPluginList","operatorPlugins","createOperatorPluginList","locale","applyFiltering","createApplyFiltering","filteringPlugins","byType","CmsEntryFilterPlugin","type","reduce","collection","plugin","fieldType","getFilterPlugin","WebinyError","execFiltering","where","initialWhere","query","keys","Object","length","key","value","undefined","childWhereList","getWhereValues","childQuery","createBaseQuery","childWhere","childQueryBool","getPopulated","filter","push","bool","should","assignMinimumShouldMatchToQuery","field","whereFieldId","operator","parseWhereKey","fieldId","cmsModelField","find","f","filterPlugin","exec"],"sources":["exec.ts"],"sourcesContent":["import WebinyError from \"@webiny/error\";\nimport { CmsEntryListWhere, CmsModel } from \"@webiny/api-headless-cms/types\";\nimport { ModelFields } from \"~/operations/entry/elasticsearch/types\";\nimport { PluginsContainer } from \"@webiny/plugins\";\nimport { ElasticsearchBoolQueryConfig, Query } from \"@webiny/api-elasticsearch/types\";\nimport { createSearchPluginList } from \"~/operations/entry/elasticsearch/plugins/search\";\nimport { createOperatorPluginList } from \"~/operations/entry/elasticsearch/plugins/operator\";\nimport { createBaseQuery } from \"~/operations/entry/elasticsearch/initialQuery\";\nimport { parseWhereKey } from \"@webiny/api-elasticsearch\";\nimport { getWhereValues } from \"./values\";\nimport { getPopulated } from \"./populated\";\nimport { createApplyFiltering } from \"./applyFiltering\";\nimport { CmsEntryFilterPlugin } from \"~/plugins/CmsEntryFilterPlugin\";\nimport { assignMinimumShouldMatchToQuery } from \"~/operations/entry/elasticsearch/assignMinimumShouldMatchToQuery\";\n\nexport interface CreateExecParams {\n    model: CmsModel;\n    fields: ModelFields;\n    plugins: PluginsContainer;\n}\nexport interface ExecParams {\n    where: CmsEntryListWhere;\n    query: ElasticsearchBoolQueryConfig;\n}\nexport interface CreateExecFilteringResponse {\n    (params: ExecParams): void;\n}\nexport const createExecFiltering = (params: CreateExecParams): CreateExecFilteringResponse => {\n    const { fields, plugins, model } = params;\n\n    /**\n     * We need the search plugins as key -> plugin value, so it is easy to find plugin we need, without iterating through array.\n     */\n    const searchPlugins = createSearchPluginList({\n        plugins\n    });\n    /**\n     * We need the operator plugins, which we execute on our where conditions.\n     */\n    const operatorPlugins = createOperatorPluginList({\n        plugins,\n        locale: model.locale\n    });\n\n    const applyFiltering = createApplyFiltering({\n        operatorPlugins,\n        searchPlugins\n    });\n\n    const filteringPlugins = plugins\n        .byType<CmsEntryFilterPlugin>(CmsEntryFilterPlugin.type)\n        .reduce<Record<string, CmsEntryFilterPlugin>>((collection, plugin) => {\n            collection[plugin.fieldType] = plugin;\n\n            return collection;\n        }, {});\n\n    const getFilterPlugin = (type: string) => {\n        const plugin = filteringPlugins[type] || filteringPlugins[\"*\"];\n        if (plugin) {\n            return plugin;\n        }\n        throw new WebinyError(\n            `There is no filtering plugin for the given field type \"${type}\".`,\n            \"FILTERING_PLUGIN_ERROR\",\n            {\n                type\n            }\n        );\n    };\n\n    const execFiltering = (params: ExecParams) => {\n        const { where: initialWhere, query } = params;\n        /**\n         * No point in continuing if no \"where\" conditions exist.\n         */\n        const keys = Object.keys(initialWhere);\n        if (keys.length === 0) {\n            return;\n        }\n        const where: CmsEntryListWhere = {\n            ...initialWhere\n        };\n\n        for (const key in where) {\n            const value = where[key] as unknown as any;\n            /**\n             * We always skip if no value is defined.\n             * Only skip undefined value, null is valid.\n             */\n            if (value === undefined) {\n                continue;\n            }\n            //\n            /**\n             * When we are running with AND, the \"value\" MUST be an array.\n             */\n            else if (key === \"AND\") {\n                const childWhereList = getWhereValues(value, \"AND\");\n\n                const childQuery = createBaseQuery();\n\n                for (const childWhere of childWhereList) {\n                    execFiltering({\n                        query: childQuery,\n                        where: childWhere\n                    });\n                }\n                const childQueryBool = getPopulated(childQuery);\n                if (Object.keys(childQueryBool).length === 0) {\n                    continue;\n                }\n                query.filter.push({\n                    bool: childQueryBool\n                });\n\n                continue;\n            }\n            //\n            /**\n             * When we are running with OR, the \"value\" must be an array.\n             */\n            else if (key === \"OR\") {\n                const childWhereList = getWhereValues(value, \"OR\");\n                /**\n                 * Each of the conditions MUST produce it's own should section.\n                 */\n                const should: Query[] = [];\n                for (const childWhere of childWhereList) {\n                    const childQuery = createBaseQuery();\n                    execFiltering({\n                        query: childQuery,\n                        where: childWhere\n                    });\n                    const childQueryBool = getPopulated(childQuery);\n                    if (Object.keys(childQueryBool).length === 0) {\n                        continue;\n                    }\n                    should.push({\n                        bool: childQueryBool\n                    });\n                }\n                if (should.length === 0) {\n                    continue;\n                }\n                query.should.push(...should);\n                /**\n                 * If there are any should, minimum to have is 1.\n                 * Of course, do not override if it's already set.\n                 */\n                assignMinimumShouldMatchToQuery({\n                    query\n                });\n                continue;\n            }\n            const { field: whereFieldId, operator } = parseWhereKey(key);\n\n            let fieldId: string = whereFieldId;\n\n            /**\n             * TODO This will be required until the storage operations receive the fieldId instead of field storageId.\n             * TODO For this to work without field searching, we need to refactor how the query looks like.\n             *\n             * Storage operations should NEVER receive an field storageId, only alias - fieldId.\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 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}\".`);\n            }\n            const filterPlugin = getFilterPlugin(field.type);\n\n            filterPlugin.exec({\n                applyFiltering,\n                getFilterPlugin,\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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"}

package/operations/entry/index.js

@@ -64,7 +64,7 @@ const getESPublishedEntryData = async (plugins, entry) => {
   }));
 };
 
-const convertToStorageEntry = params => {
+const convertEntryKeysToStorage = params => {
   const {
     model,
     entry
@@ -78,7 +78,7 @@ const convertToStorageEntry = params => {
   });
 };
 
-const convertFromStorageEntry = params => {
+const convertEntryKeysFromStorage = params => {
   const {
     model,
     entry
@@ -110,11 +110,11 @@ const createEntriesStorageOperations = params => {
     } = params;
     const isPublished = initialEntry.status === "published";
     const locked = isPublished ? true : initialEntry.locked;
-    const entry = convertToStorageEntry({
+    const entry = convertEntryKeysToStorage({
       model,
       entry: initialEntry
     });
-    const storageEntry = convertToStorageEntry({
+    const storageEntry = convertEntryKeysToStorage({
       model,
       entry: initialStorageEntry
     });
@@ -228,11 +228,11 @@ const createEntriesStorageOperations = params => {
       entry: initialEntry,
       storageEntry: initialStorageEntry
     } = params;
-    const entry = convertToStorageEntry({
+    const entry = convertEntryKeysToStorage({
       model,
       entry: initialEntry
     });
-    const storageEntry = convertToStorageEntry({
+    const storageEntry = convertEntryKeysToStorage({
       model,
       entry: initialStorageEntry
     });
@@ -315,11 +315,11 @@ const createEntriesStorageOperations = params => {
       entry: initialEntry,
       storageEntry: initialStorageEntry
     } = params;
-    const entry = convertToStorageEntry({
+    const entry = convertEntryKeysToStorage({
       model,
       entry: initialEntry
     });
-    const storageEntry = convertToStorageEntry({
+    const storageEntry = convertEntryKeysToStorage({
       model,
       entry: initialStorageEntry
     });
@@ -736,7 +736,7 @@ const createEntriesStorageOperations = params => {
       model,
       entries: hits.map(item => item._source)
     }).map(item => {
-      return convertFromStorageEntry({
+      return convertEntryKeysFromStorage({
         model,
         entry: item
       });
@@ -778,11 +778,11 @@ const createEntriesStorageOperations = params => {
       entry: initialEntry,
       storageEntry: initialStorageEntry
     } = params;
-    const entry = convertToStorageEntry({
+    const entry = convertEntryKeysToStorage({
       model,
       entry: initialEntry
     });
-    const storageEntry = convertToStorageEntry({
+    const storageEntry = convertEntryKeysToStorage({
       model,
       entry: initialStorageEntry
     });
@@ -975,11 +975,11 @@ const createEntriesStorageOperations = params => {
       entry: initialEntry,
       storageEntry: initialStorageEntry
     } = params;
-    const entry = convertToStorageEntry({
+    const entry = convertEntryKeysToStorage({
       model,
       entry: initialEntry
     });
-    const storageEntry = convertToStorageEntry({
+    const storageEntry = convertEntryKeysToStorage({
       model,
       entry: initialStorageEntry
     });
@@ -1082,7 +1082,7 @@ const createEntriesStorageOperations = params => {
       return null;
     }
 
-    return convertFromStorageEntry({
+    return convertEntryKeysFromStorage({
       model,
       entry
     });
@@ -1098,7 +1098,7 @@ const createEntriesStorageOperations = params => {
       return null;
     }
 
-    return convertFromStorageEntry({
+    return convertEntryKeysFromStorage({
       model,
       entry
     });
@@ -1114,7 +1114,7 @@ const createEntriesStorageOperations = params => {
       return null;
     }
 
-    return convertFromStorageEntry({
+    return convertEntryKeysFromStorage({
       model,
       entry
     });
@@ -1126,7 +1126,7 @@ const createEntriesStorageOperations = params => {
       ids: [params.id]
     });
     return entries.map(entry => {
-      return convertFromStorageEntry({
+      return convertEntryKeysFromStorage({
         model,
         entry
       });
@@ -1139,7 +1139,7 @@ const createEntriesStorageOperations = params => {
       ids: params.ids
     });
     return entries.map(entry => {
-      return convertFromStorageEntry({
+      return convertEntryKeysFromStorage({
         model,
         entry
       });
@@ -1152,7 +1152,7 @@ const createEntriesStorageOperations = params => {
       ids: params.ids
     });
     return entries.map(entry => {
-      return convertFromStorageEntry({
+      return convertEntryKeysFromStorage({
         model,
         entry
       });
@@ -1165,7 +1165,7 @@ const createEntriesStorageOperations = params => {
       ids: params.ids
     });
     return entries.map(entry => {
-      return convertFromStorageEntry({
+      return convertEntryKeysFromStorage({
         model,
         entry
       });
@@ -1213,7 +1213,7 @@ const createEntriesStorageOperations = params => {
         return null;
       }
 
-      return convertFromStorageEntry({
+      return convertEntryKeysFromStorage({
         entry,
         model
       });