@webiny/api-file-manager-ddb 0.0.0-unstable.9e825fd5fb → 0.0.0-unstable.a9593f74dd

package/index.d.ts

@@ -1,8 +1,8 @@
-import { DocumentClient } from "aws-sdk/clients/dynamodb";
+import { DynamoDBClient } from "@webiny/aws-sdk/client-dynamodb";
 import { PluginCollection } from "@webiny/plugins/types";
 import { FileManagerStorageOperations } from "@webiny/api-file-manager/types";
 export interface StorageOperationsConfig {
-    documentClient: DocumentClient;
+    documentClient: DynamoDBClient;
     plugins?: PluginCollection;
 }
 export * from "./plugins";

package/index.js

@@ -10,10 +10,9 @@ var _exportNames = {
 exports.createFileManagerStorageOperations = void 0;
 var _plugins = _interopRequireDefault(require("@webiny/db-dynamodb/plugins"));
 var _plugins2 = require("@webiny/plugins");
-var _FilesStorageOperations = require("./operations/files/FilesStorageOperations");
-var _SettingsStorageOperations = require("./operations/settings/SettingsStorageOperations");
-var _SystemStorageOperations = require("./operations/system/SystemStorageOperations");
-var _fields = require("./operations/files/fields");
+var _FilesStorageOperations = require("./operations/FilesStorageOperations");
+var _SettingsStorageOperations = require("./operations/SettingsStorageOperations");
+var _SystemStorageOperations = require("./operations/SystemStorageOperations");
 var _plugins3 = require("./plugins");
 Object.keys(_plugins3).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
@@ -26,24 +25,23 @@ Object.keys(_plugins3).forEach(function (key) {
     }
   });
 });
