@webiny/api-headless-cms-ddb-es 5.25.0 → 5.25.1-beta.0

package/configurations.d.ts

@@ -8,5 +8,5 @@ interface CmsElasticsearchParams {
 interface Configurations {
     es: (params: CmsElasticsearchParams) => ElasticsearchConfig;
 }
-declare const configurations: Configurations;
-export default configurations;
+export declare const configurations: Configurations;
+export {};

package/configurations.js

@@ -1,9 +1,14 @@
 "use strict";
 
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.default = void 0;
+exports.configurations = void 0;
+
+var _error = _interopRequireDefault(require("@webiny/error"));
+
 const configurations = {
   es({
     model
@@ -12,21 +17,27 @@ const configurations = {
       tenant,
       locale
     } = model;
+
+    if (!tenant) {
+      throw new _error.default(`Missing "tenant" parameter when trying to create Elasticsearch index name.`, "TENANT_ERROR");
+    } else if (!locale) {
+      throw new _error.default(`Missing "locale" parameter when trying to create Elasticsearch index name.`, "LOCALE_ERROR");
+    }
+
     const sharedIndex = process.env.ELASTICSEARCH_SHARED_INDEXES === "true";
     const index = [sharedIndex ? "root" : tenant, "headless-cms", locale, model.modelId].join("-").toLowerCase();
-    const prefix = process.env.ELASTIC_SEARCH_INDEX_PREFIX;
+    const prefix = process.env.ELASTIC_SEARCH_INDEX_PREFIX || "";
 
-    if (prefix) {
+    if (!prefix) {
       return {
-        index: prefix + index
+        index
       };
     }
 
     return {
-      index
+      index: prefix + index
     };
   }
 
 };
-var _default = configurations;
-exports.default = _default;
+exports.configurations = configurations;

package/configurations.js.map

@@ -1 +1 @@
-{"version":3,"sources":["configurations.ts"],"names":["configurations","es","model","tenant","locale","sharedIndex","process","env","ELASTICSEARCH_SHARED_INDEXES","index","modelId","join","toLowerCase","prefix","ELASTIC_SEARCH_INDEX_PREFIX"],"mappings":";;;;;;AAaA,MAAMA,cAA8B,GAAG;AACnCC,EAAAA,EAAE,CAAC;AAAEC,IAAAA;AAAF,GAAD,EAAY;AACV,UAAM;AAAEC,MAAAA,MAAF;AAAUC,MAAAA;AAAV,QAAqBF,KAA3B;AACA,UAAMG,WAAW,GAAGC,OAAO,CAACC,GAAR,CAAYC,4BAAZ,KAA6C,MAAjE;AACA,UAAMC,KAAK,GAAG,CAACJ,WAAW,GAAG,MAAH,GAAYF,MAAxB,EAAgC,cAAhC,EAAgDC,MAAhD,EAAwDF,KAAK,CAACQ,OAA9D,EACTC,IADS,CACJ,GADI,EAETC,WAFS,EAAd;AAIA,UAAMC,MAAM,GAAGP,OAAO,CAACC,GAAR,CAAYO,2BAA3B;;AACA,QAAID,MAAJ,EAAY;AACR,aAAO;AAAEJ,QAAAA,KAAK,EAAEI,MAAM,GAAGJ;AAAlB,OAAP;AACH;;AACD,WAAO;AAAEA,MAAAA;AAAF,KAAP;AACH;;AAbkC,CAAvC;eAgBeT,c","sourcesContent":["import { CmsModel } from \"@webiny/api-headless-cms/types\";\n\ninterface ElasticsearchConfig {\n    index: string;\n}\n\ninterface CmsElasticsearchParams {\n    model: CmsModel;\n}\ninterface Configurations {\n    es: (params: CmsElasticsearchParams) => ElasticsearchConfig;\n}\n\nconst configurations: Configurations = {\n    es({ model }) {\n        const { tenant, locale } = model;\n        const sharedIndex = process.env.ELASTICSEARCH_SHARED_INDEXES === \"true\";\n        const index = [sharedIndex ? \"root\" : tenant, \"headless-cms\", locale, model.modelId]\n            .join(\"-\")\n            .toLowerCase();\n\n        const prefix = process.env.ELASTIC_SEARCH_INDEX_PREFIX;\n        if (prefix) {\n            return { index: prefix + index };\n        }\n        return { index };\n    }\n};\n\nexport default configurations;\n"]}
+{"version":3,"sources":["configurations.ts"],"names":["configurations","es","model","tenant","locale","WebinyError","sharedIndex","process","env","ELASTICSEARCH_SHARED_INDEXES","index","modelId","join","toLowerCase","prefix","ELASTIC_SEARCH_INDEX_PREFIX"],"mappings":";;;;;;;;;AACA;;AAaO,MAAMA,cAA8B,GAAG;AAC1CC,EAAAA,EAAE,CAAC;AAAEC,IAAAA;AAAF,GAAD,EAAY;AACV,UAAM;AAAEC,MAAAA,MAAF;AAAUC,MAAAA;AAAV,QAAqBF,KAA3B;;AAEA,QAAI,CAACC,MAAL,EAAa;AACT,YAAM,IAAIE,cAAJ,CACD,4EADC,EAEF,cAFE,CAAN;AAIH,KALD,MAKO,IAAI,CAACD,MAAL,EAAa;AAChB,YAAM,IAAIC,cAAJ,CACD,4EADC,EAEF,cAFE,CAAN;AAIH;;AAED,UAAMC,WAAW,GAAGC,OAAO,CAACC,GAAR,CAAYC,4BAAZ,KAA6C,MAAjE;AACA,UAAMC,KAAK,GAAG,CAACJ,WAAW,GAAG,MAAH,GAAYH,MAAxB,EAAgC,cAAhC,EAAgDC,MAAhD,EAAwDF,KAAK,CAACS,OAA9D,EACTC,IADS,CACJ,GADI,EAETC,WAFS,EAAd;AAIA,UAAMC,MAAM,GAAGP,OAAO,CAACC,GAAR,CAAYO,2BAAZ,IAA2C,EAA1D;;AACA,QAAI,CAACD,MAAL,EAAa;AACT,aAAO;AACHJ,QAAAA;AADG,OAAP;AAGH;;AACD,WAAO;AACHA,MAAAA,KAAK,EAAEI,MAAM,GAAGJ;AADb,KAAP;AAGH;;AA9ByC,CAAvC","sourcesContent":["import { CmsModel } from \"@webiny/api-headless-cms/types\";\nimport WebinyError from \"@webiny/error\";\n\ninterface ElasticsearchConfig {\n    index: string;\n}\n\ninterface CmsElasticsearchParams {\n    model: CmsModel;\n}\ninterface Configurations {\n    es: (params: CmsElasticsearchParams) => ElasticsearchConfig;\n}\n\nexport const configurations: Configurations = {\n    es({ model }) {\n        const { tenant, locale } = model;\n\n        if (!tenant) {\n            throw new WebinyError(\n                `Missing \"tenant\" parameter when trying to create Elasticsearch index name.`,\n                \"TENANT_ERROR\"\n            );\n        } else if (!locale) {\n            throw new WebinyError(\n                `Missing \"locale\" parameter when trying to create Elasticsearch index name.`,\n                \"LOCALE_ERROR\"\n            );\n        }\n\n        const sharedIndex = process.env.ELASTICSEARCH_SHARED_INDEXES === \"true\";\n        const index = [sharedIndex ? \"root\" : tenant, \"headless-cms\", locale, model.modelId]\n            .join(\"-\")\n            .toLowerCase();\n\n        const prefix = process.env.ELASTIC_SEARCH_INDEX_PREFIX || \"\";\n        if (!prefix) {\n            return {\n                index\n            };\n        }\n        return {\n            index: prefix + index\n        };\n    }\n};\n"]}

package/elasticsearch/createElasticsearchIndex.d.ts

@@ -0,0 +1,9 @@
+import { Client } from "@elastic/elasticsearch";
+import { PluginsContainer } from "@webiny/plugins";
+import { CmsModel } from "@webiny/api-headless-cms/types";
+export interface CreateElasticsearchIndexParams {
+    elasticsearch: Client;
+    plugins: PluginsContainer;
+    model: CmsModel;
+}
+export declare const createElasticsearchIndex: (params: CreateElasticsearchIndexParams) => Promise<void>;

package/elasticsearch/createElasticsearchIndex.js

@@ -0,0 +1,60 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.createElasticsearchIndex = void 0;
+
+var _error = _interopRequireDefault(require("@webiny/error"));
+
+var _CmsEntryElasticsearchIndexPlugin = require("../plugins/CmsEntryElasticsearchIndexPlugin");
+
+var _indices = require("@webiny/api-elasticsearch/indices");
+
+var _configurations = require("../configurations");
+
+const createElasticsearchIndex = async params => {
+  const {
+    elasticsearch,
+    plugins: container,
+    model
+  } = params;
+  const plugin = (0, _indices.getLastAddedIndexPlugin)({
+    container,
+    type: _CmsEntryElasticsearchIndexPlugin.CmsEntryElasticsearchIndexPlugin.type,
+    locale: model.locale
+  });
+
+  const {
+    index
+  } = _configurations.configurations.es({
+    model
+  });
+
+  try {
+    const response = await elasticsearch.indices.exists({
+      index
+    });
+
+    if (response.body) {
+      return;
+    }
+
+    await elasticsearch.indices.create({
+      index,
+      body: plugin.body
+    });
+  } catch (ex) {
+    throw new _error.default(ex.message || "Could not create Elasticsearch index for the Headless CMS model.", ex.code || "CMS_ELASTICSEARCH_INDEX_ERROR", {
+      error: ex,
+      type: _CmsEntryElasticsearchIndexPlugin.CmsEntryElasticsearchIndexPlugin.type,
+      locale: model.locale,
+      tenant: model.tenant,
+      body: plugin.body
+    });
+  }
+};
+
+exports.createElasticsearchIndex = createElasticsearchIndex;

package/elasticsearch/createElasticsearchIndex.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["createElasticsearchIndex.ts"],"names":["createElasticsearchIndex","params","elasticsearch","plugins","container","model","plugin","type","CmsEntryElasticsearchIndexPlugin","locale","index","configurations","es","response","indices","exists","body","create","ex","WebinyError","message","code","error","tenant"],"mappings":";;;;;;;;;AAAA;;AAGA;;AACA;;AACA;;AASO,MAAMA,wBAAwB,GAAG,MAAOC,MAAP,IAAkD;AACtF,QAAM;AAAEC,IAAAA,aAAF;AAAiBC,IAAAA,OAAO,EAAEC,SAA1B;AAAqCC,IAAAA;AAArC,MAA+CJ,MAArD;AAEA,QAAMK,MAAM,GAAG,sCAA0D;AACrEF,IAAAA,SADqE;AAErEG,IAAAA,IAAI,EAAEC,mEAAiCD,IAF8B;AAGrEE,IAAAA,MAAM,EAAEJ,KAAK,CAACI;AAHuD,GAA1D,CAAf;;AAMA,QAAM;AAAEC,IAAAA;AAAF,MAAYC,+BAAeC,EAAf,CAAkB;AAChCP,IAAAA;AADgC,GAAlB,CAAlB;;AAIA,MAAI;AACA,UAAMQ,QAAQ,GAAG,MAAMX,aAAa,CAACY,OAAd,CAAsBC,MAAtB,CAA6B;AAChDL,MAAAA;AADgD,KAA7B,CAAvB;;AAGA,QAAIG,QAAQ,CAACG,IAAb,EAAmB;AACf;AACH;;AACD,UAAMd,aAAa,CAACY,OAAd,CAAsBG,MAAtB,CAA6B;AAC/BP,MAAAA,KAD+B;AAE/BM,MAAAA,IAAI,EAAEV,MAAM,CAACU;AAFkB,KAA7B,CAAN;AAIH,GAXD,CAWE,OAAOE,EAAP,EAAW;AACT,UAAM,IAAIC,cAAJ,CACFD,EAAE,CAACE,OAAH,IAAc,kEADZ,EAEFF,EAAE,CAACG,IAAH,IAAW,+BAFT,EAGF;AACIC,MAAAA,KAAK,EAAEJ,EADX;AAEIX,MAAAA,IAAI,EAAEC,mEAAiCD,IAF3C;AAGIE,MAAAA,MAAM,EAAEJ,KAAK,CAACI,MAHlB;AAIIc,MAAAA,MAAM,EAAElB,KAAK,CAACkB,MAJlB;AAKIP,MAAAA,IAAI,EAAEV,MAAM,CAACU;AALjB,KAHE,CAAN;AAWH;AACJ,CArCM","sourcesContent":["import WebinyError from \"@webiny/error\";\nimport { Client } from \"@elastic/elasticsearch\";\nimport { PluginsContainer } from \"@webiny/plugins\";\nimport { CmsEntryElasticsearchIndexPlugin } from \"~/plugins/CmsEntryElasticsearchIndexPlugin\";\nimport { getLastAddedIndexPlugin } from \"@webiny/api-elasticsearch/indices\";\nimport { configurations } from \"~/configurations\";\nimport { CmsModel } from \"@webiny/api-headless-cms/types\";\n\nexport interface CreateElasticsearchIndexParams {\n    elasticsearch: Client;\n    plugins: PluginsContainer;\n    model: CmsModel;\n}\n\nexport const createElasticsearchIndex = async (params: CreateElasticsearchIndexParams) => {\n    const { elasticsearch, plugins: container, model } = params;\n\n    const plugin = getLastAddedIndexPlugin<CmsEntryElasticsearchIndexPlugin>({\n        container,\n        type: CmsEntryElasticsearchIndexPlugin.type,\n        locale: model.locale\n    });\n\n    const { index } = configurations.es({\n        model\n    });\n\n    try {\n        const response = await elasticsearch.indices.exists({\n            index\n        });\n        if (response.body) {\n            return;\n        }\n        await elasticsearch.indices.create({\n            index,\n            body: plugin.body\n        });\n    } catch (ex) {\n        throw new WebinyError(\n            ex.message || \"Could not create Elasticsearch index for the Headless CMS model.\",\n            ex.code || \"CMS_ELASTICSEARCH_INDEX_ERROR\",\n            {\n                error: ex,\n                type: CmsEntryElasticsearchIndexPlugin.type,\n                locale: model.locale,\n                tenant: model.tenant,\n                body: plugin.body\n            }\n        );\n    }\n};\n"]}

package/elasticsearch/deleteElasticsearchIndex.d.ts

@@ -0,0 +1,8 @@
+import { Client } from "@elastic/elasticsearch";
+import { CmsModel } from "@webiny/api-headless-cms/types";
+interface DeleteElasticsearchIndexParams {
+    elasticsearch: Client;
+    model: CmsModel;
+}
+export declare const deleteElasticsearchIndex: (params: DeleteElasticsearchIndexParams) => Promise<void>;
+export {};

package/elasticsearch/deleteElasticsearchIndex.js

@@ -0,0 +1,43 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.deleteElasticsearchIndex = void 0;
+
+var _configurations = require("../configurations");
+
+const deleteElasticsearchIndex = async params => {
+  const {
+    elasticsearch,
+    model
+  } = params;
+
+  const {
+    index
+  } = _configurations.configurations.es({
+    model
+  });
+
+  const {
+    body: exists
+  } = await elasticsearch.indices.exists({
+    index
+  });
+
+  if (!exists) {
+    return;
+  }
+
+  try {
+    await elasticsearch.indices.delete({
+      index,
+      ignore_unavailable: true
+    });
+  } catch (ex) {
+    console.log(`Could not delete Elasticsearch index "${index}". Please do it manually.`);
+    console.log(ex.message);
+  }
+};
+
+exports.deleteElasticsearchIndex = deleteElasticsearchIndex;

package/elasticsearch/deleteElasticsearchIndex.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["deleteElasticsearchIndex.ts"],"names":["deleteElasticsearchIndex","params","elasticsearch","model","index","configurations","es","body","exists","indices","delete","ignore_unavailable","ex","console","log","message"],"mappings":";;;;;;;AAEA;;AAOO,MAAMA,wBAAwB,GAAG,MACpCC,MADoC,IAEpB;AAChB,QAAM;AAAEC,IAAAA,aAAF;AAAiBC,IAAAA;AAAjB,MAA2BF,MAAjC;;AAEA,QAAM;AAAEG,IAAAA;AAAF,MAAYC,+BAAeC,EAAf,CAAkB;AAChCH,IAAAA;AADgC,GAAlB,CAAlB;;AAGA,QAAM;AAAEI,IAAAA,IAAI,EAAEC;AAAR,MAAmB,MAAMN,aAAa,CAACO,OAAd,CAAsBD,MAAtB,CAA6B;AACxDJ,IAAAA;AADwD,GAA7B,CAA/B;;AAGA,MAAI,CAACI,MAAL,EAAa;AACT;AACH;;AAED,MAAI;AACA,UAAMN,aAAa,CAACO,OAAd,CAAsBC,MAAtB,CAA6B;AAC/BN,MAAAA,KAD+B;AAE/BO,MAAAA,kBAAkB,EAAE;AAFW,KAA7B,CAAN;AAIH,GALD,CAKE,OAAOC,EAAP,EAAW;AACTC,IAAAA,OAAO,CAACC,GAAR,CAAa,yCAAwCV,KAAM,2BAA3D;AACAS,IAAAA,OAAO,CAACC,GAAR,CAAYF,EAAE,CAACG,OAAf;AACH;AACJ,CAxBM","sourcesContent":["import { Client } from \"@elastic/elasticsearch\";\nimport { CmsModel } from \"@webiny/api-headless-cms/types\";\nimport { configurations } from \"~/configurations\";\n\ninterface DeleteElasticsearchIndexParams {\n    elasticsearch: Client;\n    model: CmsModel;\n}\n\nexport const deleteElasticsearchIndex = async (\n    params: DeleteElasticsearchIndexParams\n): Promise<void> => {\n    const { elasticsearch, model } = params;\n\n    const { index } = configurations.es({\n        model\n    });\n    const { body: exists } = await elasticsearch.indices.exists({\n        index\n    });\n    if (!exists) {\n        return;\n    }\n\n    try {\n        await elasticsearch.indices.delete({\n            index,\n            ignore_unavailable: true\n        });\n    } catch (ex) {\n        console.log(`Could not delete Elasticsearch index \"${index}\". Please do it manually.`);\n        console.log(ex.message);\n    }\n};\n"]}

package/elasticsearch/indexing/dateTimeIndexing.js

@@ -43,7 +43,7 @@ const convertValueFromIndex = (value, field) => {
     return value;
   } else if (type === "date") {
     const dateValue = new Date(value);
-    return dateValue.toISOString().substr(0, 10);
+    return dateValue.toISOString().slice(0, 10);
   }
 
   return new Date(value).toISOString();

package/elasticsearch/indexing/dateTimeIndexing.js.map

@@ -1 +1 @@
-{"version":3,"sources":["dateTimeIndexing.ts"],"names":["convertTimeToNumber","time","hours","minutes","seconds","split","map","Number","convertNumberToTime","value","undefined","String","match","Math","floor","v","padStart","join","convertValueFromIndex","field","type","settings","dateValue","Date","toISOString","substr","convertValueToIndex","name","fieldType","unmappedType","toIndex","fromIndex"],"mappings":";;;;;;;AAGA,MAAMA,mBAAmB,GAAIC,IAAD,IAAkC;AAC1D,MAAI,CAACA,IAAL,EAAW;AACP,WAAO,IAAP;AACH;;AACD,QAAM,CAACC,KAAD,EAAQC,OAAR,EAAiBC,OAAO,GAAG,CAA3B,IAAgCH,IAAI,CAACI,KAAL,CAAW,GAAX,EAAgBC,GAAhB,CAAoBC,MAApB,CAAtC;AACA,SAAOL,KAAK,GAAG,EAAR,GAAa,EAAb,GAAkBC,OAAO,GAAG,EAA5B,GAAiCC,OAAxC;AACH,CAND;;AAQA,MAAMI,mBAAmB,GAAIC,KAAD,IAAmC;AAC3D,MAAIA,KAAK,KAAKC,SAAV,IAAuBD,KAAK,KAAK,IAArC,EAA2C;AACvC,WAAO,IAAP;AACH,GAH0D,CAI3D;AACA;;;AACA,MAAIE,MAAM,CAACF,KAAD,CAAN,CAAcG,KAAd,CAAoB,wBAApB,MAAkD,IAAtD,EAA4D;AACxD,WAAOD,MAAM,CAACF,KAAD,CAAb;AACH,GAR0D,CAS3D;;;AACA,QAAMP,KAAK,GAAGW,IAAI,CAACC,KAAL,CAAWL,KAAK,GAAG,EAAR,GAAa,EAAxB,CAAd;AAEA,QAAMN,OAAO,GAAGU,IAAI,CAACC,KAAL,CAAW,CAACL,KAAK,GAAGP,KAAK,GAAG,EAAR,GAAa,EAAtB,IAA4B,EAAvC,CAAhB;AAEA,QAAME,OAAO,GAAGS,IAAI,CAACC,KAAL,CAAWL,KAAK,GAAGP,KAAK,GAAG,EAAR,GAAa,EAArB,GAA0BC,OAAO,GAAG,EAA/C,CAAhB;AAEA,SAAO,CAACD,KAAD,EAAQC,OAAR,EAAiBC,OAAjB,EAA0BE,GAA1B,CAA8BS,CAAC,IAAIJ,MAAM,CAACI,CAAD,CAAN,CAAUC,QAAV,CAAmB,CAAnB,EAAsB,GAAtB,CAAnC,EAA+DC,IAA/D,CAAoE,GAApE,CAAP;AACH,CAjBD;;AAmBA,MAAMC,qBAAqB,GAAG,CAC1BT,KAD0B,EAE1BU,KAF0B,KAGV;AAChB,QAAMC,IAAI,GAAGD,KAAK,CAACE,QAAN,CAAeD,IAA5B;;AACA,MAAIA,IAAI,KAAK,MAAb,EAAqB;AACjB,WAAOZ,mBAAmB,CAACC,KAAD,CAA1B;AACH,GAFD,MAEO,IAAI,CAACA,KAAL,EAAY;AACf,WAAO,IAAP;AACH,GAFM,MAEA,IAAIW,IAAI,KAAK,sBAAb,EAAqC;AACxC,WAAOX,KAAP;AACH,GAFM,MAEA,IAAIW,IAAI,KAAK,MAAb,EAAqB;AACxB,UAAME,SAAS,GAAG,IAAIC,IAAJ,CAASd,KAAT,CAAlB;AACA,WAAOa,SAAS,CAACE,WAAV,GAAwBC,MAAxB,CAA+B,CAA/B,EAAkC,EAAlC,CAAP;AACH;;AACD,SAAO,IAAIF,IAAJ,CAASd,KAAT,EAAgBe,WAAhB,EAAP;AACH,CAhBD;;AAkBA,MAAME,mBAAmB,GAAG,CAACjB,KAAD,EAAgBU,KAAhB,KAAiD;AACzE,MAAI,CAACV,KAAL,EAAY;AACR,WAAO,IAAP;AACH,GAFD,MAEO,IAAIU,KAAK,CAACE,QAAN,CAAeD,IAAf,KAAwB,MAA5B,EAAoC;AACvC,WAAOpB,mBAAmB,CAACS,KAAD,CAA1B;AACH;;AACD,SAAOA,KAAP;AACH,CAPD;;eASe,OAA2C;AACtDW,EAAAA,IAAI,EAAE,mCADgD;AAEtDO,EAAAA,IAAI,EAAE,4CAFgD;AAGtDC,EAAAA,SAAS,EAAE,UAH2C;AAItDC,EAAAA,YAAY,EAAE,MAAM;AAChB,WAAO,MAAP;AACH,GANqD;;AAOtDC,EAAAA,OAAO,CAAC;AAAEX,IAAAA,KAAF;AAASV,IAAAA;AAAT,GAAD,EAAmB;AACtB,UAAMa,SAAS,GAAGI,mBAAmB,CAACjB,KAAD,EAAQU,KAAR,CAArC;AACA,WAAO;AACHV,MAAAA,KAAK,EAAEa;AADJ,KAAP;AAGH,GAZqD;;AAatDS,EAAAA,SAAS,CAAC;AAAEZ,IAAAA,KAAF;AAASV,IAAAA;AAAT,GAAD,EAAmB;AACxB,WAAOS,qBAAqB,CAACT,KAAD,EAAQU,KAAR,CAA5B;AACH;;AAfqD,CAA3C,C","sourcesContent":["import { CmsModelDateTimeField } from \"@webiny/api-headless-cms/types\";\nimport { CmsModelFieldToElasticsearchPlugin } from \"~/types\";\n\nconst convertTimeToNumber = (time?: string): number | null => {\n    if (!time) {\n        return null;\n    }\n    const [hours, minutes, seconds = 0] = time.split(\":\").map(Number);\n    return hours * 60 * 60 + minutes * 60 + seconds;\n};\n\nconst convertNumberToTime = (value?: number): string | null => {\n    if (value === undefined || value === null) {\n        return null;\n    }\n    // TODO remove when v5 goes out\n    // this is a fix for pre beta.5\n    if (String(value).match(/^([0-9]{2}):([0-9]{2})/) !== null) {\n        return String(value);\n    }\n    //\n    const hours = Math.floor(value / 60 / 60);\n\n    const minutes = Math.floor((value - hours * 60 * 60) / 60);\n\n    const seconds = Math.floor(value - hours * 60 * 60 - minutes * 60);\n\n    return [hours, minutes, seconds].map(v => String(v).padStart(2, \"0\")).join(\":\");\n};\n\nconst convertValueFromIndex = (\n    value: string | number,\n    field: CmsModelDateTimeField\n): string | null => {\n    const type = field.settings.type;\n    if (type === \"time\") {\n        return convertNumberToTime(value as number);\n    } else if (!value) {\n        return null;\n    } else if (type === \"dateTimeWithTimezone\") {\n        return value as string;\n    } else if (type === \"date\") {\n        const dateValue = new Date(value);\n        return dateValue.toISOString().substr(0, 10);\n    }\n    return new Date(value).toISOString();\n};\n\nconst convertValueToIndex = (value: string, field: CmsModelDateTimeField) => {\n    if (!value) {\n        return null;\n    } else if (field.settings.type === \"time\") {\n        return convertTimeToNumber(value);\n    }\n    return value;\n};\n\nexport default (): CmsModelFieldToElasticsearchPlugin => ({\n    type: \"cms-model-field-to-elastic-search\",\n    name: \"cms-model-field-to-elastic-search-datetime\",\n    fieldType: \"datetime\",\n    unmappedType: () => {\n        return \"date\";\n    },\n    toIndex({ field, value }) {\n        const dateValue = convertValueToIndex(value, field as CmsModelDateTimeField);\n        return {\n            value: dateValue\n        };\n    },\n    fromIndex({ field, value }) {\n        return convertValueFromIndex(value, field as CmsModelDateTimeField);\n    }\n});\n"]}
+{"version":3,"sources":["dateTimeIndexing.ts"],"names":["convertTimeToNumber","time","hours","minutes","seconds","split","map","Number","convertNumberToTime","value","undefined","String","match","Math","floor","v","padStart","join","convertValueFromIndex","field","type","settings","dateValue","Date","toISOString","slice","convertValueToIndex","name","fieldType","unmappedType","toIndex","fromIndex"],"mappings":"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","sourcesContent":["import { CmsModelDateTimeField } from \"@webiny/api-headless-cms/types\";\nimport { CmsModelFieldToElasticsearchPlugin } from \"~/types\";\n\nconst convertTimeToNumber = (time?: string): number | null => {\n    if (!time) {\n        return null;\n    }\n    const [hours, minutes, seconds = 0] = time.split(\":\").map(Number);\n    return hours * 60 * 60 + minutes * 60 + seconds;\n};\n\nconst convertNumberToTime = (value?: number): string | null => {\n    if (value === undefined || value === null) {\n        return null;\n    }\n    // TODO remove when v5 goes out\n    // this is a fix for pre beta.5\n    if (String(value).match(/^([0-9]{2}):([0-9]{2})/) !== null) {\n        return String(value);\n    }\n    //\n    const hours = Math.floor(value / 60 / 60);\n\n    const minutes = Math.floor((value - hours * 60 * 60) / 60);\n\n    const seconds = Math.floor(value - hours * 60 * 60 - minutes * 60);\n\n    return [hours, minutes, seconds].map(v => String(v).padStart(2, \"0\")).join(\":\");\n};\n\nconst convertValueFromIndex = (\n    value: string | number,\n    field: CmsModelDateTimeField\n): string | null => {\n    const type = field.settings.type;\n    if (type === \"time\") {\n        return convertNumberToTime(value as number);\n    } else if (!value) {\n        return null;\n    } else if (type === \"dateTimeWithTimezone\") {\n        return value as string;\n    } else if (type === \"date\") {\n        const dateValue = new Date(value);\n        return dateValue.toISOString().slice(0, 10);\n    }\n    return new Date(value).toISOString();\n};\n\nconst convertValueToIndex = (value: string, field: CmsModelDateTimeField) => {\n    if (!value) {\n        return null;\n    } else if (field.settings.type === \"time\") {\n        return convertTimeToNumber(value);\n    }\n    return value;\n};\n\nexport default (): CmsModelFieldToElasticsearchPlugin => ({\n    type: \"cms-model-field-to-elastic-search\",\n    name: \"cms-model-field-to-elastic-search-datetime\",\n    fieldType: \"datetime\",\n    unmappedType: () => {\n        return \"date\";\n    },\n    toIndex({ field, value }) {\n        const dateValue = convertValueToIndex(value, field as CmsModelDateTimeField);\n        return {\n            value: dateValue\n        };\n    },\n    fromIndex({ field, value }) {\n        return convertValueFromIndex(value, field as CmsModelDateTimeField);\n    }\n});\n"]}

package/elasticsearch/indices/base.d.ts

@@ -0,0 +1,2 @@
+import { CmsEntryElasticsearchIndexPlugin } from "../../plugins/CmsEntryElasticsearchIndexPlugin";
+export declare const base: CmsEntryElasticsearchIndexPlugin;

package/elasticsearch/indices/base.js

@@ -0,0 +1,23 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.base = void 0;
+
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
+
+var _base = require("@webiny/api-elasticsearch/indexConfiguration/base");
+
+var _CmsEntryElasticsearchIndexPlugin = require("../../plugins/CmsEntryElasticsearchIndexPlugin");
+
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+
+const base = new _CmsEntryElasticsearchIndexPlugin.CmsEntryElasticsearchIndexPlugin({
+  body: _objectSpread({}, _base.base)
+});
+exports.base = base;

package/elasticsearch/indices/base.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["base.ts"],"names":["base","CmsEntryElasticsearchIndexPlugin","body","baseConfiguration"],"mappings":";;;;;;;;;;;AAAA;;AACA;;;;;;AAEO,MAAMA,IAAI,GAAG,IAAIC,kEAAJ,CAAqC;AACrDC,EAAAA,IAAI,oBACGC,UADH;AADiD,CAArC,CAAb","sourcesContent":["import { base as baseConfiguration } from \"@webiny/api-elasticsearch/indexConfiguration/base\";\nimport { CmsEntryElasticsearchIndexPlugin } from \"~/plugins/CmsEntryElasticsearchIndexPlugin\";\n\nexport const base = new CmsEntryElasticsearchIndexPlugin({\n    body: {\n        ...baseConfiguration\n    }\n});\n"]}

