@webiny/api-file-manager-s3 0.0.0-unstable.78f581c1d2 → 0.0.0-unstable.7be00a75a9

package/multiPartUpload/CompleteMultiPartUploadUseCase.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"multiPartUpload/CompleteMultiPartUploadUseCase.js","sources":["../../src/multiPartUpload/CompleteMultiPartUploadUseCase.ts"],"sourcesContent":["import type { S3, Part, ListPartsOutput } from \"@webiny/aws-sdk/client-s3/index.js\";\nimport {\n    ListPartsCommand,\n    CompleteMultipartUploadCommand\n} from \"@webiny/aws-sdk/client-s3/index.js\";\n\ninterface CompleteMultiPartUploadParams {\n    fileKey: string;\n    uploadId: string;\n}\n\ninterface GetAllUploadPartsParams {\n    Bucket: string;\n    Key: string;\n    UploadId: string;\n}\n\nexport class CompleteMultiPartUploadUseCase {\n    private readonly s3: S3;\n    private readonly bucket: string;\n    private readonly emptyMarkerValues = [undefined, \"0\"];\n\n    constructor(bucket: string, s3Client: S3) {\n        this.bucket = bucket;\n        this.s3 = s3Client;\n    }\n\n    async execute(params: CompleteMultiPartUploadParams) {\n        const uploadParams = {\n            Bucket: this.bucket,\n            Key: params.fileKey,\n            UploadId: params.uploadId\n        };\n\n        const allParts = await this.getAllUploadParts(uploadParams);\n\n        const s3Params = {\n            ...uploadParams,\n            MultipartUpload: {\n                Parts: allParts\n            }\n        };\n\n        try {\n            const command = new CompleteMultipartUploadCommand(s3Params);\n            await this.s3.send(command);\n        } catch (err) {\n            console.error(err);\n            throw err;\n        }\n    }\n\n    private async getAllUploadParts(params: GetAllUploadPartsParams) {\n        const parts: Part[] = [];\n\n        let marker: string | undefined = undefined;\n        while (true) {\n            const { Parts, PartNumberMarker }: ListPartsOutput = await this.s3.send(\n                new ListPartsCommand({\n                    ...params,\n                    PartNumberMarker: marker\n                })\n            );\n\n            if (Parts) {\n                Parts.forEach(part => parts.push(part));\n            }\n\n            marker = PartNumberMarker || undefined;\n            if (this.isMarkerEmpty(marker)) {\n                break;\n            }\n        }\n\n        return parts.map(part => ({\n            ETag: part.ETag as string,\n            PartNumber: part.PartNumber as number\n        }));\n    }\n\n    private isMarkerEmpty(marker: string | undefined) {\n        return this.emptyMarkerValues.includes(marker);\n    }\n}\n"],"names":["CompleteMultiPartUploadUseCase","bucket","s3Client","undefined","params","uploadParams","allParts","s3Params","command","CompleteMultipartUploadCommand","err","console","parts","marker","Parts","PartNumberMarker","ListPartsCommand","part"],"mappings":";AAiBO,MAAMA;IAKT,YAAYC,MAAc,EAAEC,QAAY,CAAE;aAFzB,iBAAiB,GAAG;YAACC;YAAW;SAAI;QAGjD,IAAI,CAAC,MAAM,GAAGF;QACd,IAAI,CAAC,EAAE,GAAGC;IACd;IAEA,MAAM,QAAQE,MAAqC,EAAE;QACjD,MAAMC,eAAe;YACjB,QAAQ,IAAI,CAAC,MAAM;YACnB,KAAKD,OAAO,OAAO;YACnB,UAAUA,OAAO,QAAQ;QAC7B;QAEA,MAAME,WAAW,MAAM,IAAI,CAAC,iBAAiB,CAACD;QAE9C,MAAME,WAAW;YACb,GAAGF,YAAY;YACf,iBAAiB;gBACb,OAAOC;YACX;QACJ;QAEA,IAAI;YACA,MAAME,UAAU,IAAIC,+BAA+BF;YACnD,MAAM,IAAI,CAAC,EAAE,CAAC,IAAI,CAACC;QACvB,EAAE,OAAOE,KAAK;YACVC,QAAQ,KAAK,CAACD;YACd,MAAMA;QACV;IACJ;IAEA,MAAc,kBAAkBN,MAA+B,EAAE;QAC7D,MAAMQ,QAAgB,EAAE;QAExB,IAAIC;QACJ,MAAO,KAAM;YACT,MAAM,EAAEC,KAAK,EAAEC,gBAAgB,EAAE,GAAoB,MAAM,IAAI,CAAC,EAAE,CAAC,IAAI,CACnE,IAAIC,iBAAiB;gBACjB,GAAGZ,MAAM;gBACT,kBAAkBS;YACtB;YAGJ,IAAIC,OACAA,MAAM,OAAO,CAACG,CAAAA,OAAQL,MAAM,IAAI,CAACK;YAGrCJ,SAASE,oBAAoBZ;YAC7B,IAAI,IAAI,CAAC,aAAa,CAACU,SACnB;QAER;QAEA,OAAOD,MAAM,GAAG,CAACK,CAAAA,OAAS;gBACtB,MAAMA,KAAK,IAAI;gBACf,YAAYA,KAAK,UAAU;YAC/B;IACJ;IAEQ,cAAcJ,MAA0B,EAAE;QAC9C,OAAO,IAAI,CAAC,iBAAiB,CAAC,QAAQ,CAACA;IAC3C;AACJ"}

package/multiPartUpload/CreateMultiPartUploadUseCase.d.ts

