@webiny/api-headless-cms-ddb-es 0.0.0-mt-2 → 0.0.0-unstable.13771d80a8

package/elasticsearch/indexing/richTextIndexing.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["type","name","fieldType","toIndex","value","rawValue","fromIndex"],"sources":["richTextIndexing.ts"],"sourcesContent":["import { CmsModelFieldToElasticsearchPlugin } from \"~/types\";\n\nexport default (): CmsModelFieldToElasticsearchPlugin => ({\n    type: \"cms-model-field-to-elastic-search\",\n    name: \"cms-model-field-to-elastic-search-rich-text\",\n    fieldType: \"rich-text\",\n    toIndex({ value }) {\n        // TODO: convert rich-text object to a searchable string to offer full-text search at some point\n\n        /**\n         * We want to store rich-text value as a \"rawValue\", meaning it wont' be indexed by ES.\n         */\n        return {\n            rawValue: value\n        };\n    },\n    fromIndex({ rawValue }) {\n        return rawValue;\n    }\n});\n"],"mappings":";;;;;;eAEe,OAA2C;EACtDA,IAAI,EAAE,mCAAmC;EACzCC,IAAI,EAAE,6CAA6C;EACnDC,SAAS,EAAE,WAAW;EACtBC,OAAO,CAAC;IAAEC;EAAM,CAAC,EAAE;IACf;;IAEA;AACR;AACA;IACQ,OAAO;MACHC,QAAQ,EAAED;IACd,CAAC;EACL,CAAC;EACDE,SAAS,CAAC;IAAED;EAAS,CAAC,EAAE;IACpB,OAAOA,QAAQ;EACnB;AACJ,CAAC,CAAC;AAAA"}

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,12 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.base = void 0;
+var _apiElasticsearch = require("@webiny/api-elasticsearch");
+var _CmsEntryElasticsearchIndexPlugin = require("../../plugins/CmsEntryElasticsearchIndexPlugin");
+const base = new _CmsEntryElasticsearchIndexPlugin.CmsEntryElasticsearchIndexPlugin({
+  body: (0, _apiElasticsearch.getBaseConfiguration)()
+});
+exports.base = base;

package/elasticsearch/indices/base.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["base","CmsEntryElasticsearchIndexPlugin","body","getBaseConfiguration"],"sources":["base.ts"],"sourcesContent":["import { getBaseConfiguration } from \"@webiny/api-elasticsearch\";\nimport { CmsEntryElasticsearchIndexPlugin } from \"~/plugins/CmsEntryElasticsearchIndexPlugin\";\n\nexport const base = new CmsEntryElasticsearchIndexPlugin({\n    body: getBaseConfiguration()\n});\n"],"mappings":";;;;;;AAAA;AACA;AAEO,MAAMA,IAAI,GAAG,IAAIC,kEAAgC,CAAC;EACrDC,IAAI,EAAE,IAAAC,sCAAoB;AAC9B,CAAC,CAAC;AAAC"}

package/elasticsearch/indices/index.d.ts

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

package/elasticsearch/indices/index.js

@@ -0,0 +1,12 @@
+"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,"names":["elasticsearchIndexPlugins","base","japanese"],"sources":["index.ts"],"sourcesContent":["import { base } from \"./base\";\nimport { japanese } from \"./japanese\";\n\nexport const elasticsearchIndexPlugins = () => {\n    return [base, japanese];\n};\n"],"mappings":";;;;;;AAAA;AACA;AAEO,MAAMA,yBAAyB,GAAG,MAAM;EAC3C,OAAO,CAACC,UAAI,EAAEC,kBAAQ,CAAC;AAC3B,CAAC;AAAC"}

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,13 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.japanese = void 0;
+var _CmsEntryElasticsearchIndexPlugin = require("../../plugins/CmsEntryElasticsearchIndexPlugin");
+var _apiElasticsearch = require("@webiny/api-elasticsearch");
+const japanese = new _CmsEntryElasticsearchIndexPlugin.CmsEntryElasticsearchIndexPlugin({
+  body: (0, _apiElasticsearch.getJapaneseConfiguration)(),
+  locales: ["ja", "ja-jp"]
+});
+exports.japanese = japanese;

package/elasticsearch/indices/japanese.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["japanese","CmsEntryElasticsearchIndexPlugin","body","getJapaneseConfiguration","locales"],"sources":["japanese.ts"],"sourcesContent":["import { CmsEntryElasticsearchIndexPlugin } from \"~/plugins/CmsEntryElasticsearchIndexPlugin\";\nimport { getJapaneseConfiguration } from \"@webiny/api-elasticsearch\";\n\nexport const japanese = new CmsEntryElasticsearchIndexPlugin({\n    body: getJapaneseConfiguration(),\n    locales: [\"ja\", \"ja-jp\"]\n});\n"],"mappings":";;;;;;AAAA;AACA;AAEO,MAAMA,QAAQ,GAAG,IAAIC,kEAAgC,CAAC;EACzDC,IAAI,EAAE,IAAAC,0CAAwB,GAAE;EAChCC,OAAO,EAAE,CAAC,IAAI,EAAE,OAAO;AAC3B,CAAC,CAAC;AAAC"}