package/elasticsearch/indices/index.d.ts

@@ -0,0 +1 @@
+export declare const elasticsearchIndexPlugins: () => import("../../plugins/CmsEntryElasticsearchIndexPlugin").CmsEntryElasticsearchIndexPlugin[];

package/elasticsearch/indices/index.js

@@ -0,0 +1,16 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.elasticsearchIndexPlugins = void 0;
+
+var _base = require("./base");
+
+var _japanese = require("./japanese");
+
+const elasticsearchIndexPlugins = () => {
+  return [_base.base, _japanese.japanese];
+};
+
+exports.elasticsearchIndexPlugins = elasticsearchIndexPlugins;

package/elasticsearch/indices/index.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["index.ts"],"names":["elasticsearchIndexPlugins","base","japanese"],"mappings":";;;;;;;AAAA;;AACA;;AAEO,MAAMA,yBAAyB,GAAG,MAAM;AAC3C,SAAO,CAACC,UAAD,EAAOC,kBAAP,CAAP;AACH,CAFM","sourcesContent":["import { base } from \"./base\";\nimport { japanese } from \"./japanese\";\n\nexport const elasticsearchIndexPlugins = () => {\n    return [base, japanese];\n};\n"]}

package/elasticsearch/indices/japanese.d.ts

@@ -0,0 +1,2 @@
+import { CmsEntryElasticsearchIndexPlugin } from "../../plugins/CmsEntryElasticsearchIndexPlugin";
+export declare const japanese: CmsEntryElasticsearchIndexPlugin;