@@ -0,0 +1,20 @@
+import type { S3 } from "@webiny/aws-sdk/client-s3/index.js";
+import type { FileData } from "../types.js";
+interface CreateMultiPartUploadParams {
+    file: FileData;
+    numberOfParts: number;
+}
+export declare class CreateMultiPartUploadUseCase {
+    private readonly s3;
+    private readonly bucket;
+    constructor(bucket: string, s3Client: S3);
+    execute({ file, numberOfParts }: CreateMultiPartUploadParams): Promise<{
+        file: FileData;
+        uploadId: string | undefined;
+        parts: {
+            url: string;
+            partNumber: number;
+        }[];
+    }>;
+}
+export {};

package/multiPartUpload/CreateMultiPartUploadUseCase.js

@@ -0,0 +1,34 @@
+import { UploadPartCommand, getSignedUrl } from "@webiny/aws-sdk/client-s3/index.js";
+class CreateMultiPartUploadUseCase {
+    constructor(bucket, s3Client){
+        this.bucket = bucket;
+        this.s3 = s3Client;
+    }
+    async execute({ file, numberOfParts }) {
+        const s3Params = {
+            Bucket: this.bucket,
+            Key: file.key
+        };
+        const { UploadId } = await this.s3.createMultipartUpload(s3Params);
+        const parts = await Promise.all(Array.from({
+            length: numberOfParts
+        }).map((_, index)=>getSignedUrl(this.s3, new UploadPartCommand({
+                ...s3Params,
+                UploadId,
+                PartNumber: index + 1
+            }), {
+                expiresIn: 86400
+            }).then((url)=>({
+                    url,
+                    partNumber: index + 1
+                }))));
+        return {
+            file,
+            uploadId: UploadId,
+            parts
+        };
+    }
+}
+export { CreateMultiPartUploadUseCase };
+
+//# sourceMappingURL=CreateMultiPartUploadUseCase.js.map

package/multiPartUpload/CreateMultiPartUploadUseCase.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"multiPartUpload/CreateMultiPartUploadUseCase.js","sources":["../../src/multiPartUpload/CreateMultiPartUploadUseCase.ts"],"sourcesContent":["import type { S3 } from \"@webiny/aws-sdk/client-s3/index.js\";\nimport { getSignedUrl, UploadPartCommand } from \"@webiny/aws-sdk/client-s3/index.js\";\nimport type { FileData } from \"~/types.js\";\n\ninterface CreateMultiPartUploadParams {\n    file: FileData;\n    numberOfParts: number;\n}\n\nexport class CreateMultiPartUploadUseCase {\n    private readonly s3: S3;\n    private readonly bucket: string;\n\n    constructor(bucket: string, s3Client: S3) {\n        this.bucket = bucket;\n        this.s3 = s3Client;\n    }\n\n    async execute({ file, numberOfParts }: CreateMultiPartUploadParams) {\n        const s3Params = { Bucket: this.bucket, Key: file.key };\n\n        const { UploadId } = await this.s3.createMultipartUpload(s3Params);\n\n        const parts = await Promise.all(\n            Array.from({ length: numberOfParts }).map((_, index) => {\n                return getSignedUrl(\n                    this.s3,\n                    new UploadPartCommand({ ...s3Params, UploadId, PartNumber: index + 1 }),\n                    {\n                        // URL expires after 24 hours.\n                        expiresIn: 86400\n                    }\n                ).then(url => ({\n                    url,\n                    partNumber: index + 1\n                }));\n            })\n        );\n\n        return {\n            file,\n            uploadId: UploadId,\n            parts\n        };\n    }\n}\n"],"names":["CreateMultiPartUploadUseCase","bucket","s3Client","file","numberOfParts","s3Params","UploadId","parts","Promise","Array","_","index","getSignedUrl","UploadPartCommand","url"],"mappings":";AASO,MAAMA;IAIT,YAAYC,MAAc,EAAEC,QAAY,CAAE;QACtC,IAAI,CAAC,MAAM,GAAGD;QACd,IAAI,CAAC,EAAE,GAAGC;IACd;IAEA,MAAM,QAAQ,EAAEC,IAAI,EAAEC,aAAa,EAA+B,EAAE;QAChE,MAAMC,WAAW;YAAE,QAAQ,IAAI,CAAC,MAAM;YAAE,KAAKF,KAAK,GAAG;QAAC;QAEtD,MAAM,EAAEG,QAAQ,EAAE,GAAG,MAAM,IAAI,CAAC,EAAE,CAAC,qBAAqB,CAACD;QAEzD,MAAME,QAAQ,MAAMC,QAAQ,GAAG,CAC3BC,MAAM,IAAI,CAAC;YAAE,QAAQL;QAAc,GAAG,GAAG,CAAC,CAACM,GAAGC,QACnCC,aACH,IAAI,CAAC,EAAE,EACP,IAAIC,kBAAkB;gBAAE,GAAGR,QAAQ;gBAAEC;gBAAU,YAAYK,QAAQ;YAAE,IACrE;gBAEI,WAAW;YACf,GACF,IAAI,CAACG,CAAAA,MAAQ;oBACXA;oBACA,YAAYH,QAAQ;gBACxB;QAIR,OAAO;YACHR;YACA,UAAUG;YACVC;QACJ;IACJ;AACJ"}

package/package.json

