@webiny/api-headless-cms-ddb 0.0.0-unstable.fcdad0bc61 → 0.0.0-unstable.fdd9228b5d

package/operations/group/index.js

@@ -1,28 +1,17 @@
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
-
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.createGroupsStorageOperations = void 0;
-
-var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
-
 var _error = _interopRequireDefault(require("@webiny/error"));
-
 var _get = require("@webiny/db-dynamodb/utils/get");
-
-var _cleanup = require("@webiny/db-dynamodb/utils/cleanup");
-
 var _query = require("@webiny/db-dynamodb/utils/query");
-
 var _filter = require("@webiny/db-dynamodb/utils/filter");
-
 var _ValueFilterPlugin = require("@webiny/db-dynamodb/plugins/definitions/ValueFilterPlugin");
-
 var _sort = require("@webiny/db-dynamodb/utils/sort");
-
+var _dbDynamodb = require("@webiny/db-dynamodb");
 const createPartitionKey = params => {
   const {
     tenant,
@@ -30,46 +19,44 @@ const createPartitionKey = params => {
   } = params;
   return `T#${tenant}#L#${locale}#CMS#CMG`;
 };
-
 const createSortKeys = params => {
   const {
     id
   } = params;
   return id;
 };
-
 const createKeys = params => {
   return {
     PK: createPartitionKey(params),
     SK: createSortKeys(params)
   };
 };
-
 const createType = () => {
   return "cms.group";
 };
-
 const createGroupsStorageOperations = params => {
   const {
     entity,
     plugins
   } = params;
   const filteringPlugins = plugins.byType(_ValueFilterPlugin.ValueFilterPlugin.type);
-
   if (filteringPlugins.length === 0) {
     throw new _error.default("DynamoDB filtering plugins not loaded.", "MISSING_DYNAMODB_FILTERING_PLUGINS");
   }
-
   const create = async params => {
     const {
       group
     } = params;
     const keys = createKeys(group);
-
     try {
-      await entity.put((0, _objectSpread2.default)((0, _objectSpread2.default)({}, group), {}, {
-        TYPE: createType()
-      }, keys));
+      await (0, _dbDynamodb.put)({
+        entity,
+        item: {
+          ...group,
+          TYPE: createType(),
+          ...keys
+        }
+      });
       return group;
     } catch (ex) {
       throw new _error.default(ex.message || "Could not create group.", ex.code || "CREATE_GROUP_ERROR", {
@@ -79,17 +66,20 @@ const createGroupsStorageOperations = params => {
       });
     }
   };
-
   const update = async params => {
     const {
       group
     } = params;
     const keys = createKeys(group);
-
     try {
-      await entity.put((0, _objectSpread2.default)((0, _objectSpread2.default)({}, group), {}, {
-        TYPE: createType()
-      }, keys));
+      await (0, _dbDynamodb.put)({
+        entity,
+        item: {
+          ...group,
+          TYPE: createType(),
+          ...keys
+        }
+      });
       return group;
     } catch (ex) {
       throw new _error.default(ex.message || "Could not update group.", ex.code || "UPDATE_GROUP_ERROR", {
@@ -99,16 +89,16 @@ const createGroupsStorageOperations = params => {
       });
     }
   };
-
   const deleteGroup = async params => {
     const {
       group
-    } = params; // TODO make sure that group has locale and tenant on it - add it in the crud just in case
-
+    } = params;
     const keys = createKeys(group);
-
     try {
-      await entity.delete(keys);
+      await (0, _dbDynamodb.deleteItem)({
+        entity,
+        keys
+      });
       return group;
     } catch (ex) {
       throw new _error.default(ex.message || "Could not delete group.", ex.code || "DELETE_GROUP_ERROR", {
@@ -118,25 +108,21 @@ const createGroupsStorageOperations = params => {
       });
     }
   };
-
   const get = async params => {
     const keys = createKeys(params);
-
     try {
-      const group = await (0, _get.get)({
+      return await (0, _get.getClean)({
         entity,
         keys
       });
-      return (0, _cleanup.cleanupItem)(entity, group);
     } catch (ex) {
-      throw new _error.default(ex.message || "Could not get group.", ex.code || "GET_GROUP_ERROR", (0, _objectSpread2.default)((0, _objectSpread2.default)({
-        error: ex
-      }, params), {}, {
+      throw new _error.default(ex.message || "Could not get group.", ex.code || "GET_GROUP_ERROR", {
+        error: ex,
+        ...params,
         keys
-      }));
+      });
     }
   };
-
   const list = async params => {
     const {
       sort,
@@ -150,36 +136,31 @@ const createGroupsStorageOperations = params => {
       }
     };
     let records = [];
-
     try {
       records = await (0, _query.queryAll)(queryAllParams);
     } catch (ex) {
-      throw new _error.default(ex.message || "Could not list groups.", ex.code || "LIST_GROUP_ERROR", (0, _objectSpread2.default)((0, _objectSpread2.default)({
-        error: ex
-      }, params), {}, {
+      throw new _error.default(ex.message || "Could not list groups.", ex.code || "LIST_GROUP_ERROR", {
+        error: ex,
+        ...params,
         sort,
         where
-      }));
+      });
     }
-
     const filteredItems = (0, _filter.filterItems)({
       items: records,
       where,
       fields: [],
       plugins
     });
-
     if (!sort || sort.length === 0) {
       return filteredItems;
     }
-
     return (0, _sort.sortItems)({
       items: filteredItems,
       sort,
       fields: []
     });
   };
-
   return {
     create,
     update,
@@ -188,5 +169,6 @@ const createGroupsStorageOperations = params => {
     list
   };
 };
+exports.createGroupsStorageOperations = createGroupsStorageOperations;
 
-exports.createGroupsStorageOperations = createGroupsStorageOperations;
+//# sourceMappingURL=index.js.map

package/operations/group/index.js.map

@@ -1 +1 @@
-{"version":3,"names":["createPartitionKey","params","tenant","locale","createSortKeys","id","createKeys","PK","SK","createType","createGroupsStorageOperations","entity","plugins","filteringPlugins","byType","ValueFilterPlugin","type","length","WebinyError","create","group","keys","put","TYPE","ex","message","code","error","update","deleteGroup","delete","get","getRecord","cleanupItem","list","sort","where","queryAllParams","partitionKey","options","gte","records","queryAll","filteredItems","filterItems","items","fields","sortItems"],"sources":["index.ts"],"sourcesContent":["import {\n    CmsGroup,\n    CmsGroupStorageOperations,\n    CmsGroupStorageOperationsCreateParams,\n    CmsGroupStorageOperationsDeleteParams,\n    CmsGroupStorageOperationsGetParams,\n    CmsGroupStorageOperationsListParams,\n    CmsGroupStorageOperationsUpdateParams\n} from \"@webiny/api-headless-cms/types\";\nimport { Entity } from \"dynamodb-toolbox\";\nimport WebinyError from \"@webiny/error\";\nimport { get as getRecord } from \"@webiny/db-dynamodb/utils/get\";\nimport { cleanupItem } from \"@webiny/db-dynamodb/utils/cleanup\";\nimport { queryAll, QueryAllParams } from \"@webiny/db-dynamodb/utils/query\";\nimport { filterItems } from \"@webiny/db-dynamodb/utils/filter\";\nimport { PluginsContainer } from \"@webiny/plugins\";\nimport { ValueFilterPlugin } from \"@webiny/db-dynamodb/plugins/definitions/ValueFilterPlugin\";\nimport { sortItems } from \"@webiny/db-dynamodb/utils/sort\";\n\ninterface PartitionKeyParams {\n    tenant: string;\n    locale: string;\n}\nconst createPartitionKey = (params: PartitionKeyParams): string => {\n    const { tenant, locale } = params;\n    return `T#${tenant}#L#${locale}#CMS#CMG`;\n};\n\ninterface SortKeyParams {\n    id: string;\n}\nconst createSortKeys = (params: SortKeyParams): string => {\n    const { id } = params;\n    return id;\n};\n\ninterface Keys {\n    PK: string;\n    SK: string;\n}\nconst createKeys = (params: PartitionKeyParams & SortKeyParams): Keys => {\n    return {\n        PK: createPartitionKey(params),\n        SK: createSortKeys(params)\n    };\n};\n\nconst createType = (): string => {\n    return \"cms.group\";\n};\n\ninterface CreateGroupsStorageOperationsParams {\n    entity: Entity<any>;\n    plugins: PluginsContainer;\n}\nexport const createGroupsStorageOperations = (\n    params: CreateGroupsStorageOperationsParams\n): CmsGroupStorageOperations => {\n    const { entity, plugins } = params;\n\n    const filteringPlugins = plugins.byType<ValueFilterPlugin>(ValueFilterPlugin.type);\n    if (filteringPlugins.length === 0) {\n        throw new WebinyError(\n            \"DynamoDB filtering plugins not loaded.\",\n            \"MISSING_DYNAMODB_FILTERING_PLUGINS\"\n        );\n    }\n\n    const create = async (params: CmsGroupStorageOperationsCreateParams) => {\n        const { group } = params;\n        const keys = createKeys(group);\n        try {\n            await entity.put({\n                ...group,\n                TYPE: createType(),\n                ...keys\n            });\n            return group;\n        } catch (ex) {\n            throw new WebinyError(\n                ex.message || \"Could not create group.\",\n                ex.code || \"CREATE_GROUP_ERROR\",\n                {\n                    error: ex,\n                    group,\n                    keys\n                }\n            );\n        }\n    };\n    const update = async (params: CmsGroupStorageOperationsUpdateParams) => {\n        const { group } = params;\n        const keys = createKeys(group);\n        try {\n            await entity.put({\n                ...group,\n                TYPE: createType(),\n                ...keys\n            });\n            return group;\n        } catch (ex) {\n            throw new WebinyError(\n                ex.message || \"Could not update group.\",\n                ex.code || \"UPDATE_GROUP_ERROR\",\n                {\n                    error: ex,\n                    group,\n                    keys\n                }\n            );\n        }\n    };\n    const deleteGroup = async (params: CmsGroupStorageOperationsDeleteParams) => {\n        const { group } = params;\n        // TODO make sure that group has locale and tenant on it - add it in the crud just in case\n        const keys = createKeys(group);\n\n        try {\n            await entity.delete(keys);\n            return group;\n        } catch (ex) {\n            throw new WebinyError(\n                ex.message || \"Could not delete group.\",\n                ex.code || \"DELETE_GROUP_ERROR\",\n                {\n                    error: ex,\n                    group,\n                    keys\n                }\n            );\n        }\n    };\n    const get = async (params: CmsGroupStorageOperationsGetParams) => {\n        const keys = createKeys(params);\n\n        try {\n            const group = await getRecord<CmsGroup>({\n                entity,\n                keys\n            });\n\n            return cleanupItem(entity, group);\n        } catch (ex) {\n            throw new WebinyError(\n                ex.message || \"Could not get group.\",\n                ex.code || \"GET_GROUP_ERROR\",\n                {\n                    error: ex,\n                    ...params,\n                    keys\n                }\n            );\n        }\n    };\n    const list = async (params: CmsGroupStorageOperationsListParams) => {\n        const { sort, where } = params;\n\n        const queryAllParams: QueryAllParams = {\n            entity,\n            partitionKey: createPartitionKey(where),\n            options: {\n                gte: \" \"\n            }\n        };\n\n        let records: CmsGroup[] = [];\n        try {\n            records = await queryAll(queryAllParams);\n        } catch (ex) {\n            throw new WebinyError(\n                ex.message || \"Could not list groups.\",\n                ex.code || \"LIST_GROUP_ERROR\",\n                {\n                    error: ex,\n                    ...params,\n                    sort,\n                    where\n                }\n            );\n        }\n\n        const filteredItems = filterItems({\n            items: records,\n            where,\n            fields: [],\n            plugins\n        });\n        if (!sort || sort.length === 0) {\n            return filteredItems;\n        }\n        return sortItems({\n            items: filteredItems,\n            sort,\n            fields: []\n        });\n    };\n\n    return {\n        create,\n        update,\n        delete: deleteGroup,\n        get,\n        list\n    };\n};\n"],"mappings":"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"}
+{"version":3,"names":["_error","_interopRequireDefault","require","_get","_query","_filter","_ValueFilterPlugin","_sort","_dbDynamodb","createPartitionKey","params","tenant","locale","createSortKeys","id","createKeys","PK","SK","createType","createGroupsStorageOperations","entity","plugins","filteringPlugins","byType","ValueFilterPlugin","type","length","WebinyError","create","group","keys","put","item","TYPE","ex","message","code","error","update","deleteGroup","deleteItem","get","getClean","list","sort","where","queryAllParams","partitionKey","options","gte","records","queryAll","filteredItems","filterItems","items","fields","sortItems","delete","exports"],"sources":["index.ts"],"sourcesContent":["import type {\n    CmsGroup,\n    CmsGroupStorageOperations,\n    CmsGroupStorageOperationsCreateParams,\n    CmsGroupStorageOperationsDeleteParams,\n    CmsGroupStorageOperationsGetParams,\n    CmsGroupStorageOperationsListParams,\n    CmsGroupStorageOperationsUpdateParams\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 type { QueryAllParams } from \"@webiny/db-dynamodb/utils/query\";\nimport { queryAll } from \"@webiny/db-dynamodb/utils/query\";\nimport { filterItems } from \"@webiny/db-dynamodb/utils/filter\";\nimport type { PluginsContainer } from \"@webiny/plugins\";\nimport { ValueFilterPlugin } from \"@webiny/db-dynamodb/plugins/definitions/ValueFilterPlugin\";\nimport { sortItems } from \"@webiny/db-dynamodb/utils/sort\";\nimport { deleteItem, put } from \"@webiny/db-dynamodb\";\n\ninterface PartitionKeyParams {\n    tenant: string;\n    locale: string;\n}\nconst createPartitionKey = (params: PartitionKeyParams): string => {\n    const { tenant, locale } = params;\n    return `T#${tenant}#L#${locale}#CMS#CMG`;\n};\n\ninterface SortKeyParams {\n    id: string;\n}\nconst createSortKeys = (params: SortKeyParams): string => {\n    const { id } = params;\n    return id;\n};\n\ninterface Keys {\n    PK: string;\n    SK: string;\n}\nconst createKeys = (params: PartitionKeyParams & SortKeyParams): Keys => {\n    return {\n        PK: createPartitionKey(params),\n        SK: createSortKeys(params)\n    };\n};\n\nconst createType = (): string => {\n    return \"cms.group\";\n};\n\ninterface CreateGroupsStorageOperationsParams {\n    entity: Entity<any>;\n    plugins: PluginsContainer;\n}\nexport const createGroupsStorageOperations = (\n    params: CreateGroupsStorageOperationsParams\n): CmsGroupStorageOperations => {\n    const { entity, plugins } = params;\n\n    const filteringPlugins = plugins.byType<ValueFilterPlugin>(ValueFilterPlugin.type);\n    if (filteringPlugins.length === 0) {\n        throw new WebinyError(\n            \"DynamoDB filtering plugins not loaded.\",\n            \"MISSING_DYNAMODB_FILTERING_PLUGINS\"\n        );\n    }\n\n    const create = async (params: CmsGroupStorageOperationsCreateParams) => {\n        const { group } = params;\n        const keys = createKeys(group);\n        try {\n            await put({\n                entity,\n                item: {\n                    ...group,\n                    TYPE: createType(),\n                    ...keys\n                }\n            });\n            return group;\n        } catch (ex) {\n            throw new WebinyError(\n                ex.message || \"Could not create group.\",\n                ex.code || \"CREATE_GROUP_ERROR\",\n                {\n                    error: ex,\n                    group,\n                    keys\n                }\n            );\n        }\n    };\n    const update = async (params: CmsGroupStorageOperationsUpdateParams) => {\n        const { group } = params;\n        const keys = createKeys(group);\n        try {\n            await put({\n                entity,\n                item: {\n                    ...group,\n                    TYPE: createType(),\n                    ...keys\n                }\n            });\n            return group;\n        } catch (ex) {\n            throw new WebinyError(\n                ex.message || \"Could not update group.\",\n                ex.code || \"UPDATE_GROUP_ERROR\",\n                {\n                    error: ex,\n                    group,\n                    keys\n                }\n            );\n        }\n    };\n    const deleteGroup = async (params: CmsGroupStorageOperationsDeleteParams) => {\n        const { group } = params;\n        const keys = createKeys(group);\n        try {\n            await deleteItem({\n                entity,\n                keys\n            });\n            return group;\n        } catch (ex) {\n            throw new WebinyError(\n                ex.message || \"Could not delete group.\",\n                ex.code || \"DELETE_GROUP_ERROR\",\n                {\n                    error: ex,\n                    group,\n                    keys\n                }\n            );\n        }\n    };\n    const get = async (params: CmsGroupStorageOperationsGetParams) => {\n        const keys = createKeys(params);\n\n        try {\n            return await getClean<CmsGroup>({\n                entity,\n                keys\n            });\n        } catch (ex) {\n            throw new WebinyError(\n                ex.message || \"Could not get group.\",\n                ex.code || \"GET_GROUP_ERROR\",\n                {\n                    error: ex,\n                    ...params,\n                    keys\n                }\n            );\n        }\n    };\n    const list = async (params: CmsGroupStorageOperationsListParams) => {\n        const { sort, where } = params;\n\n        const queryAllParams: QueryAllParams = {\n            entity,\n            partitionKey: createPartitionKey(where),\n            options: {\n                gte: \" \"\n            }\n        };\n\n        let records: CmsGroup[] = [];\n        try {\n            records = await queryAll(queryAllParams);\n        } catch (ex) {\n            throw new WebinyError(\n                ex.message || \"Could not list groups.\",\n                ex.code || \"LIST_GROUP_ERROR\",\n                {\n                    error: ex,\n                    ...params,\n                    sort,\n                    where\n                }\n            );\n        }\n\n        const filteredItems = filterItems({\n            items: records,\n            where,\n            fields: [],\n            plugins\n        });\n        if (!sort || sort.length === 0) {\n            return filteredItems;\n        }\n        return sortItems({\n            items: filteredItems,\n            sort,\n            fields: []\n        });\n    };\n\n    return {\n        create,\n        update,\n        delete: deleteGroup,\n        get,\n        list\n    };\n};\n"],"mappings":"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","ignoreList":[]}

package/operations/model/index.d.ts

@@ -1,5 +1,5 @@
-import { CmsModelStorageOperations } from "@webiny/api-headless-cms/types";
-import { Entity } from "dynamodb-toolbox";
+import type { CmsModelStorageOperations } from "@webiny/api-headless-cms/types";
+import type { Entity } from "@webiny/db-dynamodb/toolbox";
 interface CreateModelsStorageOperationsParams {
     entity: Entity<any>;
 }

package/operations/model/index.js

@@ -1,67 +1,57 @@
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
-
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.createModelsStorageOperations = void 0;
-
-var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
-
 var _error = _interopRequireDefault(require("@webiny/error"));
-
 var _get = require("@webiny/db-dynamodb/utils/get");
-
 var _cleanup = require("@webiny/db-dynamodb/utils/cleanup");
-
 var _query = require("@webiny/db-dynamodb/utils/query");
-
+var _dbDynamodb = require("@webiny/db-dynamodb");
 const createPartitionKey = params => {
   const {
     tenant,
     locale
   } = params;
-
   if (!tenant) {
     throw new _error.default(`Missing tenant variable when creating model partitionKey.`);
   } else if (!locale) {
     throw new _error.default(`Missing locale variable when creating model partitionKey.`);
   }
-
   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
   } = params;
-
   const create = async params => {
     const {
       model
     } = params;
     const keys = createKeys(model);
-
     try {
-      await entity.put((0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, (0, _cleanup.cleanupItem)(entity, 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(`Could not create CMS Content Model.`, "CREATE_MODEL_ERROR", {
@@ -71,17 +61,20 @@ const createModelsStorageOperations = params => {
       });
     }
   };
-
   const update = async params => {
     const {
       model
     } = params;
     const keys = createKeys(model);
-
     try {
-      await entity.put((0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, (0, _cleanup.cleanupItem)(entity, 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.message || "Could not update model.", ex.code || "MODEL_UPDATE_ERROR", {
@@ -91,15 +84,16 @@ const createModelsStorageOperations = params => {
       });
     }
   };
-
   const deleteModel = async params => {
     const {
       model
     } = params;
     const keys = createKeys(model);
-
     try {
-      await entity.delete(keys);
+      await (0, _dbDynamodb.deleteItem)({
+        entity,
+        keys
+      });
       return model;
     } catch (ex) {
       throw new _error.default(ex.message || "Could not delete model.", ex.code || "MODEL_DELETE_ERROR", {
@@ -109,16 +103,13 @@ const createModelsStorageOperations = params => {
       });
     }
   };
-
   const get = async params => {
     const keys = createKeys(params);
-
     try {
-      const item = await (0, _get.get)({
+      return await (0, _get.getClean)({
         entity,
         keys
       });
-      return (0, _cleanup.cleanupItem)(entity, item);
     } catch (ex) {
       throw new _error.default(ex.message || "Could not get model.", ex.code || "MODEL_GET_ERROR", {
         error: ex,
@@ -126,7 +117,6 @@ const createModelsStorageOperations = params => {
       });
     }
   };
-
   const list = async params => {
     const {
       where
@@ -138,10 +128,8 @@ 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.message || "Could not list models.", ex.code || "MODEL_LIST_ERROR", {
         error: ex,
@@ -149,7 +137,6 @@ const createModelsStorageOperations = params => {
       });
     }
   };
-
   return {
     create,
     update,
@@ -158,5 +145,6 @@ const createModelsStorageOperations = params => {
     list
   };
 };
+exports.createModelsStorageOperations = createModelsStorageOperations;
 
-exports.createModelsStorageOperations = createModelsStorageOperations;
+//# sourceMappingURL=index.js.map

package/operations/model/index.js.map

@@ -1 +1 @@
-{"version":3,"names":["createPartitionKey","params","tenant","locale","WebinyError","createSortKey","modelId","createKeys","PK","SK","createType","createModelsStorageOperations","entity","create","model","keys","put","cleanupItem","TYPE","ex","error","update","message","code","deleteModel","delete","get","item","getRecord","list","where","queryAllParams","partitionKey","options","gte","items","queryAll","cleanupItems"],"sources":["index.ts"],"sourcesContent":["import {\n    CmsModel,\n    CmsModelStorageOperations,\n    CmsModelStorageOperationsCreateParams,\n    CmsModelStorageOperationsDeleteParams,\n    CmsModelStorageOperationsGetParams,\n    CmsModelStorageOperationsListParams,\n    CmsModelStorageOperationsUpdateParams\n} from \"@webiny/api-headless-cms/types\";\nimport { Entity } from \"dynamodb-toolbox\";\nimport WebinyError from \"@webiny/error\";\nimport { get as getRecord } from \"@webiny/db-dynamodb/utils/get\";\nimport { cleanupItem, cleanupItems } from \"@webiny/db-dynamodb/utils/cleanup\";\nimport { queryAll, QueryAllParams } from \"@webiny/db-dynamodb/utils/query\";\n\ninterface PartitionKeysParams {\n    tenant: string;\n    locale: string;\n}\nconst createPartitionKey = (params: PartitionKeysParams): string => {\n    const { tenant, locale } = params;\n    if (!tenant) {\n        throw new WebinyError(`Missing tenant variable when creating model partitionKey.`);\n    } else if (!locale) {\n        throw new WebinyError(`Missing locale variable when creating model partitionKey.`);\n    }\n    return `T#${tenant}#L#${locale}#CMS#CM`;\n};\n\ninterface SortKeyParams {\n    modelId: string;\n}\nconst createSortKey = (params: SortKeyParams): string => {\n    return params.modelId;\n};\n\ninterface Keys {\n    PK: string;\n    SK: string;\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\ninterface CreateModelsStorageOperationsParams {\n    entity: Entity<any>;\n}\nexport const createModelsStorageOperations = (\n    params: CreateModelsStorageOperationsParams\n): CmsModelStorageOperations => {\n    const { entity } = params;\n\n    const create = async (params: CmsModelStorageOperationsCreateParams) => {\n        const { model } = params;\n\n        const keys = createKeys(model);\n\n        try {\n            await entity.put({\n                ...cleanupItem(entity, model),\n                ...keys,\n                TYPE: createType()\n            });\n            return model;\n        } catch (ex) {\n            throw new WebinyError(`Could not create CMS Content Model.`, \"CREATE_MODEL_ERROR\", {\n                error: ex,\n                model,\n                keys\n            });\n        }\n    };\n\n    const update = async (params: CmsModelStorageOperationsUpdateParams) => {\n        const { model } = params;\n\n        const keys = createKeys(model);\n\n        try {\n            await entity.put({\n                ...cleanupItem(entity, model),\n                ...keys,\n                TYPE: createType()\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        try {\n            await entity.delete(keys);\n            return model;\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\n    const get = async (params: CmsModelStorageOperationsGetParams) => {\n        const keys = createKeys(params);\n\n        try {\n            const item = await getRecord<CmsModel>({\n                entity,\n                keys\n            });\n            return cleanupItem(entity, item);\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            const items = await queryAll<CmsModel>(queryAllParams);\n\n            return cleanupItems(entity, items);\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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"}
+{"version":3,"names":["_error","_interopRequireDefault","require","_get","_cleanup","_query","_dbDynamodb","createPartitionKey","params","tenant","locale","WebinyError","createSortKey","modelId","createKeys","PK","SK","createType","createModelsStorageOperations","entity","create","model","keys","put","item","cleanupItem","TYPE","ex","error","update","message","code","deleteModel","deleteItem","get","getClean","list","where","queryAllParams","partitionKey","options","gte","queryAllClean","delete","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 { getClean } from \"@webiny/db-dynamodb/utils/get\";\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, put } from \"@webiny/db-dynamodb\";\n\ninterface PartitionKeysParams {\n    tenant: string;\n    locale: string;\n}\nconst createPartitionKey = (params: PartitionKeysParams): string => {\n    const { tenant, locale } = params;\n    if (!tenant) {\n        throw new WebinyError(`Missing tenant variable when creating model partitionKey.`);\n    } else if (!locale) {\n        throw new WebinyError(`Missing locale variable when creating model partitionKey.`);\n    }\n    return `T#${tenant}#L#${locale}#CMS#CM`;\n};\n\ninterface SortKeyParams {\n    modelId: string;\n}\nconst createSortKey = (params: SortKeyParams): string => {\n    return params.modelId;\n};\n\ninterface Keys {\n    PK: string;\n    SK: string;\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\ninterface CreateModelsStorageOperationsParams {\n    entity: Entity<any>;\n}\nexport const createModelsStorageOperations = (\n    params: CreateModelsStorageOperationsParams\n): CmsModelStorageOperations => {\n    const { entity } = params;\n\n    const create = async (params: CmsModelStorageOperationsCreateParams) => {\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(`Could not create CMS Content Model.`, \"CREATE_MODEL_ERROR\", {\n                error: ex,\n                model,\n                keys\n            });\n        }\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        try {\n            await deleteItem({\n                entity,\n                keys\n            });\n            return model;\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\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,5 +1,5 @@
-import { CmsSystemStorageOperations } from "@webiny/api-headless-cms/types";
-import { Entity } from "dynamodb-toolbox";
+import type { CmsSystemStorageOperations } from "@webiny/api-headless-cms/types";
+import type { Entity } from "@webiny/db-dynamodb/toolbox";
 interface CreateSystemStorageOperationsParams {
     entity: Entity<any>;
 }

package/operations/system/index.js

@@ -1,49 +1,43 @@
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
-
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.createSystemStorageOperations = void 0;
-
-var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
-
 var _error = _interopRequireDefault(require("@webiny/error"));
-
 var _get = require("@webiny/db-dynamodb/utils/get");
-
-var _cleanup = require("@webiny/db-dynamodb/utils/cleanup");
-
+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((0, _objectSpread2.default)((0, _objectSpread2.default)({}, 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", {
@@ -53,15 +47,19 @@ const createSystemStorageOperations = params => {
       });
     }
   };
-
   const update = async params => {
     const {
       system
     } = params;
     const keys = createKeys(system);
-
     try {
-      await entity.put((0, _objectSpread2.default)((0, _objectSpread2.default)({}, 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", {
@@ -71,16 +69,13 @@ const createSystemStorageOperations = params => {
       });
     }
   };
-
   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,
@@ -88,12 +83,12 @@ const createSystemStorageOperations = params => {
       });
     }
   };
-
   return {
     create,
     update,
     get
   };
 };
+exports.createSystemStorageOperations = createSystemStorageOperations;
 
-exports.createSystemStorageOperations = createSystemStorageOperations;
+//# sourceMappingURL=index.js.map