@webiny/api-headless-cms-ddb-es 0.0.0-mt-3 → 0.0.0-unstable.06b2ede40f

package/operations/model/index.js

@@ -1,28 +1,15 @@
 "use strict";
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.createModelsStorageOperations = void 0;
-
-var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
-
-var _configurations = _interopRequireDefault(require("../../configurations"));
-
 var _error = _interopRequireDefault(require("@webiny/error"));
-
-var _get = require("@webiny/db-dynamodb/utils/get");
-
+var _configurations = require("../../configurations");
 var _cleanup = require("@webiny/db-dynamodb/utils/cleanup");
-
 var _query = require("@webiny/db-dynamodb/utils/query");
-
-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; }
-
+var _dbDynamodb = require("@webiny/db-dynamodb");
 const createPartitionKey = params => {
   const {
     tenant,
@@ -30,66 +17,43 @@ const createPartitionKey = params => {
   } = params;
   return `T#${tenant}#L#${locale}#CMS#CM`;
 };
-
 const createSortKey = params => {
   return params.modelId;
 };
-
 const createKeys = params => {
   return {
     PK: createPartitionKey(params),
     SK: createSortKey(params)
   };
 };
-
 const createType = () => {
   return "cms.model";
 };
-
 const createModelsStorageOperations = params => {
   const {
     entity,
     elasticsearch
   } = params;
-
   const create = async params => {
     const {
       model
     } = params;
-
     const {
       index
-    } = _configurations.default.es({
+    } = _configurations.configurations.es({
       model
     });
-
-    try {
-      const {
-        body: exists
-      } = await elasticsearch.indices.exists({
-        index
-      });
-
-      if (!exists) {
-        await elasticsearch.indices.create({
-          index
-        });
-      }
-    } catch (ex) {
-      throw new _error.default("Could not create Elasticsearch indice.", "ELASTICSEARCH_INDICE_CREATE_ERROR", {
-        error: ex,
-        index,
-        model
-      });
-    }
-
     const keys = createKeys(model);
     let error;
-
     try {
-      await entity.put(_objectSpread(_objectSpread(_objectSpread({}, model), keys), {}, {
-        TYPE: createType()
-      }));
+      await (0, _dbDynamodb.put)({
+        entity,
+        item: {
+          ...(0, _cleanup.cleanupItem)(entity, model),
+          ...keys,
+          TYPE: createType()
+        }
+      });
       return model;
     } catch (ex) {
       error = ex;
@@ -97,79 +61,95 @@ const createModelsStorageOperations = params => {
     /**
      * In case of DynamoDB error we need to remove the index we created.
      */
-
-
     try {
       await elasticsearch.indices.delete({
-        index
+        index,
+        ignore_unavailable: true
       });
     } catch (ex) {
-      throw new _error.default(`Could not delete elasticsearch index "${index}" after model record failed to be created.`, "DELETE_MODEL_INDICE_ERROR", {
+      throw new _error.default(`Could not delete elasticsearch index "${index}" after model record failed to be created.`, "DELETE_MODEL_INDEX_ERROR", {
         dynamodbError: error,
         elasticsearchError: ex
       });
     }
-
     throw error;
   };
-
   const update = async params => {
     const {
-      original,
       model
     } = params;
     const keys = createKeys(model);
-
     try {
-      await entity.put(_objectSpread(_objectSpread(_objectSpread({}, model), keys), {}, {
-        TYPE: createType()
-      }));
+      await (0, _dbDynamodb.put)({
+        entity,
+        item: {
+          ...(0, _cleanup.cleanupItem)(entity, model),
+          ...keys,
+          TYPE: createType()
+        }
+      });
       return model;
     } catch (ex) {
-      throw new _error.default(ex.messatge || "Could not update model.", ex.code || "MODEL_UPDATE_ERROR", {
+      throw new _error.default(ex.message || "Could not update model.", ex.code || "MODEL_UPDATE_ERROR", {
         error: ex,
         model,
-        original,
         keys
       });
     }
   };
-
   const deleteModel = async params => {
     const {
       model
     } = params;
     const keys = createKeys(model);
-
+    const {
+      index
+    } = _configurations.configurations.es({
+      model
+    });
     try {
-      await entity.delete(keys);
-      return model;
+      await (0, _dbDynamodb.deleteItem)({
+        entity,
+        keys
+      });
     } catch (ex) {
-      throw new _error.default(ex.messatge || "Could not delete model.", ex.code || "MODEL_DELETE_ERROR", {
+      throw new _error.default(ex.message || "Could not delete model.", ex.code || "MODEL_DELETE_ERROR", {
         error: ex,
         model,
         keys
       });
     }
+    /**
+     * Always delete the model index after deleting the model.
+     */
+    try {
+      await elasticsearch.indices.delete({
+        index,
+        ignore_unavailable: true
+      });
+    } catch (ex) {
+      throw new _error.default(`Could not delete elasticsearch index "${index}" after model record delete.`, "DELETE_MODEL_INDEX_ERROR", {
+        error: ex,
+        index,
+        model
+      });
+    }
+    return model;
   };
-
   const get = async params => {
     const keys = createKeys(params);
-
     try {
-      const item = await (0, _get.get)({
+      return await (0, _dbDynamodb.getClean)({
         entity,
         keys
       });
-      return (0, _cleanup.cleanupItem)(entity, item);
     } catch (ex) {
-      throw new _error.default(ex.messatge || "Could not get model.", ex.code || "MODEL_GET_ERROR", {
+      throw new _error.default(ex.message || "Could not get model.", ex.code || "MODEL_GET_ERROR", {
         error: ex,
         keys
       });
     }
   };
-
   const list = async params => {
     const {
       where
@@ -181,18 +161,15 @@ const createModelsStorageOperations = params => {
         gte: " "
       }
     };
-
     try {
-      const items = await (0, _query.queryAll)(queryAllParams);
-      return (0, _cleanup.cleanupItems)(entity, items);
+      return await (0, _query.queryAllClean)(queryAllParams);
     } catch (ex) {
-      throw new _error.default(ex.messatge || "Could not list models.", ex.code || "MODEL_LIST_ERROR", {
+      throw new _error.default(ex.message || "Could not list models.", ex.code || "MODEL_LIST_ERROR", {
         error: ex,
         partitionKey: queryAllParams.partitionKey
       });
     }
   };
-
   return {
     create,
     update,
@@ -201,5 +178,6 @@ const createModelsStorageOperations = params => {
     list
   };
 };
+exports.createModelsStorageOperations = createModelsStorageOperations;
 
-exports.createModelsStorageOperations = createModelsStorageOperations;
+//# sourceMappingURL=index.js.map

package/operations/model/index.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["_error","_interopRequireDefault","require","_configurations","_cleanup","_query","_dbDynamodb","createPartitionKey","params","tenant","locale","createSortKey","modelId","createKeys","PK","SK","createType","createModelsStorageOperations","entity","elasticsearch","create","model","index","configurations","es","keys","error","put","item","cleanupItem","TYPE","ex","indices","delete","ignore_unavailable","WebinyError","dynamodbError","elasticsearchError","update","message","code","deleteModel","deleteItem","get","getClean","list","where","queryAllParams","partitionKey","options","gte","queryAllClean","exports"],"sources":["index.ts"],"sourcesContent":["import WebinyError from \"@webiny/error\";\nimport type {\n    CmsModel,\n    CmsModelStorageOperations,\n    CmsModelStorageOperationsCreateParams,\n    CmsModelStorageOperationsDeleteParams,\n    CmsModelStorageOperationsGetParams,\n    CmsModelStorageOperationsListParams,\n    CmsModelStorageOperationsUpdateParams\n} from \"@webiny/api-headless-cms/types\";\nimport type { Entity } from \"@webiny/db-dynamodb/toolbox\";\nimport { configurations } from \"~/configurations\";\nimport type { Client } from \"@elastic/elasticsearch\";\nimport { cleanupItem } from \"@webiny/db-dynamodb/utils/cleanup\";\nimport type { QueryAllParams } from \"@webiny/db-dynamodb/utils/query\";\nimport { queryAllClean } from \"@webiny/db-dynamodb/utils/query\";\nimport { deleteItem, getClean, put } from \"@webiny/db-dynamodb\";\n\ninterface PartitionKeysParams {\n    tenant: string;\n    locale: string;\n}\n\nconst createPartitionKey = (params: PartitionKeysParams): string => {\n    const { tenant, locale } = params;\n    return `T#${tenant}#L#${locale}#CMS#CM`;\n};\n\ninterface SortKeyParams {\n    modelId: string;\n}\n\nconst createSortKey = (params: SortKeyParams): string => {\n    return params.modelId;\n};\n\ninterface Keys {\n    PK: string;\n    SK: string;\n}\n\nconst createKeys = (params: PartitionKeysParams & SortKeyParams): Keys => {\n    return {\n        PK: createPartitionKey(params),\n        SK: createSortKey(params)\n    };\n};\n\nconst createType = (): string => {\n    return \"cms.model\";\n};\n\nexport interface CreateModelsStorageOperationsParams {\n    entity: Entity<any>;\n    elasticsearch: Client;\n}\n\nexport const createModelsStorageOperations = (\n    params: CreateModelsStorageOperationsParams\n): CmsModelStorageOperations => {\n    const { entity, elasticsearch } = params;\n\n    const create = async (params: CmsModelStorageOperationsCreateParams) => {\n        const { model } = params;\n\n        const { index } = configurations.es({\n            model\n        });\n\n        const keys = createKeys(model);\n\n        let error;\n        try {\n            await put({\n                entity,\n                item: {\n                    ...cleanupItem(entity, model),\n                    ...keys,\n                    TYPE: createType()\n                }\n            });\n            return model;\n        } catch (ex) {\n            error = ex;\n        }\n        /**\n         * In case of DynamoDB error we need to remove the index we created.\n         */\n        try {\n            await elasticsearch.indices.delete({\n                index,\n                ignore_unavailable: true\n            });\n        } catch (ex) {\n            throw new WebinyError(\n                `Could not delete elasticsearch index \"${index}\" after model record failed to be created.`,\n                \"DELETE_MODEL_INDEX_ERROR\",\n                {\n                    dynamodbError: error,\n                    elasticsearchError: ex\n                }\n            );\n        }\n        throw error;\n    };\n\n    const update = async (params: CmsModelStorageOperationsUpdateParams) => {\n        const { model } = params;\n\n        const keys = createKeys(model);\n\n        try {\n            await put({\n                entity,\n                item: {\n                    ...cleanupItem(entity, model),\n                    ...keys,\n                    TYPE: createType()\n                }\n            });\n            return model;\n        } catch (ex) {\n            throw new WebinyError(\n                ex.message || \"Could not update model.\",\n                ex.code || \"MODEL_UPDATE_ERROR\",\n                {\n                    error: ex,\n                    model,\n                    keys\n                }\n            );\n        }\n    };\n\n    const deleteModel = async (params: CmsModelStorageOperationsDeleteParams) => {\n        const { model } = params;\n        const keys = createKeys(model);\n\n        const { index } = configurations.es({\n            model\n        });\n\n        try {\n            await deleteItem({\n                entity,\n                keys\n            });\n        } catch (ex) {\n            throw new WebinyError(\n                ex.message || \"Could not delete model.\",\n                ex.code || \"MODEL_DELETE_ERROR\",\n                {\n                    error: ex,\n                    model,\n                    keys\n                }\n            );\n        }\n        /**\n         * Always delete the model index after deleting the model.\n         */\n        try {\n            await elasticsearch.indices.delete({\n                index,\n                ignore_unavailable: true\n            });\n        } catch (ex) {\n            throw new WebinyError(\n                `Could not delete elasticsearch index \"${index}\" after model record delete.`,\n                \"DELETE_MODEL_INDEX_ERROR\",\n                {\n                    error: ex,\n                    index,\n                    model\n                }\n            );\n        }\n\n        return model;\n    };\n\n    const get = async (params: CmsModelStorageOperationsGetParams) => {\n        const keys = createKeys(params);\n\n        try {\n            return await getClean<CmsModel>({\n                entity,\n                keys\n            });\n        } catch (ex) {\n            throw new WebinyError(\n                ex.message || \"Could not get model.\",\n                ex.code || \"MODEL_GET_ERROR\",\n                {\n                    error: ex,\n                    keys\n                }\n            );\n        }\n    };\n\n    const list = async (params: CmsModelStorageOperationsListParams) => {\n        const { where } = params;\n        const queryAllParams: QueryAllParams = {\n            entity,\n            partitionKey: createPartitionKey(where),\n            options: {\n                gte: \" \"\n            }\n        };\n        try {\n            return await queryAllClean<CmsModel>(queryAllParams);\n        } catch (ex) {\n            throw new WebinyError(\n                ex.message || \"Could not list models.\",\n                ex.code || \"MODEL_LIST_ERROR\",\n                {\n                    error: ex,\n                    partitionKey: queryAllParams.partitionKey\n                }\n            );\n        }\n    };\n\n    return {\n        create,\n        update,\n        delete: deleteModel,\n        get,\n        list\n    };\n};\n"],"mappings":"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","ignoreList":[]}

package/operations/system/index.d.ts

@@ -1,6 +1,6 @@
-import { CmsSystemStorageOperations } from "@webiny/api-headless-cms/types";
-import { Entity } from "dynamodb-toolbox";
-export interface Params {
+import type { CmsSystemStorageOperations } from "@webiny/api-headless-cms/types";
+import type { Entity } from "@webiny/db-dynamodb/toolbox";
+export interface CreateSystemStorageOperationsParams {
     entity: Entity<any>;
 }
-export declare const createSystemStorageOperations: (params: Params) => CmsSystemStorageOperations;
+export declare const createSystemStorageOperations: (params: CreateSystemStorageOperationsParams) => CmsSystemStorageOperations;

package/operations/system/index.js

@@ -1,53 +1,43 @@
 "use strict";
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.createSystemStorageOperations = void 0;
-
-var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
-
 var _error = _interopRequireDefault(require("@webiny/error"));
-
 var _get = require("@webiny/db-dynamodb/utils/get");
-
-var _cleanup = require("@webiny/db-dynamodb/utils/cleanup");
-
-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; }
-
+var _dbDynamodb = require("@webiny/db-dynamodb");
 const createPartitionKey = ({
   tenant
 }) => {
   return `T#${tenant.toLowerCase()}#SYSTEM`;
 };
-
 const createSortKey = () => {
   return "CMS";
 };
-
 const createKeys = params => {
   return {
     PK: createPartitionKey(params),
     SK: createSortKey()
   };
 };
-
 const createSystemStorageOperations = params => {
   const {
     entity
   } = params;
-
   const create = async ({
     system
   }) => {
     const keys = createKeys(system);
-
     try {
-      await entity.put(_objectSpread(_objectSpread({}, system), keys));
+      await (0, _dbDynamodb.put)({
+        entity,
+        item: {
+          ...system,
+          ...keys
+        }
+      });
       return system;
     } catch (ex) {
       throw new _error.default(ex.message || "Could not create system.", ex.code || "CREATE_SYSTEM_ERROR", {
@@ -57,36 +47,35 @@ const createSystemStorageOperations = params => {
       });
     }
   };
-
   const update = async params => {
     const {
-      system,
-      original
+      system
     } = params;
     const keys = createKeys(system);
-
     try {
-      await entity.put(_objectSpread(_objectSpread({}, system), keys));
+      await (0, _dbDynamodb.put)({
+        entity,
+        item: {
+          ...system,
+          ...keys
+        }
+      });
       return system;
     } catch (ex) {
       throw new _error.default(ex.message || "Could not update system.", ex.code || "UPDATE_SYSTEM_ERROR", {
         error: ex,
         system,
-        original,
         keys
       });
     }
   };
-
   const get = async params => {
     const keys = createKeys(params);
-
     try {
-      const system = await (0, _get.get)({
+      return await (0, _get.getClean)({
         entity,
         keys
       });
-      return (0, _cleanup.cleanupItem)(entity, system);
     } catch (ex) {
       throw new _error.default(ex.message || "Could not get system.", ex.code || "GET_SYSTEM_ERROR", {
         error: ex,
@@ -94,12 +83,12 @@ const createSystemStorageOperations = params => {
       });
     }
   };
-
   return {
     create,
     update,
     get
   };
 };
+exports.createSystemStorageOperations = createSystemStorageOperations;
 
-exports.createSystemStorageOperations = createSystemStorageOperations;
+//# sourceMappingURL=index.js.map

package/operations/system/index.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["_error","_interopRequireDefault","require","_get","_dbDynamodb","createPartitionKey","tenant","toLowerCase","createSortKey","createKeys","params","PK","SK","createSystemStorageOperations","entity","create","system","keys","put","item","ex","WebinyError","message","code","error","update","get","getClean","exports"],"sources":["index.ts"],"sourcesContent":["import type {\n    CmsSystem,\n    CmsSystemStorageOperations,\n    CmsSystemStorageOperationsCreateParams,\n    CmsSystemStorageOperationsGetParams,\n    CmsSystemStorageOperationsUpdateParams\n} from \"@webiny/api-headless-cms/types\";\nimport type { Entity } from \"@webiny/db-dynamodb/toolbox\";\nimport WebinyError from \"@webiny/error\";\nimport { getClean } from \"@webiny/db-dynamodb/utils/get\";\nimport { put } from \"@webiny/db-dynamodb\";\n\nexport interface CreateSystemStorageOperationsParams {\n    entity: Entity<any>;\n}\n\ninterface PartitionKeyParams {\n    tenant: string;\n}\nconst createPartitionKey = ({ tenant }: PartitionKeyParams): string => {\n    return `T#${tenant.toLowerCase()}#SYSTEM`;\n};\nconst createSortKey = (): string => {\n    return \"CMS\";\n};\n\ninterface Keys {\n    PK: string;\n    SK: string;\n}\nconst createKeys = (params: PartitionKeyParams): Keys => {\n    return {\n        PK: createPartitionKey(params),\n        SK: createSortKey()\n    };\n};\n\nexport const createSystemStorageOperations = (\n    params: CreateSystemStorageOperationsParams\n): CmsSystemStorageOperations => {\n    const { entity } = params;\n\n    const create = async ({ system }: CmsSystemStorageOperationsCreateParams) => {\n        const keys = createKeys(system);\n        try {\n            await put({\n                entity,\n                item: {\n                    ...system,\n                    ...keys\n                }\n            });\n            return system;\n        } catch (ex) {\n            throw new WebinyError(\n                ex.message || \"Could not create system.\",\n                ex.code || \"CREATE_SYSTEM_ERROR\",\n                {\n                    error: ex,\n                    system,\n                    keys\n                }\n            );\n        }\n    };\n\n    const update = async (params: CmsSystemStorageOperationsUpdateParams) => {\n        const { system } = params;\n\n        const keys = createKeys(system);\n\n        try {\n            await put({\n                entity,\n                item: {\n                    ...system,\n                    ...keys\n                }\n            });\n            return system;\n        } catch (ex) {\n            throw new WebinyError(\n                ex.message || \"Could not update system.\",\n                ex.code || \"UPDATE_SYSTEM_ERROR\",\n                {\n                    error: ex,\n                    system,\n                    keys\n                }\n            );\n        }\n    };\n\n    const get = async (params: CmsSystemStorageOperationsGetParams) => {\n        const keys = createKeys(params);\n\n        try {\n            return await getClean<CmsSystem>({\n                entity,\n                keys\n            });\n        } catch (ex) {\n            throw new WebinyError(\n                ex.message || \"Could not get system.\",\n                ex.code || \"GET_SYSTEM_ERROR\",\n                {\n                    error: ex,\n                    keys\n                }\n            );\n        }\n    };\n\n    return {\n        create,\n        update,\n        get\n    };\n};\n"],"mappings":";;;;;;;AAQA,IAAAA,MAAA,GAAAC,sBAAA,CAAAC,OAAA;AACA,IAAAC,IAAA,GAAAD,OAAA;AACA,IAAAE,WAAA,GAAAF,OAAA;AASA,MAAMG,kBAAkB,GAAGA,CAAC;EAAEC;AAA2B,CAAC,KAAa;EACnE,OAAO,KAAKA,MAAM,CAACC,WAAW,CAAC,CAAC,SAAS;AAC7C,CAAC;AACD,MAAMC,aAAa,GAAGA,CAAA,KAAc;EAChC,OAAO,KAAK;AAChB,CAAC;AAMD,MAAMC,UAAU,GAAIC,MAA0B,IAAW;EACrD,OAAO;IACHC,EAAE,EAAEN,kBAAkB,CAACK,MAAM,CAAC;IAC9BE,EAAE,EAAEJ,aAAa,CAAC;EACtB,CAAC;AACL,CAAC;AAEM,MAAMK,6BAA6B,GACtCH,MAA2C,IACd;EAC7B,MAAM;IAAEI;EAAO,CAAC,GAAGJ,MAAM;EAEzB,MAAMK,MAAM,GAAG,MAAAA,CAAO;IAAEC;EAA+C,CAAC,KAAK;IACzE,MAAMC,IAAI,GAAGR,UAAU,CAACO,MAAM,CAAC;IAC/B,IAAI;MACA,MAAM,IAAAE,eAAG,EAAC;QACNJ,MAAM;QACNK,IAAI,EAAE;UACF,GAAGH,MAAM;UACT,GAAGC;QACP;MACJ,CAAC,CAAC;MACF,OAAOD,MAAM;IACjB,CAAC,CAAC,OAAOI,EAAE,EAAE;MACT,MAAM,IAAIC,cAAW,CACjBD,EAAE,CAACE,OAAO,IAAI,0BAA0B,EACxCF,EAAE,CAACG,IAAI,IAAI,qBAAqB,EAChC;QACIC,KAAK,EAAEJ,EAAE;QACTJ,MAAM;QACNC;MACJ,CACJ,CAAC;IACL;EACJ,CAAC;EAED,MAAMQ,MAAM,GAAG,MAAOf,MAA8C,IAAK;IACrE,MAAM;MAAEM;IAAO,CAAC,GAAGN,MAAM;IAEzB,MAAMO,IAAI,GAAGR,UAAU,CAACO,MAAM,CAAC;IAE/B,IAAI;MACA,MAAM,IAAAE,eAAG,EAAC;QACNJ,MAAM;QACNK,IAAI,EAAE;UACF,GAAGH,MAAM;UACT,GAAGC;QACP;MACJ,CAAC,CAAC;MACF,OAAOD,MAAM;IACjB,CAAC,CAAC,OAAOI,EAAE,EAAE;MACT,MAAM,IAAIC,cAAW,CACjBD,EAAE,CAACE,OAAO,IAAI,0BAA0B,EACxCF,EAAE,CAACG,IAAI,IAAI,qBAAqB,EAChC;QACIC,KAAK,EAAEJ,EAAE;QACTJ,MAAM;QACNC;MACJ,CACJ,CAAC;IACL;EACJ,CAAC;EAED,MAAMS,GAAG,GAAG,MAAOhB,MAA2C,IAAK;IAC/D,MAAMO,IAAI,GAAGR,UAAU,CAACC,MAAM,CAAC;IAE/B,IAAI;MACA,OAAO,MAAM,IAAAiB,aAAQ,EAAY;QAC7Bb,MAAM;QACNG;MACJ,CAAC,CAAC;IACN,CAAC,CAAC,OAAOG,EAAE,EAAE;MACT,MAAM,IAAIC,cAAW,CACjBD,EAAE,CAACE,OAAO,IAAI,uBAAuB,EACrCF,EAAE,CAACG,IAAI,IAAI,kBAAkB,EAC7B;QACIC,KAAK,EAAEJ,EAAE;QACTH;MACJ,CACJ,CAAC;IACL;EACJ,CAAC;EAED,OAAO;IACHF,MAAM;IACNU,MAAM;IACNC;EACJ,CAAC;AACL,CAAC;AAACE,OAAA,CAAAf,6BAAA,GAAAA,6BAAA","ignoreList":[]}

package/operations/system/indexes.d.ts

@@ -0,0 +1,10 @@
+import type { CmsContext } from "../../types";
+import type { PluginsContainer } from "@webiny/plugins";
+import type { Client } from "@elastic/elasticsearch";
+interface Params {
+    context: CmsContext;
+    client: Client;
+    plugins: PluginsContainer;
+}
+export declare const createElasticsearchIndexesOnLocaleAfterCreate: (params: Params) => Promise<void>;
+export {};

package/operations/system/indexes.js

@@ -0,0 +1,41 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.createElasticsearchIndexesOnLocaleAfterCreate = void 0;
+var _createElasticsearchIndex = require("../../elasticsearch/createElasticsearchIndex");
+const createElasticsearchIndexesOnLocaleAfterCreate = async params => {
+  const {
+    context,
+    client,
+    plugins
+  } = params;
+  context.i18n.locales.onLocaleAfterCreate.subscribe(async ({
+    locale,
+    tenant
+  }) => {
+    /**
+     * Get all the code models and create the indexes for them.
+     */
+    const models = await context.security.withoutAuthorization(async () => {
+      return (await context.cms.listModels()).map(model => {
+        return {
+          ...model,
+          tenant,
+          locale: locale.code
+        };
+      });
+    });
+    for (const model of models) {
+      await (0, _createElasticsearchIndex.createElasticsearchIndex)({
+        client,
+        plugins,
+        model
+      });
+    }
+  });
+};
+exports.createElasticsearchIndexesOnLocaleAfterCreate = createElasticsearchIndexesOnLocaleAfterCreate;
+
+//# sourceMappingURL=indexes.js.map

package/operations/system/indexes.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["_createElasticsearchIndex","require","createElasticsearchIndexesOnLocaleAfterCreate","params","context","client","plugins","i18n","locales","onLocaleAfterCreate","subscribe","locale","tenant","models","security","withoutAuthorization","cms","listModels","map","model","code","createElasticsearchIndex","exports"],"sources":["indexes.ts"],"sourcesContent":["import type { CmsContext } from \"~/types\";\nimport type { PluginsContainer } from \"@webiny/plugins\";\nimport type { Client } from \"@elastic/elasticsearch\";\nimport { createElasticsearchIndex } from \"~/elasticsearch/createElasticsearchIndex\";\n\ninterface Params {\n    context: CmsContext;\n    client: Client;\n    plugins: PluginsContainer;\n}\n\nexport const createElasticsearchIndexesOnLocaleAfterCreate = async (params: Params) => {\n    const { context, client, plugins } = params;\n\n    context.i18n.locales.onLocaleAfterCreate.subscribe(async ({ locale, tenant }) => {\n        /**\n         * Get all the code models and create the indexes for them.\n         */\n        const models = await context.security.withoutAuthorization(async () => {\n            return (await context.cms.listModels()).map(model => {\n                return {\n                    ...model,\n                    tenant,\n                    locale: locale.code\n                };\n            });\n        });\n\n        for (const model of models) {\n            await createElasticsearchIndex({\n                client,\n                plugins,\n                model\n            });\n        }\n    });\n};\n"],"mappings":";;;;;;AAGA,IAAAA,yBAAA,GAAAC,OAAA;AAQO,MAAMC,6CAA6C,GAAG,MAAOC,MAAc,IAAK;EACnF,MAAM;IAAEC,OAAO;IAAEC,MAAM;IAAEC;EAAQ,CAAC,GAAGH,MAAM;EAE3CC,OAAO,CAACG,IAAI,CAACC,OAAO,CAACC,mBAAmB,CAACC,SAAS,CAAC,OAAO;IAAEC,MAAM;IAAEC;EAAO,CAAC,KAAK;IAC7E;AACR;AACA;IACQ,MAAMC,MAAM,GAAG,MAAMT,OAAO,CAACU,QAAQ,CAACC,oBAAoB,CAAC,YAAY;MACnE,OAAO,CAAC,MAAMX,OAAO,CAACY,GAAG,CAACC,UAAU,CAAC,CAAC,EAAEC,GAAG,CAACC,KAAK,IAAI;QACjD,OAAO;UACH,GAAGA,KAAK;UACRP,MAAM;UACND,MAAM,EAAEA,MAAM,CAACS;QACnB,CAAC;MACL,CAAC,CAAC;IACN,CAAC,CAAC;IAEF,KAAK,MAAMD,KAAK,IAAIN,MAAM,EAAE;MACxB,MAAM,IAAAQ,kDAAwB,EAAC;QAC3BhB,MAAM;QACNC,OAAO;QACPa;MACJ,CAAC,CAAC;IACN;EACJ,CAAC,CAAC;AACN,CAAC;AAACG,OAAA,CAAApB,6CAAA,GAAAA,6CAAA","ignoreList":[]}

package/package.json

@@ -1,13 +1,17 @@
 {
 	"name": "@webiny/api-headless-cms-ddb-es",
-	"version": "0.0.0-mt-3",
+	"version": "0.0.0-unstable.06b2ede40f",
 	"main": "index.js",
 	"keywords": [
 		"@webiny/api-headless-cms",
 		"storage-operations",
 		"dynamodb",
 		"elasticsearch",
-		"cms:ddb-es"
+		"ddb-es",
+		"cms:ddb-es",
+		"opensearch",
+		"ddb-os",
+		"cms:ddb-os"
 	],
 	"repository": {
 		"type": "git",
@@ -22,52 +26,46 @@
 	],
 	"license": "MIT",
 	"dependencies": {
-		"@babel/runtime": "7.15.4",
-		"@webiny/api-headless-cms": "0.0.0-mt-3",
-		"@webiny/api-upgrade": "0.0.0-mt-3",
-		"@webiny/db-dynamodb": "0.0.0-mt-3",
-		"@webiny/error": "0.0.0-mt-3",
-		"@webiny/handler": "0.0.0-mt-3",
-		"@webiny/handler-aws": "0.0.0-mt-3",
-		"@webiny/handler-db": "0.0.0-mt-3",
-		"@webiny/plugins": "0.0.0-mt-3",
-		"@webiny/utils": "0.0.0-mt-3",
-		"dataloader": "2.0.0",
-		"dynamodb-toolbox": "0.3.4",
-		"jsonpack": "1.1.5",
-		"lodash.chunk": "4.2.0",
-		"lodash.clonedeep": "4.5.0",
-		"lodash.omit": "4.5.0"
+		"@webiny/api": "0.0.0-unstable.06b2ede40f",
+		"@webiny/api-elasticsearch": "0.0.0-unstable.06b2ede40f",
+		"@webiny/api-elasticsearch-tasks": "0.0.0-unstable.06b2ede40f",
+		"@webiny/api-headless-cms": "0.0.0-unstable.06b2ede40f",
+		"@webiny/aws-sdk": "0.0.0-unstable.06b2ede40f",
+		"@webiny/db-dynamodb": "0.0.0-unstable.06b2ede40f",
+		"@webiny/error": "0.0.0-unstable.06b2ede40f",
+		"@webiny/handler-db": "0.0.0-unstable.06b2ede40f",
+		"@webiny/plugins": "0.0.0-unstable.06b2ede40f",
+		"@webiny/utils": "0.0.0-unstable.06b2ede40f",
+		"dataloader": "2.2.3",
+		"lodash": "4.17.21"
 	},
 	"devDependencies": {
-		"@babel/cli": "^7.5.5",
-		"@babel/core": "^7.5.5",
-		"@babel/preset-env": "^7.5.5",
-		"@babel/preset-flow": "^7.0.0",
 		"@elastic/elasticsearch": "7.12.0",
-		"@shelf/jest-elasticsearch": "^1.0.0",
-		"@types/jsonpack": "^1.1.0",
-		"@webiny/api-dynamodb-to-elasticsearch": "^0.0.0-mt-3",
-		"@webiny/api-elasticsearch": "^0.0.0-mt-3",
-		"@webiny/cli": "^0.0.0-mt-3",
-		"@webiny/project-utils": "^0.0.0-mt-3",
-		"jest": "^26.6.3",
-		"jest-dynalite": "^3.2.0",
-		"jest-environment-node": "^26.6.2",
-		"mdbid": "^1.0.0",
-		"prettier": "^2.3.2",
-		"rimraf": "^3.0.2",
-		"sinon": "^9.0.2",
-		"ttypescript": "^1.5.12",
-		"typescript": "^4.1.3"
+		"@types/jsonpack": "1.1.6",
+		"@webiny/api-dynamodb-to-elasticsearch": "0.0.0-unstable.06b2ede40f",
+		"@webiny/api-i18n": "0.0.0-unstable.06b2ede40f",
+		"@webiny/api-log": "0.0.0-unstable.06b2ede40f",
+		"@webiny/api-security": "0.0.0-unstable.06b2ede40f",
+		"@webiny/api-tenancy": "0.0.0-unstable.06b2ede40f",
+		"@webiny/api-wcp": "0.0.0-unstable.06b2ede40f",
+		"@webiny/handler": "0.0.0-unstable.06b2ede40f",
+		"@webiny/handler-aws": "0.0.0-unstable.06b2ede40f",
+		"@webiny/handler-graphql": "0.0.0-unstable.06b2ede40f",
+		"@webiny/project-utils": "0.0.0-unstable.06b2ede40f",
+		"@webiny/tasks": "0.0.0-unstable.06b2ede40f",
+		"jest": "29.7.0",
+		"jest-dynalite": "3.6.1",
+		"prettier": "2.8.8",
+		"rimraf": "6.0.1",
+		"typescript": "5.3.3"
 	},
 	"publishConfig": {
 		"access": "public",
 		"directory": "dist"
 	},
 	"scripts": {
-		"build": "yarn webiny run build",
-		"watch": "yarn webiny run watch"
+		"build": "node ../cli/bin.js run build",
+		"watch": "node ../cli/bin.js run watch"
 	},
-	"gitHead": "ebea815be2be99404591cba465cc1fe88355bd48"
+	"gitHead": "06b2ede40fc2212a70eeafd74afd50b56fb0ce82"
 }

package/plugins/CmsElasticsearchModelFieldPlugin.d.ts

@@ -0,0 +1,69 @@
+import { Plugin } from "@webiny/plugins";
+import type { CmsModelFieldType } from "@webiny/api-headless-cms/types";
+/**
+ * A plugin which allows you to map a custom GraphQL field to an Elasticsearch field.
+ *
+ * This is useful when you want to create a custom field in the CMS GraphQL Schema, and you want to map it to an Elasticsearch field.
+ */
+export interface CmsModelFieldPluginParams {
+    /**
+     * The type of the field.
+     * Can be something custom, like "my-field-type".
+     */
+    fieldType: CmsModelFieldType;
+    /**
+     * The ID of the field on the GraphQL side
+     */
+    fieldId: string;
+    /**
+     * The path to the field in the Elasticsearch document.
+     */
+    path: string;
+    /**
+     * If the field should be applied only to specific models.
+     * Or excluded from the specific models.
+     *
+     * The default is to apply to all models.
+     */
+    models?: {
+        include?: string[];
+        exclude?: string[];
+    };
+    /**
+     * The unmapped type of the field.
+     * In most cases, this will be undefined.
+     * When does it need to be set?
+     *
+     * When you are using a custom field type, other than the ones that are defined in the CMS.
+     * Let's say you create a field of type `my-field-type`, in which you want to store dates. By the default, it will, in most cases be set as string - if you did not specify the value transformer.
+     * If you want to be able to sort/filter properly by this field, you need to specify the unmapped type as "date".
+     */
+    unmappedType?: string;
+    /**
+     * Is this field searchable?
+     * If set to false, an error will be thrown when trying to search/filter by this field.
+     */
+    searchable?: boolean;
+    /**
+     * Is this field sortable?
+     * If set to false, an error will be thrown when trying to sort by this field.
+     */
+    sortable?: boolean;
+    /**
+     * If the .keyword should be applied when doing the filtering or sorting on the field.
+     */
+    keyword?: boolean;
+}
+export declare class CmsElasticsearchModelFieldPlugin extends Plugin {
+    static readonly type: string;
+    private readonly field;
+    get fieldType(): string;
+    get fieldId(): string;
+    get path(): string;
+    get unmappedType(): string | undefined;
+    get searchable(): boolean | undefined;
+    get sortable(): boolean | undefined;
+    get keyword(): boolean | undefined;
+    constructor(field: CmsModelFieldPluginParams);
+    canBeApplied(modelId: string): boolean;
+}