@@ -1,7 +1,11 @@
 {
 	"name": "@webiny/api-file-manager-s3",
-	"version": "0.0.0-unstable.78f581c1d2",
-	"main": "index.js",
+	"version": "0.0.0-unstable.7be00a75a9",
+	"type": "module",
+	"exports": {
+		".": "./index.js",
+		"./*": "./*"
+	},
 	"repository": {
 		"type": "git",
 		"url": "https://github.com/webiny/webiny-js.git"
@@ -10,31 +14,38 @@
 	"author": "Webiny Ltd",
 	"license": "MIT",
 	"dependencies": {
-		"@webiny/api-file-manager": "0.0.0-unstable.78f581c1d2",
-		"@webiny/error": "0.0.0-unstable.78f581c1d2",
-		"@webiny/handler-graphql": "0.0.0-unstable.78f581c1d2",
-		"@webiny/validation": "0.0.0-unstable.78f581c1d2",
-		"form-data": "4.0.0",
-		"node-fetch": "2.6.7",
-		"sanitize-filename": "1.6.3",
-		"uniqid": "5.4.0"
+		"@webiny/api": "0.0.0-unstable.7be00a75a9",
+		"@webiny/api-core": "0.0.0-unstable.7be00a75a9",
+		"@webiny/api-file-manager": "0.0.0-unstable.7be00a75a9",
+		"@webiny/api-websockets": "0.0.0-unstable.7be00a75a9",
+		"@webiny/aws-sdk": "0.0.0-unstable.7be00a75a9",
+		"@webiny/feature": "0.0.0-unstable.7be00a75a9",
+		"@webiny/handler": "0.0.0-unstable.7be00a75a9",
+		"@webiny/handler-aws": "0.0.0-unstable.7be00a75a9",
+		"@webiny/handler-graphql": "0.0.0-unstable.7be00a75a9",
+		"@webiny/plugins": "0.0.0-unstable.7be00a75a9",
+		"@webiny/tasks": "0.0.0-unstable.7be00a75a9",
+		"@webiny/utils": "0.0.0-unstable.7be00a75a9",
+		"@webiny/validation": "0.0.0-unstable.7be00a75a9",
+		"exifreader": "4.39.1",
+		"mime": "4.1.0",
+		"object-hash": "3.0.0",
+		"p-map": "7.0.4",
+		"p-reduce": "3.0.0",
+		"sanitize-filename": "1.6.4",
+		"sharp": "0.34.5"
 	},
 	"devDependencies": {
-		"@babel/cli": "^7.19.3",
-		"@babel/core": "^7.19.3",
-		"@types/node-fetch": "^2.6.1",
-		"@webiny/cli": "^0.0.0-unstable.78f581c1d2",
-		"@webiny/project-utils": "^0.0.0-unstable.78f581c1d2",
-		"rimraf": "^3.0.2",
-		"typescript": "4.7.4"
+		"@webiny/build-tools": "0.0.0-unstable.7be00a75a9",
+		"rimraf": "6.1.3",
+		"typescript": "6.0.3",
+		"vitest": "4.1.7"
 	},
 	"publishConfig": {
-		"access": "public",
-		"directory": "dist"
-	},
-	"scripts": {
-		"build": "yarn webiny run build",
-		"watch": "yarn webiny run watch"
+		"access": "public"
 	},
-	"gitHead": "78f581c1d2e5e6936aa11b9452a66d2a3652a1b2"
+	"gitHead": "8476da73b653c89cc1474d968baf55c1b0ae0e5f",
+	"webiny": {
+		"publishFrom": "dist"
+	}
 }

package/types.d.ts

@@ -1,16 +1,21 @@
-import S3 from "aws-sdk/clients/s3";
+import type { PresignedPost } from "@webiny/aws-sdk/client-s3/index.js";
+import "@webiny/tasks/features/TaskController/augmentation.js";
 export interface PresignedPostPayloadData {
     name: string;
     type: string;
     size: number;
-    keyPrefix: string;
+    id?: string;
+    key?: string;
+    keyPrefix?: string;
+}
+export interface FileData {
+    id: string;
+    key: string;
+    name: string;
+    size: number;
+    type: string;
 }
 export interface PresignedPostPayloadDataResponse {
-    data: S3.PresignedPost;
-    file: {
-        name: string;
-        key: string;
-        type: string;
-        size: number;
-    };
+    data: PresignedPost;
+    file: FileData;
 }

package/types.js

@@ -1,5 +1 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
+import "@webiny/tasks/features/TaskController/augmentation.js";

package/utils/CdnPathsGenerator.d.ts

@@ -0,0 +1,3 @@
+export declare class CdnPathsGenerator {
+    generate(fileId: string): string[];
+}

package/utils/CdnPathsGenerator.js

@@ -0,0 +1,11 @@
+class CdnPathsGenerator {
+    generate(fileId) {
+        return [
+            `/files/${fileId}/*`,
+            `/private/${fileId}/*`
+        ];
+    }
+}
+export { CdnPathsGenerator };
+
+//# sourceMappingURL=CdnPathsGenerator.js.map

package/utils/CdnPathsGenerator.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"utils/CdnPathsGenerator.js","sources":["../../src/utils/CdnPathsGenerator.ts"],"sourcesContent":["export class CdnPathsGenerator {\n    generate(fileId: string): string[] {\n        return [`/files/${fileId}/*`, `/private/${fileId}/*`];\n    }\n}\n"],"names":["CdnPathsGenerator","fileId"],"mappings":"AAAO,MAAMA;IACT,SAASC,MAAc,EAAY;QAC/B,OAAO;YAAC,CAAC,OAAO,EAAEA,OAAO,EAAE,CAAC;YAAE,CAAC,SAAS,EAAEA,OAAO,EAAE,CAAC;SAAC;IACzD;AACJ"}

package/utils/FileExtension.d.ts

@@ -0,0 +1,6 @@
+import type { PresignedPostPayloadData } from "../types.js";
+export declare class FileExtension {
+    private data;
+    constructor(data: PresignedPostPayloadData);
+    getValue(): string;
+}

package/utils/FileExtension.js

@@ -0,0 +1,16 @@
+import { mimeTypes as external_mimeTypes_js_mimeTypes } from "./mimeTypes.js";
+class FileExtension {
+    constructor(data){
+        this.data = data;
+    }
+    getValue() {
+        const name = (this.data.key || this.data.name).toLowerCase();
+        const maybeExt = name.split(".").pop();
+        const extensions = external_mimeTypes_js_mimeTypes[this.data.type];
+        if (extensions && !extensions.includes(maybeExt)) return extensions[0];
+        return "";
+    }
+}
+export { FileExtension };
+
+//# sourceMappingURL=FileExtension.js.map