package/elasticsearch/indices/japanese.js

@@ -0,0 +1,24 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.japanese = void 0;
+
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
+
+var _CmsEntryElasticsearchIndexPlugin = require("../../plugins/CmsEntryElasticsearchIndexPlugin");
+
+var _japanese = require("@webiny/api-elasticsearch/indexConfiguration/japanese");
+
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+
+const japanese = new _CmsEntryElasticsearchIndexPlugin.CmsEntryElasticsearchIndexPlugin({
+  body: _objectSpread({}, _japanese.japanese),
+  locales: ["ja", "ja-jp"]
+});
+exports.japanese = japanese;

package/elasticsearch/indices/japanese.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["japanese.ts"],"names":["japanese","CmsEntryElasticsearchIndexPlugin","body","japaneseConfiguration","locales"],"mappings":";;;;;;;;;;;AAAA;;AACA;;;;;;AAEO,MAAMA,QAAQ,GAAG,IAAIC,kEAAJ,CAAqC;AACzDC,EAAAA,IAAI,oBACGC,kBADH,CADqD;AAIzDC,EAAAA,OAAO,EAAE,CAAC,IAAD,EAAO,OAAP;AAJgD,CAArC,CAAjB","sourcesContent":["import { CmsEntryElasticsearchIndexPlugin } from \"~/plugins/CmsEntryElasticsearchIndexPlugin\";\nimport { japanese as japaneseConfiguration } from \"@webiny/api-elasticsearch/indexConfiguration/japanese\";\n\nexport const japanese = new CmsEntryElasticsearchIndexPlugin({\n    body: {\n        ...japaneseConfiguration\n    },\n    locales: [\"ja\", \"ja-jp\"]\n});\n"]}

