@webiny/api-page-builder-so-ddb-es 5.39.0-beta.0 → 5.39.0-beta.2

package/definitions/table.d.ts

@@ -1,9 +1,9 @@
-import { Table } from "dynamodb-toolbox";
-import { DocumentClient } from "aws-sdk/clients/dynamodb";
+import { Table } from "@webiny/db-dynamodb/toolbox";
+import { DynamoDBClient } from "@webiny/aws-sdk/client-dynamodb";
 import { TableModifier } from "../types";
 interface Params {
     table?: TableModifier;
-    documentClient: DocumentClient;
+    documentClient: DynamoDBClient;
 }
-export declare const createTable: ({ table, documentClient }: Params) => Table;
+export declare const createTable: ({ table, documentClient }: Params) => Table<string, string, string>;
 export {};

package/definitions/table.js

@@ -4,7 +4,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.createTable = void 0;
-var _dynamodbToolbox = require("dynamodb-toolbox");
+var _toolbox = require("@webiny/db-dynamodb/toolbox");
 const createTable = ({
   table,
   documentClient
@@ -19,10 +19,12 @@ const createTable = ({
         partitionKey: "GSI1_PK",
         sortKey: "GSI1_SK"
       }
-    }
+    },
+    autoExecute: true,
+    autoParse: true
   };
   const config = typeof table === "function" ? table(tableConfig) : tableConfig;
-  return new _dynamodbToolbox.Table(config);
+  return new _toolbox.Table(config);
 };
 exports.createTable = createTable;
 

package/definitions/table.js.map

@@ -1 +1 @@
-{"version":3,"names":["_dynamodbToolbox","require","createTable","table","documentClient","tableConfig","name","process","env","DB_PAGE_BUILDER","DB_TABLE","partitionKey","sortKey","DocumentClient","indexes","GSI1","config","Table","exports"],"sources":["table.ts"],"sourcesContent":["import { Table } from \"dynamodb-toolbox\";\nimport { DocumentClient } from \"aws-sdk/clients/dynamodb\";\nimport { TableConstructor } from \"dynamodb-toolbox/dist/classes/Table\";\nimport { TableModifier } from \"~/types\";\n\ninterface Params {\n    table?: TableModifier;\n    documentClient: DocumentClient;\n}\nexport const createTable = ({ table, documentClient }: Params): Table => {\n    const tableConfig: TableConstructor = {\n        name: process.env.DB_PAGE_BUILDER || (process.env.DB_TABLE as string),\n        partitionKey: \"PK\",\n        sortKey: \"SK\",\n        DocumentClient: documentClient,\n        indexes: {\n            GSI1: {\n                partitionKey: \"GSI1_PK\",\n                sortKey: \"GSI1_SK\"\n            }\n        }\n    };\n\n    const config = typeof table === \"function\" ? table(tableConfig) : tableConfig;\n\n    return new Table(config);\n};\n"],"mappings":";;;;;;AAAA,IAAAA,gBAAA,GAAAC,OAAA;AASO,MAAMC,WAAW,GAAGA,CAAC;EAAEC,KAAK;EAAEC;AAAuB,CAAC,KAAY;EACrE,MAAMC,WAA6B,GAAG;IAClCC,IAAI,EAAEC,OAAO,CAACC,GAAG,CAACC,eAAe,IAAKF,OAAO,CAACC,GAAG,CAACE,QAAmB;IACrEC,YAAY,EAAE,IAAI;IAClBC,OAAO,EAAE,IAAI;IACbC,cAAc,EAAET,cAAc;IAC9BU,OAAO,EAAE;MACLC,IAAI,EAAE;QACFJ,YAAY,EAAE,SAAS;QACvBC,OAAO,EAAE;MACb;IACJ;EACJ,CAAC;EAED,MAAMI,MAAM,GAAG,OAAOb,KAAK,KAAK,UAAU,GAAGA,KAAK,CAACE,WAAW,CAAC,GAAGA,WAAW;EAE7E,OAAO,IAAIY,sBAAK,CAACD,MAAM,CAAC;AAC5B,CAAC;AAACE,OAAA,CAAAhB,WAAA,GAAAA,WAAA"}
+{"version":3,"names":["_toolbox","require","createTable","table","documentClient","tableConfig","name","process","env","DB_PAGE_BUILDER","DB_TABLE","partitionKey","sortKey","DocumentClient","indexes","GSI1","autoExecute","autoParse","config","Table","exports"],"sources":["table.ts"],"sourcesContent":["import { Table } from \"@webiny/db-dynamodb/toolbox\";\nimport { DynamoDBClient } from \"@webiny/aws-sdk/client-dynamodb\";\nimport { TableConstructor } from \"@webiny/db-dynamodb/toolbox\";\nimport { TableModifier } from \"~/types\";\n\ninterface Params {\n    table?: TableModifier;\n    documentClient: DynamoDBClient;\n}\nexport const createTable = ({ table, documentClient }: Params): Table<string, string, string> => {\n    const tableConfig: TableConstructor<string, string, string> = {\n        name: process.env.DB_PAGE_BUILDER || (process.env.DB_TABLE as string),\n        partitionKey: \"PK\",\n        sortKey: \"SK\",\n        DocumentClient: documentClient,\n        indexes: {\n            GSI1: {\n                partitionKey: \"GSI1_PK\",\n                sortKey: \"GSI1_SK\"\n            }\n        },\n        autoExecute: true,\n        autoParse: true\n    };\n\n    const config = typeof table === \"function\" ? table(tableConfig) : tableConfig;\n\n    return new Table(config);\n};\n"],"mappings":";;;;;;AAAA,IAAAA,QAAA,GAAAC,OAAA;AASO,MAAMC,WAAW,GAAGA,CAAC;EAAEC,KAAK;EAAEC;AAAuB,CAAC,KAAoC;EAC7F,MAAMC,WAAqD,GAAG;IAC1DC,IAAI,EAAEC,OAAO,CAACC,GAAG,CAACC,eAAe,IAAKF,OAAO,CAACC,GAAG,CAACE,QAAmB;IACrEC,YAAY,EAAE,IAAI;IAClBC,OAAO,EAAE,IAAI;IACbC,cAAc,EAAET,cAAc;IAC9BU,OAAO,EAAE;MACLC,IAAI,EAAE;QACFJ,YAAY,EAAE,SAAS;QACvBC,OAAO,EAAE;MACb;IACJ,CAAC;IACDI,WAAW,EAAE,IAAI;IACjBC,SAAS,EAAE;EACf,CAAC;EAED,MAAMC,MAAM,GAAG,OAAOf,KAAK,KAAK,UAAU,GAAGA,KAAK,CAACE,WAAW,CAAC,GAAGA,WAAW;EAE7E,OAAO,IAAIc,cAAK,CAACD,MAAM,CAAC;AAC5B,CAAC;AAACE,OAAA,CAAAlB,WAAA,GAAAA,WAAA"}

package/definitions/tableElasticsearch.d.ts

@@ -1,9 +1,9 @@
 import { TableModifier } from "../types";
-import { DocumentClient } from "aws-sdk/clients/dynamodb";
-import { Table } from "dynamodb-toolbox";
+import { DynamoDBClient } from "@webiny/aws-sdk/client-dynamodb";
+import { Table } from "@webiny/db-dynamodb/toolbox";
 interface Params {
     table?: TableModifier;
-    documentClient: DocumentClient;
+    documentClient: DynamoDBClient;
 }
-export declare const createElasticsearchTable: ({ table, documentClient }: Params) => Table;
+export declare const createElasticsearchTable: ({ table, documentClient }: Params) => Table<string, string, string>;
 export {};

package/definitions/tableElasticsearch.js