package/utils/FileExtension.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"utils/FileExtension.js","sources":["../../src/utils/FileExtension.ts"],"sourcesContent":["import { mimeTypes } from \"~/utils/mimeTypes.js\";\nimport type { PresignedPostPayloadData } from \"~/types.js\";\n\nexport class FileExtension {\n    private data: PresignedPostPayloadData;\n\n    constructor(data: PresignedPostPayloadData) {\n        this.data = data;\n    }\n\n    getValue() {\n        const name = (this.data.key || this.data.name).toLowerCase();\n\n        const maybeExt = name.split(\".\").pop() as string;\n        const extensions = mimeTypes[this.data.type];\n        if (extensions && !extensions.includes(maybeExt)) {\n            return extensions[0];\n        }\n\n        return \"\";\n    }\n}\n"],"names":["FileExtension","data","name","maybeExt","extensions","mimeTypes"],"mappings":";AAGO,MAAMA;IAGT,YAAYC,IAA8B,CAAE;QACxC,IAAI,CAAC,IAAI,GAAGA;IAChB;IAEA,WAAW;QACP,MAAMC,OAAQ,KAAI,CAAC,IAAI,CAAC,GAAG,IAAI,IAAI,CAAC,IAAI,CAAC,IAAG,EAAG,WAAW;QAE1D,MAAMC,WAAWD,KAAK,KAAK,CAAC,KAAK,GAAG;QACpC,MAAME,aAAaC,+BAAS,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC;QAC5C,IAAID,cAAc,CAACA,WAAW,QAAQ,CAACD,WACnC,OAAOC,UAAU,CAAC,EAAE;QAGxB,OAAO;IACX;AACJ"}

package/utils/FileKey.d.ts

@@ -0,0 +1,11 @@
+import type { PresignedPostPayloadData } from "../types.js";
+export declare class FileKey {
+    private data;
+    private extension;
+    private key;
+    constructor(data: PresignedPostPayloadData);
+    getExtension(): string;
+    setKey(key: string): this;
+    toString(): string;
+    private getSanitizedKey;
+}

package/utils/FileKey.js

@@ -0,0 +1,33 @@
+import sanitize_filename from "sanitize-filename";
+import { FileExtension } from "./FileExtension.js";
+class FileKey {
+    constructor(data){
+        this.data = data;
+        this.extension = new FileExtension(data);
+        this.key = this.getSanitizedKey();
+    }
+    getExtension() {
+        return this.extension.getValue();
+    }
+    setKey(key) {
+        this.key = key;
+        return this;
+    }
+    toString() {
+        return [
+            this.data.keyPrefix,
+            this.data.id,
+            this.key
+        ].filter(Boolean).join("/");
+    }
+    getSanitizedKey() {
+        const key = sanitize_filename(this.data.key || this.data.name).replace(/\s/g, "");
+        return [
+            key,
+            this.getExtension()
+        ].filter(Boolean).join(".");
+    }
+}
+export { FileKey };
+
+//# sourceMappingURL=FileKey.js.map

package/utils/FileKey.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"utils/FileKey.js","sources":["../../src/utils/FileKey.ts"],"sourcesContent":["import sanitizeFilename from \"sanitize-filename\";\nimport type { PresignedPostPayloadData } from \"~/types.js\";\nimport { FileExtension } from \"~/utils/FileExtension.js\";\n\nexport class FileKey {\n    private data: PresignedPostPayloadData;\n    private extension: FileExtension;\n    private key: string;\n\n    constructor(data: PresignedPostPayloadData) {\n        this.data = data;\n        this.extension = new FileExtension(data);\n        this.key = this.getSanitizedKey();\n    }\n\n    getExtension() {\n        return this.extension.getValue();\n    }\n\n    setKey(key: string) {\n        this.key = key;\n        return this;\n    }\n\n    toString() {\n        return [this.data.keyPrefix, this.data.id, this.key].filter(Boolean).join(\"/\");\n    }\n\n    private getSanitizedKey() {\n        const key = sanitizeFilename(this.data.key || this.data.name).replace(/\\s/g, \"\");\n\n        return [key, this.getExtension()].filter(Boolean).join(\".\");\n    }\n}\n"],"names":["FileKey","data","FileExtension","key","Boolean","sanitizeFilename"],"mappings":";;AAIO,MAAMA;IAKT,YAAYC,IAA8B,CAAE;QACxC,IAAI,CAAC,IAAI,GAAGA;QACZ,IAAI,CAAC,SAAS,GAAG,IAAIC,cAAcD;QACnC,IAAI,CAAC,GAAG,GAAG,IAAI,CAAC,eAAe;IACnC;IAEA,eAAe;QACX,OAAO,IAAI,CAAC,SAAS,CAAC,QAAQ;IAClC;IAEA,OAAOE,GAAW,EAAE;QAChB,IAAI,CAAC,GAAG,GAAGA;QACX,OAAO,IAAI;IACf;IAEA,WAAW;QACP,OAAO;YAAC,IAAI,CAAC,IAAI,CAAC,SAAS;YAAE,IAAI,CAAC,IAAI,CAAC,EAAE;YAAE,IAAI,CAAC,GAAG;SAAC,CAAC,MAAM,CAACC,SAAS,IAAI,CAAC;IAC9E;IAEQ,kBAAkB;QACtB,MAAMD,MAAME,kBAAiB,IAAI,CAAC,IAAI,CAAC,GAAG,IAAI,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,OAAO,CAAC,OAAO;QAE7E,OAAO;YAACF;YAAK,IAAI,CAAC,YAAY;SAAG,CAAC,MAAM,CAACC,SAAS,IAAI,CAAC;IAC3D;AACJ"}