package/elasticsearch/search/index.d.ts

@@ -1,3 +1,3 @@
-import { ElasticsearchQueryBuilderValueSearchPlugin } from "../../types";
-declare const _default: () => ElasticsearchQueryBuilderValueSearchPlugin[];
+import { CmsEntryElasticsearchQueryBuilderValueSearchPlugin } from "../../plugins/CmsEntryElasticsearchQueryBuilderValueSearchPlugin";
+declare const _default: () => CmsEntryElasticsearchQueryBuilderValueSearchPlugin[];
 export default _default;

package/elasticsearch/search/index.js

@@ -1,16 +1,10 @@
 "use strict";
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-
-var _timeSearch = _interopRequireDefault(require("./timeSearch"));
-
-var _refSearch = _interopRequireDefault(require("./refSearch"));
-
-var _default = () => [(0, _timeSearch.default)(), (0, _refSearch.default)()];
-
+var _timeSearch = require("./timeSearch");
+var _refSearch = require("./refSearch");
+var _default = () => [(0, _timeSearch.createTimeSearchPlugin)(), (0, _refSearch.createRefSearchPlugin)()];
 exports.default = _default;

package/elasticsearch/search/index.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["createTimeSearchPlugin","createRefSearchPlugin"],"sources":["index.ts"],"sourcesContent":["import { createTimeSearchPlugin } from \"./timeSearch\";\nimport { createRefSearchPlugin } from \"./refSearch\";\nimport { CmsEntryElasticsearchQueryBuilderValueSearchPlugin } from \"~/plugins/CmsEntryElasticsearchQueryBuilderValueSearchPlugin\";\n\nexport default (): CmsEntryElasticsearchQueryBuilderValueSearchPlugin[] => [\n    createTimeSearchPlugin(),\n    createRefSearchPlugin()\n];\n"],"mappings":";;;;;;AAAA;AACA;AAAoD,eAGrC,MAA4D,CACvE,IAAAA,kCAAsB,GAAE,EACxB,IAAAC,gCAAqB,GAAE,CAC1B;AAAA"}

package/elasticsearch/search/refSearch.d.ts

@@ -1,3 +1,2 @@
-import { ElasticsearchQueryBuilderValueSearchPlugin } from "../../types";
-declare const _default: () => ElasticsearchQueryBuilderValueSearchPlugin;
-export default _default;
+import { CmsEntryElasticsearchQueryBuilderValueSearchPlugin } from "../../plugins/CmsEntryElasticsearchQueryBuilderValueSearchPlugin";
+export declare const createRefSearchPlugin: () => CmsEntryElasticsearchQueryBuilderValueSearchPlugin;

package/elasticsearch/search/refSearch.js

@@ -3,22 +3,27 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.default = void 0;
-
-var _default = () => ({
-  type: "cms-elastic-search-query-builder-value-search",
-  name: "cms-elastic-search-query-builder-value-search-ref-field",
-  fieldType: "ref",
-  transform: ({
-    value
-  }) => {
-    return value;
-  },
-  createPath: ({
-    field
-  }) => {
-    return `values.${field.fieldId}.entryId`;
+exports.createRefSearchPlugin = void 0;
+var _CmsEntryElasticsearchQueryBuilderValueSearchPlugin = require("../../plugins/CmsEntryElasticsearchQueryBuilderValueSearchPlugin");
+const createPath = ({
+  field,
+  key
+}) => {
+  if (key && key.match("entryId") === null) {
+    return `${field.storageId}.id`;
   }
-});
-
-exports.default = _default;
+  return `${field.storageId}.entryId`;
+};
+const transform = ({
+  value
+}) => {
+  return value;
+};
+const createRefSearchPlugin = () => {
+  return new _CmsEntryElasticsearchQueryBuilderValueSearchPlugin.CmsEntryElasticsearchQueryBuilderValueSearchPlugin({
+    fieldType: "ref",
+    path: createPath,
+    transform
+  });
+};
+exports.createRefSearchPlugin = createRefSearchPlugin;

package/elasticsearch/search/refSearch.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["createPath","field","key","match","storageId","transform","value","createRefSearchPlugin","CmsEntryElasticsearchQueryBuilderValueSearchPlugin","fieldType","path"],"sources":["refSearch.ts"],"sourcesContent":["import {\n    CmsEntryElasticsearchQueryBuilderValueSearchPlugin,\n    CreatePathCallable,\n    TransformCallable\n} from \"~/plugins/CmsEntryElasticsearchQueryBuilderValueSearchPlugin\";\n\nconst createPath: CreatePathCallable<string> = ({ field, key }) => {\n    if (key && key.match(\"entryId\") === null) {\n        return `${field.storageId}.id`;\n    }\n    return `${field.storageId}.entryId`;\n};\n\nconst transform: TransformCallable = ({ value }) => {\n    return value;\n};\n\nexport const createRefSearchPlugin = (): CmsEntryElasticsearchQueryBuilderValueSearchPlugin => {\n    return new CmsEntryElasticsearchQueryBuilderValueSearchPlugin({\n        fieldType: \"ref\",\n        path: createPath,\n        transform\n    });\n};\n"],"mappings":";;;;;;AAAA;AAMA,MAAMA,UAAsC,GAAG,CAAC;EAAEC,KAAK;EAAEC;AAAI,CAAC,KAAK;EAC/D,IAAIA,GAAG,IAAIA,GAAG,CAACC,KAAK,CAAC,SAAS,CAAC,KAAK,IAAI,EAAE;IACtC,OAAQ,GAAEF,KAAK,CAACG,SAAU,KAAI;EAClC;EACA,OAAQ,GAAEH,KAAK,CAACG,SAAU,UAAS;AACvC,CAAC;AAED,MAAMC,SAA4B,GAAG,CAAC;EAAEC;AAAM,CAAC,KAAK;EAChD,OAAOA,KAAK;AAChB,CAAC;AAEM,MAAMC,qBAAqB,GAAG,MAA0D;EAC3F,OAAO,IAAIC,sGAAkD,CAAC;IAC1DC,SAAS,EAAE,KAAK;IAChBC,IAAI,EAAEV,UAAU;IAChBK;EACJ,CAAC,CAAC;AACN,CAAC;AAAC"}