package/helpers/createElasticsearchQueryBody.js

@@ -11,8 +11,6 @@ var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/de
 
 var _error = _interopRequireDefault(require("@webiny/error"));
 
-var _operatorPluginsList = require("./operatorPluginsList");
-
 var _transformValueForSearch = require("./transformValueForSearch");
 
 var _searchPluginsList = require("./searchPluginsList");
@@ -35,11 +33,15 @@ var _CmsEntryElasticsearchSortModifierPlugin = require("../plugins/CmsEntryElast
 
 var _CmsEntryElasticsearchBodyModifierPlugin = require("../plugins/CmsEntryElasticsearchBodyModifierPlugin");
 
+var _operators = require("@webiny/api-elasticsearch/operators");
+
+var _normalize = require("@webiny/api-elasticsearch/normalize");
+
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 
-const specialFields = ["published", "latest", "locale", "tenant"];
+const specialFields = ["published", "latest"];
 const noKeywordFields = ["date", "number", "boolean"];
 
 const createElasticsearchSortParams = args => {
@@ -83,11 +85,17 @@ const createElasticsearchSortParams = args => {
  */
 
 
-const createInitialQueryValue = args => {
+const createInitialQueryValue = params => {
+  const {
+    model,
+    where: initialWhere
+  } = params;
   /**
    * Cast as partial so we can remove unnecessary keys.
    */
-  const where = args.where;
+
+  const where = _objectSpread({}, initialWhere);
+
   const query = {
     must: [],
     must_not: [],
@@ -97,25 +105,19 @@ const createInitialQueryValue = args => {
 
   const sharedIndex = process.env.ELASTICSEARCH_SHARED_INDEXES === "true";
 
-  if (sharedIndex && where.tenant) {
-    query.must.push({
-      term: {
-        "tenant.keyword": where.tenant
-      }
-    });
-  }
-
-  delete where["tenant"];
-
-  if (where.locale) {
+  if (sharedIndex) {
     query.must.push({
       term: {
-        "locale.keyword": where.locale
+        "tenant.keyword": model.tenant
       }
     });
   }
 
-  delete where["locale"];
+  query.must.push({
+    term: {
+      "locale.keyword": model.locale
+    }
+  });
   /**
    * We must transform published and latest where args into something that is understandable by our Elasticsearch
    */
@@ -306,6 +308,38 @@ const applyFiltering = params => {
     keyword
   });
 };
+
+const applyFullTextSearch = params => {
+  const {
+    query,
+    modelFields,
+    term,
+    fields
+  } = params;
+
+  if (!term || term.length === 0 || fields.length === 0) {
+    return;
+  }
+
+  const fieldPaths = fields.reduce((collection, field) => {
+    const modelField = modelFields[field];
+
+    if (!modelField) {
+      return collection;
+    }
+
+    collection.push(`values.${field}`);
+    return collection;
+  }, []);
+  query.must.push({
+    query_string: {
+      allow_leading_wildcard: true,
+      fields: fieldPaths,
+      query: (0, _normalize.normalizeValue)(term),
+      default_operator: "or"
+    }
+  });
+};
 /*
  * Iterate through where keys and apply plugins where necessary
  */
@@ -313,11 +347,13 @@ const applyFiltering = params => {
 
 const execElasticsearchBuildQueryPlugins = params => {
   const {
+    model,
     where: initialWhere,
     modelFields,
     parentPath,
     plugins,
-    searchPlugins
+    searchPlugins,
+    fullTextSearch
   } = params;
 
   const where = _objectSpread({}, initialWhere);
@@ -325,6 +361,16 @@ const execElasticsearchBuildQueryPlugins = params => {
   const query = createInitialQueryValue(_objectSpread(_objectSpread({}, params), {}, {
     where
   }));
+  /**
+   * Add full text search for requested fields.
+   */
+
+  applyFullTextSearch({
+    query,
+    modelFields,
+    term: fullTextSearch.term,
+    fields: fullTextSearch.fields
+  });
   /**
    * Always remove special fields, as these do not exist in Elasticsearch.
    */
@@ -337,7 +383,7 @@ const execElasticsearchBuildQueryPlugins = params => {
     return query;
   }
 
-  const operatorPlugins = (0, _operatorPluginsList.operatorPluginsList)(plugins);
+  const operatorPlugins = (0, _operators.getElasticsearchOperatorPluginsByLocale)(plugins, model.locale);
 
   for (const key in where) {
     if (where.hasOwnProperty(key) === false) {
@@ -347,9 +393,12 @@ const execElasticsearchBuildQueryPlugins = params => {
      * We do not need to go further if value is undefined.
      * There are few hardcoded possibilities when value is undefined, for example, ownedBy.
      */
+    // TODO figure out how to have type.
+
 
+    const value = where[key];
 
-    if (where[key] === undefined) {
+    if (value === undefined) {
       continue;
     }
 
@@ -379,13 +428,13 @@ const execElasticsearchBuildQueryPlugins = params => {
 
     if (isRefFieldFiltering({
       key,
-      value: where[key],
+      value,
       field: cmsField
     })) {
       /**
        * We we need to go through each key in where[key] to determine the filters.
        */
-      for (const whereKey in where[key]) {
+      for (const whereKey in value) {
         const {
           operator
         } = (0, _where.parseWhereKey)(whereKey);
@@ -394,7 +443,7 @@ const execElasticsearchBuildQueryPlugins = params => {
           modelField,
           operator,
           key: whereKey,
-          value: where[key][whereKey],
+          value: value[whereKey],
           searchPlugins,
           operatorPlugins,
           parentPath
@@ -409,7 +458,7 @@ const execElasticsearchBuildQueryPlugins = params => {
       modelField,
       operator,
       key,
-      value: where[key],
+      value,
       searchPlugins,
       operatorPlugins,
       parentPath
@@ -427,10 +476,12 @@ const createElasticsearchQueryBody = params => {
     parentPath = null
   } = params;
   const {
-    where,
+    where = {},
     after,
     limit,
-    sort: initialSort
+    sort: initialSort,
+    search,
+    fields
   } = args;
   const modelFields = (0, _fields.createModelFields)(plugins, model);
   const searchPlugins = (0, _searchPluginsList.searchPluginsList)(plugins);
@@ -440,7 +491,11 @@ const createElasticsearchQueryBody = params => {
     where,
     modelFields,
     parentPath,
-    searchPlugins
+    searchPlugins,
+    fullTextSearch: {
+      term: search,
+      fields: fields || []
+    }
   });
   const queryPlugins = plugins.byType(_CmsEntryElasticsearchQueryModifierPlugin.CmsEntryElasticsearchQueryModifierPlugin.type).filter(pl => {
     return !pl.modelId || pl.modelId === model.modelId;