package/utils/FileKey.test.d.ts

@@ -0,0 +1 @@
+export {};

package/utils/FileKey.test.js

@@ -0,0 +1,59 @@
+import { describe, expect, it } from "vitest";
+import { FileKey } from "./FileKey.js";
+describe("FileKey", ()=>{
+    it("should generate a file key (extension is included in the name)", ()=>{
+        const fileKey = new FileKey({
+            size: 1071690,
+            name: "image-14.jpg",
+            type: "image/jpeg"
+        });
+        expect(fileKey.toString()).toEqual("image-14.jpg");
+    });
+    it("should generate a file key (extension derived from file type)", ()=>{
+        const fileKey = new FileKey({
+            size: 1071690,
+            name: "image-14",
+            type: "image/jpeg"
+        });
+        expect(fileKey.toString()).toEqual("image-14.jpg");
+    });
+    it("should generate a file key containing id", ()=>{
+        const fileKey = new FileKey({
+            size: 1071690,
+            name: "image-14.jpeg",
+            type: "image/jpeg",
+            id: "12345678"
+        });
+        expect(fileKey.toString()).toEqual("12345678/image-14.jpeg");
+    });
+    it("should generate a file key containing prefix", ()=>{
+        const fileKey = new FileKey({
+            size: 1071690,
+            name: "image-14.jpeg",
+            type: "image/jpeg",
+            keyPrefix: "prefix"
+        });
+        expect(fileKey.toString()).toEqual("prefix/image-14.jpeg");
+    });
+    it("should generate a file key containing id and prefix", ()=>{
+        const fileKey = new FileKey({
+            size: 1071690,
+            name: "image-14.jpeg",
+            type: "image/jpeg",
+            id: "12345678",
+            keyPrefix: "prefix"
+        });
+        expect(fileKey.toString()).toEqual("prefix/12345678/image-14.jpeg");
+    });
+    it("should use the key defined in the input", ()=>{
+        const fileKey = new FileKey({
+            size: 1071690,
+            name: "image",
+            type: "image/jpeg",
+            key: "image-14.jpg"
+        });
+        expect(fileKey.toString()).toEqual("image-14.jpg");
+    });
+});
+
+//# sourceMappingURL=FileKey.test.js.map

package/utils/FileKey.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"utils/FileKey.test.js","sources":["../../src/utils/FileKey.test.ts"],"sourcesContent":["import { describe, it, expect } from \"vitest\";\nimport { FileKey } from \"./FileKey.js\";\n\ndescribe(\"FileKey\", () => {\n    it(\"should generate a file key (extension is included in the name)\", () => {\n        const fileKey = new FileKey({\n            size: 1071690,\n            name: \"image-14.jpg\",\n            type: \"image/jpeg\"\n        });\n\n        expect(fileKey.toString()).toEqual(\"image-14.jpg\");\n    });\n\n    it(\"should generate a file key (extension derived from file type)\", () => {\n        const fileKey = new FileKey({\n            size: 1071690,\n            name: \"image-14\",\n            type: \"image/jpeg\"\n        });\n\n        expect(fileKey.toString()).toEqual(\"image-14.jpg\");\n    });\n\n    it(\"should generate a file key containing id\", () => {\n        const fileKey = new FileKey({\n            size: 1071690,\n            name: \"image-14.jpeg\",\n            type: \"image/jpeg\",\n            id: \"12345678\"\n        });\n\n        expect(fileKey.toString()).toEqual(\"12345678/image-14.jpeg\");\n    });\n\n    it(\"should generate a file key containing prefix\", () => {\n        const fileKey = new FileKey({\n            size: 1071690,\n            name: \"image-14.jpeg\",\n            type: \"image/jpeg\",\n            keyPrefix: \"prefix\"\n        });\n\n        expect(fileKey.toString()).toEqual(\"prefix/image-14.jpeg\");\n    });\n\n    it(\"should generate a file key containing id and prefix\", () => {\n        const fileKey = new FileKey({\n            size: 1071690,\n            name: \"image-14.jpeg\",\n            type: \"image/jpeg\",\n            id: \"12345678\",\n            keyPrefix: \"prefix\"\n        });\n\n        expect(fileKey.toString()).toEqual(\"prefix/12345678/image-14.jpeg\");\n    });\n\n    it(\"should use the key defined in the input\", () => {\n        const fileKey = new FileKey({\n            size: 1071690,\n            name: \"image\",\n            type: \"image/jpeg\",\n            key: \"image-14.jpg\"\n        });\n\n        expect(fileKey.toString()).toEqual(\"image-14.jpg\");\n    });\n});\n"],"names":["describe","it","fileKey","FileKey","expect"],"mappings":";;AAGAA,SAAS,WAAW;IAChBC,GAAG,kEAAkE;QACjE,MAAMC,UAAU,IAAIC,QAAQ;YACxB,MAAM;YACN,MAAM;YACN,MAAM;QACV;QAEAC,OAAOF,QAAQ,QAAQ,IAAI,OAAO,CAAC;IACvC;IAEAD,GAAG,iEAAiE;QAChE,MAAMC,UAAU,IAAIC,QAAQ;YACxB,MAAM;YACN,MAAM;YACN,MAAM;QACV;QAEAC,OAAOF,QAAQ,QAAQ,IAAI,OAAO,CAAC;IACvC;IAEAD,GAAG,4CAA4C;QAC3C,MAAMC,UAAU,IAAIC,QAAQ;YACxB,MAAM;YACN,MAAM;YACN,MAAM;YACN,IAAI;QACR;QAEAC,OAAOF,QAAQ,QAAQ,IAAI,OAAO,CAAC;IACvC;IAEAD,GAAG,gDAAgD;QAC/C,MAAMC,UAAU,IAAIC,QAAQ;YACxB,MAAM;YACN,MAAM;YACN,MAAM;YACN,WAAW;QACf;QAEAC,OAAOF,QAAQ,QAAQ,IAAI,OAAO,CAAC;IACvC;IAEAD,GAAG,uDAAuD;QACtD,MAAMC,UAAU,IAAIC,QAAQ;YACxB,MAAM;YACN,MAAM;YACN,MAAM;YACN,IAAI;YACJ,WAAW;QACf;QAEAC,OAAOF,QAAQ,QAAQ,IAAI,OAAO,CAAC;IACvC;IAEAD,GAAG,2CAA2C;QAC1C,MAAMC,UAAU,IAAIC,QAAQ;YACxB,MAAM;YACN,MAAM;YACN,MAAM;YACN,KAAK;QACT;QAEAC,OAAOF,QAAQ,QAAQ,IAAI,OAAO,CAAC;IACvC;AACJ"}