+var _AliasesStorageOperations = require("./operations/AliasesStorageOperations");
 const createFileManagerStorageOperations = ({
   documentClient,
   plugins: userPlugins
 }) => {
   const plugins = new _plugins2.PluginsContainer([(0, _plugins.default)(),
-  // Built-in plugins
-  ...(0, _fields.createFileFieldsPlugins)(),
   // User plugins
   ...(userPlugins || [])]);
   return {
     beforeInit: async context => {
-      const types = [_plugins3.FileAttributePlugin.type, _plugins3.FileDynamoDbFieldPlugin.type, _plugins3.SettingsAttributePlugin.type, _plugins3.SystemAttributePlugin.type];
+      const types = [_plugins3.SettingsAttributePlugin.type, _plugins3.SystemAttributePlugin.type];
       for (const type of types) {
         plugins.mergeByType(context.plugins, type);
       }
     },
-    files: new _FilesStorageOperations.FilesStorageOperations({
-      plugins,
+    files: new _FilesStorageOperations.FilesStorageOperations(),
+    aliases: new _AliasesStorageOperations.AliasesStorageOperations({
       documentClient
     }),
     settings: new _SettingsStorageOperations.SettingsStorageOperations({
@@ -54,4 +52,6 @@ const createFileManagerStorageOperations = ({
     })
   };
 };
-exports.createFileManagerStorageOperations = createFileManagerStorageOperations;
+exports.createFileManagerStorageOperations = createFileManagerStorageOperations;
+
+//# sourceMappingURL=index.js.map

package/index.js.map

@@ -1 +1 @@
-{"version":3,"names":["createFileManagerStorageOperations","documentClient","plugins","userPlugins","PluginsContainer","ddbPlugins","createFileFieldsPlugins","beforeInit","context","types","FileAttributePlugin","type","FileDynamoDbFieldPlugin","SettingsAttributePlugin","SystemAttributePlugin","mergeByType","files","FilesStorageOperations","settings","SettingsStorageOperations","system","SystemStorageOperations"],"sources":["index.ts"],"sourcesContent":["import { DocumentClient } from \"aws-sdk/clients/dynamodb\";\nimport ddbPlugins from \"@webiny/db-dynamodb/plugins\";\nimport { PluginsContainer } from \"@webiny/plugins\";\nimport { PluginCollection } from \"@webiny/plugins/types\";\nimport { FileManagerStorageOperations } from \"@webiny/api-file-manager/types\";\nimport { FilesStorageOperations } from \"~/operations/files/FilesStorageOperations\";\nimport { SettingsStorageOperations } from \"~/operations/settings/SettingsStorageOperations\";\nimport { SystemStorageOperations } from \"~/operations/system/SystemStorageOperations\";\nimport { createFileFieldsPlugins } from \"~/operations/files/fields\";\nimport {\n    FileAttributePlugin,\n    FileDynamoDbFieldPlugin,\n    SettingsAttributePlugin,\n    SystemAttributePlugin\n} from \"./plugins\";\n\nexport interface StorageOperationsConfig {\n    documentClient: DocumentClient;\n    plugins?: PluginCollection;\n}\n\nexport * from \"./plugins\";\n\nexport const createFileManagerStorageOperations = ({\n    documentClient,\n    plugins: userPlugins\n}: StorageOperationsConfig): FileManagerStorageOperations => {\n    const plugins = new PluginsContainer([\n        ddbPlugins(),\n        // Built-in plugins\n        ...createFileFieldsPlugins(),\n        // User plugins\n        ...(userPlugins || [])\n    ]);\n\n    return {\n        beforeInit: async context => {\n            const types: string[] = [\n                FileAttributePlugin.type,\n                FileDynamoDbFieldPlugin.type,\n                SettingsAttributePlugin.type,\n                SystemAttributePlugin.type\n            ];\n            for (const type of types) {\n                plugins.mergeByType(context.plugins, type);\n            }\n        },\n        files: new FilesStorageOperations({ plugins, documentClient }),\n        settings: new SettingsStorageOperations({ documentClient }),\n        system: new SystemStorageOperations({ documentClient })\n    };\n};\n"],"mappings":";;;;;;;;;;AACA;AACA;AAGA;AACA;AACA;AACA;AACA;AAYA;EAAA;EAAA;EAAA;EAAA;IAAA;IAAA;MAAA;IAAA;EAAA;AAAA;AAEO,MAAMA,kCAAkC,GAAG,CAAC;EAC/CC,cAAc;EACdC,OAAO,EAAEC;AACY,CAAC,KAAmC;EACzD,MAAMD,OAAO,GAAG,IAAIE,0BAAgB,CAAC,CACjC,IAAAC,gBAAU,GAAE;EACZ;EACA,GAAG,IAAAC,+BAAuB,GAAE;EAC5B;EACA,IAAIH,WAAW,IAAI,EAAE,CAAC,CACzB,CAAC;EAEF,OAAO;IACHI,UAAU,EAAE,MAAMC,OAAO,IAAI;MACzB,MAAMC,KAAe,GAAG,CACpBC,6BAAmB,CAACC,IAAI,EACxBC,iCAAuB,CAACD,IAAI,EAC5BE,iCAAuB,CAACF,IAAI,EAC5BG,+BAAqB,CAACH,IAAI,CAC7B;MACD,KAAK,MAAMA,IAAI,IAAIF,KAAK,EAAE;QACtBP,OAAO,CAACa,WAAW,CAACP,OAAO,CAACN,OAAO,EAAES,IAAI,CAAC;MAC9C;IACJ,CAAC;IACDK,KAAK,EAAE,IAAIC,8CAAsB,CAAC;MAAEf,OAAO;MAAED;IAAe,CAAC,CAAC;IAC9DiB,QAAQ,EAAE,IAAIC,oDAAyB,CAAC;MAAElB;IAAe,CAAC,CAAC;IAC3DmB,MAAM,EAAE,IAAIC,gDAAuB,CAAC;MAAEpB;IAAe,CAAC;EAC1D,CAAC;AACL,CAAC;AAAC"}
+{"version":3,"names":["_plugins","_interopRequireDefault","require","_plugins2","_FilesStorageOperations","_SettingsStorageOperations","_SystemStorageOperations","_plugins3","Object","keys","forEach","key","prototype","hasOwnProperty","call","_exportNames","exports","defineProperty","enumerable","get","_AliasesStorageOperations","createFileManagerStorageOperations","documentClient","plugins","userPlugins","PluginsContainer","ddbPlugins","beforeInit","context","types","SettingsAttributePlugin","type","SystemAttributePlugin","mergeByType","files","FilesStorageOperations","aliases","AliasesStorageOperations","settings","SettingsStorageOperations","system","SystemStorageOperations"],"sources":["index.ts"],"sourcesContent":["import { DynamoDBClient } from \"@webiny/aws-sdk/client-dynamodb\";\nimport ddbPlugins from \"@webiny/db-dynamodb/plugins\";\nimport { PluginsContainer } from \"@webiny/plugins\";\nimport { PluginCollection } from \"@webiny/plugins/types\";\nimport { FileManagerStorageOperations } from \"@webiny/api-file-manager/types\";\nimport { FilesStorageOperations } from \"~/operations/FilesStorageOperations\";\nimport { SettingsStorageOperations } from \"~/operations/SettingsStorageOperations\";\nimport { SystemStorageOperations } from \"~/operations/SystemStorageOperations\";\nimport { SettingsAttributePlugin, SystemAttributePlugin } from \"./plugins\";\nimport { AliasesStorageOperations } from \"~/operations/AliasesStorageOperations\";\n\nexport interface StorageOperationsConfig {\n    documentClient: DynamoDBClient;\n    plugins?: PluginCollection;\n}\n\nexport * from \"./plugins\";\n\nexport const createFileManagerStorageOperations = ({\n    documentClient,\n    plugins: userPlugins\n}: StorageOperationsConfig): FileManagerStorageOperations => {\n    const plugins = new PluginsContainer([\n        ddbPlugins(),\n        // User plugins\n        ...(userPlugins || [])\n    ]);\n\n    return {\n        beforeInit: async context => {\n            const types: string[] = [SettingsAttributePlugin.type, SystemAttributePlugin.type];\n            for (const type of types) {\n                plugins.mergeByType(context.plugins, type);\n            }\n        },\n        files: new FilesStorageOperations(),\n        aliases: new AliasesStorageOperations({ documentClient }),\n        settings: new SettingsStorageOperations({ documentClient }),\n        system: new SystemStorageOperations({ documentClient })\n    };\n};\n"],"mappings":";;;;;;;;;;AACA,IAAAA,QAAA,GAAAC,sBAAA,CAAAC,OAAA;AACA,IAAAC,SAAA,GAAAD,OAAA;AAGA,IAAAE,uBAAA,GAAAF,OAAA;AACA,IAAAG,0BAAA,GAAAH,OAAA;AACA,IAAAI,wBAAA,GAAAJ,OAAA;AACA,IAAAK,SAAA,GAAAL,OAAA;AAQAM,MAAA,CAAAC,IAAA,CAAAF,SAAA,EAAAG,OAAA,WAAAC,GAAA;EAAA,IAAAA,GAAA,kBAAAA,GAAA;EAAA,IAAAH,MAAA,CAAAI,SAAA,CAAAC,cAAA,CAAAC,IAAA,CAAAC,YAAA,EAAAJ,GAAA;EAAA,IAAAA,GAAA,IAAAK,OAAA,IAAAA,OAAA,CAAAL,GAAA,MAAAJ,SAAA,CAAAI,GAAA;EAAAH,MAAA,CAAAS,cAAA,CAAAD,OAAA,EAAAL,GAAA;IAAAO,UAAA;IAAAC,GAAA,WAAAA,CAAA;MAAA,OAAAZ,SAAA,CAAAI,GAAA;IAAA;EAAA;AAAA;AAPA,IAAAS,yBAAA,GAAAlB,OAAA;AASO,MAAMmB,kCAAkC,GAAGA,CAAC;EAC/CC,cAAc;EACdC,OAAO,EAAEC;AACY,CAAC,KAAmC;EACzD,MAAMD,OAAO,GAAG,IAAIE,0BAAgB,CAAC,CACjC,IAAAC,gBAAU,EAAC,CAAC;EACZ;EACA,IAAIF,WAAW,IAAI,EAAE,CAAC,CACzB,CAAC;EAEF,OAAO;IACHG,UAAU,EAAE,MAAMC,OAAO,IAAI;MACzB,MAAMC,KAAe,GAAG,CAACC,iCAAuB,CAACC,IAAI,EAAEC,+BAAqB,CAACD,IAAI,CAAC;MAClF,KAAK,MAAMA,IAAI,IAAIF,KAAK,EAAE;QACtBN,OAAO,CAACU,WAAW,CAACL,OAAO,CAACL,OAAO,EAAEQ,IAAI,CAAC;MAC9C;IACJ,CAAC;IACDG,KAAK,EAAE,IAAIC,8CAAsB,CAAC,CAAC;IACnCC,OAAO,EAAE,IAAIC,kDAAwB,CAAC;MAAEf;IAAe,CAAC,CAAC;IACzDgB,QAAQ,EAAE,IAAIC,oDAAyB,CAAC;MAAEjB;IAAe,CAAC,CAAC;IAC3DkB,MAAM,EAAE,IAAIC,gDAAuB,CAAC;MAAEnB;IAAe,CAAC;EAC1D,CAAC;AACL,CAAC;AAACN,OAAA,CAAAK,kCAAA,GAAAA,kCAAA"}

package/operations/AliasesStorageOperations.d.ts

@@ -0,0 +1,16 @@
+import { DynamoDBClient } from "@webiny/aws-sdk/client-dynamodb";
+import { FileManagerAliasesStorageOperations, File } from "@webiny/api-file-manager/types";
+interface AliasesStorageOperationsConfig {
+    documentClient: DynamoDBClient;
+}
+export declare class AliasesStorageOperations implements FileManagerAliasesStorageOperations {
+    private readonly aliasEntity;
+    private readonly table;
+    constructor({ documentClient }: AliasesStorageOperationsConfig);
+    deleteAliases(file: File): Promise<void>;
+    storeAliases(file: File): Promise<void>;
+    private getExistingAliases;
+    private createPartitionKey;
+    private createNewAliasesRecords;
+}
+export {};

package/operations/AliasesStorageOperations.js

@@ -0,0 +1,105 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.AliasesStorageOperations = void 0;
+var _dbDynamodb = require("@webiny/db-dynamodb");
+class AliasesStorageOperations {
+  constructor({
+    documentClient
+  }) {
+    this.table = (0, _dbDynamodb.createTable)({
+      documentClient
+    });
+    this.aliasEntity = (0, _dbDynamodb.createStandardEntity)({
+      table: this.table,
+      name: "FM.FileAlias"
+    });
+  }
+  async deleteAliases(file) {
+    const aliasItems = await this.getExistingAliases(file);
+    const items = [];
+    aliasItems.forEach(item => {
+      items.push(this.aliasEntity.deleteBatch({
+        PK: this.createPartitionKey({
+          id: item.fileId,
+          tenant: item.tenant,
+          locale: item.locale
+        }),
+        SK: `ALIAS#${item.alias}`
+      }));
+    });
+    await (0, _dbDynamodb.batchWriteAll)({
+      table: this.table,
+      items
+    });
+  }
+  async storeAliases(file) {
+    const items = [];
+    const existingAliases = await this.getExistingAliases(file);
+    const newAliases = this.createNewAliasesRecords(file, existingAliases);
+    newAliases.forEach(alias => {
+      items.push(this.aliasEntity.putBatch(alias));
+    });
+
+    // Delete aliases that are in the DB but are NOT in the file.
+    for (const data of existingAliases) {
+      if (!file.aliases.some(alias => data.alias === alias)) {
+        items.push(this.aliasEntity.deleteBatch({
+          PK: this.createPartitionKey(file),
+          SK: `ALIAS#${data.alias}`
+        }));
+      }
+    }
+    await (0, _dbDynamodb.batchWriteAll)({
+      table: this.table,
+      items
+    });
+  }
+  async getExistingAliases(file) {
+    const aliases = await (0, _dbDynamodb.queryAll)({
+      entity: this.aliasEntity,
+      partitionKey: this.createPartitionKey(file),
+      options: {
+        beginsWith: "ALIAS#"
+      }
+    });
+    return aliases.map(alias => alias.data);
+  }
+  createPartitionKey(params) {
+    const {
+      tenant,
+      locale,
+      id
+    } = params;
+    return `T#${tenant}#L#${locale}#FM#F${id}`;
+  }
+  createNewAliasesRecords(file, existingAliases = []) {
+    return (file.aliases || []).map(alias => {
+      // If alias is already in the DB, skip it.
+      if (existingAliases.find(item => item.alias === alias)) {
+        return null;
+      }
+
+      // Add a new alias.
+      return {
+        PK: this.createPartitionKey(file),
+        SK: `ALIAS#${alias}`,
+        GSI1_PK: `T#${file.tenant}#FM#FILE_ALIASES`,
+        GSI1_SK: alias,
+        TYPE: "fm.fileAlias",
+        data: {
+          alias,
+          tenant: file.tenant,
+          locale: file.locale,
+          fileId: file.id,
+          key: file.key
+        }
+      };
+    }).filter(Boolean);
+  }
+}
+exports.AliasesStorageOperations = AliasesStorageOperations;
+
+//# sourceMappingURL=AliasesStorageOperations.js.map

package/operations/AliasesStorageOperations.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["_dbDynamodb","require","AliasesStorageOperations","constructor","documentClient","table","createTable","aliasEntity","createStandardEntity","name","deleteAliases","file","aliasItems","getExistingAliases","items","forEach","item","push","deleteBatch","PK","createPartitionKey","id","fileId","tenant","locale","SK","alias","batchWriteAll","storeAliases","existingAliases","newAliases","createNewAliasesRecords","putBatch","data","aliases","some","queryAll","entity","partitionKey","options","beginsWith","map","params","find","GSI1_PK","GSI1_SK","TYPE","key","filter","Boolean","exports"],"sources":["AliasesStorageOperations.ts"],"sourcesContent":["import { DynamoDBClient } from \"@webiny/aws-sdk/client-dynamodb\";\nimport { Entity, Table } from \"@webiny/db-dynamodb/toolbox\";\nimport {\n    FileManagerAliasesStorageOperations,\n    File,\n    FileAlias\n} from \"@webiny/api-file-manager/types\";\nimport {\n    BatchWriteItem,\n    batchWriteAll,\n    createStandardEntity,\n    createTable,\n    DbItem,\n    queryAll\n} from \"@webiny/db-dynamodb\";\n\ninterface AliasesStorageOperationsConfig {\n    documentClient: DynamoDBClient;\n}\n\ninterface CreatePartitionKeyParams {\n    locale: string;\n    tenant: string;\n    id: string;\n}\n\nexport class AliasesStorageOperations implements FileManagerAliasesStorageOperations {\n    private readonly aliasEntity: Entity<any>;\n    private readonly table: Table<string, string, string>;\n\n    constructor({ documentClient }: AliasesStorageOperationsConfig) {\n        this.table = createTable({ documentClient });\n\n        this.aliasEntity = createStandardEntity({\n            table: this.table,\n            name: \"FM.FileAlias\"\n        });\n    }\n\n    async deleteAliases(file: File): Promise<void> {\n        const aliasItems = await this.getExistingAliases(file);\n        const items: BatchWriteItem[] = [];\n\n        aliasItems.forEach(item => {\n            items.push(\n                this.aliasEntity.deleteBatch({\n                    PK: this.createPartitionKey({\n                        id: item.fileId,\n                        tenant: item.tenant,\n                        locale: item.locale\n                    }),\n                    SK: `ALIAS#${item.alias}`\n                })\n            );\n        });\n\n        await batchWriteAll({ table: this.table, items });\n    }\n\n    async storeAliases(file: File): Promise<void> {\n        const items: BatchWriteItem[] = [];\n        const existingAliases = await this.getExistingAliases(file);\n        const newAliases = this.createNewAliasesRecords(file, existingAliases);\n\n        newAliases.forEach(alias => {\n            items.push(this.aliasEntity.putBatch(alias));\n        });\n\n        // Delete aliases that are in the DB but are NOT in the file.\n        for (const data of existingAliases) {\n            if (!file.aliases.some(alias => data.alias === alias)) {\n                items.push(\n                    this.aliasEntity.deleteBatch({\n                        PK: this.createPartitionKey(file),\n                        SK: `ALIAS#${data.alias}`\n                    })\n                );\n            }\n        }\n\n        await batchWriteAll({\n            table: this.table,\n            items\n        });\n    }\n\n    private async getExistingAliases(file: File) {\n        const aliases = await queryAll<{ data: FileAlias }>({\n            entity: this.aliasEntity,\n            partitionKey: this.createPartitionKey(file),\n            options: {\n                beginsWith: \"ALIAS#\"\n            }\n        });\n\n        return aliases.map(alias => alias.data);\n    }\n\n    private createPartitionKey(params: CreatePartitionKeyParams): string {\n        const { tenant, locale, id } = params;\n        return `T#${tenant}#L#${locale}#FM#F${id}`;\n    }\n\n    private createNewAliasesRecords(\n        file: File,\n        existingAliases: FileAlias[] = []\n    ): DbItem<FileAlias>[] {\n        return (file.aliases || [])\n            .map(alias => {\n                // If alias is already in the DB, skip it.\n                if (existingAliases.find(item => item.alias === alias)) {\n                    return null;\n                }\n\n                // Add a new alias.\n                return {\n                    PK: this.createPartitionKey(file),\n                    SK: `ALIAS#${alias}`,\n                    GSI1_PK: `T#${file.tenant}#FM#FILE_ALIASES`,\n                    GSI1_SK: alias,\n                    TYPE: \"fm.fileAlias\",\n                    data: {\n                        alias,\n                        tenant: file.tenant,\n                        locale: file.locale,\n                        fileId: file.id,\n                        key: file.key\n                    }\n                };\n            })\n            .filter(Boolean) as DbItem<FileAlias>[];\n    }\n}\n"],"mappings":"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"}

package/operations/FilesStorageOperations.d.ts

@@ -0,0 +1,15 @@
+import { File, FileManagerFilesStorageOperations, FileManagerFilesStorageOperationsListResponse, FileManagerFilesStorageOperationsTagsResponse } from "@webiny/api-file-manager/types";
+/**
+ * This class is here to satisfy TS interface, but it will always be overridden by CMS storage operations
+ * within the `api-file-manager` package itself. This will remain here until we find a better approach to organizing
+ * storage operations, and connecting app logic to CMS.
+ */
+export declare class FilesStorageOperations implements FileManagerFilesStorageOperations {
+    create(): Promise<File>;
+    createBatch(): Promise<File[]>;
+    delete(): Promise<void>;
+    get(): Promise<File | null>;
+    list(): Promise<FileManagerFilesStorageOperationsListResponse>;
+    tags(): Promise<FileManagerFilesStorageOperationsTagsResponse[]>;
+    update(): Promise<File>;
+}

package/operations/FilesStorageOperations.js

@@ -0,0 +1,37 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.FilesStorageOperations = void 0;
+/**
+ * This class is here to satisfy TS interface, but it will always be overridden by CMS storage operations
+ * within the `api-file-manager` package itself. This will remain here until we find a better approach to organizing
+ * storage operations, and connecting app logic to CMS.
+ */
+class FilesStorageOperations {
+  create() {
+    throw new Error("api-file-manager-ddb does not implement the Files storage operations.");
+  }
+  createBatch() {
+    throw new Error("api-file-manager-ddb does not implement the Files storage operations.");
+  }
+  delete() {
+    throw new Error("api-file-manager-ddb does not implement the Files storage operations.");
+  }
+  get() {
+    throw new Error("api-file-manager-ddb does not implement the Files storage operations.");
+  }
+  list() {
+    throw new Error("api-file-manager-ddb does not implement the Files storage operations.");
+  }
+  tags() {
+    throw new Error("api-file-manager-ddb does not implement the Files storage operations.");
+  }
+  update() {
+    throw new Error("api-file-manager-ddb does not implement the Files storage operations.");
+  }
+}
+exports.FilesStorageOperations = FilesStorageOperations;
+
+//# sourceMappingURL=FilesStorageOperations.js.map

package/operations/FilesStorageOperations.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["FilesStorageOperations","create","Error","createBatch","delete","get","list","tags","update","exports"],"sources":["FilesStorageOperations.ts"],"sourcesContent":["import {\n    File,\n    FileManagerFilesStorageOperations,\n    FileManagerFilesStorageOperationsListResponse,\n    FileManagerFilesStorageOperationsTagsResponse\n} from \"@webiny/api-file-manager/types\";\n\n/**\n * This class is here to satisfy TS interface, but it will always be overridden by CMS storage operations\n * within the `api-file-manager` package itself. This will remain here until we find a better approach to organizing\n * storage operations, and connecting app logic to CMS.\n */\nexport class FilesStorageOperations implements FileManagerFilesStorageOperations {\n    create(): Promise<File> {\n        throw new Error(\"api-file-manager-ddb does not implement the Files storage operations.\");\n    }\n\n    createBatch(): Promise<File[]> {\n        throw new Error(\"api-file-manager-ddb does not implement the Files storage operations.\");\n    }\n\n    delete(): Promise<void> {\n        throw new Error(\"api-file-manager-ddb does not implement the Files storage operations.\");\n    }\n\n    get(): Promise<File | null> {\n        throw new Error(\"api-file-manager-ddb does not implement the Files storage operations.\");\n    }\n\n    list(): Promise<FileManagerFilesStorageOperationsListResponse> {\n        throw new Error(\"api-file-manager-ddb does not implement the Files storage operations.\");\n    }\n\n    tags(): Promise<FileManagerFilesStorageOperationsTagsResponse[]> {\n        throw new Error(\"api-file-manager-ddb does not implement the Files storage operations.\");\n    }\n\n    update(): Promise<File> {\n        throw new Error(\"api-file-manager-ddb does not implement the Files storage operations.\");\n    }\n}\n"],"mappings":";;;;;;AAOA;AACA;AACA;AACA;AACA;AACO,MAAMA,sBAAsB,CAA8C;EAC7EC,MAAMA,CAAA,EAAkB;IACpB,MAAM,IAAIC,KAAK,CAAC,uEAAuE,CAAC;EAC5F;EAEAC,WAAWA,CAAA,EAAoB;IAC3B,MAAM,IAAID,KAAK,CAAC,uEAAuE,CAAC;EAC5F;EAEAE,MAAMA,CAAA,EAAkB;IACpB,MAAM,IAAIF,KAAK,CAAC,uEAAuE,CAAC;EAC5F;EAEAG,GAAGA,CAAA,EAAyB;IACxB,MAAM,IAAIH,KAAK,CAAC,uEAAuE,CAAC;EAC5F;EAEAI,IAAIA,CAAA,EAA2D;IAC3D,MAAM,IAAIJ,KAAK,CAAC,uEAAuE,CAAC;EAC5F;EAEAK,IAAIA,CAAA,EAA6D;IAC7D,MAAM,IAAIL,KAAK,CAAC,uEAAuE,CAAC;EAC5F;EAEAM,MAAMA,CAAA,EAAkB;IACpB,MAAM,IAAIN,KAAK,CAAC,uEAAuE,CAAC;EAC5F;AACJ;AAACO,OAAA,CAAAT,sBAAA,GAAAA,sBAAA"}

package/operations/{settings/SettingsStorageOperations.d.ts → SettingsStorageOperations.d.ts}

@@ -1,7 +1,7 @@
+import { DynamoDBClient } from "@webiny/aws-sdk/client-dynamodb";
 import { FileManagerSettings, FileManagerSettingsStorageOperations, FileManagerSettingsStorageOperationsCreateParams, FileManagerSettingsStorageOperationsUpdateParams, FileManagerStorageOperationsDeleteSettings, FileManagerStorageOperationsGetSettingsParams } from "@webiny/api-file-manager/types";
-import { DocumentClient } from "aws-sdk/clients/dynamodb";
 interface SettingsStorageOperationsConfig {
-    documentClient: DocumentClient;
+    documentClient: DynamoDBClient;
 }
 export declare class SettingsStorageOperations implements FileManagerSettingsStorageOperations {
     private readonly _entity;

package/operations/{settings/SettingsStorageOperations.js → SettingsStorageOperations.js}

@@ -5,35 +5,32 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.SettingsStorageOperations = void 0;
-var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _error = _interopRequireDefault(require("@webiny/error"));
-var _settingsEntity = _interopRequireDefault(require("../../definitions/settingsEntity"));
-var _get = require("@webiny/db-dynamodb/utils/get");
-var _table = require("../../definitions/table");
+var _dbDynamodb = require("@webiny/db-dynamodb");
 const SORT_KEY = "A";
 class SettingsStorageOperations {
   constructor({
     documentClient
   }) {
-    (0, _defineProperty2.default)(this, "_entity", void 0);
-    this._entity = (0, _settingsEntity.default)({
-      table: (0, _table.createTable)({
+    this._entity = (0, _dbDynamodb.createStandardEntity)({
+      table: (0, _dbDynamodb.createTable)({
         documentClient
-      })
+      }),
+      name: "FM.Settings"
     });
   }
   async get({
     tenant
   }) {
     try {
-      const settings = await (0, _get.get)({
+      const settings = await (0, _dbDynamodb.get)({
         entity: this._entity,
         keys: {
           PK: `T#${tenant}#FM#SETTINGS`,
-          SK: "A"
+          SK: SORT_KEY
         }
       });
-      return settings ? settings.data : null;
+      return settings?.data || null;
     } catch (ex) {
       throw new _error.default(ex.message || "Could not fetch the FileManager settings.", ex.code || "GET_SETTINGS_ERROR");
     }
@@ -51,11 +48,14 @@ class SettingsStorageOperations {
       });
     }
     try {
-      await this._entity.put({
-        PK: `T#${data.tenant}#FM#SETTINGS`,
-        SK: SORT_KEY,
-        TYPE: "fm.settings",
-        data
+      await (0, _dbDynamodb.put)({
+        entity: this._entity,
+        item: {
+          PK: `T#${data.tenant}#FM#SETTINGS`,
+          SK: SORT_KEY,
+          TYPE: "fm.settings",
+          data
+        }
       });
       return data;
     } catch (ex) {
@@ -68,11 +68,14 @@ class SettingsStorageOperations {
     data
   }) {
     try {
-      await this._entity.update({
-        PK: `T#${data.tenant}#FM#SETTINGS`,
-        SK: SORT_KEY,
-        TYPE: "fm.settings",
-        data
+      await (0, _dbDynamodb.put)({
+        entity: this._entity,
+        item: {
+          PK: `T#${data.tenant}#FM#SETTINGS`,
+          SK: SORT_KEY,
+          TYPE: "fm.settings",
+          data
+        }
       });
       return data;
     } catch (ex) {
@@ -84,10 +87,15 @@ class SettingsStorageOperations {
   async delete({
     tenant
   }) {
-    return this._entity.delete({
-      PK: `T#${tenant}#FM#SETTINGS`,
-      SK: SORT_KEY
+    await (0, _dbDynamodb.deleteItem)({
+      entity: this._entity,
+      keys: {
+        PK: `T#${tenant}#FM#SETTINGS`,
+        SK: SORT_KEY
+      }
     });
   }
 }
-exports.SettingsStorageOperations = SettingsStorageOperations;
+exports.SettingsStorageOperations = SettingsStorageOperations;
+
+//# sourceMappingURL=SettingsStorageOperations.js.map

package/operations/SettingsStorageOperations.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["_error","_interopRequireDefault","require","_dbDynamodb","SORT_KEY","SettingsStorageOperations","constructor","documentClient","_entity","createStandardEntity","table","createTable","name","get","tenant","settings","entity","keys","PK","SK","data","ex","WebinyError","message","code","create","original","update","put","item","TYPE","delete","deleteItem","exports"],"sources":["SettingsStorageOperations.ts"],"sourcesContent":["import { Entity } from \"@webiny/db-dynamodb/toolbox\";\nimport { DynamoDBClient } from \"@webiny/aws-sdk/client-dynamodb\";\nimport {\n    FileManagerSettings,\n    FileManagerSettingsStorageOperations,\n    FileManagerSettingsStorageOperationsCreateParams,\n    FileManagerSettingsStorageOperationsUpdateParams,\n    FileManagerStorageOperationsDeleteSettings,\n    FileManagerStorageOperationsGetSettingsParams\n} from \"@webiny/api-file-manager/types\";\nimport WebinyError from \"@webiny/error\";\nimport { createStandardEntity, createTable, deleteItem, get, put } from \"@webiny/db-dynamodb\";\n\ninterface SettingsStorageOperationsConfig {\n    documentClient: DynamoDBClient;\n}\n\nconst SORT_KEY = \"A\";\n\nexport class SettingsStorageOperations implements FileManagerSettingsStorageOperations {\n    private readonly _entity: Entity<any>;\n\n    public constructor({ documentClient }: SettingsStorageOperationsConfig) {\n        this._entity = createStandardEntity({\n            table: createTable({ documentClient }),\n            name: \"FM.Settings\"\n        });\n    }\n\n    public async get({\n        tenant\n    }: FileManagerStorageOperationsGetSettingsParams): Promise<FileManagerSettings | null> {\n        try {\n            const settings = await get<{ data: FileManagerSettings }>({\n                entity: this._entity,\n                keys: {\n                    PK: `T#${tenant}#FM#SETTINGS`,\n                    SK: SORT_KEY\n                }\n            });\n\n            return settings?.data || null;\n        } catch (ex) {\n            throw new WebinyError(\n                ex.message || \"Could not fetch the FileManager settings.\",\n                ex.code || \"GET_SETTINGS_ERROR\"\n            );\n        }\n    }\n\n    public async create({\n        data\n    }: FileManagerSettingsStorageOperationsCreateParams): Promise<FileManagerSettings> {\n        const original = await this.get({ tenant: data.tenant });\n\n        if (original) {\n            return await this.update({ original, data });\n        }\n\n        try {\n            await put({\n                entity: this._entity,\n                item: {\n                    PK: `T#${data.tenant}#FM#SETTINGS`,\n                    SK: SORT_KEY,\n                    TYPE: \"fm.settings\",\n                    data\n                }\n            });\n            return data;\n        } catch (ex) {\n            throw new WebinyError(\n                ex.message || \"Cannot create FileManager settings.\",\n                ex.code || \"CREATE_FM_SETTINGS_ERROR\",\n                {\n                    data\n                }\n            );\n        }\n    }\n\n    public async update({\n        data\n    }: FileManagerSettingsStorageOperationsUpdateParams): Promise<FileManagerSettings> {\n        try {\n            await put({\n                entity: this._entity,\n                item: {\n                    PK: `T#${data.tenant}#FM#SETTINGS`,\n                    SK: SORT_KEY,\n                    TYPE: \"fm.settings\",\n                    data\n                }\n            });\n            return data;\n        } catch (ex) {\n            throw new WebinyError(\n                ex.message || \"Cannot update FileManager settings.\",\n                ex.code || \"UPDATE_FM_SETTINGS_ERROR\",\n                {\n                    data\n                }\n            );\n        }\n    }\n\n    public async delete({ tenant }: FileManagerStorageOperationsDeleteSettings): Promise<void> {\n        await deleteItem({\n            entity: this._entity,\n            keys: {\n                PK: `T#${tenant}#FM#SETTINGS`,\n                SK: SORT_KEY\n            }\n        });\n    }\n}\n"],"mappings":";;;;;;;AAUA,IAAAA,MAAA,GAAAC,sBAAA,CAAAC,OAAA;AACA,IAAAC,WAAA,GAAAD,OAAA;AAMA,MAAME,QAAQ,GAAG,GAAG;AAEb,MAAMC,yBAAyB,CAAiD;EAG5EC,WAAWA,CAAC;IAAEC;EAAgD,CAAC,EAAE;IACpE,IAAI,CAACC,OAAO,GAAG,IAAAC,gCAAoB,EAAC;MAChCC,KAAK,EAAE,IAAAC,uBAAW,EAAC;QAAEJ;MAAe,CAAC,CAAC;MACtCK,IAAI,EAAE;IACV,CAAC,CAAC;EACN;EAEA,MAAaC,GAAGA,CAAC;IACbC;EAC2C,CAAC,EAAuC;IACnF,IAAI;MACA,MAAMC,QAAQ,GAAG,MAAM,IAAAF,eAAG,EAAgC;QACtDG,MAAM,EAAE,IAAI,CAACR,OAAO;QACpBS,IAAI,EAAE;UACFC,EAAE,EAAG,KAAIJ,MAAO,cAAa;UAC7BK,EAAE,EAAEf;QACR;MACJ,CAAC,CAAC;MAEF,OAAOW,QAAQ,EAAEK,IAAI,IAAI,IAAI;IACjC,CAAC,CAAC,OAAOC,EAAE,EAAE;MACT,MAAM,IAAIC,cAAW,CACjBD,EAAE,CAACE,OAAO,IAAI,2CAA2C,EACzDF,EAAE,CAACG,IAAI,IAAI,oBACf,CAAC;IACL;EACJ;EAEA,MAAaC,MAAMA,CAAC;IAChBL;EAC8C,CAAC,EAAgC;IAC/E,MAAMM,QAAQ,GAAG,MAAM,IAAI,CAACb,GAAG,CAAC;MAAEC,MAAM,EAAEM,IAAI,CAACN;IAAO,CAAC,CAAC;IAExD,IAAIY,QAAQ,EAAE;MACV,OAAO,MAAM,IAAI,CAACC,MAAM,CAAC;QAAED,QAAQ;QAAEN;MAAK,CAAC,CAAC;IAChD;IAEA,IAAI;MACA,MAAM,IAAAQ,eAAG,EAAC;QACNZ,MAAM,EAAE,IAAI,CAACR,OAAO;QACpBqB,IAAI,EAAE;UACFX,EAAE,EAAG,KAAIE,IAAI,CAACN,MAAO,cAAa;UAClCK,EAAE,EAAEf,QAAQ;UACZ0B,IAAI,EAAE,aAAa;UACnBV;QACJ;MACJ,CAAC,CAAC;MACF,OAAOA,IAAI;IACf,CAAC,CAAC,OAAOC,EAAE,EAAE;MACT,MAAM,IAAIC,cAAW,CACjBD,EAAE,CAACE,OAAO,IAAI,qCAAqC,EACnDF,EAAE,CAACG,IAAI,IAAI,0BAA0B,EACrC;QACIJ;MACJ,CACJ,CAAC;IACL;EACJ;EAEA,MAAaO,MAAMA,CAAC;IAChBP;EAC8C,CAAC,EAAgC;IAC/E,IAAI;MACA,MAAM,IAAAQ,eAAG,EAAC;QACNZ,MAAM,EAAE,IAAI,CAACR,OAAO;QACpBqB,IAAI,EAAE;UACFX,EAAE,EAAG,KAAIE,IAAI,CAACN,MAAO,cAAa;UAClCK,EAAE,EAAEf,QAAQ;UACZ0B,IAAI,EAAE,aAAa;UACnBV;QACJ;MACJ,CAAC,CAAC;MACF,OAAOA,IAAI;IACf,CAAC,CAAC,OAAOC,EAAE,EAAE;MACT,MAAM,IAAIC,cAAW,CACjBD,EAAE,CAACE,OAAO,IAAI,qCAAqC,EACnDF,EAAE,CAACG,IAAI,IAAI,0BAA0B,EACrC;QACIJ;MACJ,CACJ,CAAC;IACL;EACJ;EAEA,MAAaW,MAAMA,CAAC;IAAEjB;EAAmD,CAAC,EAAiB;IACvF,MAAM,IAAAkB,sBAAU,EAAC;MACbhB,MAAM,EAAE,IAAI,CAACR,OAAO;MACpBS,IAAI,EAAE;QACFC,EAAE,EAAG,KAAIJ,MAAO,cAAa;QAC7BK,EAAE,EAAEf;MACR;IACJ,CAAC,CAAC;EACN;AACJ;AAAC6B,OAAA,CAAA5B,yBAAA,GAAAA,yBAAA"}

package/operations/{system/SystemStorageOperations.d.ts → SystemStorageOperations.d.ts}

@@ -1,7 +1,7 @@
-import { DocumentClient } from "aws-sdk/clients/dynamodb";
+import { DynamoDBClient } from "@webiny/aws-sdk/client-dynamodb";
 import { FileManagerSystem, FileManagerSystemStorageOperations, FileManagerSystemStorageOperationsCreateParams, FileManagerSystemStorageOperationsGetParams, FileManagerSystemStorageOperationsUpdateParams } from "@webiny/api-file-manager/types";
 interface SystemStorageOperationsConstructorParams {
-    documentClient: DocumentClient;
+    documentClient: DynamoDBClient;
 }
 export declare class SystemStorageOperations implements FileManagerSystemStorageOperations {
     private readonly _entity;

package/operations/{system/SystemStorageOperations.js → SystemStorageOperations.js}

@@ -5,35 +5,40 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.SystemStorageOperations = void 0;
-var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
-var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _error = _interopRequireDefault(require("@webiny/error"));
-var _systemEntity = _interopRequireDefault(require("../../definitions/systemEntity"));
-var _table = require("../../definitions/table");
+var _dbDynamodb = require("@webiny/db-dynamodb");
 const SORT_KEY = "FM";
 class SystemStorageOperations {
   constructor({
     documentClient
   }) {
-    (0, _defineProperty2.default)(this, "_entity", void 0);
-    this._entity = (0, _systemEntity.default)({
-      table: (0, _table.createTable)({
+    this._entity = (0, _dbDynamodb.createLegacyEntity)({
+      table: (0, _dbDynamodb.createTable)({
         documentClient
-      })
+      }),
+      name: "System",
+      attributes: {
+        version: {
+          type: "string"
+        },
+        tenant: {
+          type: "string"
+        }
+      }
     });
   }
   async get({
     tenant
   }) {
     try {
-      const system = await this._entity.get({
-        PK: `T#${tenant}#SYSTEM`,
-        SK: SORT_KEY
+      const system = await (0, _dbDynamodb.get)({
+        entity: this._entity,
+        keys: {
+          PK: `T#${tenant}#SYSTEM`,
+          SK: SORT_KEY
+        }
       });
-      if (!system || !system.Item) {
-        return null;
-      }
-      return system.Item;
+      return system || null;
     } catch (ex) {
       throw new _error.default(ex.message || "Could not fetch the FileManager system.", ex.code || "GET_SYSTEM_ERROR");
     }
@@ -43,10 +48,14 @@ class SystemStorageOperations {
       data
     } = params;
     try {
-      await this._entity.put((0, _objectSpread2.default)({
-        PK: `T#${data.tenant}#SYSTEM`,
-        SK: SORT_KEY
-      }, data));
+      await (0, _dbDynamodb.put)({
+        entity: this._entity,
+        item: {
+          ...data,
+          PK: `T#${data.tenant}#SYSTEM`,
+          SK: SORT_KEY
+        }
+      });
     } catch (ex) {
       throw new _error.default("Could not insert new system data into DynamoDB", "CREATE_SYSTEM_ERROR", {
         data
@@ -60,16 +69,25 @@ class SystemStorageOperations {
       data
     } = params;
     try {
-      await this._entity.update((0, _objectSpread2.default)({
-        PK: `T#${data.tenant}#SYSTEM`,
-        SK: SORT_KEY
-      }, data));
+      await (0, _dbDynamodb.put)({
+        entity: this._entity,
+        item: {
+          ...data,
+          PK: `T#${data.tenant}#SYSTEM`,
+          SK: SORT_KEY
+        }
+      });
     } catch (ex) {
       throw new _error.default("Could not update system data in the DynamoDB.", "UPDATE_SYSTEM_ERROR", {
         data
       });
     }
-    return (0, _objectSpread2.default)((0, _objectSpread2.default)({}, original), data);
+    return {
+      ...original,
+      ...data
+    };
   }
 }
-exports.SystemStorageOperations = SystemStorageOperations;
+exports.SystemStorageOperations = SystemStorageOperations;
+
+//# sourceMappingURL=SystemStorageOperations.js.map

package/operations/SystemStorageOperations.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["_error","_interopRequireDefault","require","_dbDynamodb","SORT_KEY","SystemStorageOperations","constructor","documentClient","_entity","createLegacyEntity","table","createTable","name","attributes","version","type","tenant","get","system","entity","keys","PK","SK","ex","WebinyError","message","code","create","params","data","put","item","update","original","exports"],"sources":["SystemStorageOperations.ts"],"sourcesContent":["import { DynamoDBClient } from \"@webiny/aws-sdk/client-dynamodb\";\nimport { Entity } from \"@webiny/db-dynamodb/toolbox\";\nimport {\n    FileManagerSystem,\n    FileManagerSystemStorageOperations,\n    FileManagerSystemStorageOperationsCreateParams,\n    FileManagerSystemStorageOperationsGetParams,\n    FileManagerSystemStorageOperationsUpdateParams\n} from \"@webiny/api-file-manager/types\";\nimport WebinyError from \"@webiny/error\";\nimport { createLegacyEntity, createTable, get, put } from \"@webiny/db-dynamodb\";\n\ninterface SystemStorageOperationsConstructorParams {\n    documentClient: DynamoDBClient;\n}\n\nconst SORT_KEY = \"FM\";\n\nexport class SystemStorageOperations implements FileManagerSystemStorageOperations {\n    private readonly _entity: Entity<any>;\n\n    public constructor({ documentClient }: SystemStorageOperationsConstructorParams) {\n        this._entity = createLegacyEntity({\n            table: createTable({ documentClient }),\n            name: \"System\",\n            attributes: {\n                version: {\n                    type: \"string\"\n                },\n                tenant: {\n                    type: \"string\"\n                }\n            }\n        });\n    }\n\n    public async get({\n        tenant\n    }: FileManagerSystemStorageOperationsGetParams): Promise<FileManagerSystem | null> {\n        try {\n            const system = await get<FileManagerSystem>({\n                entity: this._entity,\n                keys: {\n                    PK: `T#${tenant}#SYSTEM`,\n                    SK: SORT_KEY\n                }\n            });\n            return system || null;\n        } catch (ex) {\n            throw new WebinyError(\n                ex.message || \"Could not fetch the FileManager system.\",\n                ex.code || \"GET_SYSTEM_ERROR\"\n            );\n        }\n    }\n\n    public async create(\n        params: FileManagerSystemStorageOperationsCreateParams\n    ): Promise<FileManagerSystem> {\n        const { data } = params;\n        try {\n            await put({\n                entity: this._entity,\n                item: {\n                    ...data,\n                    PK: `T#${data.tenant}#SYSTEM`,\n                    SK: SORT_KEY\n                }\n            });\n        } catch (ex) {\n            throw new WebinyError(\n                \"Could not insert new system data into DynamoDB\",\n                \"CREATE_SYSTEM_ERROR\",\n                {\n                    data\n                }\n            );\n        }\n        return data;\n    }\n\n    public async update(\n        params: FileManagerSystemStorageOperationsUpdateParams\n    ): Promise<FileManagerSystem> {\n        const { original, data } = params;\n\n        try {\n            await put({\n                entity: this._entity,\n                item: {\n                    ...data,\n                    PK: `T#${data.tenant}#SYSTEM`,\n                    SK: SORT_KEY\n                }\n            });\n        } catch (ex) {\n            throw new WebinyError(\n                \"Could not update system data in the DynamoDB.\",\n                \"UPDATE_SYSTEM_ERROR\",\n                {\n                    data\n                }\n            );\n        }\n        return {\n            ...original,\n            ...data\n        };\n    }\n}\n"],"mappings":";;;;;;;AASA,IAAAA,MAAA,GAAAC,sBAAA,CAAAC,OAAA;AACA,IAAAC,WAAA,GAAAD,OAAA;AAMA,MAAME,QAAQ,GAAG,IAAI;AAEd,MAAMC,uBAAuB,CAA+C;EAGxEC,WAAWA,CAAC;IAAEC;EAAyD,CAAC,EAAE;IAC7E,IAAI,CAACC,OAAO,GAAG,IAAAC,8BAAkB,EAAC;MAC9BC,KAAK,EAAE,IAAAC,uBAAW,EAAC;QAAEJ;MAAe,CAAC,CAAC;MACtCK,IAAI,EAAE,QAAQ;MACdC,UAAU,EAAE;QACRC,OAAO,EAAE;UACLC,IAAI,EAAE;QACV,CAAC;QACDC,MAAM,EAAE;UACJD,IAAI,EAAE;QACV;MACJ;IACJ,CAAC,CAAC;EACN;EAEA,MAAaE,GAAGA,CAAC;IACbD;EACyC,CAAC,EAAqC;IAC/E,IAAI;MACA,MAAME,MAAM,GAAG,MAAM,IAAAD,eAAG,EAAoB;QACxCE,MAAM,EAAE,IAAI,CAACX,OAAO;QACpBY,IAAI,EAAE;UACFC,EAAE,EAAG,KAAIL,MAAO,SAAQ;UACxBM,EAAE,EAAElB;QACR;MACJ,CAAC,CAAC;MACF,OAAOc,MAAM,IAAI,IAAI;IACzB,CAAC,CAAC,OAAOK,EAAE,EAAE;MACT,MAAM,IAAIC,cAAW,CACjBD,EAAE,CAACE,OAAO,IAAI,yCAAyC,EACvDF,EAAE,CAACG,IAAI,IAAI,kBACf,CAAC;IACL;EACJ;EAEA,MAAaC,MAAMA,CACfC,MAAsD,EAC5B;IAC1B,MAAM;MAAEC;IAAK,CAAC,GAAGD,MAAM;IACvB,IAAI;MACA,MAAM,IAAAE,eAAG,EAAC;QACNX,MAAM,EAAE,IAAI,CAACX,OAAO;QACpBuB,IAAI,EAAE;UACF,GAAGF,IAAI;UACPR,EAAE,EAAG,KAAIQ,IAAI,CAACb,MAAO,SAAQ;UAC7BM,EAAE,EAAElB;QACR;MACJ,CAAC,CAAC;IACN,CAAC,CAAC,OAAOmB,EAAE,EAAE;MACT,MAAM,IAAIC,cAAW,CACjB,gDAAgD,EAChD,qBAAqB,EACrB;QACIK;MACJ,CACJ,CAAC;IACL;IACA,OAAOA,IAAI;EACf;EAEA,MAAaG,MAAMA,CACfJ,MAAsD,EAC5B;IAC1B,MAAM;MAAEK,QAAQ;MAAEJ;IAAK,CAAC,GAAGD,MAAM;IAEjC,IAAI;MACA,MAAM,IAAAE,eAAG,EAAC;QACNX,MAAM,EAAE,IAAI,CAACX,OAAO;QACpBuB,IAAI,EAAE;UACF,GAAGF,IAAI;UACPR,EAAE,EAAG,KAAIQ,IAAI,CAACb,MAAO,SAAQ;UAC7BM,EAAE,EAAElB;QACR;MACJ,CAAC,CAAC;IACN,CAAC,CAAC,OAAOmB,EAAE,EAAE;MACT,MAAM,IAAIC,cAAW,CACjB,+CAA+C,EAC/C,qBAAqB,EACrB;QACIK;MACJ,CACJ,CAAC;IACL;IACA,OAAO;MACH,GAAGI,QAAQ;MACX,GAAGJ;IACP,CAAC;EACL;AACJ;AAACK,OAAA,CAAA7B,uBAAA,GAAAA,uBAAA"}

package/package.json

@@ -1,12 +1,11 @@
 {
 	"name": "@webiny/api-file-manager-ddb",
-	"version": "0.0.0-unstable.9e825fd5fb",
+	"version": "0.0.0-unstable.a9593f74dd",
 	"main": "index.js",
 	"keywords": [
 		"@webiny/api-file-manager",
 		"storage-operations",
-		"dynamodb",
-		"fm:ddb"
+		"ddb"
 	],
 	"repository": {
 		"type": "git",
@@ -21,28 +20,27 @@
 	],
 	"license": "MIT",
 	"dependencies": {
-		"@babel/runtime": "7.20.13",
-		"@webiny/api-file-manager": "0.0.0-unstable.9e825fd5fb",
-		"@webiny/db-dynamodb": "0.0.0-unstable.9e825fd5fb",
-		"@webiny/error": "0.0.0-unstable.9e825fd5fb",
-		"@webiny/plugins": "0.0.0-unstable.9e825fd5fb",
-		"@webiny/project-utils": "0.0.0-unstable.9e825fd5fb",
-		"aws-sdk": "2.1310.0",
-		"dynamodb-toolbox": "0.3.5"
+		"@babel/runtime": "7.22.6",
+		"@webiny/api-file-manager": "0.0.0-unstable.a9593f74dd",
+		"@webiny/aws-sdk": "0.0.0-unstable.a9593f74dd",
+		"@webiny/db-dynamodb": "0.0.0-unstable.a9593f74dd",
+		"@webiny/error": "0.0.0-unstable.a9593f74dd",
+		"@webiny/plugins": "0.0.0-unstable.a9593f74dd",
+		"@webiny/project-utils": "0.0.0-unstable.a9593f74dd"
 	},
 	"devDependencies": {
-		"@babel/cli": "^7.19.3",
-		"@babel/core": "^7.19.3",
-		"@babel/plugin-proposal-object-rest-spread": "^7.16.0",
-		"@babel/plugin-transform-runtime": "^7.16.4",
-		"@babel/preset-env": "^7.19.4",
-		"@babel/preset-typescript": "^7.18.6",
-		"@webiny/cli": "^0.0.0-unstable.9e825fd5fb",
-		"jest": "^28.1.0",
-		"jest-dynalite": "^3.2.0",
-		"jsonpack": "^1.1.5",
-		"rimraf": "^3.0.2",
-		"ttypescript": "^1.5.12",
+		"@babel/cli": "7.22.6",
+		"@babel/core": "7.22.8",
+		"@babel/plugin-proposal-object-rest-spread": "7.20.7",
+		"@babel/plugin-transform-runtime": "7.22.7",
+		"@babel/preset-env": "7.22.7",
+		"@babel/preset-typescript": "7.22.5",
+		"@webiny/cli": "0.0.0-unstable.a9593f74dd",
+		"jest": "29.5.0",
+		"jest-dynalite": "3.6.1",
+		"jsonpack": "1.1.5",
+		"rimraf": "3.0.2",
+		"ttypescript": "1.5.15",
 		"typescript": "4.7.4"
 	},
 	"publishConfig": {
@@ -59,10 +57,9 @@
 		],
 		"ignore": {
 			"src": [
-				"aws-sdk",
 				"sharp"
 			]
 		}
 	},
-	"gitHead": "9e825fd5fb3c021691acbaee6c5fd925f5f5de4d"
+	"gitHead": "a9593f74ddf9ce93263eadb0ddc0807ed343f5ee"
 }