package/elasticsearch/search/timeSearch.d.ts

@@ -1,3 +1,2 @@
-import { ElasticsearchQueryBuilderValueSearchPlugin } from "../../types";
-declare const _default: () => ElasticsearchQueryBuilderValueSearchPlugin;
-export default _default;
+import { CmsEntryElasticsearchQueryBuilderValueSearchPlugin } from "../../plugins/CmsEntryElasticsearchQueryBuilderValueSearchPlugin";
+export declare const createTimeSearchPlugin: () => CmsEntryElasticsearchQueryBuilderValueSearchPlugin;

package/elasticsearch/search/timeSearch.js

@@ -3,23 +3,24 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.default = void 0;
-
-var _default = () => ({
-  type: "cms-elastic-search-query-builder-value-search",
-  name: "elastic-search-query-builder-value-search-time",
-  fieldType: "datetime",
-  transform: ({
+exports.createTimeSearchPlugin = void 0;
+var _CmsEntryElasticsearchQueryBuilderValueSearchPlugin = require("../../plugins/CmsEntryElasticsearchQueryBuilderValueSearchPlugin");
+const transform = params => {
+  var _field$settings;
+  const {
     field,
     value
-  }) => {
-    if (field.settings.type !== "time") {
-      return value;
-    }
-
-    const [hours, minutes, seconds = 0] = value.split(":").map(Number);
-    return hours * 60 * 60 + minutes * 60 + seconds;
+  } = params;
+  if (!value || ((_field$settings = field.settings) === null || _field$settings === void 0 ? void 0 : _field$settings.type) !== "time") {
+    return value;
   }
-});
-
-exports.default = _default;
+  const [hours, minutes, seconds = 0] = value.split(":").map(Number);
+  return hours * 60 * 60 + minutes * 60 + seconds;
+};
+const createTimeSearchPlugin = () => {
+  return new _CmsEntryElasticsearchQueryBuilderValueSearchPlugin.CmsEntryElasticsearchQueryBuilderValueSearchPlugin({
+    fieldType: "datetime",
+    transform
+  });
+};
+exports.createTimeSearchPlugin = createTimeSearchPlugin;

package/elasticsearch/search/timeSearch.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["transform","params","field","value","settings","type","hours","minutes","seconds","split","map","Number","createTimeSearchPlugin","CmsEntryElasticsearchQueryBuilderValueSearchPlugin","fieldType"],"sources":["timeSearch.ts"],"sourcesContent":["import {\n    CmsEntryElasticsearchQueryBuilderValueSearchPlugin,\n    TransformCallable\n} from \"~/plugins/CmsEntryElasticsearchQueryBuilderValueSearchPlugin\";\n\nconst transform: TransformCallable = params => {\n    const { field, value } = params;\n    if (!value || field.settings?.type !== \"time\") {\n        return value;\n    }\n    const [hours, minutes, seconds = 0] = value.split(\":\").map(Number);\n    return hours * 60 * 60 + minutes * 60 + seconds;\n};\n\nexport const createTimeSearchPlugin = (): CmsEntryElasticsearchQueryBuilderValueSearchPlugin => {\n    return new CmsEntryElasticsearchQueryBuilderValueSearchPlugin({\n        fieldType: \"datetime\",\n        transform\n    });\n};\n"],"mappings":";;;;;;AAAA;AAKA,MAAMA,SAA4B,GAAGC,MAAM,IAAI;EAAA;EAC3C,MAAM;IAAEC,KAAK;IAAEC;EAAM,CAAC,GAAGF,MAAM;EAC/B,IAAI,CAACE,KAAK,IAAI,oBAAAD,KAAK,CAACE,QAAQ,oDAAd,gBAAgBC,IAAI,MAAK,MAAM,EAAE;IAC3C,OAAOF,KAAK;EAChB;EACA,MAAM,CAACG,KAAK,EAAEC,OAAO,EAAEC,OAAO,GAAG,CAAC,CAAC,GAAGL,KAAK,CAACM,KAAK,CAAC,GAAG,CAAC,CAACC,GAAG,CAACC,MAAM,CAAC;EAClE,OAAOL,KAAK,GAAG,EAAE,GAAG,EAAE,GAAGC,OAAO,GAAG,EAAE,GAAGC,OAAO;AACnD,CAAC;AAEM,MAAMI,sBAAsB,GAAG,MAA0D;EAC5F,OAAO,IAAIC,sGAAkD,CAAC;IAC1DC,SAAS,EAAE,UAAU;IACrBd;EACJ,CAAC,CAAC;AACN,CAAC;AAAC"}