package/utils/FileNormalizer.d.ts

@@ -0,0 +1,18 @@
+import type { FileData, PresignedPostPayloadData } from "../types.js";
+import type { FileModifier } from "./FileUploadModifier.js";
+export interface FileToSign {
+    name: string;
+    key: string;
+    type: string;
+    size: number;
+}
+/**
+ * FileNormalizer normalizes file data, before it's signed for upload to S3.
+ * It generates a unique file id, and makes sure that the file key includes the unique id.
+ *
+ */
+export declare class FileNormalizer {
+    private readonly modifier;
+    constructor(modifier?: FileModifier);
+    normalizeFile(payload: PresignedPostPayloadData): Promise<FileData>;
+}

package/utils/FileNormalizer.js

@@ -0,0 +1,41 @@
+import { mdbid } from "@webiny/utils";
+import { FileKey } from "./FileKey.js";
+import { mimeTypes as external_mimeTypes_js_mimeTypes } from "./mimeTypes.js";
+const extensionToMime = new Map();
+for (const [mime, extensions] of Object.entries(external_mimeTypes_js_mimeTypes))for (const ext of extensions)if (!extensionToMime.has(ext)) extensionToMime.set(ext, mime);
+function resolveTypeFromName(name) {
+    const ext = name.slice(name.lastIndexOf(".") + 1).toLowerCase();
+    return extensionToMime.get(ext) || "application/octet-stream";
+}
+class FileNormalizer {
+    constructor(modifier){
+        this.modifier = modifier;
+    }
+    async normalizeFile(payload) {
+        const data = {
+            ...payload,
+            id: payload.id || mdbid(),
+            type: payload.type || resolveTypeFromName(payload.name)
+        };
+        const key = new FileKey(data);
+        const defaultKey = key.toString();
+        const file = {
+            name: data.name,
+            type: data.type,
+            key: defaultKey,
+            size: data.size
+        };
+        if (this.modifier) Object.assign(file, await this.modifier(file));
+        if (defaultKey !== file.key) key.setKey(file.key);
+        return {
+            id: data.id,
+            key: key.toString(),
+            name: file.name,
+            size: file.size,
+            type: file.type
+        };
+    }
+}
+export { FileNormalizer };
+
+//# sourceMappingURL=FileNormalizer.js.map

package/utils/FileNormalizer.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"utils/FileNormalizer.js","sources":["../../src/utils/FileNormalizer.ts"],"sourcesContent":["import { mdbid } from \"@webiny/utils\";\nimport type { FileData, PresignedPostPayloadData } from \"~/types.js\";\nimport { FileKey } from \"~/utils/FileKey.js\";\nimport { mimeTypes } from \"~/utils/mimeTypes.js\";\nimport type { FileModifier } from \"./FileUploadModifier.js\";\n\nexport interface FileToSign {\n    name: string;\n    key: string;\n    type: string;\n    size: number;\n}\n\nconst extensionToMime = new Map<string, string>();\nfor (const [mime, extensions] of Object.entries(mimeTypes)) {\n    for (const ext of extensions) {\n        if (!extensionToMime.has(ext)) {\n            extensionToMime.set(ext, mime);\n        }\n    }\n}\n\nfunction resolveTypeFromName(name: string): string {\n    const ext = name.slice(name.lastIndexOf(\".\") + 1).toLowerCase();\n    return extensionToMime.get(ext) || \"application/octet-stream\";\n}\n\n/**\n * FileNormalizer normalizes file data, before it's signed for upload to S3.\n * It generates a unique file id, and makes sure that the file key includes the unique id.\n *\n */\nexport class FileNormalizer {\n    private readonly modifier: FileModifier | undefined;\n\n    constructor(modifier?: FileModifier) {\n        this.modifier = modifier;\n    }\n\n    async normalizeFile(payload: PresignedPostPayloadData): Promise<FileData> {\n        const data = {\n            ...payload,\n            id: payload.id || mdbid(),\n            type: payload.type || resolveTypeFromName(payload.name)\n        };\n\n        const key = new FileKey(data);\n        const defaultKey = key.toString();\n\n        const file: FileToSign = {\n            name: data.name,\n            type: data.type,\n            key: defaultKey,\n            size: data.size\n        };\n\n        if (this.modifier) {\n            Object.assign(file, await this.modifier(file));\n        }\n\n        if (defaultKey !== file.key) {\n            key.setKey(file.key);\n        }\n\n        return {\n            id: data.id,\n            key: key.toString(),\n            name: file.name,\n            size: file.size,\n            type: file.type\n        };\n    }\n}\n"],"names":["extensionToMime","Map","mime","extensions","Object","mimeTypes","ext","resolveTypeFromName","name","FileNormalizer","modifier","payload","data","mdbid","key","FileKey","defaultKey","file"],"mappings":";;;AAaA,MAAMA,kBAAkB,IAAIC;AAC5B,KAAK,MAAM,CAACC,MAAMC,WAAW,IAAIC,OAAO,OAAO,CAACC,iCAC5C,KAAK,MAAMC,OAAOH,WACd,IAAI,CAACH,gBAAgB,GAAG,CAACM,MACrBN,gBAAgB,GAAG,CAACM,KAAKJ;AAKrC,SAASK,oBAAoBC,IAAY;IACrC,MAAMF,MAAME,KAAK,KAAK,CAACA,KAAK,WAAW,CAAC,OAAO,GAAG,WAAW;IAC7D,OAAOR,gBAAgB,GAAG,CAACM,QAAQ;AACvC;AAOO,MAAMG;IAGT,YAAYC,QAAuB,CAAE;QACjC,IAAI,CAAC,QAAQ,GAAGA;IACpB;IAEA,MAAM,cAAcC,OAAiC,EAAqB;QACtE,MAAMC,OAAO;YACT,GAAGD,OAAO;YACV,IAAIA,QAAQ,EAAE,IAAIE;YAClB,MAAMF,QAAQ,IAAI,IAAIJ,oBAAoBI,QAAQ,IAAI;QAC1D;QAEA,MAAMG,MAAM,IAAIC,QAAQH;QACxB,MAAMI,aAAaF,IAAI,QAAQ;QAE/B,MAAMG,OAAmB;YACrB,MAAML,KAAK,IAAI;YACf,MAAMA,KAAK,IAAI;YACf,KAAKI;YACL,MAAMJ,KAAK,IAAI;QACnB;QAEA,IAAI,IAAI,CAAC,QAAQ,EACbR,OAAO,MAAM,CAACa,MAAM,MAAM,IAAI,CAAC,QAAQ,CAACA;QAG5C,IAAID,eAAeC,KAAK,GAAG,EACvBH,IAAI,MAAM,CAACG,KAAK,GAAG;QAGvB,OAAO;YACH,IAAIL,KAAK,EAAE;YACX,KAAKE,IAAI,QAAQ;YACjB,MAAMG,KAAK,IAAI;YACf,MAAMA,KAAK,IAAI;YACf,MAAMA,KAAK,IAAI;QACnB;IACJ;AACJ"}

