@webiny/api-file-manager-s3 0.0.0-unstable.eb196ccd2f → 0.0.0-unstable.eb81deee7e

package/package.json

@@ -1,7 +1,11 @@
 {
 	"name": "@webiny/api-file-manager-s3",
-	"version": "0.0.0-unstable.eb196ccd2f",
-	"main": "index.js",
+	"version": "0.0.0-unstable.eb81deee7e",
+	"type": "module",
+	"exports": {
+		".": "./index.js",
+		"./*": "./*"
+	},
 	"repository": {
 		"type": "git",
 		"url": "https://github.com/webiny/webiny-js.git"
@@ -10,42 +14,40 @@
 	"author": "Webiny Ltd",
 	"license": "MIT",
 	"dependencies": {
-		"@webiny/api": "0.0.0-unstable.eb196ccd2f",
-		"@webiny/api-file-manager": "0.0.0-unstable.eb196ccd2f",
-		"@webiny/api-security": "0.0.0-unstable.eb196ccd2f",
-		"@webiny/api-wcp": "0.0.0-unstable.eb196ccd2f",
-		"@webiny/api-websockets": "0.0.0-unstable.eb196ccd2f",
-		"@webiny/aws-sdk": "0.0.0-unstable.eb196ccd2f",
-		"@webiny/error": "0.0.0-unstable.eb196ccd2f",
-		"@webiny/handler": "0.0.0-unstable.eb196ccd2f",
-		"@webiny/handler-aws": "0.0.0-unstable.eb196ccd2f",
-		"@webiny/handler-graphql": "0.0.0-unstable.eb196ccd2f",
-		"@webiny/plugins": "0.0.0-unstable.eb196ccd2f",
-		"@webiny/tasks": "0.0.0-unstable.eb196ccd2f",
-		"@webiny/utils": "0.0.0-unstable.eb196ccd2f",
-		"@webiny/validation": "0.0.0-unstable.eb196ccd2f",
-		"form-data": "4.0.0",
-		"mime": "3.0.0",
-		"node-fetch": "2.6.7",
+		"@webiny/api": "0.0.0-unstable.eb81deee7e",
+		"@webiny/api-core": "0.0.0-unstable.eb81deee7e",
+		"@webiny/api-file-manager": "0.0.0-unstable.eb81deee7e",
+		"@webiny/api-graphql": "0.0.0-unstable.eb81deee7e",
+		"@webiny/api-websockets": "0.0.0-unstable.eb81deee7e",
+		"@webiny/aws-sdk": "0.0.0-unstable.eb81deee7e",
+		"@webiny/background-tasks": "0.0.0-unstable.eb81deee7e",
+		"@webiny/di": "1.1.0",
+		"@webiny/event-handler-aws": "0.0.0-unstable.eb81deee7e",
+		"@webiny/event-handler-core": "0.0.0-unstable.eb81deee7e",
+		"@webiny/feature": "0.0.0-unstable.eb81deee7e",
+		"@webiny/handler": "0.0.0-unstable.eb81deee7e",
+		"@webiny/plugins": "0.0.0-unstable.eb81deee7e",
+		"@webiny/utils": "0.0.0-unstable.eb81deee7e",
+		"@webiny/validation": "0.0.0-unstable.eb81deee7e",
+		"exifreader": "4.43.0",
+		"mime": "4.1.0",
 		"object-hash": "3.0.0",
-		"p-map": "4.0.0",
-		"p-reduce": "2.1.0",
-		"sanitize-filename": "1.6.3",
-		"sharp": "0.32.6"
+		"p-map": "7.0.6",
+		"p-reduce": "3.0.0",
+		"sanitize-filename": "1.6.4",
+		"sharp": "0.35.3"
 	},
 	"devDependencies": {
-		"@types/node-fetch": "2.6.2",
-		"@webiny/project-utils": "0.0.0-unstable.eb196ccd2f",
-		"rimraf": "6.0.1",
-		"typescript": "5.3.3"
+		"@webiny/build-tools": "0.0.0-unstable.eb81deee7e",
+		"rimraf": "6.1.3",
+		"typescript": "7.0.2",
+		"vitest": "4.1.11"
 	},
 	"publishConfig": {
-		"access": "public",
-		"directory": "dist"
-	},
-	"scripts": {
-		"build": "node ../cli/bin.js run build",
-		"watch": "node ../cli/bin.js run watch"
+		"access": "public"
 	},
-	"gitHead": "eb196ccd2f32296e10f7add6dd7220d4e3abece4"
+	"gitHead": "8476da73b653c89cc1474d968baf55c1b0ae0e5f",
+	"webiny": {
+		"publishFrom": "dist"
+	}
 }

package/types.d.ts

@@ -1,4 +1,5 @@
-import type { PresignedPost } from "@webiny/aws-sdk/client-s3";
+import type { PresignedPost } from "@webiny/aws-sdk/client-s3/index.js";
+import "@webiny/background-tasks/api/features/TaskController/augmentation.js";
 export interface PresignedPostPayloadData {
     name: string;
     type: string;

package/types.js

@@ -1,7 +1 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-
-//# sourceMappingURL=types.js.map
+import "@webiny/background-tasks/api/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

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

package/utils/FileExtension.js

@@ -1,24 +1,16 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.FileExtension = void 0;
-var _mimeTypes = require("./mimeTypes");
+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 = _mimeTypes.mimeTypes[this.data.type];
-    if (extensions && !extensions.includes(maybeExt)) {
-      return extensions[0];
+    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 "";
     }
-    return "";
-  }
 }