package/helpers/entryIndexHelpers.js

@@ -1,20 +1,12 @@
 "use strict";
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.prepareEntryToIndex = exports.extractEntriesFromIndex = void 0;
-
-var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
-
+var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
 var _error = _interopRequireDefault(require("@webiny/error"));
-
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (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 = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
-
 const prepareEntryToIndex = params => {
   const {
     plugins,
@@ -29,36 +21,32 @@ const prepareEntryToIndex = params => {
   } = setupEntriesIndexHelpers({
     plugins
   });
-
   function getFieldIndexPlugin(fieldType) {
     return fieldIndexPlugins[fieldType] || defaultIndexFieldPlugin;
   }
-
   function getFieldTypePlugin(fieldType) {
     const pl = fieldTypePlugins[fieldType];
-
     if (pl) {
       return pl;
     }
-
     throw new _error.default(`Missing field type plugin "${fieldType}". Prepare entry for index.`);
-  } // These objects will contain values processed by field index plugins
-
+  }
 
+  // These objects will contain values processed by field index plugins
   const values = {};
-  const rawValues = {}; // We're only interested in current model fields.
+  const rawValues = {};
 
+  // We're only interested in current model fields.
   for (const field of model.fields) {
-    if (storageEntry.values.hasOwnProperty(field.fieldId) === false) {
+    if (storageEntry.values.hasOwnProperty(field.storageId) === false) {
       continue;
     }
+    const targetFieldPlugin = getFieldIndexPlugin(field.type);
 
-    const targetFieldPlugin = getFieldIndexPlugin(field.type); // TODO: remove this `if` once we convert this plugin to proper plugin class
-
+    // TODO: remove this `if` once we convert this plugin to proper plugin class
     if (!targetFieldPlugin || !targetFieldPlugin.toIndex) {
       continue;
     }
-
     const {
       value,
       rawValue
@@ -66,47 +54,40 @@ const prepareEntryToIndex = params => {
       plugins,
       model,
       field,
-      rawValue: entry.values[field.fieldId],
-      value: storageEntry.values[field.fieldId],
+      rawValue: entry.values[field.storageId],
+      value: storageEntry.values[field.storageId],
       getFieldIndexPlugin,
       getFieldTypePlugin
     });
-
     if (typeof value !== "undefined") {
-      values[field.fieldId] = value;
+      values[field.storageId] = value;
     }
-
     if (typeof rawValue !== "undefined") {
-      rawValues[field.fieldId] = rawValue;
+      rawValues[field.storageId] = rawValue;
     }
   }
-
-  return _objectSpread(_objectSpread({}, storageEntry), {}, {
+  return (0, _objectSpread2.default)((0, _objectSpread2.default)({}, storageEntry), {}, {
     values,
     rawValues
   });
 };
-
 exports.prepareEntryToIndex = prepareEntryToIndex;
-
 const setupEntriesIndexHelpers = ({
   plugins: pluginsContainer
 }) => {
   const plugins = pluginsContainer.byType("cms-model-field-to-elastic-search");
   const fieldIndexPlugins = {};
-
   for (const plugin of plugins.reverse()) {
     if (fieldIndexPlugins[plugin.fieldType]) {
       continue;
     }
-
     fieldIndexPlugins[plugin.fieldType] = plugin;
-  } // we will use this plugin if no targeted plugin found
-
-
-  const defaultIndexFieldPlugin = plugins.find(plugin => plugin.fieldType === "*"); // CmsModelFieldToGraphQLPlugin plugins
+  }
+  // we will use this plugin if no targeted plugin found
+  const defaultIndexFieldPlugin = plugins.find(plugin => plugin.fieldType === "*");
 
-  const fieldTypePlugins = pluginsContainer.byType("cms-model-field-to-graphql").reduce((plugins, plugin) => _objectSpread(_objectSpread({}, plugins), {}, {
+  // CmsModelFieldToGraphQLPlugin plugins
+  const fieldTypePlugins = pluginsContainer.byType("cms-model-field-to-graphql").reduce((plugins, plugin) => (0, _objectSpread2.default)((0, _objectSpread2.default)({}, plugins), {}, {
     [plugin.fieldType]: plugin
   }), {});
   return {
@@ -115,7 +96,6 @@ const setupEntriesIndexHelpers = ({
     fieldTypePlugins
   };
 };
-
 const extractEntriesFromIndex = ({
   plugins,
   entries,
@@ -128,47 +108,39 @@ const extractEntriesFromIndex = ({
   } = setupEntriesIndexHelpers({
     plugins
   });
-
   function getFieldIndexPlugin(fieldType) {
     return fieldIndexPlugins[fieldType] || defaultIndexFieldPlugin;
   }
-
   function getFieldTypePlugin(fieldType) {
     return fieldTypePlugins[fieldType];
   }
-
   const list = [];
-
   for (const entry of entries) {
     // This object will contain values processed by field index plugins
-    const indexValues = {}; // We only consider fields that are present in the model
+    const indexValues = {};
 
+    // We only consider fields that are present in the model
     for (const field of model.fields) {
       const fieldTypePlugin = fieldTypePlugins[field.type];
-
       if (!fieldTypePlugin) {
         throw new _error.default(`Missing field type plugin "${field.type}". Extract entries from index.`);
       }
-
       const targetFieldPlugin = getFieldIndexPlugin(field.type);
-
       if (!targetFieldPlugin || !targetFieldPlugin.fromIndex) {
         continue;
       }
-
       try {
-        indexValues[field.fieldId] = targetFieldPlugin.fromIndex({
+        indexValues[field.storageId] = targetFieldPlugin.fromIndex({
           plugins,
           model,
           field,
           getFieldIndexPlugin,
           getFieldTypePlugin,
-          value: entry.values[field.fieldId],
-
+          value: entry.values[field.storageId],
           /**
            * Possibly no rawValues so we must check for the existence of the field.
            */
-          rawValue: entry.rawValues ? entry.rawValues[field.fieldId] : null
+          rawValue: entry.rawValues ? entry.rawValues[field.storageId] : null
         });
       } catch (ex) {
         throw new _error.default(ex.message || "Could not transform entry field from index.", ex.code || "FIELD_FROM_INDEX_ERROR", {
@@ -177,13 +149,27 @@ const extractEntriesFromIndex = ({
         });
       }
     }
-
-    list.push(_objectSpread(_objectSpread({}, entry), {}, {
+    /**
+     * Let's have a new entry so we do not modify the original one.
+     */
+    const newEntry = (0, _objectSpread2.default)((0, _objectSpread2.default)({}, entry), {}, {
       values: indexValues
-    }));
+    });
+    /**
+     * If we want to remove the rawValues, TYPE, latest, published and __type, we must make them optional or ignore them.
+     */
+    // @ts-ignore
+    delete newEntry["rawValues"];
+    // @ts-ignore
+    delete newEntry["TYPE"];
+    // @ts-ignore
+    delete newEntry["__type"];
+    // @ts-ignore
+    delete newEntry["latest"];
+    // @ts-ignore
+    delete newEntry["published"];
+    list.push((0, _objectSpread2.default)({}, newEntry));
   }
-
   return list;
 };
-
 exports.extractEntriesFromIndex = extractEntriesFromIndex;

package/helpers/entryIndexHelpers.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["prepareEntryToIndex","params","plugins","storageEntry","entry","model","fieldIndexPlugins","defaultIndexFieldPlugin","fieldTypePlugins","setupEntriesIndexHelpers","getFieldIndexPlugin","fieldType","getFieldTypePlugin","pl","WebinyError","values","rawValues","field","fields","hasOwnProperty","storageId","targetFieldPlugin","type","toIndex","value","rawValue","pluginsContainer","byType","plugin","reverse","find","reduce","extractEntriesFromIndex","entries","list","indexValues","fieldTypePlugin","fromIndex","ex","message","code","newEntry","push"],"sources":["entryIndexHelpers.ts"],"sourcesContent":["import WebinyError from \"@webiny/error\";\nimport { CmsEntry, CmsModel, CmsModelFieldToGraphQLPlugin } from \"@webiny/api-headless-cms/types\";\nimport { CmsIndexEntry, CmsModelFieldToElasticsearchPlugin } from \"~/types\";\nimport { PluginsContainer } from \"@webiny/plugins\";\n\ninterface SetupEntriesIndexHelpersParams {\n    plugins: PluginsContainer;\n}\n\ninterface ExtractEntriesFromIndexParams extends SetupEntriesIndexHelpersParams {\n    model: CmsModel;\n    entries: CmsIndexEntry[];\n}\n\ninterface PrepareElasticsearchDataParams extends SetupEntriesIndexHelpersParams {\n    model: CmsModel;\n    entry: CmsEntry;\n    storageEntry: CmsEntry;\n}\n\nexport const prepareEntryToIndex = (params: PrepareElasticsearchDataParams): CmsIndexEntry => {\n    const { plugins, storageEntry, entry, model } = params;\n    const { fieldIndexPlugins, defaultIndexFieldPlugin, fieldTypePlugins } =\n        setupEntriesIndexHelpers({ plugins });\n\n    function getFieldIndexPlugin(fieldType: string) {\n        return fieldIndexPlugins[fieldType] || defaultIndexFieldPlugin;\n    }\n\n    function getFieldTypePlugin(fieldType: string) {\n        const pl = fieldTypePlugins[fieldType];\n        if (pl) {\n            return pl;\n        }\n        throw new WebinyError(`Missing field type plugin \"${fieldType}\". Prepare entry for index.`);\n    }\n\n    // These objects will contain values processed by field index plugins\n    const values: Record<string, string> = {};\n    const rawValues: Record<string, string> = {};\n\n    // We're only interested in current model fields.\n    for (const field of model.fields) {\n        if (storageEntry.values.hasOwnProperty(field.storageId) === false) {\n            continue;\n        }\n\n        const targetFieldPlugin = getFieldIndexPlugin(field.type);\n\n        // TODO: remove this `if` once we convert this plugin to proper plugin class\n        if (!targetFieldPlugin || !targetFieldPlugin.toIndex) {\n            continue;\n        }\n\n        const { value, rawValue } = targetFieldPlugin.toIndex({\n            plugins,\n            model,\n            field,\n            rawValue: entry.values[field.storageId],\n            value: storageEntry.values[field.storageId],\n            getFieldIndexPlugin,\n            getFieldTypePlugin\n        });\n\n        if (typeof value !== \"undefined\") {\n            values[field.storageId] = value;\n        }\n\n        if (typeof rawValue !== \"undefined\") {\n            rawValues[field.storageId] = rawValue;\n        }\n    }\n    return {\n        ...storageEntry,\n        values,\n        rawValues\n    } as CmsIndexEntry;\n};\n\nconst setupEntriesIndexHelpers = ({\n    plugins: pluginsContainer\n}: SetupEntriesIndexHelpersParams) => {\n    const plugins = pluginsContainer.byType<CmsModelFieldToElasticsearchPlugin>(\n        \"cms-model-field-to-elastic-search\"\n    );\n\n    const fieldIndexPlugins: Record<string, CmsModelFieldToElasticsearchPlugin> = {};\n    for (const plugin of plugins.reverse()) {\n        if (fieldIndexPlugins[plugin.fieldType]) {\n            continue;\n        }\n        fieldIndexPlugins[plugin.fieldType] = plugin;\n    }\n    // we will use this plugin if no targeted plugin found\n    const defaultIndexFieldPlugin = plugins.find(plugin => plugin.fieldType === \"*\");\n\n    // CmsModelFieldToGraphQLPlugin plugins\n    const fieldTypePlugins: Record<string, CmsModelFieldToGraphQLPlugin> = pluginsContainer\n        .byType<CmsModelFieldToGraphQLPlugin>(\"cms-model-field-to-graphql\")\n        .reduce((plugins, plugin) => ({ ...plugins, [plugin.fieldType]: plugin }), {});\n\n    return {\n        fieldIndexPlugins,\n        defaultIndexFieldPlugin,\n        fieldTypePlugins\n    };\n};\n\nexport const extractEntriesFromIndex = ({\n    plugins,\n    entries,\n    model\n}: ExtractEntriesFromIndexParams): CmsEntry[] => {\n    const { fieldIndexPlugins, defaultIndexFieldPlugin, fieldTypePlugins } =\n        setupEntriesIndexHelpers({ plugins });\n\n    function getFieldIndexPlugin(fieldType: string) {\n        return fieldIndexPlugins[fieldType] || defaultIndexFieldPlugin;\n    }\n\n    function getFieldTypePlugin(fieldType: string) {\n        return fieldTypePlugins[fieldType];\n    }\n\n    const list: CmsEntry[] = [];\n\n    for (const entry of entries) {\n        // This object will contain values processed by field index plugins\n        const indexValues: Record<string, string> = {};\n\n        // We only consider fields that are present in the model\n        for (const field of model.fields) {\n            const fieldTypePlugin = fieldTypePlugins[field.type];\n            if (!fieldTypePlugin) {\n                throw new WebinyError(\n                    `Missing field type plugin \"${field.type}\". Extract entries from index.`\n                );\n            }\n\n            const targetFieldPlugin = getFieldIndexPlugin(field.type);\n            if (!targetFieldPlugin || !targetFieldPlugin.fromIndex) {\n                continue;\n            }\n            try {\n                indexValues[field.storageId] = targetFieldPlugin.fromIndex({\n                    plugins,\n                    model,\n                    field,\n                    getFieldIndexPlugin,\n                    getFieldTypePlugin,\n                    value: entry.values[field.storageId],\n                    /**\n                     * Possibly no rawValues so we must check for the existence of the field.\n                     */\n                    rawValue: entry.rawValues ? entry.rawValues[field.storageId] : null\n                });\n            } catch (ex) {\n                throw new WebinyError(\n                    ex.message || \"Could not transform entry field from index.\",\n                    ex.code || \"FIELD_FROM_INDEX_ERROR\",\n                    {\n                        field,\n                        entry\n                    }\n                );\n            }\n        }\n        /**\n         * Let's have a new entry so we do not modify the original one.\n         */\n        const newEntry: CmsEntry = {\n            ...entry,\n            values: indexValues\n        };\n        /**\n         * If we want to remove the rawValues, TYPE, latest, published and __type, we must make them optional or ignore them.\n         */\n        // @ts-ignore\n        delete newEntry[\"rawValues\"];\n        // @ts-ignore\n        delete newEntry[\"TYPE\"];\n        // @ts-ignore\n        delete newEntry[\"__type\"];\n        // @ts-ignore\n        delete newEntry[\"latest\"];\n        // @ts-ignore\n        delete newEntry[\"published\"];\n        list.push({ ...newEntry });\n    }\n\n    return list;\n};\n"],"mappings":";;;;;;;;AAAA;AAoBO,MAAMA,mBAAmB,GAAIC,MAAsC,IAAoB;EAC1F,MAAM;IAAEC,OAAO;IAAEC,YAAY;IAAEC,KAAK;IAAEC;EAAM,CAAC,GAAGJ,MAAM;EACtD,MAAM;IAAEK,iBAAiB;IAAEC,uBAAuB;IAAEC;EAAiB,CAAC,GAClEC,wBAAwB,CAAC;IAAEP;EAAQ,CAAC,CAAC;EAEzC,SAASQ,mBAAmB,CAACC,SAAiB,EAAE;IAC5C,OAAOL,iBAAiB,CAACK,SAAS,CAAC,IAAIJ,uBAAuB;EAClE;EAEA,SAASK,kBAAkB,CAACD,SAAiB,EAAE;IAC3C,MAAME,EAAE,GAAGL,gBAAgB,CAACG,SAAS,CAAC;IACtC,IAAIE,EAAE,EAAE;MACJ,OAAOA,EAAE;IACb;IACA,MAAM,IAAIC,cAAW,CAAE,8BAA6BH,SAAU,6BAA4B,CAAC;EAC/F;;EAEA;EACA,MAAMI,MAA8B,GAAG,CAAC,CAAC;EACzC,MAAMC,SAAiC,GAAG,CAAC,CAAC;;EAE5C;EACA,KAAK,MAAMC,KAAK,IAAIZ,KAAK,CAACa,MAAM,EAAE;IAC9B,IAAIf,YAAY,CAACY,MAAM,CAACI,cAAc,CAACF,KAAK,CAACG,SAAS,CAAC,KAAK,KAAK,EAAE;MAC/D;IACJ;IAEA,MAAMC,iBAAiB,GAAGX,mBAAmB,CAACO,KAAK,CAACK,IAAI,CAAC;;IAEzD;IACA,IAAI,CAACD,iBAAiB,IAAI,CAACA,iBAAiB,CAACE,OAAO,EAAE;MAClD;IACJ;IAEA,MAAM;MAAEC,KAAK;MAAEC;IAAS,CAAC,GAAGJ,iBAAiB,CAACE,OAAO,CAAC;MAClDrB,OAAO;MACPG,KAAK;MACLY,KAAK;MACLQ,QAAQ,EAAErB,KAAK,CAACW,MAAM,CAACE,KAAK,CAACG,SAAS,CAAC;MACvCI,KAAK,EAAErB,YAAY,CAACY,MAAM,CAACE,KAAK,CAACG,SAAS,CAAC;MAC3CV,mBAAmB;MACnBE;IACJ,CAAC,CAAC;IAEF,IAAI,OAAOY,KAAK,KAAK,WAAW,EAAE;MAC9BT,MAAM,CAACE,KAAK,CAACG,SAAS,CAAC,GAAGI,KAAK;IACnC;IAEA,IAAI,OAAOC,QAAQ,KAAK,WAAW,EAAE;MACjCT,SAAS,CAACC,KAAK,CAACG,SAAS,CAAC,GAAGK,QAAQ;IACzC;EACJ;EACA,mEACOtB,YAAY;IACfY,MAAM;IACNC;EAAS;AAEjB,CAAC;AAAC;AAEF,MAAMP,wBAAwB,GAAG,CAAC;EAC9BP,OAAO,EAAEwB;AACmB,CAAC,KAAK;EAClC,MAAMxB,OAAO,GAAGwB,gBAAgB,CAACC,MAAM,CACnC,mCAAmC,CACtC;EAED,MAAMrB,iBAAqE,GAAG,CAAC,CAAC;EAChF,KAAK,MAAMsB,MAAM,IAAI1B,OAAO,CAAC2B,OAAO,EAAE,EAAE;IACpC,IAAIvB,iBAAiB,CAACsB,MAAM,CAACjB,SAAS,CAAC,EAAE;MACrC;IACJ;IACAL,iBAAiB,CAACsB,MAAM,CAACjB,SAAS,CAAC,GAAGiB,MAAM;EAChD;EACA;EACA,MAAMrB,uBAAuB,GAAGL,OAAO,CAAC4B,IAAI,CAACF,MAAM,IAAIA,MAAM,CAACjB,SAAS,KAAK,GAAG,CAAC;;EAEhF;EACA,MAAMH,gBAA8D,GAAGkB,gBAAgB,CAClFC,MAAM,CAA+B,4BAA4B,CAAC,CAClEI,MAAM,CAAC,CAAC7B,OAAO,EAAE0B,MAAM,iEAAW1B,OAAO;IAAE,CAAC0B,MAAM,CAACjB,SAAS,GAAGiB;EAAM,EAAG,EAAE,CAAC,CAAC,CAAC;EAElF,OAAO;IACHtB,iBAAiB;IACjBC,uBAAuB;IACvBC;EACJ,CAAC;AACL,CAAC;AAEM,MAAMwB,uBAAuB,GAAG,CAAC;EACpC9B,OAAO;EACP+B,OAAO;EACP5B;AAC2B,CAAC,KAAiB;EAC7C,MAAM;IAAEC,iBAAiB;IAAEC,uBAAuB;IAAEC;EAAiB,CAAC,GAClEC,wBAAwB,CAAC;IAAEP;EAAQ,CAAC,CAAC;EAEzC,SAASQ,mBAAmB,CAACC,SAAiB,EAAE;IAC5C,OAAOL,iBAAiB,CAACK,SAAS,CAAC,IAAIJ,uBAAuB;EAClE;EAEA,SAASK,kBAAkB,CAACD,SAAiB,EAAE;IAC3C,OAAOH,gBAAgB,CAACG,SAAS,CAAC;EACtC;EAEA,MAAMuB,IAAgB,GAAG,EAAE;EAE3B,KAAK,MAAM9B,KAAK,IAAI6B,OAAO,EAAE;IACzB;IACA,MAAME,WAAmC,GAAG,CAAC,CAAC;;IAE9C;IACA,KAAK,MAAMlB,KAAK,IAAIZ,KAAK,CAACa,MAAM,EAAE;MAC9B,MAAMkB,eAAe,GAAG5B,gBAAgB,CAACS,KAAK,CAACK,IAAI,CAAC;MACpD,IAAI,CAACc,eAAe,EAAE;QAClB,MAAM,IAAItB,cAAW,CAChB,8BAA6BG,KAAK,CAACK,IAAK,gCAA+B,CAC3E;MACL;MAEA,MAAMD,iBAAiB,GAAGX,mBAAmB,CAACO,KAAK,CAACK,IAAI,CAAC;MACzD,IAAI,CAACD,iBAAiB,IAAI,CAACA,iBAAiB,CAACgB,SAAS,EAAE;QACpD;MACJ;MACA,IAAI;QACAF,WAAW,CAAClB,KAAK,CAACG,SAAS,CAAC,GAAGC,iBAAiB,CAACgB,SAAS,CAAC;UACvDnC,OAAO;UACPG,KAAK;UACLY,KAAK;UACLP,mBAAmB;UACnBE,kBAAkB;UAClBY,KAAK,EAAEpB,KAAK,CAACW,MAAM,CAACE,KAAK,CAACG,SAAS,CAAC;UACpC;AACpB;AACA;UACoBK,QAAQ,EAAErB,KAAK,CAACY,SAAS,GAAGZ,KAAK,CAACY,SAAS,CAACC,KAAK,CAACG,SAAS,CAAC,GAAG;QACnE,CAAC,CAAC;MACN,CAAC,CAAC,OAAOkB,EAAE,EAAE;QACT,MAAM,IAAIxB,cAAW,CACjBwB,EAAE,CAACC,OAAO,IAAI,6CAA6C,EAC3DD,EAAE,CAACE,IAAI,IAAI,wBAAwB,EACnC;UACIvB,KAAK;UACLb;QACJ,CAAC,CACJ;MACL;IACJ;IACA;AACR;AACA;IACQ,MAAMqC,QAAkB,+DACjBrC,KAAK;MACRW,MAAM,EAAEoB;IAAW,EACtB;IACD;AACR;AACA;IACQ;IACA,OAAOM,QAAQ,CAAC,WAAW,CAAC;IAC5B;IACA,OAAOA,QAAQ,CAAC,MAAM,CAAC;IACvB;IACA,OAAOA,QAAQ,CAAC,QAAQ,CAAC;IACzB;IACA,OAAOA,QAAQ,CAAC,QAAQ,CAAC;IACzB;IACA,OAAOA,QAAQ,CAAC,WAAW,CAAC;IAC5BP,IAAI,CAACQ,IAAI,iCAAMD,QAAQ,EAAG;EAC9B;EAEA,OAAOP,IAAI;AACf,CAAC;AAAC"}

package/helpers/index.d.ts

@@ -1,2 +1 @@
-export * from "./createElasticsearchQueryBody";
 export * from "./entryIndexHelpers";

package/helpers/index.js

@@ -3,22 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-
-var _createElasticsearchQueryBody = require("./createElasticsearchQueryBody");
-
-Object.keys(_createElasticsearchQueryBody).forEach(function (key) {
-  if (key === "default" || key === "__esModule") return;
-  if (key in exports && exports[key] === _createElasticsearchQueryBody[key]) return;
-  Object.defineProperty(exports, key, {
-    enumerable: true,
-    get: function () {
-      return _createElasticsearchQueryBody[key];
-    }
-  });
-});
-
 var _entryIndexHelpers = require("./entryIndexHelpers");
-
 Object.keys(_entryIndexHelpers).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
   if (key in exports && exports[key] === _entryIndexHelpers[key]) return;

package/helpers/index.js.map

@@ -0,0 +1 @@
+{"version":3,"names":[],"sources":["index.ts"],"sourcesContent":["export * from \"./entryIndexHelpers\";\n"],"mappings":";;;;;AAAA;AAAA;EAAA;EAAA;EAAA;IAAA;IAAA;MAAA;IAAA;EAAA;AAAA"}

package/index.d.ts

@@ -1,2 +1,3 @@
 import { StorageOperationsFactory } from "./types";
+export * from "./plugins";
 export declare const createStorageOperations: StorageOperationsFactory;