@webiny/api-headless-cms-ddb-es 0.0.0-mt-3 → 0.0.0-unstable.40876133bb

package/index.js

@@ -1,10 +1,13 @@
 "use strict";
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
 
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
+var _exportNames = {
+  createStorageOperations: true
+};
 exports.createStorageOperations = void 0;
 
 var _filters = _interopRequireDefault(require("@webiny/db-dynamodb/plugins/filters"));
@@ -39,25 +42,42 @@ var _system2 = require("./definitions/system");
 
 var _settings2 = require("./definitions/settings");
 
-var _createElasticsearchTemplate = require("./operations/system/createElasticsearchTemplate");
+var _createElasticsearchIndex = require("./elasticsearch/createElasticsearchIndex");
 
 var _plugins = require("@webiny/plugins");
 
 var _group2 = require("./operations/group");
 
-var _operators = require("@webiny/api-elasticsearch/operators");
+var _apiElasticsearch = require("@webiny/api-elasticsearch");
 
 var _elasticsearchFields = require("./operations/entry/elasticsearchFields");
 
+var _indices = require("./elasticsearch/indices");
+
+var _deleteElasticsearchIndex = require("./elasticsearch/deleteElasticsearchIndex");
+
+var _plugins2 = require("./plugins");
+
+Object.keys(_plugins2).forEach(function (key) {
+  if (key === "default" || key === "__esModule") return;
+  if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
+  if (key in exports && exports[key] === _plugins2[key]) return;
+  Object.defineProperty(exports, key, {
+    enumerable: true,
+    get: function () {
+      return _plugins2[key];
+    }
+  });
+});
+
 const createStorageOperations = params => {
   const {
-    attributes = {},
+    attributes,
     table,
     esTable,
     documentClient,
     elasticsearch,
-    plugins: customPlugins,
-    modelFieldToGraphQLPlugins
+    plugins: userPlugins
   } = params;
   const tableInstance = (0, _table.createTable)({
     table,
@@ -71,43 +91,39 @@ const createStorageOperations = params => {
     settings: (0, _settings2.createSettingsEntity)({
       entityName: _types.ENTITIES.SETTINGS,
       table: tableInstance,
-      attributes: attributes[_types.ENTITIES.SETTINGS]
+      attributes: attributes ? attributes[_types.ENTITIES.SETTINGS] : {}
     }),
     system: (0, _system2.createSystemEntity)({
       entityName: _types.ENTITIES.SYSTEM,
       table: tableInstance,
-      attributes: attributes[_types.ENTITIES.SYSTEM]
+      attributes: attributes ? attributes[_types.ENTITIES.SYSTEM] : {}
     }),
     groups: (0, _group.createGroupEntity)({
       entityName: _types.ENTITIES.GROUPS,
       table: tableInstance,
-      attributes: attributes[_types.ENTITIES.GROUPS]
+      attributes: attributes ? attributes[_types.ENTITIES.GROUPS] : {}
     }),
     models: (0, _model2.createModelEntity)({
       entityName: _types.ENTITIES.MODELS,
       table: tableInstance,
-      attributes: attributes[_types.ENTITIES.MODELS]
+      attributes: attributes ? attributes[_types.ENTITIES.MODELS] : {}
     }),
     entries: (0, _entry2.createEntryEntity)({
       entityName: _types.ENTITIES.ENTRIES,
       table: tableInstance,
-      attributes: attributes[_types.ENTITIES.ENTRIES]
+      attributes: attributes ? attributes[_types.ENTITIES.ENTRIES] : {}
     }),
     entriesEs: (0, _entryElasticsearch.createEntryElasticsearchEntity)({
       entityName: _types.ENTITIES.ENTRIES_ES,
       table: tableElasticsearchInstance,
-      attributes: attributes[_types.ENTITIES.ENTRIES_ES]
+      attributes: attributes ? attributes[_types.ENTITIES.ENTRIES_ES] : {}
     })
   };
   const plugins = new _plugins.PluginsContainer([
-  /**
-   * User defined custom plugins.
-   */
-  ...(customPlugins || []),
   /**
    * Plugins of type CmsModelFieldToGraphQLPlugin.
    */
-  modelFieldToGraphQLPlugins,
+
   /**
    * Elasticsearch field definitions for the entry record.
    */
@@ -119,7 +135,7 @@ const createStorageOperations = params => {
   /**
    * Elasticsearch operators.
    */
-  (0, _operators.getElasticsearchOperators)(),
+  (0, _apiElasticsearch.getElasticsearchOperators)(),
   /**
    * Field plugins for DynamoDB.
    */
@@ -127,21 +143,102 @@ const createStorageOperations = params => {
   /**
    * Field plugins for Elasticsearch.
    */
-  (0, _elasticsearch.default)()]);
+  (0, _elasticsearch.default)(),
+  /**
+   * Built-in Elasticsearch index templates.
+   */
+  (0, _indices.elasticsearchIndexPlugins)(),
+  /**
+   * User defined custom plugins.
+   * They are at the end because we can then override existing plugins.
+   */
+  ...(userPlugins || [])]);
   return {
-    init: async cms => {
-      cms.onBeforeSystemInstall.subscribe(async () => {
-        await (0, _createElasticsearchTemplate.createElasticsearchTemplate)({
-          elasticsearch
+    beforeInit: async context => {
+      /**
+       * Attach the elasticsearch into context if it is not already attached.
+       */
+      if (!context.elasticsearch) {
+        context.elasticsearch = elasticsearch;
+      }
+      /**
+       * Collect all required plugins from parent context.
+       */
+
+
+      const fieldPlugins = context.plugins.byType("cms-model-field-to-graphql");
+      plugins.register(fieldPlugins);
+      /**
+       * We need to get all the operator plugins from the main plugin container.
+       */
+
+      const elasticsearchOperatorPlugins = context.plugins.byType(_apiElasticsearch.ElasticsearchQueryBuilderOperatorPlugin.type);
+      plugins.register(elasticsearchOperatorPlugins);
+      /**
+       * We need to get all the query modifier plugins
+       */
+
+      const queryModifierPlugins = context.plugins.byType(_plugins2.CmsEntryElasticsearchQueryModifierPlugin.type);
+      plugins.register(queryModifierPlugins);
+      /**
+       * We need to get all the sort modifier plugins
+       */
+
+      const sortModifierPlugins = context.plugins.byType(_plugins2.CmsEntryElasticsearchSortModifierPlugin.type);
+      plugins.register(sortModifierPlugins);
+      /**
+       * We need to get all the body modifier plugins
+       */
+
+      const bodyModifierPlugins = context.plugins.byType(_plugins2.CmsEntryElasticsearchBodyModifierPlugin.type);
+      plugins.register(bodyModifierPlugins);
+      /**
+       * Pass the plugins to the parent context.
+       */
+
+      context.plugins.register([(0, _dynamoDb.default)()]);
+    },
+    init: async context => {
+      /**
+       * We need to create indexes on before model create and on clone (create from).
+       * Other apps create indexes on locale creation.
+       */
+      context.cms.onModelBeforeCreate.subscribe(async ({
+        model
+      }) => {
+        await (0, _createElasticsearchIndex.createElasticsearchIndex)({
+          elasticsearch,
+          model,
+          plugins
+        });
+      });
+      context.cms.onModelBeforeCreateFrom.subscribe(async ({
+        model
+      }) => {
+        await (0, _createElasticsearchIndex.createElasticsearchIndex)({
+          elasticsearch,
+          model,
+          plugins
+        });
+      });
+      context.cms.onModelAfterDelete.subscribe(async ({
+        model
+      }) => {
+        await (0, _deleteElasticsearchIndex.deleteElasticsearchIndex)({
+          elasticsearch,
+          model
+        });
+      });
+      context.cms.onModelInitialize.subscribe(async ({
+        model
+      }) => {
+        await (0, _createElasticsearchIndex.createElasticsearchIndex)({
+          elasticsearch,
+          model,
+          plugins
         });
       });
     },
-    plugins: [
-    /**
-     * Field plugins for DynamoDB.
-     * We must pass them to the base application.
-     */
-    (0, _dynamoDb.default)()],
     getEntities: () => entities,
     getTable: () => tableInstance,
     getEsTable: () => tableElasticsearchInstance,

package/index.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["createStorageOperations","params","attributes","table","esTable","documentClient","elasticsearch","plugins","userPlugins","tableInstance","createTable","tableElasticsearchInstance","createElasticsearchTable","entities","settings","createSettingsEntity","entityName","ENTITIES","SETTINGS","system","createSystemEntity","SYSTEM","groups","createGroupEntity","GROUPS","models","createModelEntity","MODELS","entries","createEntryEntity","ENTRIES","entriesEs","createEntryElasticsearchEntity","ENTRIES_ES","PluginsContainer","cmsEntryElasticsearchFields","dynamoDbValueFilters","getElasticsearchOperators","dynamoDbPlugins","elasticsearchPlugins","elasticsearchIndexPlugins","beforeInit","context","fieldPlugins","byType","register","elasticsearchOperatorPlugins","ElasticsearchQueryBuilderOperatorPlugin","type","queryModifierPlugins","CmsEntryElasticsearchQueryModifierPlugin","sortModifierPlugins","CmsEntryElasticsearchSortModifierPlugin","bodyModifierPlugins","CmsEntryElasticsearchBodyModifierPlugin","init","cms","onModelBeforeCreate","subscribe","model","createElasticsearchIndex","onModelBeforeCreateFrom","onModelAfterDelete","deleteElasticsearchIndex","onModelInitialize","getEntities","getTable","getEsTable","createSystemStorageOperations","entity","createSettingsStorageOperations","createGroupsStorageOperations","createModelsStorageOperations","createEntriesStorageOperations","esEntity"],"sources":["index.ts"],"sourcesContent":["import dynamoDbValueFilters from \"@webiny/db-dynamodb/plugins/filters\";\nimport elasticsearchPlugins from \"./elasticsearch\";\nimport dynamoDbPlugins from \"./dynamoDb\";\nimport { createSettingsStorageOperations } from \"./operations/settings\";\nimport { createSystemStorageOperations } from \"./operations/system\";\nimport { createModelsStorageOperations } from \"./operations/model\";\nimport { createEntriesStorageOperations } from \"./operations/entry\";\nimport { ENTITIES, StorageOperationsFactory } from \"~/types\";\nimport { createTable } from \"~/definitions/table\";\nimport { createElasticsearchTable } from \"~/definitions/tableElasticsearch\";\nimport { createGroupEntity } from \"~/definitions/group\";\nimport { createModelEntity } from \"~/definitions/model\";\nimport { createEntryEntity } from \"~/definitions/entry\";\nimport { createEntryElasticsearchEntity } from \"~/definitions/entryElasticsearch\";\nimport { createSystemEntity } from \"~/definitions/system\";\nimport { createSettingsEntity } from \"~/definitions/settings\";\nimport { createElasticsearchIndex } from \"~/elasticsearch/createElasticsearchIndex\";\nimport { PluginsContainer } from \"@webiny/plugins\";\nimport { createGroupsStorageOperations } from \"~/operations/group\";\nimport {\n    ElasticsearchQueryBuilderOperatorPlugin,\n    getElasticsearchOperators\n} from \"@webiny/api-elasticsearch\";\nimport { elasticsearchFields as cmsEntryElasticsearchFields } from \"~/operations/entry/elasticsearchFields\";\nimport { elasticsearchIndexPlugins } from \"./elasticsearch/indices\";\nimport { deleteElasticsearchIndex } from \"./elasticsearch/deleteElasticsearchIndex\";\nimport { CmsModelFieldToGraphQLPlugin } from \"@webiny/api-headless-cms/types\";\nimport {\n    CmsEntryElasticsearchBodyModifierPlugin,\n    CmsEntryElasticsearchQueryModifierPlugin,\n    CmsEntryElasticsearchSortModifierPlugin\n} from \"~/plugins\";\n\nexport * from \"./plugins\";\n\nexport const createStorageOperations: StorageOperationsFactory = params => {\n    const {\n        attributes,\n        table,\n        esTable,\n        documentClient,\n        elasticsearch,\n        plugins: userPlugins\n    } = params;\n\n    const tableInstance = createTable({\n        table,\n        documentClient\n    });\n    const tableElasticsearchInstance = createElasticsearchTable({\n        table: esTable,\n        documentClient\n    });\n\n    const entities = {\n        settings: createSettingsEntity({\n            entityName: ENTITIES.SETTINGS,\n            table: tableInstance,\n            attributes: attributes ? attributes[ENTITIES.SETTINGS] : {}\n        }),\n        system: createSystemEntity({\n            entityName: ENTITIES.SYSTEM,\n            table: tableInstance,\n            attributes: attributes ? attributes[ENTITIES.SYSTEM] : {}\n        }),\n        groups: createGroupEntity({\n            entityName: ENTITIES.GROUPS,\n            table: tableInstance,\n            attributes: attributes ? attributes[ENTITIES.GROUPS] : {}\n        }),\n        models: createModelEntity({\n            entityName: ENTITIES.MODELS,\n            table: tableInstance,\n            attributes: attributes ? attributes[ENTITIES.MODELS] : {}\n        }),\n        entries: createEntryEntity({\n            entityName: ENTITIES.ENTRIES,\n            table: tableInstance,\n            attributes: attributes ? attributes[ENTITIES.ENTRIES] : {}\n        }),\n        entriesEs: createEntryElasticsearchEntity({\n            entityName: ENTITIES.ENTRIES_ES,\n            table: tableElasticsearchInstance,\n            attributes: attributes ? attributes[ENTITIES.ENTRIES_ES] : {}\n        })\n    };\n\n    const plugins = new PluginsContainer([\n        /**\n         * Plugins of type CmsModelFieldToGraphQLPlugin.\n         */\n        /**\n         * Elasticsearch field definitions for the entry record.\n         */\n        cmsEntryElasticsearchFields,\n        /**\n         * DynamoDB filter plugins for the where conditions.\n         */\n        dynamoDbValueFilters(),\n        /**\n         * Elasticsearch operators.\n         */\n        getElasticsearchOperators(),\n        /**\n         * Field plugins for DynamoDB.\n         */\n        dynamoDbPlugins(),\n        /**\n         * Field plugins for Elasticsearch.\n         */\n        elasticsearchPlugins(),\n        /**\n         * Built-in Elasticsearch index templates.\n         */\n        elasticsearchIndexPlugins(),\n        /**\n         * User defined custom plugins.\n         * They are at the end because we can then override existing plugins.\n         */\n        ...(userPlugins || [])\n    ]);\n\n    return {\n        beforeInit: async context => {\n            /**\n             * Attach the elasticsearch into context if it is not already attached.\n             */\n            if (!context.elasticsearch) {\n                context.elasticsearch = elasticsearch;\n            }\n            /**\n             * Collect all required plugins from parent context.\n             */\n            const fieldPlugins = context.plugins.byType<CmsModelFieldToGraphQLPlugin>(\n                \"cms-model-field-to-graphql\"\n            );\n            plugins.register(fieldPlugins);\n            /**\n             * We need to get all the operator plugins from the main plugin container.\n             */\n            const elasticsearchOperatorPlugins =\n                context.plugins.byType<ElasticsearchQueryBuilderOperatorPlugin>(\n                    ElasticsearchQueryBuilderOperatorPlugin.type\n                );\n            plugins.register(elasticsearchOperatorPlugins);\n            /**\n             * We need to get all the query modifier plugins\n             */\n            const queryModifierPlugins =\n                context.plugins.byType<CmsEntryElasticsearchQueryModifierPlugin>(\n                    CmsEntryElasticsearchQueryModifierPlugin.type\n                );\n            plugins.register(queryModifierPlugins);\n            /**\n             * We need to get all the sort modifier plugins\n             */\n            const sortModifierPlugins =\n                context.plugins.byType<CmsEntryElasticsearchSortModifierPlugin>(\n                    CmsEntryElasticsearchSortModifierPlugin.type\n                );\n            plugins.register(sortModifierPlugins);\n            /**\n             * We need to get all the body modifier plugins\n             */\n            const bodyModifierPlugins =\n                context.plugins.byType<CmsEntryElasticsearchBodyModifierPlugin>(\n                    CmsEntryElasticsearchBodyModifierPlugin.type\n                );\n            plugins.register(bodyModifierPlugins);\n\n            /**\n             * Pass the plugins to the parent context.\n             */\n            context.plugins.register([dynamoDbPlugins()]);\n        },\n        init: async context => {\n            /**\n             * We need to create indexes on before model create and on clone (create from).\n             * Other apps create indexes on locale creation.\n             */\n            context.cms.onModelBeforeCreate.subscribe(async ({ model }) => {\n                await createElasticsearchIndex({\n                    elasticsearch,\n                    model,\n                    plugins\n                });\n            });\n            context.cms.onModelBeforeCreateFrom.subscribe(async ({ model }) => {\n                await createElasticsearchIndex({\n                    elasticsearch,\n                    model,\n                    plugins\n                });\n            });\n            context.cms.onModelAfterDelete.subscribe(async ({ model }) => {\n                await deleteElasticsearchIndex({\n                    elasticsearch,\n                    model\n                });\n            });\n\n            context.cms.onModelInitialize.subscribe(async ({ model }) => {\n                await createElasticsearchIndex({\n                    elasticsearch,\n                    model,\n                    plugins\n                });\n            });\n        },\n        getEntities: () => entities,\n        getTable: () => tableInstance,\n        getEsTable: () => tableElasticsearchInstance,\n        system: createSystemStorageOperations({\n            entity: entities.system\n        }),\n        settings: createSettingsStorageOperations({\n            entity: entities.settings\n        }),\n        groups: createGroupsStorageOperations({\n            entity: entities.groups,\n            plugins\n        }),\n        models: createModelsStorageOperations({\n            entity: entities.models,\n            elasticsearch\n        }),\n        entries: createEntriesStorageOperations({\n            entity: entities.entries,\n            esEntity: entities.entriesEs,\n            plugins,\n            elasticsearch\n        })\n    };\n};\n"],"mappings":"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"}

package/operations/entry/dataLoaders.d.ts

@@ -20,13 +20,13 @@ interface ClearLoaderParams {
     model: CmsModel;
     entry?: CmsEntry;
 }
-export interface Params {
+export interface DataLoadersHandlerParams {
     entity: Entity<any>;
 }
 export declare class DataLoadersHandler {
     private readonly loaders;
     private readonly entity;
-    constructor(params: any);
+    constructor(params: DataLoadersHandlerParams);
     getAllEntryRevisions(params: GetAllEntryRevisionsParams): Promise<CmsEntry[]>;
     clearAllEntryRevisions(params: ClearLoaderParams): void;
     getRevisionById(params: GetRevisionByIdParams): Promise<CmsEntry[]>;
@@ -35,6 +35,10 @@ export declare class DataLoadersHandler {
     clearPublishedRevisionByEntryId(params: ClearLoaderParams): void;
     getLatestRevisionByEntryId(params: GetLatestRevisionByEntryIdParams): Promise<CmsEntry[]>;
     clearLatestRevisionByEntryId(params: ClearLoaderParams): void;
+    /**
+     * TODO @ts-refactor
+     * Maybe pass on the generics to DataLoader definition?
+     */
     private getLoader;
     private loadMany;
     clearAll(params: Omit<ClearLoaderParams, "entry">): void;

package/operations/entry/dataLoaders.js

@@ -1,12 +1,14 @@
 "use strict";
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
 
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.DataLoadersHandler = void 0;
 
+var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
+
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 
 var _dataloader = _interopRequireDefault(require("dataloader"));
@@ -23,10 +25,6 @@ var _utils = require("@webiny/utils");
 
 var _batchRead = require("@webiny/db-dynamodb/utils/batchRead");
 
-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 getAllEntryRevisions = params => {
   const {
     entity,
@@ -37,7 +35,7 @@ const getAllEntryRevisions = params => {
     locale
   } = model;
   return new _dataloader.default(async ids => {
-    const results = [];
+    const results = {};
 
     for (const id of ids) {
       const queryAllParams = {
@@ -52,11 +50,12 @@ const getAllEntryRevisions = params => {
         }
       };
       const items = await (0, _query.queryAll)(queryAllParams);
-      const entries = (0, _cleanup.cleanupItems)(entity, items);
-      results.push(entries);
+      results[id] = (0, _cleanup.cleanupItems)(entity, items);
     }
 
-    return results;
+    return ids.map(id => {
+      return results[id] || [];
+    });
   });
 };
 
@@ -79,6 +78,11 @@ const getRevisionById = params => {
       const {
         version
       } = (0, _utils.parseIdentifier)(id);
+
+      if (!version) {
+        return collection;
+      }
+
       const sortKey = (0, _keys.createRevisionSortKey)({
         version
       });
@@ -93,6 +97,9 @@ const getRevisionById = params => {
         SK: sortKey
       });
       return collection;
+      /**
+       * We use any because there is no type for the return type.
+       */
     }, {});
     const records = await (0, _batchRead.batchReadAll)({
       table: entity.table,
@@ -134,6 +141,9 @@ const getPublishedRevisionByEntryId = params => {
         SK: publishedKey
       });
       return collection;
+      /**
+       * We use any because there is no type for the return type.
+       */
     }, {});
     const records = await (0, _batchRead.batchReadAll)({
       table: entity.table,
@@ -178,6 +188,9 @@ const getLatestRevisionByEntryId = params => {
         SK: latestKey
       });
       return collection;
+      /**
+       * We use any because there is no type for the return type.
+       */
     }, {});
     const records = await (0, _batchRead.batchReadAll)({
       table: entity.table,
@@ -241,6 +254,11 @@ class DataLoadersHandler {
   clearLatestRevisionByEntryId(params) {
     this.clear("getLatestRevisionByEntryId", params);
   }
+  /**
+   * TODO @ts-refactor
+   * Maybe pass on the generics to DataLoader definition?
+   */
+
 
   getLoader(name, params) {
     if (!dataLoaders[name]) {
@@ -259,7 +277,7 @@ class DataLoadersHandler {
     const loaderKey = `${name}-${tenant}-${locale}-${model.modelId}`;
 
     if (!this.loaders.has(loaderKey)) {
-      this.loaders.set(loaderKey, dataLoaders[name](_objectSpread(_objectSpread({}, params), {}, {
+      this.loaders.set(loaderKey, dataLoaders[name]((0, _objectSpread2.default)((0, _objectSpread2.default)({}, params), {}, {
         entity: this.entity
       })));
     }
@@ -277,12 +295,12 @@ class DataLoadersHandler {
         return results.reduce((acc, res) => {
           if (Array.isArray(res) === false) {
             if (res && res.message) {
-              throw new _error.default(res.message, res.code, _objectSpread(_objectSpread({}, res), {}, {
+              throw new _error.default(res.message, res.code, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, res), {}, {
                 data: JSON.stringify(res.data || {})
               }));
             }
 
-            throw new _error.default("Result from the data loader must be an array of arrays which contain requested items.", "DATA_LOADER_RESULTS_ERROR", _objectSpread(_objectSpread({}, params), {}, {
+            throw new _error.default("Result from the data loader must be an array of arrays which contain requested items.", "DATA_LOADER_RESULTS_ERROR", (0, _objectSpread2.default)((0, _objectSpread2.default)({}, params), {}, {
               loader
             }));
           }
@@ -292,7 +310,7 @@ class DataLoadersHandler {
         }, []);
       }
     } catch (ex) {
-      throw new _error.default(ex.message || "Data loader error.", ex.code || "DATA_LOADER_ERROR", _objectSpread(_objectSpread({
+      throw new _error.default(ex.message || "Data loader error.", ex.code || "DATA_LOADER_ERROR", (0, _objectSpread2.default)((0, _objectSpread2.default)({
         error: ex
       }, params), {}, {
         loader,

package/operations/entry/dataLoaders.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["getAllEntryRevisions","params","entity","model","tenant","locale","DataLoader","ids","results","id","queryAllParams","partitionKey","createPartitionKey","options","beginsWith","items","queryAll","cleanupItems","map","getRevisionById","queries","reduce","collection","version","parseIdentifier","sortKey","createRevisionSortKey","keys","getBatch","PK","SK","records","batchReadAll","table","Object","values","filter","item","getPublishedRevisionByEntryId","publishedKey","createPublishedSortKey","entryId","getLatestRevisionByEntryId","latestKey","createLatestSortKey","dataLoaders","loaderNames","DataLoadersHandler","constructor","Map","loadMany","clearAllEntryRevisions","clear","clearRevisionById","clearPublishedRevisionByEntryId","clearLatestRevisionByEntryId","getLoader","name","WebinyError","loaderKey","modelId","loaders","has","set","get","loader","Array","isArray","acc","res","message","code","data","JSON","stringify","push","ex","error","clearAll","entry"],"sources":["dataLoaders.ts"],"sourcesContent":["import DataLoader from \"dataloader\";\nimport { CmsEntry, CmsModel } from \"@webiny/api-headless-cms/types\";\nimport WebinyError from \"@webiny/error\";\nimport { Entity } from \"dynamodb-toolbox\";\nimport { queryAll, QueryAllParams } from \"@webiny/db-dynamodb/utils/query\";\nimport {\n    createLatestSortKey,\n    createPartitionKey,\n    createPublishedSortKey,\n    createRevisionSortKey\n} from \"./keys\";\nimport { cleanupItems } from \"@webiny/db-dynamodb/utils/cleanup\";\nimport { parseIdentifier } from \"@webiny/utils\";\nimport { batchReadAll } from \"@webiny/db-dynamodb/utils/batchRead\";\n\nconst getAllEntryRevisions = (params: LoaderParams) => {\n    const { entity, model } = params;\n    const { tenant, locale } = model;\n    return new DataLoader<string, CmsEntry[]>(async (ids: readonly string[]) => {\n        const results: Record<string, CmsEntry[]> = {};\n        for (const id of ids) {\n            const queryAllParams: QueryAllParams = {\n                entity,\n                partitionKey: createPartitionKey({\n                    tenant,\n                    locale,\n                    id\n                }),\n                options: {\n                    beginsWith: \"REV#\"\n                }\n            };\n            const items = await queryAll<CmsEntry>(queryAllParams);\n\n            results[id] = cleanupItems(entity, items);\n        }\n\n        return ids.map(id => {\n            return results[id] || [];\n        });\n    });\n};\n\nconst getRevisionById = (params: LoaderParams) => {\n    const { entity, model } = params;\n    const { locale, tenant } = model;\n\n    return new DataLoader<string, CmsEntry[]>(async (ids: readonly string[]) => {\n        const queries = ids.reduce((collection, id) => {\n            const partitionKey = createPartitionKey({\n                tenant,\n                locale,\n                id\n            });\n            const { version } = parseIdentifier(id);\n            if (!version) {\n                return collection;\n            }\n            const sortKey = createRevisionSortKey({\n                version\n            });\n            const keys = `${partitionKey}__${sortKey}`;\n            if (collection[keys]) {\n                return collection;\n            }\n\n            collection[keys] = entity.getBatch({\n                PK: partitionKey,\n                SK: sortKey\n            });\n\n            return collection;\n            /**\n             * We use any because there is no type for the return type.\n             */\n        }, {} as Record<string, any>);\n\n        const records = await batchReadAll<CmsEntry>({\n            table: entity.table,\n            items: Object.values(queries)\n        });\n        const items = cleanupItems(entity, records);\n\n        return ids.map(id => {\n            return items.filter(item => {\n                return id === item.id;\n            });\n        });\n    });\n};\n\nconst getPublishedRevisionByEntryId = (params: LoaderParams) => {\n    const { entity, model } = params;\n    const { locale, tenant } = model;\n\n    const publishedKey = createPublishedSortKey();\n\n    return new DataLoader<string, CmsEntry[]>(async (ids: readonly string[]) => {\n        const queries = ids.reduce((collection, id) => {\n            const partitionKey = createPartitionKey({\n                tenant,\n                locale,\n                id\n            });\n            if (collection[partitionKey]) {\n                return collection;\n            }\n            collection[partitionKey] = entity.getBatch({\n                PK: partitionKey,\n                SK: publishedKey\n            });\n            return collection;\n            /**\n             * We use any because there is no type for the return type.\n             */\n        }, {} as Record<string, any>);\n\n        const records = await batchReadAll<CmsEntry>({\n            table: entity.table,\n            items: Object.values(queries)\n        });\n        const items = cleanupItems(entity, records);\n\n        return ids.map(id => {\n            const { id: entryId } = parseIdentifier(id);\n            return items.filter(item => {\n                return entryId === item.entryId;\n            });\n        });\n    });\n};\n\nconst getLatestRevisionByEntryId = (params: LoaderParams) => {\n    const { entity, model } = params;\n    const { locale, tenant } = model;\n\n    const latestKey = createLatestSortKey();\n\n    return new DataLoader<string, CmsEntry[]>(async (ids: readonly string[]) => {\n        const queries = ids.reduce((collection, id) => {\n            const partitionKey = createPartitionKey({\n                tenant,\n                locale,\n                id\n            });\n            if (collection[partitionKey]) {\n                return collection;\n            }\n            collection[partitionKey] = entity.getBatch({\n                PK: partitionKey,\n                SK: latestKey\n            });\n            return collection;\n            /**\n             * We use any because there is no type for the return type.\n             */\n        }, {} as Record<string, any>);\n\n        const records = await batchReadAll<CmsEntry>({\n            table: entity.table,\n            items: Object.values(queries)\n        });\n        const items = cleanupItems(entity, records);\n\n        return ids.map(id => {\n            const { id: entryId } = parseIdentifier(id);\n            return items.filter(item => {\n                return entryId === item.entryId;\n            });\n        });\n    });\n};\n\nconst dataLoaders: Record<Loaders, any> = {\n    getAllEntryRevisions,\n    getRevisionById,\n    getPublishedRevisionByEntryId,\n    getLatestRevisionByEntryId\n};\n\nexport interface GetAllEntryRevisionsParams {\n    ids: readonly string[];\n    model: CmsModel;\n}\n\nexport interface GetRevisionByIdParams {\n    ids: readonly string[];\n    model: CmsModel;\n}\n\nexport interface GetPublishedRevisionByEntryIdParams {\n    ids: readonly string[];\n    model: CmsModel;\n}\n\nexport interface GetLatestRevisionByEntryIdParams {\n    ids: readonly string[];\n    model: CmsModel;\n}\n\ninterface LoaderParams {\n    entity: Entity<any>;\n    model: CmsModel;\n}\n\ninterface GetLoaderParams {\n    model: CmsModel;\n}\n\ninterface ClearLoaderParams {\n    model: CmsModel;\n    entry?: CmsEntry;\n}\n\ntype Loaders =\n    | \"getAllEntryRevisions\"\n    | \"getRevisionById\"\n    | \"getPublishedRevisionByEntryId\"\n    | \"getLatestRevisionByEntryId\";\n\nconst loaderNames = Object.keys(dataLoaders) as Loaders[];\n\nexport interface DataLoadersHandlerParams {\n    entity: Entity<any>;\n}\nexport class DataLoadersHandler {\n    private readonly loaders: Map<string, DataLoader<any, any>> = new Map();\n    private readonly entity: Entity<any>;\n\n    public constructor(params: DataLoadersHandlerParams) {\n        this.entity = params.entity;\n    }\n\n    public async getAllEntryRevisions(params: GetAllEntryRevisionsParams): Promise<CmsEntry[]> {\n        return await this.loadMany(\"getAllEntryRevisions\", params, params.ids);\n    }\n\n    public clearAllEntryRevisions(params: ClearLoaderParams): void {\n        this.clear(\"getAllEntryRevisions\", params);\n    }\n\n    public async getRevisionById(params: GetRevisionByIdParams): Promise<CmsEntry[]> {\n        return await this.loadMany(\"getRevisionById\", params, params.ids);\n    }\n\n    public clearRevisionById(params: ClearLoaderParams): void {\n        this.clear(\"getRevisionById\", params);\n    }\n\n    public async getPublishedRevisionByEntryId(\n        params: GetPublishedRevisionByEntryIdParams\n    ): Promise<CmsEntry[]> {\n        return await this.loadMany(\"getPublishedRevisionByEntryId\", params, params.ids);\n    }\n    public clearPublishedRevisionByEntryId(params: ClearLoaderParams): void {\n        this.clear(\"getPublishedRevisionByEntryId\", params);\n    }\n\n    public async getLatestRevisionByEntryId(\n        params: GetLatestRevisionByEntryIdParams\n    ): Promise<CmsEntry[]> {\n        return await this.loadMany(\"getLatestRevisionByEntryId\", params, params.ids);\n    }\n\n    public clearLatestRevisionByEntryId(params: ClearLoaderParams): void {\n        this.clear(\"getLatestRevisionByEntryId\", params);\n    }\n    /**\n     * TODO @ts-refactor\n     * Maybe pass on the generics to DataLoader definition?\n     */\n    private getLoader(name: Loaders, params: GetLoaderParams): DataLoader<any, any> {\n        if (!dataLoaders[name]) {\n            throw new WebinyError(\"Unknown data loader.\", \"UNKNOWN_DATA_LOADER\", {\n                name\n            });\n        }\n        const { model } = params;\n        const { tenant, locale } = model;\n        const loaderKey = `${name}-${tenant}-${locale}-${model.modelId}`;\n        if (!this.loaders.has(loaderKey)) {\n            this.loaders.set(\n                loaderKey,\n                dataLoaders[name]({\n                    ...params,\n                    entity: this.entity\n                })\n            );\n        }\n        return this.loaders.get(loaderKey) as DataLoader<any, any>;\n    }\n\n    private async loadMany(\n        loader: Loaders,\n        params: GetLoaderParams,\n        ids: readonly string[]\n    ): Promise<CmsEntry[]> {\n        let results;\n        try {\n            results = await this.getLoader(loader, params).loadMany(ids);\n            if (Array.isArray(results) === true) {\n                return results.reduce((acc, res) => {\n                    if (Array.isArray(res) === false) {\n                        if (res && res.message) {\n                            throw new WebinyError(res.message, res.code, {\n                                ...res,\n                                data: JSON.stringify(res.data || {})\n                            });\n                        }\n                        throw new WebinyError(\n                            \"Result from the data loader must be an array of arrays which contain requested items.\",\n                            \"DATA_LOADER_RESULTS_ERROR\",\n                            {\n                                ...params,\n                                loader\n                            }\n                        );\n                    }\n                    acc.push(...res);\n                    return acc;\n                }, []);\n            }\n        } catch (ex) {\n            throw new WebinyError(\n                ex.message || \"Data loader error.\",\n                ex.code || \"DATA_LOADER_ERROR\",\n                {\n                    error: ex,\n                    ...params,\n                    loader,\n                    ids\n                }\n            );\n        }\n        throw new WebinyError(\n            `Data loader did not return array of items or empty array.`,\n            \"INVALID_DATA_LOADER_RESULT\",\n            {\n                loader,\n                ids,\n                results\n            }\n        );\n    }\n\n    public clearAll(params: Omit<ClearLoaderParams, \"entry\">): void {\n        for (const name of loaderNames) {\n            const loader = this.getLoader(name, params);\n            loader.clearAll();\n        }\n    }\n    /**\n     * Helper to clear the cache for certain data loader.\n     * If entry is passed then clear target key only.\n     */\n    private clear(name: Loaders, params: ClearLoaderParams): void {\n        const { entry } = params;\n        const loader = this.getLoader(name, params);\n        if (!entry) {\n            loader.clearAll();\n            return;\n        }\n        loader.clear(entry.id);\n        const { tenant, locale } = params.model;\n        loader.clear(\n            createPartitionKey({\n                tenant,\n                locale,\n                id: entry.id\n            })\n        );\n    }\n}\n"],"mappings":"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"}

package/operations/entry/elasticsearchFields.js

@@ -22,6 +22,12 @@ const elasticsearchFields = [new _CmsEntryElasticsearchFieldPlugin.CmsEntryElast
 }), new _CmsEntryElasticsearchFieldPlugin.CmsEntryElasticsearchFieldPlugin({
   field: "createdBy",
   path: "createdBy.id"
+}), new _CmsEntryElasticsearchFieldPlugin.CmsEntryElasticsearchFieldPlugin({
+  field: "version",
+  path: "version"
+}), new _CmsEntryElasticsearchFieldPlugin.CmsEntryElasticsearchFieldPlugin({
+  field: "status",
+  path: "status"
 }),
 /**
  * Always add the ALL fields plugin because of the keyword/path build.

package/operations/entry/elasticsearchFields.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["elasticsearchFields","CmsEntryElasticsearchFieldPlugin","field","unmappedType","path","ALL"],"sources":["elasticsearchFields.ts"],"sourcesContent":["import { CmsEntryElasticsearchFieldPlugin } from \"~/plugins/CmsEntryElasticsearchFieldPlugin\";\n\nexport const elasticsearchFields = [\n    new CmsEntryElasticsearchFieldPlugin({\n        field: \"createdOn\",\n        unmappedType: \"date\"\n    }),\n    new CmsEntryElasticsearchFieldPlugin({\n        field: \"savedOn\",\n        unmappedType: \"date\"\n    }),\n    new CmsEntryElasticsearchFieldPlugin({\n        field: \"publishedOn\",\n        unmappedType: \"date\"\n    }),\n    new CmsEntryElasticsearchFieldPlugin({\n        field: \"ownedBy\",\n        path: \"ownedBy.id\"\n    }),\n    new CmsEntryElasticsearchFieldPlugin({\n        field: \"createdBy\",\n        path: \"createdBy.id\"\n    }),\n    new CmsEntryElasticsearchFieldPlugin({\n        field: \"version\",\n        path: \"version\"\n    }),\n    new CmsEntryElasticsearchFieldPlugin({\n        field: \"status\",\n        path: \"status\"\n    }),\n    /**\n     * Always add the ALL fields plugin because of the keyword/path build.\n     */\n    new CmsEntryElasticsearchFieldPlugin({\n        field: CmsEntryElasticsearchFieldPlugin.ALL\n    })\n];\n"],"mappings":";;;;;;;AAAA;;AAEO,MAAMA,mBAAmB,GAAG,CAC/B,IAAIC,kEAAJ,CAAqC;EACjCC,KAAK,EAAE,WAD0B;EAEjCC,YAAY,EAAE;AAFmB,CAArC,CAD+B,EAK/B,IAAIF,kEAAJ,CAAqC;EACjCC,KAAK,EAAE,SAD0B;EAEjCC,YAAY,EAAE;AAFmB,CAArC,CAL+B,EAS/B,IAAIF,kEAAJ,CAAqC;EACjCC,KAAK,EAAE,aAD0B;EAEjCC,YAAY,EAAE;AAFmB,CAArC,CAT+B,EAa/B,IAAIF,kEAAJ,CAAqC;EACjCC,KAAK,EAAE,SAD0B;EAEjCE,IAAI,EAAE;AAF2B,CAArC,CAb+B,EAiB/B,IAAIH,kEAAJ,CAAqC;EACjCC,KAAK,EAAE,WAD0B;EAEjCE,IAAI,EAAE;AAF2B,CAArC,CAjB+B,EAqB/B,IAAIH,kEAAJ,CAAqC;EACjCC,KAAK,EAAE,SAD0B;EAEjCE,IAAI,EAAE;AAF2B,CAArC,CArB+B,EAyB/B,IAAIH,kEAAJ,CAAqC;EACjCC,KAAK,EAAE,QAD0B;EAEjCE,IAAI,EAAE;AAF2B,CAArC,CAzB+B;AA6B/B;AACJ;AACA;AACI,IAAIH,kEAAJ,CAAqC;EACjCC,KAAK,EAAED,kEAAA,CAAiCI;AADP,CAArC,CAhC+B,CAA5B"}

package/operations/entry/index.d.ts

@@ -4,10 +4,10 @@ import { Client } from "@elastic/elasticsearch";
 import { PluginsContainer } from "@webiny/plugins";
 export declare const createLatestType: () => string;
 export declare const createPublishedType: () => string;
-export interface Params {
+export interface CreateEntriesStorageOperationsParams {
     entity: Entity<any>;
     esEntity: Entity<any>;
     elasticsearch: Client;
     plugins: PluginsContainer;
 }
-export declare const createEntriesStorageOperations: (params: Params) => CmsEntryStorageOperations;
+export declare const createEntriesStorageOperations: (params: CreateEntriesStorageOperationsParams) => CmsEntryStorageOperations;