package/utils/FileUploadModifier.d.ts

@@ -0,0 +1,30 @@
+import { Plugin } from "@webiny/plugins";
+import type { FileToSign } from "../utils/FileNormalizer.js";
+interface Setter<T> {
+    (param: T): T;
+}
+declare class FileUploadModifier {
+    private fileSetters;
+    setFile(setter: Setter<FileToSign>): void;
+    execute(file: FileToSign): Promise<FileToSign>;
+}
+interface FileUploadModifierCallbackParams {
+    modifier: {
+        setFile: FileUploadModifier["setFile"];
+    };
+}
+export declare class FileUploadModifierPlugin extends Plugin {
+    static type: string;
+    private readonly cb;
+    constructor(cb: FileUploadModifierCallable);
+    execute(params: FileUploadModifierCallbackParams): void;
+}
+interface FileUploadModifierCallable {
+    (params: FileUploadModifierCallbackParams): void;
+}
+export declare const createFileUploadModifier: (cb: FileUploadModifierCallable) => FileUploadModifierPlugin;
+export interface FileModifier {
+    (file: FileToSign): Promise<Partial<FileToSign>> | Partial<FileToSign>;
+}
+export declare const createModifierFromPlugins: (plugins?: FileUploadModifierPlugin[]) => FileModifier;
+export {};

package/utils/FileUploadModifier.js

@@ -0,0 +1,39 @@
+import p_reduce from "p-reduce";
+import { Plugin } from "@webiny/plugins";
+class FileUploadModifier {
+    setFile(setter) {
+        this.fileSetters.push(setter);
+    }
+    execute(file) {
+        return p_reduce(this.fileSetters, async (file, setter)=>({
+                ...file,
+                ...await setter(file)
+            }), file);
+    }
+    constructor(){
+        this.fileSetters = [];
+    }
+}
+class FileUploadModifierPlugin extends Plugin {
+    static{
+        this.type = "fm.s3.uploadModifier";
+    }
+    constructor(cb){
+        super();
+        this.cb = cb;
+    }
+    execute(params) {
+        return this.cb(params);
+    }
+}
+const createFileUploadModifier = (cb)=>new FileUploadModifierPlugin(cb);
+const createModifierFromPlugins = (plugins = [])=>{
+    const modifier = new FileUploadModifier();
+    plugins.forEach((pl)=>pl.execute({
+            modifier
+        }));
+    return (file)=>modifier.execute(file);
+};
+export { FileUploadModifierPlugin, createFileUploadModifier, createModifierFromPlugins };
+
+//# sourceMappingURL=FileUploadModifier.js.map