-exports.FileExtension = FileExtension;
+export { FileExtension };
 
 //# sourceMappingURL=FileExtension.js.map

package/utils/FileExtension.js.map

@@ -1 +1 @@
-{"version":3,"names":["_mimeTypes","require","FileExtension","constructor","data","getValue","name","key","toLowerCase","maybeExt","split","pop","extensions","mimeTypes","type","includes","exports"],"sources":["FileExtension.ts"],"sourcesContent":["import { mimeTypes } from \"~/utils/mimeTypes\";\nimport type { PresignedPostPayloadData } from \"~/types\";\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"],"mappings":";;;;;;AAAA,IAAAA,UAAA,GAAAC,OAAA;AAGO,MAAMC,aAAa,CAAC;EAGvBC,WAAWA,CAACC,IAA8B,EAAE;IACxC,IAAI,CAACA,IAAI,GAAGA,IAAI;EACpB;EAEAC,QAAQA,CAAA,EAAG;IACP,MAAMC,IAAI,GAAG,CAAC,IAAI,CAACF,IAAI,CAACG,GAAG,IAAI,IAAI,CAACH,IAAI,CAACE,IAAI,EAAEE,WAAW,CAAC,CAAC;IAE5D,MAAMC,QAAQ,GAAGH,IAAI,CAACI,KAAK,CAAC,GAAG,CAAC,CAACC,GAAG,CAAC,CAAW;IAChD,MAAMC,UAAU,GAAGC,oBAAS,CAAC,IAAI,CAACT,IAAI,CAACU,IAAI,CAAC;IAC5C,IAAIF,UAAU,IAAI,CAACA,UAAU,CAACG,QAAQ,CAACN,QAAQ,CAAC,EAAE;MAC9C,OAAOG,UAAU,CAAC,CAAC,CAAC;IACxB;IAEA,OAAO,EAAE;EACb;AACJ;AAACI,OAAA,CAAAd,aAAA,GAAAA,aAAA","ignoreList":[]}
+{"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

@@ -1,4 +1,4 @@
-import type { PresignedPostPayloadData } from "../types";
+import type { PresignedPostPayloadData } from "../types.js";
 export declare class FileKey {
     private data;
     private extension;

package/utils/FileKey.js

@@ -1,33 +1,33 @@
-"use strict";
-
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.FileKey = void 0;
-var _sanitizeFilename = _interopRequireDefault(require("sanitize-filename"));
-var _FileExtension = require("./FileExtension");
+import sanitize_filename from "sanitize-filename";
+import { FileExtension } from "./FileExtension.js";
 class FileKey {
-  constructor(data) {
-    this.data = data;
-    this.extension = new _FileExtension.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 = (0, _sanitizeFilename.default)(this.data.key || this.data.name).replace(/\s/g, "");
-    return [key, this.getExtension()].filter(Boolean).join(".");
-  }
+    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(".");
+    }
 }
-exports.FileKey = FileKey;
+export { FileKey };
 
 //# sourceMappingURL=FileKey.js.map

package/utils/FileKey.js.map

@@ -1 +1 @@
-{"version":3,"names":["_sanitizeFilename","_interopRequireDefault","require","_FileExtension","FileKey","constructor","data","extension","FileExtension","key","getSanitizedKey","getExtension","getValue","setKey","toString","keyPrefix","id","filter","Boolean","join","sanitizeFilename","name","replace","exports"],"sources":["FileKey.ts"],"sourcesContent":["import sanitizeFilename from \"sanitize-filename\";\nimport type { PresignedPostPayloadData } from \"~/types\";\nimport { FileExtension } from \"~/utils/FileExtension\";\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"],"mappings":";;;;;;;AAAA,IAAAA,iBAAA,GAAAC,sBAAA,CAAAC,OAAA;AAEA,IAAAC,cAAA,GAAAD,OAAA;AAEO,MAAME,OAAO,CAAC;EAKjBC,WAAWA,CAACC,IAA8B,EAAE;IACxC,IAAI,CAACA,IAAI,GAAGA,IAAI;IAChB,IAAI,CAACC,SAAS,GAAG,IAAIC,4BAAa,CAACF,IAAI,CAAC;IACxC,IAAI,CAACG,GAAG,GAAG,IAAI,CAACC,eAAe,CAAC,CAAC;EACrC;EAEAC,YAAYA,CAAA,EAAG;IACX,OAAO,IAAI,CAACJ,SAAS,CAACK,QAAQ,CAAC,CAAC;EACpC;EAEAC,MAAMA,CAACJ,GAAW,EAAE;IAChB,IAAI,CAACA,GAAG,GAAGA,GAAG;IACd,OAAO,IAAI;EACf;EAEAK,QAAQA,CAAA,EAAG;IACP,OAAO,CAAC,IAAI,CAACR,IAAI,CAACS,SAAS,EAAE,IAAI,CAACT,IAAI,CAACU,EAAE,EAAE,IAAI,CAACP,GAAG,CAAC,CAACQ,MAAM,CAACC,OAAO,CAAC,CAACC,IAAI,CAAC,GAAG,CAAC;EAClF;EAEQT,eAAeA,CAAA,EAAG;IACtB,MAAMD,GAAG,GAAG,IAAAW,yBAAgB,EAAC,IAAI,CAACd,IAAI,CAACG,GAAG,IAAI,IAAI,CAACH,IAAI,CAACe,IAAI,CAAC,CAACC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC;IAEhF,OAAO,CAACb,GAAG,EAAE,IAAI,CAACE,YAAY,CAAC,CAAC,CAAC,CAACM,MAAM,CAACC,OAAO,CAAC,CAACC,IAAI,CAAC,GAAG,CAAC;EAC/D;AACJ;AAACI,OAAA,CAAAnB,OAAA,GAAAA,OAAA","ignoreList":[]}
+{"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.js

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

package/utils/FileKey.test.js.map

@@ -1 +1 @@
-{"version":3,"names":["_FileKey","require","describe","it","fileKey","FileKey","size","name","type","expect","toString","toEqual","id","keyPrefix","key"],"sources":["FileKey.test.ts"],"sourcesContent":["import { FileKey } from \"./FileKey\";\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.jpeg\");\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"],"mappings":";;AAAA,IAAAA,QAAA,GAAAC,OAAA;AAEAC,QAAQ,CAAC,SAAS,EAAE,MAAM;EACtBC,EAAE,CAAC,gEAAgE,EAAE,MAAM;IACvE,MAAMC,OAAO,GAAG,IAAIC,gBAAO,CAAC;MACxBC,IAAI,EAAE,OAAO;MACbC,IAAI,EAAE,cAAc;MACpBC,IAAI,EAAE;IACV,CAAC,CAAC;IAEFC,MAAM,CAACL,OAAO,CAACM,QAAQ,CAAC,CAAC,CAAC,CAACC,OAAO,CAAC,cAAc,CAAC;EACtD,CAAC,CAAC;EAEFR,EAAE,CAAC,+DAA+D,EAAE,MAAM;IACtE,MAAMC,OAAO,GAAG,IAAIC,gBAAO,CAAC;MACxBC,IAAI,EAAE,OAAO;MACbC,IAAI,EAAE,UAAU;MAChBC,IAAI,EAAE;IACV,CAAC,CAAC;IAEFC,MAAM,CAACL,OAAO,CAACM,QAAQ,CAAC,CAAC,CAAC,CAACC,OAAO,CAAC,eAAe,CAAC;EACvD,CAAC,CAAC;EAEFR,EAAE,CAAC,0CAA0C,EAAE,MAAM;IACjD,MAAMC,OAAO,GAAG,IAAIC,gBAAO,CAAC;MACxBC,IAAI,EAAE,OAAO;MACbC,IAAI,EAAE,eAAe;MACrBC,IAAI,EAAE,YAAY;MAClBI,EAAE,EAAE;IACR,CAAC,CAAC;IAEFH,MAAM,CAACL,OAAO,CAACM,QAAQ,CAAC,CAAC,CAAC,CAACC,OAAO,CAAC,wBAAwB,CAAC;EAChE,CAAC,CAAC;EAEFR,EAAE,CAAC,8CAA8C,EAAE,MAAM;IACrD,MAAMC,OAAO,GAAG,IAAIC,gBAAO,CAAC;MACxBC,IAAI,EAAE,OAAO;MACbC,IAAI,EAAE,eAAe;MACrBC,IAAI,EAAE,YAAY;MAClBK,SAAS,EAAE;IACf,CAAC,CAAC;IAEFJ,MAAM,CAACL,OAAO,CAACM,QAAQ,CAAC,CAAC,CAAC,CAACC,OAAO,CAAC,sBAAsB,CAAC;EAC9D,CAAC,CAAC;EAEFR,EAAE,CAAC,qDAAqD,EAAE,MAAM;IAC5D,MAAMC,OAAO,GAAG,IAAIC,gBAAO,CAAC;MACxBC,IAAI,EAAE,OAAO;MACbC,IAAI,EAAE,eAAe;MACrBC,IAAI,EAAE,YAAY;MAClBI,EAAE,EAAE,UAAU;MACdC,SAAS,EAAE;IACf,CAAC,CAAC;IAEFJ,MAAM,CAACL,OAAO,CAACM,QAAQ,CAAC,CAAC,CAAC,CAACC,OAAO,CAAC,+BAA+B,CAAC;EACvE,CAAC,CAAC;EAEFR,EAAE,CAAC,yCAAyC,EAAE,MAAM;IAChD,MAAMC,OAAO,GAAG,IAAIC,gBAAO,CAAC;MACxBC,IAAI,EAAE,OAAO;MACbC,IAAI,EAAE,OAAO;MACbC,IAAI,EAAE,YAAY;MAClBM,GAAG,EAAE;IACT,CAAC,CAAC;IAEFL,MAAM,CAACL,OAAO,CAACM,QAAQ,CAAC,CAAC,CAAC,CAACC,OAAO,CAAC,cAAc,CAAC;EACtD,CAAC,CAAC;AACN,CAAC,CAAC","ignoreList":[]}
+{"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

@@ -1,5 +1,5 @@
-import type { FileData, PresignedPostPayloadData } from "../types";
-import type { FileModifier } from "./FileUploadModifier";
+import type { FileData, PresignedPostPayloadData } from "../types.js";
+import type { FileModifier } from "./FileUploadModifier.js";
 export interface FileToSign {
     name: string;
     key: string;

package/utils/FileNormalizer.js

@@ -1,49 +1,41 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.FileNormalizer = void 0;
-var _utils = require("@webiny/utils");
-var _FileKey = require("./FileKey");
-/**
- * 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.
- *
- */
+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 || (0, _utils.mdbid)(),
-      type: payload.type || "application/octet-stream"
-    };
-    const key = new _FileKey.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));
+    constructor(modifier){
+        this.modifier = modifier;
     }
-    if (defaultKey !== file.key) {
-      key.setKey(file.key);
+    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
+        };
     }