@@ -4,7 +4,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.createElasticsearchTable = void 0;
-var _dynamodbToolbox = require("dynamodb-toolbox");
+var _toolbox = require("@webiny/db-dynamodb/toolbox");
 const createElasticsearchTable = ({
   table,
   documentClient
@@ -13,10 +13,12 @@ const createElasticsearchTable = ({
     name: process.env.DB_TABLE_ELASTICSEARCH,
     partitionKey: "PK",
     sortKey: "SK",
-    DocumentClient: documentClient
+    DocumentClient: documentClient,
+    autoExecute: true,
+    autoParse: true
   };
   const config = typeof table === "function" ? table(tableConfig) : tableConfig;
-  return new _dynamodbToolbox.Table(config);
+  return new _toolbox.Table(config);
 };
 exports.createElasticsearchTable = createElasticsearchTable;
 

package/definitions/tableElasticsearch.js.map

@@ -1 +1 @@
-{"version":3,"names":["_dynamodbToolbox","require","createElasticsearchTable","table","documentClient","tableConfig","name","process","env","DB_TABLE_ELASTICSEARCH","partitionKey","sortKey","DocumentClient","config","Table","exports"],"sources":["tableElasticsearch.ts"],"sourcesContent":["import { TableModifier } from \"~/types\";\nimport { DocumentClient } from \"aws-sdk/clients/dynamodb\";\nimport { Table } from \"dynamodb-toolbox\";\nimport { TableConstructor } from \"dynamodb-toolbox/dist/classes/Table\";\n\ninterface Params {\n    table?: TableModifier;\n    documentClient: DocumentClient;\n}\nexport const createElasticsearchTable = ({ table, documentClient }: Params): Table => {\n    const tableConfig: TableConstructor = {\n        name: process.env.DB_TABLE_ELASTICSEARCH as string,\n        partitionKey: \"PK\",\n        sortKey: \"SK\",\n        DocumentClient: documentClient\n    };\n\n    const config = typeof table === \"function\" ? table(tableConfig) : tableConfig;\n\n    return new Table(config);\n};\n"],"mappings":";;;;;;AAEA,IAAAA,gBAAA,GAAAC,OAAA;AAOO,MAAMC,wBAAwB,GAAGA,CAAC;EAAEC,KAAK;EAAEC;AAAuB,CAAC,KAAY;EAClF,MAAMC,WAA6B,GAAG;IAClCC,IAAI,EAAEC,OAAO,CAACC,GAAG,CAACC,sBAAgC;IAClDC,YAAY,EAAE,IAAI;IAClBC,OAAO,EAAE,IAAI;IACbC,cAAc,EAAER;EACpB,CAAC;EAED,MAAMS,MAAM,GAAG,OAAOV,KAAK,KAAK,UAAU,GAAGA,KAAK,CAACE,WAAW,CAAC,GAAGA,WAAW;EAE7E,OAAO,IAAIS,sBAAK,CAACD,MAAM,CAAC;AAC5B,CAAC;AAACE,OAAA,CAAAb,wBAAA,GAAAA,wBAAA"}
+{"version":3,"names":["_toolbox","require","createElasticsearchTable","table","documentClient","tableConfig","name","process","env","DB_TABLE_ELASTICSEARCH","partitionKey","sortKey","DocumentClient","autoExecute","autoParse","config","Table","exports"],"sources":["tableElasticsearch.ts"],"sourcesContent":["import { TableModifier } from \"~/types\";\nimport { DynamoDBClient } from \"@webiny/aws-sdk/client-dynamodb\";\nimport { Table } from \"@webiny/db-dynamodb/toolbox\";\nimport { TableConstructor } from \"@webiny/db-dynamodb/toolbox\";\n\ninterface Params {\n    table?: TableModifier;\n    documentClient: DynamoDBClient;\n}\nexport const createElasticsearchTable = ({\n    table,\n    documentClient\n}: Params): Table<string, string, string> => {\n    const tableConfig: TableConstructor<string, string, string> = {\n        name: process.env.DB_TABLE_ELASTICSEARCH as string,\n        partitionKey: \"PK\",\n        sortKey: \"SK\",\n        DocumentClient: documentClient,\n        autoExecute: true,\n        autoParse: true\n    };\n\n    const config = typeof table === \"function\" ? table(tableConfig) : tableConfig;\n\n    return new Table(config);\n};\n"],"mappings":";;;;;;AAEA,IAAAA,QAAA,GAAAC,OAAA;AAOO,MAAMC,wBAAwB,GAAGA,CAAC;EACrCC,KAAK;EACLC;AACI,CAAC,KAAoC;EACzC,MAAMC,WAAqD,GAAG;IAC1DC,IAAI,EAAEC,OAAO,CAACC,GAAG,CAACC,sBAAgC;IAClDC,YAAY,EAAE,IAAI;IAClBC,OAAO,EAAE,IAAI;IACbC,cAAc,EAAER,cAAc;IAC9BS,WAAW,EAAE,IAAI;IACjBC,SAAS,EAAE;EACf,CAAC;EAED,MAAMC,MAAM,GAAG,OAAOZ,KAAK,KAAK,UAAU,GAAGA,KAAK,CAACE,WAAW,CAAC,GAAGA,WAAW;EAE7E,OAAO,IAAIW,cAAK,CAACD,MAAM,CAAC;AAC5B,CAAC;AAACE,OAAA,CAAAf,wBAAA,GAAAA,wBAAA"}

package/operations/blockCategory/dataLoader.d.ts

@@ -1,5 +1,5 @@
 import { BlockCategory } from "@webiny/api-page-builder/types";
-import { Entity } from "dynamodb-toolbox";
+import { Entity } from "@webiny/db-dynamodb/toolbox";
 import { DataLoaderInterface } from "../../types";
 interface Params {
     entity: Entity<any>;

package/operations/blockCategory/dataLoader.js

@@ -5,15 +5,13 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.BlockCategoryDataLoader = void 0;
-var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _dataloader = _interopRequireDefault(require("dataloader"));
 var _batchRead = require("@webiny/db-dynamodb/utils/batchRead");
 var _cleanup = require("@webiny/db-dynamodb/utils/cleanup");
 var _keys = require("./keys");
 class BlockCategoryDataLoader {
+  _getDataLoader = undefined;
   constructor(params) {
-    (0, _defineProperty2.default)(this, "_getDataLoader", undefined);
-    (0, _defineProperty2.default)(this, "entity", void 0);
     this.entity = params.entity;
   }
   async getOne(item) {

package/operations/blockCategory/dataLoader.js.map

@@ -1 +1 @@
-{"version":3,"names":["_dataloader","_interopRequireDefault","require","_batchRead","_cleanup","_keys","BlockCategoryDataLoader","constructor","params","_defineProperty2","default","undefined","entity","getOne","item","getDataLoader","load","getAll","items","loadMany","clear","clearAll","_getDataLoader","cacheKeyFn","key","tenant","locale","slug","DataLoader","batched","map","getBatch","PK","createPartitionKey","SK","createSortKey","records","batchReadAll","table","results","reduce","collection","result","cleanupItem","exports"],"sources":["dataLoader.ts"],"sourcesContent":["import DataLoader from \"dataloader\";\nimport { batchReadAll } from \"@webiny/db-dynamodb/utils/batchRead\";\nimport { BlockCategory } from \"@webiny/api-page-builder/types\";\nimport { cleanupItem } from \"@webiny/db-dynamodb/utils/cleanup\";\nimport { Entity } from \"dynamodb-toolbox\";\nimport { createPartitionKey, createSortKey } from \"./keys\";\nimport { DataLoaderInterface } from \"~/types\";\n\ninterface Params {\n    entity: Entity<any>;\n}\n\ntype DataLoaderGetItem = Pick<BlockCategory, \"slug\" | \"tenant\" | \"locale\">;\n\nexport class BlockCategoryDataLoader implements DataLoaderInterface {\n    private _getDataLoader: DataLoader<any, any> | undefined = undefined;\n\n    private readonly entity: Entity<any>;\n\n    constructor(params: Params) {\n        this.entity = params.entity;\n    }\n\n    public async getOne(item: DataLoaderGetItem): Promise<BlockCategory> {\n        return await this.getDataLoader().load(item);\n    }\n\n    public async getAll(items: DataLoaderGetItem[]): Promise<BlockCategory[]> {\n        return await this.getDataLoader().loadMany(items);\n    }\n\n    public clear(): void {\n        this.getDataLoader().clearAll();\n    }\n\n    private getDataLoader(): DataLoader<any, any> {\n        if (!this._getDataLoader) {\n            const cacheKeyFn = (key: DataLoaderGetItem) => {\n                return `T#${key.tenant}#L#${key.locale}#${key.slug}`;\n            };\n            this._getDataLoader = new DataLoader(\n                async items => {\n                    const batched = items.map(item => {\n                        return this.entity.getBatch({\n                            PK: createPartitionKey(item),\n                            SK: createSortKey(item)\n                        });\n                    });\n\n                    const records = await batchReadAll<BlockCategory>({\n                        table: this.entity.table,\n                        items: batched\n                    });\n\n                    const results = records.reduce((collection, result) => {\n                        if (!result) {\n                            return collection;\n                        }\n                        const key = cacheKeyFn(result);\n                        collection[key] = cleanupItem(this.entity, result) as BlockCategory;\n                        return collection;\n                    }, {} as Record<string, BlockCategory>);\n                    return items.map(item => {\n                        const key = cacheKeyFn(item);\n                        return results[key] || null;\n                    });\n                },\n                {\n                    cacheKeyFn\n                }\n            );\n        }\n        return this._getDataLoader;\n    }\n}\n"],"mappings":";;;;;;;;AAAA,IAAAA,WAAA,GAAAC,sBAAA,CAAAC,OAAA;AACA,IAAAC,UAAA,GAAAD,OAAA;AAEA,IAAAE,QAAA,GAAAF,OAAA;AAEA,IAAAG,KAAA,GAAAH,OAAA;AASO,MAAMI,uBAAuB,CAAgC;EAKhEC,WAAWA,CAACC,MAAc,EAAE;IAAA,IAAAC,gBAAA,CAAAC,OAAA,0BAJ+BC,SAAS;IAAA,IAAAF,gBAAA,CAAAC,OAAA;IAKhE,IAAI,CAACE,MAAM,GAAGJ,MAAM,CAACI,MAAM;EAC/B;EAEA,MAAaC,MAAMA,CAACC,IAAuB,EAA0B;IACjE,OAAO,MAAM,IAAI,CAACC,aAAa,CAAC,CAAC,CAACC,IAAI,CAACF,IAAI,CAAC;EAChD;EAEA,MAAaG,MAAMA,CAACC,KAA0B,EAA4B;IACtE,OAAO,MAAM,IAAI,CAACH,aAAa,CAAC,CAAC,CAACI,QAAQ,CAACD,KAAK,CAAC;EACrD;EAEOE,KAAKA,CAAA,EAAS;IACjB,IAAI,CAACL,aAAa,CAAC,CAAC,CAACM,QAAQ,CAAC,CAAC;EACnC;EAEQN,aAAaA,CAAA,EAAyB;IAC1C,IAAI,CAAC,IAAI,CAACO,cAAc,EAAE;MACtB,MAAMC,UAAU,GAAIC,GAAsB,IAAK;QAC3C,OAAQ,KAAIA,GAAG,CAACC,MAAO,MAAKD,GAAG,CAACE,MAAO,IAAGF,GAAG,CAACG,IAAK,EAAC;MACxD,CAAC;MACD,IAAI,CAACL,cAAc,GAAG,IAAIM,mBAAU,CAChC,MAAMV,KAAK,IAAI;QACX,MAAMW,OAAO,GAAGX,KAAK,CAACY,GAAG,CAAChB,IAAI,IAAI;UAC9B,OAAO,IAAI,CAACF,MAAM,CAACmB,QAAQ,CAAC;YACxBC,EAAE,EAAE,IAAAC,wBAAkB,EAACnB,IAAI,CAAC;YAC5BoB,EAAE,EAAE,IAAAC,mBAAa,EAACrB,IAAI;UAC1B,CAAC,CAAC;QACN,CAAC,CAAC;QAEF,MAAMsB,OAAO,GAAG,MAAM,IAAAC,uBAAY,EAAgB;UAC9CC,KAAK,EAAE,IAAI,CAAC1B,MAAM,CAAC0B,KAAK;UACxBpB,KAAK,EAAEW;QACX,CAAC,CAAC;QAEF,MAAMU,OAAO,GAAGH,OAAO,CAACI,MAAM,CAAC,CAACC,UAAU,EAAEC,MAAM,KAAK;UACnD,IAAI,CAACA,MAAM,EAAE;YACT,OAAOD,UAAU;UACrB;UACA,MAAMjB,GAAG,GAAGD,UAAU,CAACmB,MAAM,CAAC;UAC9BD,UAAU,CAACjB,GAAG,CAAC,GAAG,IAAAmB,oBAAW,EAAC,IAAI,CAAC/B,MAAM,EAAE8B,MAAM,CAAkB;UACnE,OAAOD,UAAU;QACrB,CAAC,EAAE,CAAC,CAAkC,CAAC;QACvC,OAAOvB,KAAK,CAACY,GAAG,CAAChB,IAAI,IAAI;UACrB,MAAMU,GAAG,GAAGD,UAAU,CAACT,IAAI,CAAC;UAC5B,OAAOyB,OAAO,CAACf,GAAG,CAAC,IAAI,IAAI;QAC/B,CAAC,CAAC;MACN,CAAC,EACD;QACID;MACJ,CACJ,CAAC;IACL;IACA,OAAO,IAAI,CAACD,cAAc;EAC9B;AACJ;AAACsB,OAAA,CAAAtC,uBAAA,GAAAA,uBAAA"}
+{"version":3,"names":["_dataloader","_interopRequireDefault","require","_batchRead","_cleanup","_keys","BlockCategoryDataLoader","_getDataLoader","undefined","constructor","params","entity","getOne","item","getDataLoader","load","getAll","items","loadMany","clear","clearAll","cacheKeyFn","key","tenant","locale","slug","DataLoader","batched","map","getBatch","PK","createPartitionKey","SK","createSortKey","records","batchReadAll","table","results","reduce","collection","result","cleanupItem","exports"],"sources":["dataLoader.ts"],"sourcesContent":["import DataLoader from \"dataloader\";\nimport { batchReadAll } from \"@webiny/db-dynamodb/utils/batchRead\";\nimport { BlockCategory } from \"@webiny/api-page-builder/types\";\nimport { cleanupItem } from \"@webiny/db-dynamodb/utils/cleanup\";\nimport { Entity } from \"@webiny/db-dynamodb/toolbox\";\nimport { createPartitionKey, createSortKey } from \"./keys\";\nimport { DataLoaderInterface } from \"~/types\";\n\ninterface Params {\n    entity: Entity<any>;\n}\n\ntype DataLoaderGetItem = Pick<BlockCategory, \"slug\" | \"tenant\" | \"locale\">;\n\nexport class BlockCategoryDataLoader implements DataLoaderInterface {\n    private _getDataLoader: DataLoader<any, any> | undefined = undefined;\n\n    private readonly entity: Entity<any>;\n\n    constructor(params: Params) {\n        this.entity = params.entity;\n    }\n\n    public async getOne(item: DataLoaderGetItem): Promise<BlockCategory> {\n        return await this.getDataLoader().load(item);\n    }\n\n    public async getAll(items: DataLoaderGetItem[]): Promise<BlockCategory[]> {\n        return await this.getDataLoader().loadMany(items);\n    }\n\n    public clear(): void {\n        this.getDataLoader().clearAll();\n    }\n\n    private getDataLoader(): DataLoader<any, any> {\n        if (!this._getDataLoader) {\n            const cacheKeyFn = (key: DataLoaderGetItem) => {\n                return `T#${key.tenant}#L#${key.locale}#${key.slug}`;\n            };\n            this._getDataLoader = new DataLoader(\n                async items => {\n                    const batched = items.map(item => {\n                        return this.entity.getBatch({\n                            PK: createPartitionKey(item),\n                            SK: createSortKey(item)\n                        });\n                    });\n\n                    const records = await batchReadAll<BlockCategory>({\n                        table: this.entity.table,\n                        items: batched\n                    });\n\n                    const results = records.reduce((collection, result) => {\n                        if (!result) {\n                            return collection;\n                        }\n                        const key = cacheKeyFn(result);\n                        collection[key] = cleanupItem(this.entity, result) as BlockCategory;\n                        return collection;\n                    }, {} as Record<string, BlockCategory>);\n                    return items.map(item => {\n                        const key = cacheKeyFn(item);\n                        return results[key] || null;\n                    });\n                },\n                {\n                    cacheKeyFn\n                }\n            );\n        }\n        return this._getDataLoader;\n    }\n}\n"],"mappings":";;;;;;;AAAA,IAAAA,WAAA,GAAAC,sBAAA,CAAAC,OAAA;AACA,IAAAC,UAAA,GAAAD,OAAA;AAEA,IAAAE,QAAA,GAAAF,OAAA;AAEA,IAAAG,KAAA,GAAAH,OAAA;AASO,MAAMI,uBAAuB,CAAgC;EACxDC,cAAc,GAAqCC,SAAS;EAIpEC,WAAWA,CAACC,MAAc,EAAE;IACxB,IAAI,CAACC,MAAM,GAAGD,MAAM,CAACC,MAAM;EAC/B;EAEA,MAAaC,MAAMA,CAACC,IAAuB,EAA0B;IACjE,OAAO,MAAM,IAAI,CAACC,aAAa,CAAC,CAAC,CAACC,IAAI,CAACF,IAAI,CAAC;EAChD;EAEA,MAAaG,MAAMA,CAACC,KAA0B,EAA4B;IACtE,OAAO,MAAM,IAAI,CAACH,aAAa,CAAC,CAAC,CAACI,QAAQ,CAACD,KAAK,CAAC;EACrD;EAEOE,KAAKA,CAAA,EAAS;IACjB,IAAI,CAACL,aAAa,CAAC,CAAC,CAACM,QAAQ,CAAC,CAAC;EACnC;EAEQN,aAAaA,CAAA,EAAyB;IAC1C,IAAI,CAAC,IAAI,CAACP,cAAc,EAAE;MACtB,MAAMc,UAAU,GAAIC,GAAsB,IAAK;QAC3C,OAAQ,KAAIA,GAAG,CAACC,MAAO,MAAKD,GAAG,CAACE,MAAO,IAAGF,GAAG,CAACG,IAAK,EAAC;MACxD,CAAC;MACD,IAAI,CAAClB,cAAc,GAAG,IAAImB,mBAAU,CAChC,MAAMT,KAAK,IAAI;QACX,MAAMU,OAAO,GAAGV,KAAK,CAACW,GAAG,CAACf,IAAI,IAAI;UAC9B,OAAO,IAAI,CAACF,MAAM,CAACkB,QAAQ,CAAC;YACxBC,EAAE,EAAE,IAAAC,wBAAkB,EAAClB,IAAI,CAAC;YAC5BmB,EAAE,EAAE,IAAAC,mBAAa,EAACpB,IAAI;UAC1B,CAAC,CAAC;QACN,CAAC,CAAC;QAEF,MAAMqB,OAAO,GAAG,MAAM,IAAAC,uBAAY,EAAgB;UAC9CC,KAAK,EAAE,IAAI,CAACzB,MAAM,CAACyB,KAAK;UACxBnB,KAAK,EAAEU;QACX,CAAC,CAAC;QAEF,MAAMU,OAAO,GAAGH,OAAO,CAACI,MAAM,CAAC,CAACC,UAAU,EAAEC,MAAM,KAAK;UACnD,IAAI,CAACA,MAAM,EAAE;YACT,OAAOD,UAAU;UACrB;UACA,MAAMjB,GAAG,GAAGD,UAAU,CAACmB,MAAM,CAAC;UAC9BD,UAAU,CAACjB,GAAG,CAAC,GAAG,IAAAmB,oBAAW,EAAC,IAAI,CAAC9B,MAAM,EAAE6B,MAAM,CAAkB;UACnE,OAAOD,UAAU;QACrB,CAAC,EAAE,CAAC,CAAkC,CAAC;QACvC,OAAOtB,KAAK,CAACW,GAAG,CAACf,IAAI,IAAI;UACrB,MAAMS,GAAG,GAAGD,UAAU,CAACR,IAAI,CAAC;UAC5B,OAAOwB,OAAO,CAACf,GAAG,CAAC,IAAI,IAAI;QAC/B,CAAC,CAAC;MACN,CAAC,EACD;QACID;MACJ,CACJ,CAAC;IACL;IACA,OAAO,IAAI,CAACd,cAAc;EAC9B;AACJ;AAACmC,OAAA,CAAApC,uBAAA,GAAAA,uBAAA"}

package/operations/blockCategory/index.d.ts

@@ -1,4 +1,4 @@
-import { Entity } from "dynamodb-toolbox";
+import { Entity } from "@webiny/db-dynamodb/toolbox";
 import { PluginsContainer } from "@webiny/plugins";
 import { BlockCategoryStorageOperations } from "../../types";
 export interface CreateBlockCategoryStorageOperationsParams {

package/operations/blockCategory/index.js

@@ -5,8 +5,6 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.createBlockCategoryStorageOperations = void 0;
-var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
-var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
 var _error = _interopRequireDefault(require("@webiny/error"));
 var _query = require("@webiny/db-dynamodb/utils/query");
 var _sort = require("@webiny/db-dynamodb/utils/sort");
@@ -15,7 +13,7 @@ var _dataLoader = require("./dataLoader");
 var _listResponse = require("@webiny/db-dynamodb/utils/listResponse");
 var _BlockCategoryDynamoDbElasticFieldPlugin = require("../../plugins/definitions/BlockCategoryDynamoDbElasticFieldPlugin");
 var _keys = require("./keys");
-const _excluded = ["tenant", "locale"];
+var _dbDynamodb = require("@webiny/db-dynamodb");
 const createType = () => {
   return "pb.blockCategory";
 };
@@ -50,9 +48,14 @@ const createBlockCategoryStorageOperations = ({
       SK: (0, _keys.createSortKey)(blockCategory)
     };
     try {
-      await entity.put((0, _objectSpread2.default)((0, _objectSpread2.default)({}, blockCategory), {}, {
-        TYPE: createType()
-      }, keys));
+      await (0, _dbDynamodb.put)({
+        entity,
+        item: {
+          ...blockCategory,
+          TYPE: createType(),
+          ...keys
+        }
+      });
       /**
        * Always clear data loader cache when modifying the records.
        */
@@ -77,9 +80,14 @@ const createBlockCategoryStorageOperations = ({
       SK: (0, _keys.createSortKey)(blockCategory)
     };
     try {
-      await entity.put((0, _objectSpread2.default)((0, _objectSpread2.default)({}, blockCategory), {}, {
-        TYPE: createType()
-      }, keys));
+      await (0, _dbDynamodb.put)({
+        entity,
+        item: {
+          ...blockCategory,
+          TYPE: createType(),
+          ...keys
+        }
+      });
       /**
        * Always clear data loader cache when modifying the records.
        */
@@ -105,7 +113,10 @@ const createBlockCategoryStorageOperations = ({
       SK: (0, _keys.createSortKey)(blockCategory)
     };
     try {
-      await entity.delete((0, _objectSpread2.default)((0, _objectSpread2.default)({}, blockCategory), keys));
+      await (0, _dbDynamodb.deleteItem)({
+        entity,
+        keys
+      });
       /**
        * Always clear data loader cache when modifying the records.
        */
@@ -125,10 +136,10 @@ const createBlockCategoryStorageOperations = ({
       limit
     } = params;
     const {
-        tenant,
-        locale
-      } = where,
-      restWhere = (0, _objectWithoutProperties2.default)(where, _excluded);
+      tenant,
+      locale,
+      ...restWhere
+    } = where;
     const queryAllParams = {
       entity,
       partitionKey: (0, _keys.createPartitionKey)({

package/operations/blockCategory/index.js.map

@@ -1 +1 @@
-{"version":3,"names":["_error","_interopRequireDefault","require","_query","_sort","_filter","_dataLoader","_listResponse","_BlockCategoryDynamoDbElasticFieldPlugin","_keys","_excluded","createType","createBlockCategoryStorageOperations","entity","plugins","dataLoader","BlockCategoryDataLoader","get","params","where","getOne","ex","WebinyError","message","code","create","blockCategory","keys","PK","createPartitionKey","tenant","locale","SK","createSortKey","put","_objectSpread2","default","TYPE","clear","update","original","category","deleteBlockCategory","delete","list","sort","limit","restWhere","_objectWithoutProperties2","queryAllParams","partitionKey","options","gt","items","queryAll","fields","byType","BlockCategoryDynamoDbElasticFieldPlugin","type","filteredItems","filterItems","sortedItems","sortItems","createListResponse","totalCount","length","after","exports"],"sources":["index.ts"],"sourcesContent":["import WebinyError from \"@webiny/error\";\nimport {\n    BlockCategory,\n    BlockCategoryStorageOperationsCreateParams,\n    BlockCategoryStorageOperationsDeleteParams,\n    BlockCategoryStorageOperationsGetParams,\n    BlockCategoryStorageOperationsListParams,\n    BlockCategoryStorageOperationsUpdateParams\n} from \"@webiny/api-page-builder/types\";\nimport { Entity } from \"dynamodb-toolbox\";\nimport { queryAll, QueryAllParams } from \"@webiny/db-dynamodb/utils/query\";\nimport { sortItems } from \"@webiny/db-dynamodb/utils/sort\";\nimport { filterItems } from \"@webiny/db-dynamodb/utils/filter\";\nimport { BlockCategoryDataLoader } from \"./dataLoader\";\nimport { createListResponse } from \"@webiny/db-dynamodb/utils/listResponse\";\nimport { BlockCategoryDynamoDbElasticFieldPlugin } from \"~/plugins/definitions/BlockCategoryDynamoDbElasticFieldPlugin\";\nimport { PluginsContainer } from \"@webiny/plugins\";\nimport { createPartitionKey, createSortKey } from \"~/operations/blockCategory/keys\";\nimport { BlockCategoryStorageOperations } from \"~/types\";\n\nconst createType = (): string => {\n    return \"pb.blockCategory\";\n};\n\nexport interface CreateBlockCategoryStorageOperationsParams {\n    entity: Entity<any>;\n    plugins: PluginsContainer;\n}\nexport const createBlockCategoryStorageOperations = ({\n    entity,\n    plugins\n}: CreateBlockCategoryStorageOperationsParams): BlockCategoryStorageOperations => {\n    const dataLoader = new BlockCategoryDataLoader({\n        entity\n    });\n\n    const get = async (params: BlockCategoryStorageOperationsGetParams) => {\n        const { where } = params;\n\n        try {\n            return await dataLoader.getOne(where);\n        } catch (ex) {\n            throw new WebinyError(\n                ex.message || \"Could not load block category by given parameters.\",\n                ex.code || \"BLOCK_CATEGORY_GET_ERROR\",\n                {\n                    where\n                }\n            );\n        }\n    };\n\n    const create = async (params: BlockCategoryStorageOperationsCreateParams) => {\n        const { blockCategory } = params;\n\n        const keys = {\n            PK: createPartitionKey({\n                tenant: blockCategory.tenant,\n                locale: blockCategory.locale\n            }),\n            SK: createSortKey(blockCategory)\n        };\n\n        try {\n            await entity.put({\n                ...blockCategory,\n                TYPE: createType(),\n                ...keys\n            });\n            /**\n             * Always clear data loader cache when modifying the records.\n             */\n            dataLoader.clear();\n\n            return blockCategory;\n        } catch (ex) {\n            throw new WebinyError(\n                ex.message || \"Could not create block category.\",\n                ex.code || \"BLOCK_CATEGORY_CREATE_ERROR\",\n                {\n                    keys\n                }\n            );\n        }\n    };\n\n    const update = async (params: BlockCategoryStorageOperationsUpdateParams) => {\n        const { original, blockCategory } = params;\n        const keys = {\n            PK: createPartitionKey({\n                tenant: original.tenant,\n                locale: original.locale\n            }),\n            SK: createSortKey(blockCategory)\n        };\n\n        try {\n            await entity.put({\n                ...blockCategory,\n                TYPE: createType(),\n                ...keys\n            });\n            /**\n             * Always clear data loader cache when modifying the records.\n             */\n            dataLoader.clear();\n\n            return blockCategory;\n        } catch (ex) {\n            throw new WebinyError(\n                ex.message || \"Could not update block category.\",\n                ex.code || \"BLOCK_CATEGORY_UPDATE_ERROR\",\n                {\n                    keys,\n                    original,\n                    category: blockCategory\n                }\n            );\n        }\n    };\n\n    const deleteBlockCategory = async (params: BlockCategoryStorageOperationsDeleteParams) => {\n        const { blockCategory } = params;\n        const keys = {\n            PK: createPartitionKey({\n                tenant: blockCategory.tenant,\n                locale: blockCategory.locale\n            }),\n            SK: createSortKey(blockCategory)\n        };\n\n        try {\n            await entity.delete({\n                ...blockCategory,\n                ...keys\n            });\n            /**\n             * Always clear data loader cache when modifying the records.\n             */\n            dataLoader.clear();\n\n            return blockCategory;\n        } catch (ex) {\n            throw new WebinyError(\n                ex.message || \"Could not delete block category.\",\n                ex.code || \"BLOCK_CATEGORY_DELETE_ERROR\",\n                {\n                    keys,\n                    blockCategory\n                }\n            );\n        }\n    };\n\n    const list = async (params: BlockCategoryStorageOperationsListParams) => {\n        const { where, sort, limit } = params;\n\n        const { tenant, locale, ...restWhere } = where;\n        const queryAllParams: QueryAllParams = {\n            entity,\n            partitionKey: createPartitionKey({ tenant, locale }),\n            options: {\n                gt: \" \"\n            }\n        };\n\n        let items: BlockCategory[] = [];\n\n        try {\n            items = await queryAll<BlockCategory>(queryAllParams);\n        } catch (ex) {\n            throw new WebinyError(\n                ex.message || \"Could not list block categories by given parameters.\",\n                ex.code || \"BLOCK_CATEGORIES_LIST_ERROR\",\n                {\n                    partitionKey: queryAllParams.partitionKey,\n                    options: queryAllParams.options\n                }\n            );\n        }\n\n        const fields = plugins.byType<BlockCategoryDynamoDbElasticFieldPlugin>(\n            BlockCategoryDynamoDbElasticFieldPlugin.type\n        );\n\n        const filteredItems = filterItems<BlockCategory>({\n            plugins,\n            where: restWhere,\n            items,\n            fields\n        });\n\n        const sortedItems = sortItems<BlockCategory>({\n            items: filteredItems,\n            sort,\n            fields\n        });\n\n        return createListResponse({\n            items: sortedItems,\n            limit: limit || 100000,\n            totalCount: filteredItems.length,\n            after: null\n        });\n    };\n\n    return {\n        dataLoader,\n        get,\n        create,\n        update,\n        delete: deleteBlockCategory,\n        list\n    };\n};\n"],"mappings":"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"}
+{"version":3,"names":["_error","_interopRequireDefault","require","_query","_sort","_filter","_dataLoader","_listResponse","_BlockCategoryDynamoDbElasticFieldPlugin","_keys","_dbDynamodb","createType","createBlockCategoryStorageOperations","entity","plugins","dataLoader","BlockCategoryDataLoader","get","params","where","getOne","ex","WebinyError","message","code","create","blockCategory","keys","PK","createPartitionKey","tenant","locale","SK","createSortKey","put","item","TYPE","clear","update","original","category","deleteBlockCategory","deleteItem","list","sort","limit","restWhere","queryAllParams","partitionKey","options","gt","items","queryAll","fields","byType","BlockCategoryDynamoDbElasticFieldPlugin","type","filteredItems","filterItems","sortedItems","sortItems","createListResponse","totalCount","length","after","delete","exports"],"sources":["index.ts"],"sourcesContent":["import WebinyError from \"@webiny/error\";\nimport {\n    BlockCategory,\n    BlockCategoryStorageOperationsCreateParams,\n    BlockCategoryStorageOperationsDeleteParams,\n    BlockCategoryStorageOperationsGetParams,\n    BlockCategoryStorageOperationsListParams,\n    BlockCategoryStorageOperationsUpdateParams\n} from \"@webiny/api-page-builder/types\";\nimport { Entity } from \"@webiny/db-dynamodb/toolbox\";\nimport { queryAll, QueryAllParams } from \"@webiny/db-dynamodb/utils/query\";\nimport { sortItems } from \"@webiny/db-dynamodb/utils/sort\";\nimport { filterItems } from \"@webiny/db-dynamodb/utils/filter\";\nimport { BlockCategoryDataLoader } from \"./dataLoader\";\nimport { createListResponse } from \"@webiny/db-dynamodb/utils/listResponse\";\nimport { BlockCategoryDynamoDbElasticFieldPlugin } from \"~/plugins/definitions/BlockCategoryDynamoDbElasticFieldPlugin\";\nimport { PluginsContainer } from \"@webiny/plugins\";\nimport { createPartitionKey, createSortKey } from \"~/operations/blockCategory/keys\";\nimport { BlockCategoryStorageOperations } from \"~/types\";\nimport { deleteItem, put } from \"@webiny/db-dynamodb\";\n\nconst createType = (): string => {\n    return \"pb.blockCategory\";\n};\n\nexport interface CreateBlockCategoryStorageOperationsParams {\n    entity: Entity<any>;\n    plugins: PluginsContainer;\n}\nexport const createBlockCategoryStorageOperations = ({\n    entity,\n    plugins\n}: CreateBlockCategoryStorageOperationsParams): BlockCategoryStorageOperations => {\n    const dataLoader = new BlockCategoryDataLoader({\n        entity\n    });\n\n    const get = async (params: BlockCategoryStorageOperationsGetParams) => {\n        const { where } = params;\n\n        try {\n            return await dataLoader.getOne(where);\n        } catch (ex) {\n            throw new WebinyError(\n                ex.message || \"Could not load block category by given parameters.\",\n                ex.code || \"BLOCK_CATEGORY_GET_ERROR\",\n                {\n                    where\n                }\n            );\n        }\n    };\n\n    const create = async (params: BlockCategoryStorageOperationsCreateParams) => {\n        const { blockCategory } = params;\n\n        const keys = {\n            PK: createPartitionKey({\n                tenant: blockCategory.tenant,\n                locale: blockCategory.locale\n            }),\n            SK: createSortKey(blockCategory)\n        };\n\n        try {\n            await put({\n                entity,\n                item: {\n                    ...blockCategory,\n                    TYPE: createType(),\n                    ...keys\n                }\n            });\n            /**\n             * Always clear data loader cache when modifying the records.\n             */\n            dataLoader.clear();\n\n            return blockCategory;\n        } catch (ex) {\n            throw new WebinyError(\n                ex.message || \"Could not create block category.\",\n                ex.code || \"BLOCK_CATEGORY_CREATE_ERROR\",\n                {\n                    keys\n                }\n            );\n        }\n    };\n\n    const update = async (params: BlockCategoryStorageOperationsUpdateParams) => {\n        const { original, blockCategory } = params;\n        const keys = {\n            PK: createPartitionKey({\n                tenant: original.tenant,\n                locale: original.locale\n            }),\n            SK: createSortKey(blockCategory)\n        };\n\n        try {\n            await put({\n                entity,\n                item: {\n                    ...blockCategory,\n                    TYPE: createType(),\n                    ...keys\n                }\n            });\n            /**\n             * Always clear data loader cache when modifying the records.\n             */\n            dataLoader.clear();\n\n            return blockCategory;\n        } catch (ex) {\n            throw new WebinyError(\n                ex.message || \"Could not update block category.\",\n                ex.code || \"BLOCK_CATEGORY_UPDATE_ERROR\",\n                {\n                    keys,\n                    original,\n                    category: blockCategory\n                }\n            );\n        }\n    };\n\n    const deleteBlockCategory = async (params: BlockCategoryStorageOperationsDeleteParams) => {\n        const { blockCategory } = params;\n        const keys = {\n            PK: createPartitionKey({\n                tenant: blockCategory.tenant,\n                locale: blockCategory.locale\n            }),\n            SK: createSortKey(blockCategory)\n        };\n\n        try {\n            await deleteItem({\n                entity,\n                keys\n            });\n            /**\n             * Always clear data loader cache when modifying the records.\n             */\n            dataLoader.clear();\n\n            return blockCategory;\n        } catch (ex) {\n            throw new WebinyError(\n                ex.message || \"Could not delete block category.\",\n                ex.code || \"BLOCK_CATEGORY_DELETE_ERROR\",\n                {\n                    keys,\n                    blockCategory\n                }\n            );\n        }\n    };\n\n    const list = async (params: BlockCategoryStorageOperationsListParams) => {\n        const { where, sort, limit } = params;\n\n        const { tenant, locale, ...restWhere } = where;\n        const queryAllParams: QueryAllParams = {\n            entity,\n            partitionKey: createPartitionKey({ tenant, locale }),\n            options: {\n                gt: \" \"\n            }\n        };\n\n        let items: BlockCategory[] = [];\n\n        try {\n            items = await queryAll<BlockCategory>(queryAllParams);\n        } catch (ex) {\n            throw new WebinyError(\n                ex.message || \"Could not list block categories by given parameters.\",\n                ex.code || \"BLOCK_CATEGORIES_LIST_ERROR\",\n                {\n                    partitionKey: queryAllParams.partitionKey,\n                    options: queryAllParams.options\n                }\n            );\n        }\n\n        const fields = plugins.byType<BlockCategoryDynamoDbElasticFieldPlugin>(\n            BlockCategoryDynamoDbElasticFieldPlugin.type\n        );\n\n        const filteredItems = filterItems<BlockCategory>({\n            plugins,\n            where: restWhere,\n            items,\n            fields\n        });\n\n        const sortedItems = sortItems<BlockCategory>({\n            items: filteredItems,\n            sort,\n            fields\n        });\n\n        return createListResponse({\n            items: sortedItems,\n            limit: limit || 100000,\n            totalCount: filteredItems.length,\n            after: null\n        });\n    };\n\n    return {\n        dataLoader,\n        get,\n        create,\n        update,\n        delete: deleteBlockCategory,\n        list\n    };\n};\n"],"mappings":"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"}

package/operations/category/dataLoader.d.ts

@@ -1,5 +1,5 @@
 import { Category } from "@webiny/api-page-builder/types";
-import { Entity } from "dynamodb-toolbox";
+import { Entity } from "@webiny/db-dynamodb/toolbox";
 import { DataLoaderInterface } from "../../types";
 interface Params {
     entity: Entity<any>;

package/operations/category/dataLoader.js

@@ -5,15 +5,13 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.CategoryDataLoader = void 0;
-var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _dataloader = _interopRequireDefault(require("dataloader"));
 var _batchRead = require("@webiny/db-dynamodb/utils/batchRead");
 var _cleanup = require("@webiny/db-dynamodb/utils/cleanup");
 var _keys = require("./keys");
 class CategoryDataLoader {
+  _getDataLoader = undefined;
   constructor(params) {
-    (0, _defineProperty2.default)(this, "_getDataLoader", undefined);
-    (0, _defineProperty2.default)(this, "entity", void 0);
     this.entity = params.entity;
   }
   async getOne(item) {

package/operations/category/dataLoader.js.map

@@ -1 +1 @@
-{"version":3,"names":["_dataloader","_interopRequireDefault","require","_batchRead","_cleanup","_keys","CategoryDataLoader","constructor","params","_defineProperty2","default","undefined","entity","getOne","item","getDataLoader","load","getAll","items","loadMany","clear","clearAll","_getDataLoader","cacheKeyFn","key","tenant","locale","slug","DataLoader","batched","map","getBatch","PK","createPartitionKey","SK","createSortKey","records","batchReadAll","table","results","reduce","collection","result","cleanupItem","exports"],"sources":["dataLoader.ts"],"sourcesContent":["import DataLoader from \"dataloader\";\nimport { batchReadAll } from \"@webiny/db-dynamodb/utils/batchRead\";\nimport { Category } from \"@webiny/api-page-builder/types\";\nimport { cleanupItem } from \"@webiny/db-dynamodb/utils/cleanup\";\nimport { Entity } from \"dynamodb-toolbox\";\nimport { createPartitionKey, createSortKey } from \"./keys\";\nimport { DataLoaderInterface } from \"~/types\";\n\ninterface Params {\n    entity: Entity<any>;\n}\n\ntype DataLoaderGetItem = Pick<Category, \"slug\" | \"tenant\" | \"locale\">;\n\nexport class CategoryDataLoader implements DataLoaderInterface {\n    private _getDataLoader: DataLoader<any, any> | undefined = undefined;\n\n    private readonly entity: Entity<any>;\n\n    constructor(params: Params) {\n        this.entity = params.entity;\n    }\n\n    public async getOne(item: DataLoaderGetItem): Promise<Category> {\n        return await this.getDataLoader().load(item);\n    }\n\n    public async getAll(items: DataLoaderGetItem[]): Promise<Category[]> {\n        return await this.getDataLoader().loadMany(items);\n    }\n\n    public clear(): void {\n        this.getDataLoader().clearAll();\n    }\n\n    private getDataLoader(): DataLoader<any, any> {\n        if (!this._getDataLoader) {\n            const cacheKeyFn = (key: DataLoaderGetItem) => {\n                return `T#${key.tenant}#L#${key.locale}#${key.slug}`;\n            };\n            this._getDataLoader = new DataLoader(\n                async items => {\n                    const batched = items.map(item => {\n                        return this.entity.getBatch({\n                            PK: createPartitionKey(item),\n                            SK: createSortKey(item)\n                        });\n                    });\n\n                    const records = await batchReadAll<Category>({\n                        table: this.entity.table,\n                        items: batched\n                    });\n\n                    const results = records.reduce((collection, result) => {\n                        if (!result) {\n                            return collection;\n                        }\n                        const key = cacheKeyFn(result);\n                        collection[key] = cleanupItem(this.entity, result) as Category;\n                        return collection;\n                    }, {} as Record<string, Category>);\n                    return items.map(item => {\n                        const key = cacheKeyFn(item);\n                        return results[key] || null;\n                    });\n                },\n                {\n                    cacheKeyFn\n                }\n            );\n        }\n        return this._getDataLoader;\n    }\n}\n"],"mappings":";;;;;;;;AAAA,IAAAA,WAAA,GAAAC,sBAAA,CAAAC,OAAA;AACA,IAAAC,UAAA,GAAAD,OAAA;AAEA,IAAAE,QAAA,GAAAF,OAAA;AAEA,IAAAG,KAAA,GAAAH,OAAA;AASO,MAAMI,kBAAkB,CAAgC;EAK3DC,WAAWA,CAACC,MAAc,EAAE;IAAA,IAAAC,gBAAA,CAAAC,OAAA,0BAJ+BC,SAAS;IAAA,IAAAF,gBAAA,CAAAC,OAAA;IAKhE,IAAI,CAACE,MAAM,GAAGJ,MAAM,CAACI,MAAM;EAC/B;EAEA,MAAaC,MAAMA,CAACC,IAAuB,EAAqB;IAC5D,OAAO,MAAM,IAAI,CAACC,aAAa,CAAC,CAAC,CAACC,IAAI,CAACF,IAAI,CAAC;EAChD;EAEA,MAAaG,MAAMA,CAACC,KAA0B,EAAuB;IACjE,OAAO,MAAM,IAAI,CAACH,aAAa,CAAC,CAAC,CAACI,QAAQ,CAACD,KAAK,CAAC;EACrD;EAEOE,KAAKA,CAAA,EAAS;IACjB,IAAI,CAACL,aAAa,CAAC,CAAC,CAACM,QAAQ,CAAC,CAAC;EACnC;EAEQN,aAAaA,CAAA,EAAyB;IAC1C,IAAI,CAAC,IAAI,CAACO,cAAc,EAAE;MACtB,MAAMC,UAAU,GAAIC,GAAsB,IAAK;QAC3C,OAAQ,KAAIA,GAAG,CAACC,MAAO,MAAKD,GAAG,CAACE,MAAO,IAAGF,GAAG,CAACG,IAAK,EAAC;MACxD,CAAC;MACD,IAAI,CAACL,cAAc,GAAG,IAAIM,mBAAU,CAChC,MAAMV,KAAK,IAAI;QACX,MAAMW,OAAO,GAAGX,KAAK,CAACY,GAAG,CAAChB,IAAI,IAAI;UAC9B,OAAO,IAAI,CAACF,MAAM,CAACmB,QAAQ,CAAC;YACxBC,EAAE,EAAE,IAAAC,wBAAkB,EAACnB,IAAI,CAAC;YAC5BoB,EAAE,EAAE,IAAAC,mBAAa,EAACrB,IAAI;UAC1B,CAAC,CAAC;QACN,CAAC,CAAC;QAEF,MAAMsB,OAAO,GAAG,MAAM,IAAAC,uBAAY,EAAW;UACzCC,KAAK,EAAE,IAAI,CAAC1B,MAAM,CAAC0B,KAAK;UACxBpB,KAAK,EAAEW;QACX,CAAC,CAAC;QAEF,MAAMU,OAAO,GAAGH,OAAO,CAACI,MAAM,CAAC,CAACC,UAAU,EAAEC,MAAM,KAAK;UACnD,IAAI,CAACA,MAAM,EAAE;YACT,OAAOD,UAAU;UACrB;UACA,MAAMjB,GAAG,GAAGD,UAAU,CAACmB,MAAM,CAAC;UAC9BD,UAAU,CAACjB,GAAG,CAAC,GAAG,IAAAmB,oBAAW,EAAC,IAAI,CAAC/B,MAAM,EAAE8B,MAAM,CAAa;UAC9D,OAAOD,UAAU;QACrB,CAAC,EAAE,CAAC,CAA6B,CAAC;QAClC,OAAOvB,KAAK,CAACY,GAAG,CAAChB,IAAI,IAAI;UACrB,MAAMU,GAAG,GAAGD,UAAU,CAACT,IAAI,CAAC;UAC5B,OAAOyB,OAAO,CAACf,GAAG,CAAC,IAAI,IAAI;QAC/B,CAAC,CAAC;MACN,CAAC,EACD;QACID;MACJ,CACJ,CAAC;IACL;IACA,OAAO,IAAI,CAACD,cAAc;EAC9B;AACJ;AAACsB,OAAA,CAAAtC,kBAAA,GAAAA,kBAAA"}
+{"version":3,"names":["_dataloader","_interopRequireDefault","require","_batchRead","_cleanup","_keys","CategoryDataLoader","_getDataLoader","undefined","constructor","params","entity","getOne","item","getDataLoader","load","getAll","items","loadMany","clear","clearAll","cacheKeyFn","key","tenant","locale","slug","DataLoader","batched","map","getBatch","PK","createPartitionKey","SK","createSortKey","records","batchReadAll","table","results","reduce","collection","result","cleanupItem","exports"],"sources":["dataLoader.ts"],"sourcesContent":["import DataLoader from \"dataloader\";\nimport { batchReadAll } from \"@webiny/db-dynamodb/utils/batchRead\";\nimport { Category } from \"@webiny/api-page-builder/types\";\nimport { cleanupItem } from \"@webiny/db-dynamodb/utils/cleanup\";\nimport { Entity } from \"@webiny/db-dynamodb/toolbox\";\nimport { createPartitionKey, createSortKey } from \"./keys\";\nimport { DataLoaderInterface } from \"~/types\";\n\ninterface Params {\n    entity: Entity<any>;\n}\n\ntype DataLoaderGetItem = Pick<Category, \"slug\" | \"tenant\" | \"locale\">;\n\nexport class CategoryDataLoader implements DataLoaderInterface {\n    private _getDataLoader: DataLoader<any, any> | undefined = undefined;\n\n    private readonly entity: Entity<any>;\n\n    constructor(params: Params) {\n        this.entity = params.entity;\n    }\n\n    public async getOne(item: DataLoaderGetItem): Promise<Category> {\n        return await this.getDataLoader().load(item);\n    }\n\n    public async getAll(items: DataLoaderGetItem[]): Promise<Category[]> {\n        return await this.getDataLoader().loadMany(items);\n    }\n\n    public clear(): void {\n        this.getDataLoader().clearAll();\n    }\n\n    private getDataLoader(): DataLoader<any, any> {\n        if (!this._getDataLoader) {\n            const cacheKeyFn = (key: DataLoaderGetItem) => {\n                return `T#${key.tenant}#L#${key.locale}#${key.slug}`;\n            };\n            this._getDataLoader = new DataLoader(\n                async items => {\n                    const batched = items.map(item => {\n                        return this.entity.getBatch({\n                            PK: createPartitionKey(item),\n                            SK: createSortKey(item)\n                        });\n                    });\n\n                    const records = await batchReadAll<Category>({\n                        table: this.entity.table,\n                        items: batched\n                    });\n\n                    const results = records.reduce((collection, result) => {\n                        if (!result) {\n                            return collection;\n                        }\n                        const key = cacheKeyFn(result);\n                        collection[key] = cleanupItem(this.entity, result) as Category;\n                        return collection;\n                    }, {} as Record<string, Category>);\n                    return items.map(item => {\n                        const key = cacheKeyFn(item);\n                        return results[key] || null;\n                    });\n                },\n                {\n                    cacheKeyFn\n                }\n            );\n        }\n        return this._getDataLoader;\n    }\n}\n"],"mappings":";;;;;;;AAAA,IAAAA,WAAA,GAAAC,sBAAA,CAAAC,OAAA;AACA,IAAAC,UAAA,GAAAD,OAAA;AAEA,IAAAE,QAAA,GAAAF,OAAA;AAEA,IAAAG,KAAA,GAAAH,OAAA;AASO,MAAMI,kBAAkB,CAAgC;EACnDC,cAAc,GAAqCC,SAAS;EAIpEC,WAAWA,CAACC,MAAc,EAAE;IACxB,IAAI,CAACC,MAAM,GAAGD,MAAM,CAACC,MAAM;EAC/B;EAEA,MAAaC,MAAMA,CAACC,IAAuB,EAAqB;IAC5D,OAAO,MAAM,IAAI,CAACC,aAAa,CAAC,CAAC,CAACC,IAAI,CAACF,IAAI,CAAC;EAChD;EAEA,MAAaG,MAAMA,CAACC,KAA0B,EAAuB;IACjE,OAAO,MAAM,IAAI,CAACH,aAAa,CAAC,CAAC,CAACI,QAAQ,CAACD,KAAK,CAAC;EACrD;EAEOE,KAAKA,CAAA,EAAS;IACjB,IAAI,CAACL,aAAa,CAAC,CAAC,CAACM,QAAQ,CAAC,CAAC;EACnC;EAEQN,aAAaA,CAAA,EAAyB;IAC1C,IAAI,CAAC,IAAI,CAACP,cAAc,EAAE;MACtB,MAAMc,UAAU,GAAIC,GAAsB,IAAK;QAC3C,OAAQ,KAAIA,GAAG,CAACC,MAAO,MAAKD,GAAG,CAACE,MAAO,IAAGF,GAAG,CAACG,IAAK,EAAC;MACxD,CAAC;MACD,IAAI,CAAClB,cAAc,GAAG,IAAImB,mBAAU,CAChC,MAAMT,KAAK,IAAI;QACX,MAAMU,OAAO,GAAGV,KAAK,CAACW,GAAG,CAACf,IAAI,IAAI;UAC9B,OAAO,IAAI,CAACF,MAAM,CAACkB,QAAQ,CAAC;YACxBC,EAAE,EAAE,IAAAC,wBAAkB,EAAClB,IAAI,CAAC;YAC5BmB,EAAE,EAAE,IAAAC,mBAAa,EAACpB,IAAI;UAC1B,CAAC,CAAC;QACN,CAAC,CAAC;QAEF,MAAMqB,OAAO,GAAG,MAAM,IAAAC,uBAAY,EAAW;UACzCC,KAAK,EAAE,IAAI,CAACzB,MAAM,CAACyB,KAAK;UACxBnB,KAAK,EAAEU;QACX,CAAC,CAAC;QAEF,MAAMU,OAAO,GAAGH,OAAO,CAACI,MAAM,CAAC,CAACC,UAAU,EAAEC,MAAM,KAAK;UACnD,IAAI,CAACA,MAAM,EAAE;YACT,OAAOD,UAAU;UACrB;UACA,MAAMjB,GAAG,GAAGD,UAAU,CAACmB,MAAM,CAAC;UAC9BD,UAAU,CAACjB,GAAG,CAAC,GAAG,IAAAmB,oBAAW,EAAC,IAAI,CAAC9B,MAAM,EAAE6B,MAAM,CAAa;UAC9D,OAAOD,UAAU;QACrB,CAAC,EAAE,CAAC,CAA6B,CAAC;QAClC,OAAOtB,KAAK,CAACW,GAAG,CAACf,IAAI,IAAI;UACrB,MAAMS,GAAG,GAAGD,UAAU,CAACR,IAAI,CAAC;UAC5B,OAAOwB,OAAO,CAACf,GAAG,CAAC,IAAI,IAAI;QAC/B,CAAC,CAAC;MACN,CAAC,EACD;QACID;MACJ,CACJ,CAAC;IACL;IACA,OAAO,IAAI,CAACd,cAAc;EAC9B;AACJ;AAACmC,OAAA,CAAApC,kBAAA,GAAAA,kBAAA"}

package/operations/category/index.d.ts

@@ -1,4 +1,4 @@
-import { Entity } from "dynamodb-toolbox";
+import { Entity } from "@webiny/db-dynamodb/toolbox";
 import { PluginsContainer } from "@webiny/plugins";
 import { CategoryStorageOperations } from "../../types";
 export interface CreateCategoryStorageOperationsParams {

package/operations/category/index.js

@@ -5,8 +5,6 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.createCategoryStorageOperations = void 0;
-var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
-var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
 var _error = _interopRequireDefault(require("@webiny/error"));
 var _query = require("@webiny/db-dynamodb/utils/query");
 var _sort = require("@webiny/db-dynamodb/utils/sort");
@@ -15,7 +13,7 @@ var _dataLoader = require("./dataLoader");
 var _listResponse = require("@webiny/db-dynamodb/utils/listResponse");
 var _CategoryDynamoDbElasticFieldPlugin = require("../../plugins/definitions/CategoryDynamoDbElasticFieldPlugin");
 var _keys = require("./keys");
-const _excluded = ["tenant", "locale"];
+var _dbDynamodb = require("@webiny/db-dynamodb");
 const createType = () => {
   return "pb.category";
 };
@@ -50,9 +48,14 @@ const createCategoryStorageOperations = ({
       SK: (0, _keys.createSortKey)(category)
     };
     try {
-      await entity.put((0, _objectSpread2.default)((0, _objectSpread2.default)({}, category), {}, {
-        TYPE: createType()
-      }, keys));
+      await (0, _dbDynamodb.put)({
+        entity,
+        item: {
+          ...category,
+          TYPE: createType(),
+          ...keys
+        }
+      });
       /**
        * Always clear data loader cache when modifying the records.
        */
@@ -77,9 +80,14 @@ const createCategoryStorageOperations = ({
       SK: (0, _keys.createSortKey)(category)
     };
     try {
-      await entity.put((0, _objectSpread2.default)((0, _objectSpread2.default)({}, category), {}, {
-        TYPE: createType()
-      }, keys));
+      await (0, _dbDynamodb.put)({
+        entity,
+        item: {
+          ...category,
+          TYPE: createType(),
+          ...keys
+        }
+      });
       /**
        * Always clear data loader cache when modifying the records.
        */
@@ -105,7 +113,10 @@ const createCategoryStorageOperations = ({
       SK: (0, _keys.createSortKey)(category)
     };
     try {
-      await entity.delete((0, _objectSpread2.default)((0, _objectSpread2.default)({}, category), keys));
+      await (0, _dbDynamodb.deleteItem)({
+        entity,
+        keys
+      });
       /**
        * Always clear data loader cache when modifying the records.
        */
@@ -125,10 +136,10 @@ const createCategoryStorageOperations = ({
       limit
     } = params;
     const {
-        tenant,
-        locale
-      } = where,
-      restWhere = (0, _objectWithoutProperties2.default)(where, _excluded);
+      tenant,
+      locale,
+      ...restWhere
+    } = where;
     const queryAllParams = {
       entity,
       partitionKey: (0, _keys.createPartitionKey)({

package/operations/category/index.js.map

@@ -1 +1 @@
-{"version":3,"names":["_error","_interopRequireDefault","require","_query","_sort","_filter","_dataLoader","_listResponse","_CategoryDynamoDbElasticFieldPlugin","_keys","_excluded","createType","createCategoryStorageOperations","entity","plugins","dataLoader","CategoryDataLoader","get","params","where","getOne","ex","WebinyError","message","code","create","category","keys","PK","createPartitionKey","tenant","locale","SK","createSortKey","put","_objectSpread2","default","TYPE","clear","update","original","deleteCategory","delete","list","sort","limit","restWhere","_objectWithoutProperties2","queryAllParams","partitionKey","options","gt","items","queryAll","fields","byType","CategoryDynamoDbElasticFieldPlugin","type","filteredItems","filterItems","sortedItems","sortItems","createListResponse","totalCount","length","after","exports"],"sources":["index.ts"],"sourcesContent":["import WebinyError from \"@webiny/error\";\nimport {\n    Category,\n    CategoryStorageOperationsCreateParams,\n    CategoryStorageOperationsDeleteParams,\n    CategoryStorageOperationsGetParams,\n    CategoryStorageOperationsListParams,\n    CategoryStorageOperationsUpdateParams\n} from \"@webiny/api-page-builder/types\";\nimport { Entity } from \"dynamodb-toolbox\";\nimport { queryAll, QueryAllParams } from \"@webiny/db-dynamodb/utils/query\";\nimport { sortItems } from \"@webiny/db-dynamodb/utils/sort\";\nimport { filterItems } from \"@webiny/db-dynamodb/utils/filter\";\nimport { CategoryDataLoader } from \"./dataLoader\";\nimport { createListResponse } from \"@webiny/db-dynamodb/utils/listResponse\";\nimport { CategoryDynamoDbElasticFieldPlugin } from \"~/plugins/definitions/CategoryDynamoDbElasticFieldPlugin\";\nimport { PluginsContainer } from \"@webiny/plugins\";\nimport { createPartitionKey, createSortKey } from \"~/operations/category/keys\";\nimport { CategoryStorageOperations } from \"~/types\";\n\nconst createType = (): string => {\n    return \"pb.category\";\n};\n\nexport interface CreateCategoryStorageOperationsParams {\n    entity: Entity<any>;\n    plugins: PluginsContainer;\n}\nexport const createCategoryStorageOperations = ({\n    entity,\n    plugins\n}: CreateCategoryStorageOperationsParams): CategoryStorageOperations => {\n    const dataLoader = new CategoryDataLoader({\n        entity\n    });\n\n    const get = async (params: CategoryStorageOperationsGetParams) => {\n        const { where } = params;\n\n        try {\n            return await dataLoader.getOne(where);\n        } catch (ex) {\n            throw new WebinyError(\n                ex.message || \"Could not load category by given parameters.\",\n                ex.code || \"CATEGORY_GET_ERROR\",\n                {\n                    where\n                }\n            );\n        }\n    };\n\n    const create = async (params: CategoryStorageOperationsCreateParams) => {\n        const { category } = params;\n\n        const keys = {\n            PK: createPartitionKey({\n                tenant: category.tenant,\n                locale: category.locale\n            }),\n            SK: createSortKey(category)\n        };\n\n        try {\n            await entity.put({\n                ...category,\n                TYPE: createType(),\n                ...keys\n            });\n            /**\n             * Always clear data loader cache when modifying the records.\n             */\n            dataLoader.clear();\n\n            return category;\n        } catch (ex) {\n            throw new WebinyError(\n                ex.message || \"Could not create category.\",\n                ex.code || \"CATEGORY_CREATE_ERROR\",\n                {\n                    keys\n                }\n            );\n        }\n    };\n\n    const update = async (params: CategoryStorageOperationsUpdateParams) => {\n        const { original, category } = params;\n        const keys = {\n            PK: createPartitionKey({\n                tenant: original.tenant,\n                locale: original.locale\n            }),\n            SK: createSortKey(category)\n        };\n\n        try {\n            await entity.put({\n                ...category,\n                TYPE: createType(),\n                ...keys\n            });\n            /**\n             * Always clear data loader cache when modifying the records.\n             */\n            dataLoader.clear();\n\n            return category;\n        } catch (ex) {\n            throw new WebinyError(\n                ex.message || \"Could not update category.\",\n                ex.code || \"CATEGORY_UPDATE_ERROR\",\n                {\n                    keys,\n                    original,\n                    category\n                }\n            );\n        }\n    };\n\n    const deleteCategory = async (params: CategoryStorageOperationsDeleteParams) => {\n        const { category } = params;\n        const keys = {\n            PK: createPartitionKey({\n                tenant: category.tenant,\n                locale: category.locale\n            }),\n            SK: createSortKey(category)\n        };\n\n        try {\n            await entity.delete({\n                ...category,\n                ...keys\n            });\n            /**\n             * Always clear data loader cache when modifying the records.\n             */\n            dataLoader.clear();\n\n            return category;\n        } catch (ex) {\n            throw new WebinyError(\n                ex.message || \"Could not delete category.\",\n                ex.code || \"CATEGORY_DELETE_ERROR\",\n                {\n                    keys,\n                    category\n                }\n            );\n        }\n    };\n\n    const list = async (params: CategoryStorageOperationsListParams) => {\n        const { where, sort, limit } = params;\n\n        const { tenant, locale, ...restWhere } = where;\n        const queryAllParams: QueryAllParams = {\n            entity,\n            partitionKey: createPartitionKey({ tenant, locale }),\n            options: {\n                gt: \" \"\n            }\n        };\n\n        let items: Category[] = [];\n\n        try {\n            items = await queryAll<Category>(queryAllParams);\n        } catch (ex) {\n            throw new WebinyError(\n                ex.message || \"Could not list categories by given parameters.\",\n                ex.code || \"CATEGORIES_LIST_ERROR\",\n                {\n                    partitionKey: queryAllParams.partitionKey,\n                    options: queryAllParams.options\n                }\n            );\n        }\n\n        const fields = plugins.byType<CategoryDynamoDbElasticFieldPlugin>(\n            CategoryDynamoDbElasticFieldPlugin.type\n        );\n\n        const filteredItems = filterItems<Category>({\n            plugins,\n            where: restWhere,\n            items,\n            fields\n        });\n\n        const sortedItems = sortItems<Category>({\n            items: filteredItems,\n            sort,\n            fields\n        });\n\n        return createListResponse({\n            items: sortedItems,\n            limit: limit || 100000,\n            totalCount: filteredItems.length,\n            after: null\n        });\n    };\n\n    return {\n        dataLoader,\n        get,\n        create,\n        update,\n        delete: deleteCategory,\n        list\n    };\n};\n"],"mappings":"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"}
+{"version":3,"names":["_error","_interopRequireDefault","require","_query","_sort","_filter","_dataLoader","_listResponse","_CategoryDynamoDbElasticFieldPlugin","_keys","_dbDynamodb","createType","createCategoryStorageOperations","entity","plugins","dataLoader","CategoryDataLoader","get","params","where","getOne","ex","WebinyError","message","code","create","category","keys","PK","createPartitionKey","tenant","locale","SK","createSortKey","put","item","TYPE","clear","update","original","deleteCategory","deleteItem","list","sort","limit","restWhere","queryAllParams","partitionKey","options","gt","items","queryAll","fields","byType","CategoryDynamoDbElasticFieldPlugin","type","filteredItems","filterItems","sortedItems","sortItems","createListResponse","totalCount","length","after","delete","exports"],"sources":["index.ts"],"sourcesContent":["import WebinyError from \"@webiny/error\";\nimport {\n    Category,\n    CategoryStorageOperationsCreateParams,\n    CategoryStorageOperationsDeleteParams,\n    CategoryStorageOperationsGetParams,\n    CategoryStorageOperationsListParams,\n    CategoryStorageOperationsUpdateParams\n} from \"@webiny/api-page-builder/types\";\nimport { Entity } from \"@webiny/db-dynamodb/toolbox\";\nimport { queryAll, QueryAllParams } from \"@webiny/db-dynamodb/utils/query\";\nimport { sortItems } from \"@webiny/db-dynamodb/utils/sort\";\nimport { filterItems } from \"@webiny/db-dynamodb/utils/filter\";\nimport { CategoryDataLoader } from \"./dataLoader\";\nimport { createListResponse } from \"@webiny/db-dynamodb/utils/listResponse\";\nimport { CategoryDynamoDbElasticFieldPlugin } from \"~/plugins/definitions/CategoryDynamoDbElasticFieldPlugin\";\nimport { PluginsContainer } from \"@webiny/plugins\";\nimport { createPartitionKey, createSortKey } from \"~/operations/category/keys\";\nimport { CategoryStorageOperations } from \"~/types\";\nimport { deleteItem, put } from \"@webiny/db-dynamodb\";\n\nconst createType = (): string => {\n    return \"pb.category\";\n};\n\nexport interface CreateCategoryStorageOperationsParams {\n    entity: Entity<any>;\n    plugins: PluginsContainer;\n}\nexport const createCategoryStorageOperations = ({\n    entity,\n    plugins\n}: CreateCategoryStorageOperationsParams): CategoryStorageOperations => {\n    const dataLoader = new CategoryDataLoader({\n        entity\n    });\n\n    const get = async (params: CategoryStorageOperationsGetParams) => {\n        const { where } = params;\n\n        try {\n            return await dataLoader.getOne(where);\n        } catch (ex) {\n            throw new WebinyError(\n                ex.message || \"Could not load category by given parameters.\",\n                ex.code || \"CATEGORY_GET_ERROR\",\n                {\n                    where\n                }\n            );\n        }\n    };\n\n    const create = async (params: CategoryStorageOperationsCreateParams) => {\n        const { category } = params;\n\n        const keys = {\n            PK: createPartitionKey({\n                tenant: category.tenant,\n                locale: category.locale\n            }),\n            SK: createSortKey(category)\n        };\n\n        try {\n            await put({\n                entity,\n                item: {\n                    ...category,\n                    TYPE: createType(),\n                    ...keys\n                }\n            });\n            /**\n             * Always clear data loader cache when modifying the records.\n             */\n            dataLoader.clear();\n\n            return category;\n        } catch (ex) {\n            throw new WebinyError(\n                ex.message || \"Could not create category.\",\n                ex.code || \"CATEGORY_CREATE_ERROR\",\n                {\n                    keys\n                }\n            );\n        }\n    };\n\n    const update = async (params: CategoryStorageOperationsUpdateParams) => {\n        const { original, category } = params;\n        const keys = {\n            PK: createPartitionKey({\n                tenant: original.tenant,\n                locale: original.locale\n            }),\n            SK: createSortKey(category)\n        };\n\n        try {\n            await put({\n                entity,\n                item: {\n                    ...category,\n                    TYPE: createType(),\n                    ...keys\n                }\n            });\n            /**\n             * Always clear data loader cache when modifying the records.\n             */\n            dataLoader.clear();\n\n            return category;\n        } catch (ex) {\n            throw new WebinyError(\n                ex.message || \"Could not update category.\",\n                ex.code || \"CATEGORY_UPDATE_ERROR\",\n                {\n                    keys,\n                    original,\n                    category\n                }\n            );\n        }\n    };\n\n    const deleteCategory = async (params: CategoryStorageOperationsDeleteParams) => {\n        const { category } = params;\n        const keys = {\n            PK: createPartitionKey({\n                tenant: category.tenant,\n                locale: category.locale\n            }),\n            SK: createSortKey(category)\n        };\n\n        try {\n            await deleteItem({\n                entity,\n                keys\n            });\n            /**\n             * Always clear data loader cache when modifying the records.\n             */\n            dataLoader.clear();\n\n            return category;\n        } catch (ex) {\n            throw new WebinyError(\n                ex.message || \"Could not delete category.\",\n                ex.code || \"CATEGORY_DELETE_ERROR\",\n                {\n                    keys,\n                    category\n                }\n            );\n        }\n    };\n\n    const list = async (params: CategoryStorageOperationsListParams) => {\n        const { where, sort, limit } = params;\n\n        const { tenant, locale, ...restWhere } = where;\n        const queryAllParams: QueryAllParams = {\n            entity,\n            partitionKey: createPartitionKey({ tenant, locale }),\n            options: {\n                gt: \" \"\n            }\n        };\n\n        let items: Category[] = [];\n\n        try {\n            items = await queryAll<Category>(queryAllParams);\n        } catch (ex) {\n            throw new WebinyError(\n                ex.message || \"Could not list categories by given parameters.\",\n                ex.code || \"CATEGORIES_LIST_ERROR\",\n                {\n                    partitionKey: queryAllParams.partitionKey,\n                    options: queryAllParams.options\n                }\n            );\n        }\n\n        const fields = plugins.byType<CategoryDynamoDbElasticFieldPlugin>(\n            CategoryDynamoDbElasticFieldPlugin.type\n        );\n\n        const filteredItems = filterItems<Category>({\n            plugins,\n            where: restWhere,\n            items,\n            fields\n        });\n\n        const sortedItems = sortItems<Category>({\n            items: filteredItems,\n            sort,\n            fields\n        });\n\n        return createListResponse({\n            items: sortedItems,\n            limit: limit || 100000,\n            totalCount: filteredItems.length,\n            after: null\n        });\n    };\n\n    return {\n        dataLoader,\n        get,\n        create,\n        update,\n        delete: deleteCategory,\n        list\n    };\n};\n"],"mappings":"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"}

package/operations/menu/index.d.ts

@@ -1,5 +1,5 @@
 import { MenuStorageOperations } from "@webiny/api-page-builder/types";
-import { Entity } from "dynamodb-toolbox";
+import { Entity } from "@webiny/db-dynamodb/toolbox";
 import { PluginsContainer } from "@webiny/plugins";
 export interface CreateMenuStorageOperationsParams {
     entity: Entity<any>;

package/operations/menu/index.js

@@ -5,8 +5,6 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.createMenuStorageOperations = void 0;
-var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
-var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
 var _error = _interopRequireDefault(require("@webiny/error"));
 var _cleanup = require("@webiny/db-dynamodb/utils/cleanup");
 var _query = require("@webiny/db-dynamodb/utils/query");
@@ -14,7 +12,7 @@ var _filter = require("@webiny/db-dynamodb/utils/filter");
 var _sort = require("@webiny/db-dynamodb/utils/sort");
 var _listResponse = require("@webiny/db-dynamodb/utils/listResponse");
 var _MenuDynamoDbElasticFieldPlugin = require("../../plugins/definitions/MenuDynamoDbElasticFieldPlugin");
-const _excluded = ["tenant", "locale"];
+var _dbDynamodb = require("@webiny/db-dynamodb");
 const createPartitionKey = params => {
   const {
     tenant,
@@ -44,11 +42,10 @@ const createMenuStorageOperations = ({
       SK: createSortKey(where)
     };
     try {
-      const result = await entity.get(keys);
-      if (!result || !result.Item) {
-        return null;
-      }
-      return (0, _cleanup.cleanupItem)(entity, result.Item);
+      return await (0, _dbDynamodb.getClean)({
+        entity,
+        keys
+      });
     } catch (ex) {
       throw new _error.default(ex.message || "Could not load menu by given parameters.", ex.code || "MENU_GET_ERROR", {
         where
@@ -67,9 +64,14 @@ const createMenuStorageOperations = ({
       SK: createSortKey(menu)
     };
     try {
-      await entity.put((0, _objectSpread2.default)((0, _objectSpread2.default)({}, menu), {}, {
-        TYPE: createType()
-      }, keys));
+      await (0, _dbDynamodb.put)({
+        entity,
+        item: {
+          ...menu,
+          TYPE: createType(),
+          ...keys
+        }
+      });
       return menu;
     } catch (ex) {
       throw new _error.default(ex.message || "Could not create menu.", ex.code || "MENU_CREATE_ERROR", {
@@ -91,9 +93,14 @@ const createMenuStorageOperations = ({
       SK: createSortKey(menu)
     };
     try {
-      await entity.put((0, _objectSpread2.default)((0, _objectSpread2.default)({}, menu), {}, {
-        TYPE: createType()
-      }, keys));
+      await (0, _dbDynamodb.put)({
+        entity,
+        item: {
+          ...menu,
+          TYPE: createType(),
+          ...keys
+        }
+      });
       return menu;
     } catch (ex) {
       throw new _error.default(ex.message || "Could not update menu.", ex.code || "MENU_UPDATE_ERROR", {
@@ -110,10 +117,10 @@ const createMenuStorageOperations = ({
       limit = 10
     } = params;
     const {
-        tenant,
-        locale
-      } = where,
-      restWhere = (0, _objectWithoutProperties2.default)(where, _excluded);
+      tenant,
+      locale,
+      ...restWhere
+    } = where;
     const queryAllParams = {
       entity,
       partitionKey: createPartitionKey({
@@ -169,7 +176,10 @@ const createMenuStorageOperations = ({
       SK: createSortKey(menu)
     };
     try {
-      await entity.delete((0, _objectSpread2.default)((0, _objectSpread2.default)({}, menu), keys));
+      await (0, _dbDynamodb.deleteItem)({
+        entity,
+        keys
+      });
       return menu;
     } catch (ex) {
       throw new _error.default(ex.message || "Could not delete menu.", ex.code || "MENU_DELETE_ERROR", {