package/utils/FileUploadModifier.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"utils/FileUploadModifier.js","sources":["../../src/utils/FileUploadModifier.ts"],"sourcesContent":["import pReduce from \"p-reduce\";\nimport { Plugin } from \"@webiny/plugins\";\nimport type { FileToSign } from \"~/utils/FileNormalizer.js\";\n\ninterface Setter<T> {\n    (param: T): T;\n}\n\nclass FileUploadModifier {\n    private fileSetters: Setter<FileToSign>[] = [];\n\n    setFile(setter: Setter<FileToSign>): void {\n        this.fileSetters.push(setter);\n    }\n\n    execute(file: FileToSign) {\n        return pReduce(\n            this.fileSetters,\n            async (file, setter) => {\n                // We need to spread the original file, then add (potentially) partial changes.\n                return { ...file, ...(await setter(file)) };\n            },\n            file\n        );\n    }\n}\n\ninterface FileUploadModifierCallbackParams {\n    modifier: {\n        setFile: FileUploadModifier[\"setFile\"];\n    };\n}\n\nexport class FileUploadModifierPlugin extends Plugin {\n    public static override type = \"fm.s3.uploadModifier\";\n    private readonly cb: FileUploadModifierCallable;\n\n    constructor(cb: FileUploadModifierCallable) {\n        super();\n        this.cb = cb;\n    }\n\n    execute(params: FileUploadModifierCallbackParams) {\n        return this.cb(params);\n    }\n}\n\ninterface FileUploadModifierCallable {\n    (params: FileUploadModifierCallbackParams): void;\n}\n\nexport const createFileUploadModifier = (cb: FileUploadModifierCallable) => {\n    return new FileUploadModifierPlugin(cb);\n};\n\nexport interface FileModifier {\n    (file: FileToSign): Promise<Partial<FileToSign>> | Partial<FileToSign>;\n}\n\nexport const createModifierFromPlugins = (\n    plugins: FileUploadModifierPlugin[] = []\n): FileModifier => {\n    const modifier = new FileUploadModifier();\n    plugins.forEach(pl => pl.execute({ modifier }));\n\n    return (file: FileToSign) => modifier.execute(file);\n};\n"],"names":["FileUploadModifier","setter","file","pReduce","FileUploadModifierPlugin","Plugin","cb","params","createFileUploadModifier","createModifierFromPlugins","plugins","modifier","pl"],"mappings":";;AAQA,MAAMA;IAGF,QAAQC,MAA0B,EAAQ;QACtC,IAAI,CAAC,WAAW,CAAC,IAAI,CAACA;IAC1B;IAEA,QAAQC,IAAgB,EAAE;QACtB,OAAOC,SACH,IAAI,CAAC,WAAW,EAChB,OAAOD,MAAMD,SAEF;gBAAE,GAAGC,IAAI;gBAAE,GAAI,MAAMD,OAAOC,KAAK;YAAE,IAE9CA;IAER;;aAfQ,WAAW,GAAyB,EAAE;;AAgBlD;AAQO,MAAME,iCAAiCC;;aACnB,IAAI,GAAG;;IAG9B,YAAYC,EAA8B,CAAE;QACxC,KAAK;QACL,IAAI,CAAC,EAAE,GAAGA;IACd;IAEA,QAAQC,MAAwC,EAAE;QAC9C,OAAO,IAAI,CAAC,EAAE,CAACA;IACnB;AACJ;AAMO,MAAMC,2BAA2B,CAACF,KAC9B,IAAIF,yBAAyBE;AAOjC,MAAMG,4BAA4B,CACrCC,UAAsC,EAAE;IAExC,MAAMC,WAAW,IAAIX;IACrBU,QAAQ,OAAO,CAACE,CAAAA,KAAMA,GAAG,OAAO,CAAC;YAAED;QAAS;IAE5C,OAAO,CAACT,OAAqBS,SAAS,OAAO,CAACT;AAClD"}

package/utils/createFileNormalizerFromContext.d.ts

@@ -0,0 +1,3 @@
+import type { Context } from "@webiny/api/types.js";
+import { FileNormalizer } from "../utils/FileNormalizer.js";
+export declare const createFileNormalizerFromContext: (context: Context) => FileNormalizer;

package/utils/createFileNormalizerFromContext.js

@@ -0,0 +1,9 @@
+import { FileNormalizer } from "./FileNormalizer.js";
+import { FileUploadModifierPlugin, createModifierFromPlugins } from "./FileUploadModifier.js";
+const createFileNormalizerFromContext = (context)=>{
+    const modifierPlugins = context.plugins.byType(FileUploadModifierPlugin.type);
+    return new FileNormalizer(createModifierFromPlugins(modifierPlugins));
+};
+export { createFileNormalizerFromContext };
+
+//# sourceMappingURL=createFileNormalizerFromContext.js.map

package/utils/createFileNormalizerFromContext.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"utils/createFileNormalizerFromContext.js","sources":["../../src/utils/createFileNormalizerFromContext.ts"],"sourcesContent":["import type { Context } from \"@webiny/api/types.js\";\nimport { FileNormalizer } from \"~/utils/FileNormalizer.js\";\nimport { createModifierFromPlugins, FileUploadModifierPlugin } from \"~/utils/FileUploadModifier.js\";\n\nexport const createFileNormalizerFromContext = (context: Context) => {\n    const modifierPlugins = context.plugins.byType<FileUploadModifierPlugin>(\n        FileUploadModifierPlugin.type\n    );\n\n    return new FileNormalizer(createModifierFromPlugins(modifierPlugins));\n};\n"],"names":["createFileNormalizerFromContext","context","modifierPlugins","FileUploadModifierPlugin","FileNormalizer","createModifierFromPlugins"],"mappings":";;AAIO,MAAMA,kCAAkC,CAACC;IAC5C,MAAMC,kBAAkBD,QAAQ,OAAO,CAAC,MAAM,CAC1CE,yBAAyB,IAAI;IAGjC,OAAO,IAAIC,eAAeC,0BAA0BH;AACxD"}

package/utils/getPresignedPostPayload.d.ts

@@ -1,4 +1,4 @@
-import { PresignedPostPayloadData, PresignedPostPayloadDataResponse } from "../types";
-import { FileManagerSettings } from "@webiny/api-file-manager/types";
-declare const _default: (data: PresignedPostPayloadData, settings: FileManagerSettings) => Promise<PresignedPostPayloadDataResponse>;
-export default _default;
+import type { FileData, PresignedPostPayloadDataResponse } from "../types.js";
+import type { FileManagerSettings } from "@webiny/api-file-manager/domain/settings/types.js";
+import { TenantContext } from "@webiny/api-core/features/tenancy/TenantContext/index.js";
+export declare const getPresignedPostPayload: (file: FileData, settings: FileManagerSettings, tenantContext: TenantContext.Interface) => Promise<PresignedPostPayloadDataResponse>;