-    return {
-      id: data.id,
-      key: key.toString(),
-      name: file.name,
-      size: file.size,
-      type: file.type
-    };
-  }
 }
-exports.FileNormalizer = FileNormalizer;
+export { FileNormalizer };
 
 //# sourceMappingURL=FileNormalizer.js.map

package/utils/FileNormalizer.js.map

@@ -1 +1 @@
-{"version":3,"names":["_utils","require","_FileKey","FileNormalizer","constructor","modifier","normalizeFile","payload","data","id","mdbid","type","key","FileKey","defaultKey","toString","file","name","size","Object","assign","setKey","exports"],"sources":["FileNormalizer.ts"],"sourcesContent":["import { mdbid } from \"@webiny/utils\";\nimport type { FileData, PresignedPostPayloadData } from \"~/types\";\nimport { FileKey } from \"~/utils/FileKey\";\nimport type { FileModifier } from \"./FileUploadModifier\";\n\nexport interface FileToSign {\n    name: string;\n    key: string;\n    type: string;\n    size: number;\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 || \"application/octet-stream\"\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"],"mappings":";;;;;;AAAA,IAAAA,MAAA,GAAAC,OAAA;AAEA,IAAAC,QAAA,GAAAD,OAAA;AAUA;AACA;AACA;AACA;AACA;AACO,MAAME,cAAc,CAAC;EAGxBC,WAAWA,CAACC,QAAuB,EAAE;IACjC,IAAI,CAACA,QAAQ,GAAGA,QAAQ;EAC5B;EAEA,MAAMC,aAAaA,CAACC,OAAiC,EAAqB;IACtE,MAAMC,IAAI,GAAG;MACT,GAAGD,OAAO;MACVE,EAAE,EAAEF,OAAO,CAACE,EAAE,IAAI,IAAAC,YAAK,EAAC,CAAC;MACzBC,IAAI,EAAEJ,OAAO,CAACI,IAAI,IAAI;IAC1B,CAAC;IAED,MAAMC,GAAG,GAAG,IAAIC,gBAAO,CAACL,IAAI,CAAC;IAC7B,MAAMM,UAAU,GAAGF,GAAG,CAACG,QAAQ,CAAC,CAAC;IAEjC,MAAMC,IAAgB,GAAG;MACrBC,IAAI,EAAET,IAAI,CAACS,IAAI;MACfN,IAAI,EAAEH,IAAI,CAACG,IAAI;MACfC,GAAG,EAAEE,UAAU;MACfI,IAAI,EAAEV,IAAI,CAACU;IACf,CAAC;IAED,IAAI,IAAI,CAACb,QAAQ,EAAE;MACfc,MAAM,CAACC,MAAM,CAACJ,IAAI,EAAE,MAAM,IAAI,CAACX,QAAQ,CAACW,IAAI,CAAC,CAAC;IAClD;IAEA,IAAIF,UAAU,KAAKE,IAAI,CAACJ,GAAG,EAAE;MACzBA,GAAG,CAACS,MAAM,CAACL,IAAI,CAACJ,GAAG,CAAC;IACxB;IAEA,OAAO;MACHH,EAAE,EAAED,IAAI,CAACC,EAAE;MACXG,GAAG,EAAEA,GAAG,CAACG,QAAQ,CAAC,CAAC;MACnBE,IAAI,EAAED,IAAI,CAACC,IAAI;MACfC,IAAI,EAAEF,IAAI,CAACE,IAAI;MACfP,IAAI,EAAEK,IAAI,CAACL;IACf,CAAC;EACL;AACJ;AAACW,OAAA,CAAAnB,cAAA,GAAAA,cAAA","ignoreList":[]}
+{"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

@@ -1,16 +1,16 @@
 import { Plugin } from "@webiny/plugins";
-import type { FileToSign } from "./FileNormalizer";
+import type { FileToSign } from "../utils/FileNormalizer.js";
 interface Setter<T> {
     (param: T): T;
 }
-declare class FileUploadModifier {
+declare class FileUploadModifierBuilder {
     private fileSetters;
     setFile(setter: Setter<FileToSign>): void;
     execute(file: FileToSign): Promise<FileToSign>;
 }
 interface FileUploadModifierCallbackParams {
     modifier: {
-        setFile: FileUploadModifier["setFile"];
+        setFile: FileUploadModifierBuilder["setFile"];
     };
 }
 export declare class FileUploadModifierPlugin extends Plugin {
@@ -23,6 +23,12 @@ interface FileUploadModifierCallable {
     (params: FileUploadModifierCallbackParams): void;
 }
 export declare const createFileUploadModifier: (cb: FileUploadModifierCallable) => FileUploadModifierPlugin;
+/**
+ * DI multiple-abstraction for file-upload modifiers. Replaces the old
+ * `context.plugins.byType(FileUploadModifierPlugin.type)` lookup in createFileNormalizerFromContext.
+ * Extensions register modifiers via `container.registerInstance(FileUploadModifier, createFileUploadModifier(cb))`.
+ */
+export declare const FileUploadModifier: import("@webiny/di").Abstraction<FileUploadModifierPlugin>;
 export interface FileModifier {
     (file: FileToSign): Promise<Partial<FileToSign>> | Partial<FileToSign>;
 }