@webiny/api-file-manager-s3 6.4.5 → 6.6.0-alpha.0

package/graphql/S3GraphQLSchema.d.ts

@@ -0,0 +1,9 @@
+import { CoreGraphQLSchemaFactory } from "@webiny/api-graphql/graphql/abstractions.js";
+import { GraphQLSchemaBuilder } from "@webiny/api-graphql/features/GraphQLSchemaBuilder/abstractions.js";
+declare class S3GraphQLSchemaImpl implements CoreGraphQLSchemaFactory.Interface {
+    execute(builder: GraphQLSchemaBuilder.Interface): CoreGraphQLSchemaFactory.Return;
+}
+export declare const S3GraphQLSchema: typeof S3GraphQLSchemaImpl & {
+    __abstraction: import("@webiny/di").Abstraction<import("@webiny/api-graphql/graphql/abstractions.core.js").ICoreGraphQLSchemaFactory>;
+};
+export {};

package/graphql/S3GraphQLSchema.js

@@ -0,0 +1,229 @@
+import p_map from "p-map";
+import { CoreGraphQLSchemaFactory } from "@webiny/api-graphql/graphql/abstractions.js";
+import { IdentityContext } from "@webiny/api-core/features/security/IdentityContext/index.js";
+import { TenantContext } from "@webiny/api-core/features/tenancy/TenantContext/index.js";
+import { S3 } from "@webiny/aws-sdk/client-s3/index.js";
+import { ErrorResponse, Response } from "@webiny/api-graphql/responses.js";
+import { GetSettingsUseCase } from "@webiny/api-file-manager/features/settings/GetSettings/abstractions.js";
+import { getPresignedPostPayload } from "../utils/getPresignedPostPayload.js";
+import { createFileNormalizerFromContext } from "../utils/createFileNormalizerFromContext.js";
+import { checkPermissions } from "./checkPermissions.js";
+import { CreateMultiPartUploadUseCase } from "../multiPartUpload/CreateMultiPartUploadUseCase.js";
+import { CompleteMultiPartUploadUseCase } from "../multiPartUpload/CompleteMultiPartUploadUseCase.js";
+const TYPE_DEFS = `
+    type UploadFileResponseDataFile {
+        id: ID!
+        name: String!
+        type: String!
+        size: Long!
+        key: String!
+    }
+
+    input PreSignedPostPayloadInput {
+        id: ID
+        name: String!
+        type: String!
+        size: Long!
+        key: String
+        keyPrefix: String
+    }
+
+    type GetPreSignedPostPayloadResponseDataFile {
+        id: ID!
+        name: String!
+        type: String!
+        size: Long!
+        key: String!
+    }
+
+    type GetPreSignedPostPayloadResponseData {
+        # Contains data that is necessary for initiating a file upload.
+        data: JSON!
+        file: UploadFileResponseDataFile!
+    }
+
+    type GetPreSignedPostPayloadResponse {
+        error: FmError
+        data: GetPreSignedPostPayloadResponseData
+    }
+
+    type MultiPartUploadFilePart {
+        partNumber: Int!
+        url: String!
+    }
+
+    type CreateMultiPartUploadResponseData {
+        file: GetPreSignedPostPayloadResponseDataFile!
+        uploadId: String!
+        parts: [MultiPartUploadFilePart!]!
+    }
+
+    type CompleteMultiPartUploadResponse {
+        data: Boolean
+        error: FmError
+    }
+
+    type GetPreSignedPostPayloadsResponse {
+        error: FmError
+        data: [GetPreSignedPostPayloadResponseData!]!
+    }
+
+    extend type FmQuery {
+        getPreSignedPostPayload(data: PreSignedPostPayloadInput!): GetPreSignedPostPayloadResponse
+        getPreSignedPostPayloads(
+            data: [PreSignedPostPayloadInput]!
+        ): GetPreSignedPostPayloadsResponse
+    }
+
+    type CreateMultiPartUploadResponse {
+        data: CreateMultiPartUploadResponseData
+        error: FmError
+    }
+
+    input MultiPartUploadFilePartInput {
+        partNumber: Int!
+        etag: String!
+    }
+
+    extend type FmMutation {
+        createMultiPartUpload(
+            data: PreSignedPostPayloadInput!
+            numberOfParts: Number!
+        ): CreateMultiPartUploadResponse
+
+        completeMultiPartUpload(
+            fileKey: String!
+            uploadId: String!
+        ): CompleteMultiPartUploadResponse
+    }
+`;
+class S3GraphQLSchemaImpl {
+    async execute(builder) {
+        builder.addTypeDefs(TYPE_DEFS);
+        builder.addResolver({
+            path: "FmQuery.getPreSignedPostPayload",
+            dependencies: [
+                IdentityContext,
+                GetSettingsUseCase,
+                TenantContext
+            ],
+            resolver (identityContext, getSettings, tenantContext) {
+                return async ({ args, context })=>{
+                    try {
+                        await checkPermissions(identityContext, {
+                            rwd: "w"
+                        });
+                        const settingsResult = await getSettings.execute();
+                        const settings = settingsResult.value;
+                        const normalizer = createFileNormalizerFromContext(context);
+                        const presignedPayload = await getPresignedPostPayload(await normalizer.normalizeFile(args.data), settings, tenantContext);
+                        return new Response(presignedPayload);
+                    } catch (e) {
+                        return new ErrorResponse({
+                            message: e.message,
+                            code: e.code,
+                            data: e.data
+                        });
+                    }
+                };
+            }
+        });
+        builder.addResolver({
+            path: "FmQuery.getPreSignedPostPayloads",
+            dependencies: [
+                IdentityContext,
+                GetSettingsUseCase,
+                TenantContext
+            ],
+            resolver (identityContext, getSettings, tenantContext) {
+                return async ({ args, context })=>{
+                    await checkPermissions(identityContext, {
+                        rwd: "w"
+                    });
+                    try {
+                        const settingsResult = await getSettings.execute();
+                        const settings = settingsResult.value;
+                        const normalizer = createFileNormalizerFromContext(context);
+                        const presignedPayloads = await p_map(args.data, async (data)=>getPresignedPostPayload(await normalizer.normalizeFile(data), settings, tenantContext));
+                        return new Response(presignedPayloads);
+                    } catch (e) {
+                        return new ErrorResponse({
+                            message: e.message,
+                            code: e.code,
+                            data: e.data
+                        });
+                    }
+                };
+            }
+        });
+        builder.addResolver({
+            path: "FmMutation.createMultiPartUpload",
+            dependencies: [
+                IdentityContext
+            ],
+            resolver (identityContext) {
+                return async ({ args, context })=>{
+                    await checkPermissions(identityContext, {
+                        rwd: "w"
+                    });
+                    const s3Client = new S3({
+                        region: process.env.AWS_REGION
+                    });
+                    try {
+                        const useCase = new CreateMultiPartUploadUseCase(String(process.env.S3_BUCKET), s3Client);
+                        const normalizer = createFileNormalizerFromContext(context);
+                        const multiPartUpload = await useCase.execute({
+                            file: await normalizer.normalizeFile(args.data),
+                            numberOfParts: args.numberOfParts
+                        });
+                        return new Response(multiPartUpload);
+                    } catch (e) {
+                        return new ErrorResponse({
+                            message: e.message,
+                            code: e.code,
+                            data: e.data
+                        });
+                    }
+                };
+            }
+        });
+        builder.addResolver({
+            path: "FmMutation.completeMultiPartUpload",
+            dependencies: [
+                IdentityContext
+            ],
+            resolver (identityContext) {
+                return async ({ args })=>{
+                    await checkPermissions(identityContext, {
+                        rwd: "w"
+                    });
+                    const s3Client = new S3({
+                        region: process.env.AWS_REGION
+                    });
+                    try {
+                        const useCase = new CompleteMultiPartUploadUseCase(String(process.env.S3_BUCKET), s3Client);
+                        await useCase.execute({
+                            fileKey: args.fileKey,
+                            uploadId: args.uploadId
+                        });
+                        return new Response(true);
+                    } catch (e) {
+                        return new ErrorResponse({
+                            message: e.message,
+                            code: e.code,
+                            data: e.data
+                        });
+                    }
+                };
+            }
+        });
+        return builder;
+    }
+}
+const S3GraphQLSchema = CoreGraphQLSchemaFactory.createImplementation({
+    implementation: S3GraphQLSchemaImpl,
+    dependencies: []
+});
+export { S3GraphQLSchema };
+
+//# sourceMappingURL=S3GraphQLSchema.js.map

package/graphql/S3GraphQLSchema.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"graphql/S3GraphQLSchema.js","sources":["../../src/graphql/S3GraphQLSchema.ts"],"sourcesContent":["import pMap from \"p-map\";\nimport { CoreGraphQLSchemaFactory } from \"@webiny/api-graphql/graphql/abstractions.js\";\nimport { GraphQLSchemaBuilder } from \"@webiny/api-graphql/features/GraphQLSchemaBuilder/abstractions.js\";\nimport { IdentityContext } from \"@webiny/api-core/features/security/IdentityContext/index.js\";\nimport { TenantContext } from \"@webiny/api-core/features/tenancy/TenantContext/index.js\";\nimport { S3 } from \"@webiny/aws-sdk/client-s3/index.js\";\nimport { ErrorResponse, Response } from \"@webiny/api-graphql/responses.js\";\nimport { GetSettingsUseCase } from \"@webiny/api-file-manager/features/settings/GetSettings/abstractions.js\";\nimport { getPresignedPostPayload } from \"~/utils/getPresignedPostPayload.js\";\nimport { createFileNormalizerFromContext } from \"~/utils/createFileNormalizerFromContext.js\";\nimport { checkPermissions } from \"./checkPermissions.js\";\nimport type { PresignedPostPayloadData } from \"~/types.js\";\nimport { CreateMultiPartUploadUseCase } from \"~/multiPartUpload/CreateMultiPartUploadUseCase.js\";\nimport { CompleteMultiPartUploadUseCase } from \"~/multiPartUpload/CompleteMultiPartUploadUseCase.js\";\n\nconst TYPE_DEFS = /* GraphQL */ `\n    type UploadFileResponseDataFile {\n        id: ID!\n        name: String!\n        type: String!\n        size: Long!\n        key: String!\n    }\n\n    input PreSignedPostPayloadInput {\n        id: ID\n        name: String!\n        type: String!\n        size: Long!\n        key: String\n        keyPrefix: String\n    }\n\n    type GetPreSignedPostPayloadResponseDataFile {\n        id: ID!\n        name: String!\n        type: String!\n        size: Long!\n        key: String!\n    }\n\n    type GetPreSignedPostPayloadResponseData {\n        # Contains data that is necessary for initiating a file upload.\n        data: JSON!\n        file: UploadFileResponseDataFile!\n    }\n\n    type GetPreSignedPostPayloadResponse {\n        error: FmError\n        data: GetPreSignedPostPayloadResponseData\n    }\n\n    type MultiPartUploadFilePart {\n        partNumber: Int!\n        url: String!\n    }\n\n    type CreateMultiPartUploadResponseData {\n        file: GetPreSignedPostPayloadResponseDataFile!\n        uploadId: String!\n        parts: [MultiPartUploadFilePart!]!\n    }\n\n    type CompleteMultiPartUploadResponse {\n        data: Boolean\n        error: FmError\n    }\n\n    type GetPreSignedPostPayloadsResponse {\n        error: FmError\n        data: [GetPreSignedPostPayloadResponseData!]!\n    }\n\n    extend type FmQuery {\n        getPreSignedPostPayload(data: PreSignedPostPayloadInput!): GetPreSignedPostPayloadResponse\n        getPreSignedPostPayloads(\n            data: [PreSignedPostPayloadInput]!\n        ): GetPreSignedPostPayloadsResponse\n    }\n\n    type CreateMultiPartUploadResponse {\n        data: CreateMultiPartUploadResponseData\n        error: FmError\n    }\n\n    input MultiPartUploadFilePartInput {\n        partNumber: Int!\n        etag: String!\n    }\n\n    extend type FmMutation {\n        createMultiPartUpload(\n            data: PreSignedPostPayloadInput!\n            numberOfParts: Number!\n        ): CreateMultiPartUploadResponse\n\n        completeMultiPartUpload(\n            fileKey: String!\n            uploadId: String!\n        ): CompleteMultiPartUploadResponse\n    }\n`;\n\nclass S3GraphQLSchemaImpl implements CoreGraphQLSchemaFactory.Interface {\n    public async execute(builder: GraphQLSchemaBuilder.Interface): CoreGraphQLSchemaFactory.Return {\n        builder.addTypeDefs(TYPE_DEFS);\n\n        builder.addResolver<{ data: PresignedPostPayloadData }>({\n            path: \"FmQuery.getPreSignedPostPayload\",\n            dependencies: [IdentityContext, GetSettingsUseCase, TenantContext],\n            resolver(\n                identityContext: IdentityContext.Interface,\n                getSettings: GetSettingsUseCase.Interface,\n                tenantContext: TenantContext.Interface\n            ) {\n                return async ({ args, context }) => {\n                    try {\n                        await checkPermissions(identityContext, { rwd: \"w\" });\n\n                        const settingsResult = await getSettings.execute();\n                        const settings = settingsResult.value;\n\n                        const normalizer = createFileNormalizerFromContext(context);\n                        const presignedPayload = await getPresignedPostPayload(\n                            await normalizer.normalizeFile(args.data),\n                            settings,\n                            tenantContext\n                        );\n\n                        return new Response(presignedPayload);\n                    } catch (e) {\n                        return new ErrorResponse({\n                            message: e.message,\n                            code: e.code,\n                            data: e.data\n                        });\n                    }\n                };\n            }\n        });\n\n        builder.addResolver<{ data: PresignedPostPayloadData[] }>({\n            path: \"FmQuery.getPreSignedPostPayloads\",\n            dependencies: [IdentityContext, GetSettingsUseCase, TenantContext],\n            resolver(\n                identityContext: IdentityContext.Interface,\n                getSettings: GetSettingsUseCase.Interface,\n                tenantContext: TenantContext.Interface\n            ) {\n                return async ({ args, context }) => {\n                    await checkPermissions(identityContext, { rwd: \"w\" });\n\n                    try {\n                        const settingsResult = await getSettings.execute();\n                        const settings = settingsResult.value;\n\n                        const normalizer = createFileNormalizerFromContext(context);\n\n                        const presignedPayloads = await pMap(args.data, async data => {\n                            return getPresignedPostPayload(\n                                await normalizer.normalizeFile(data),\n                                settings,\n                                tenantContext\n                            );\n                        });\n\n                        return new Response(presignedPayloads);\n                    } catch (e) {\n                        return new ErrorResponse({\n                            message: e.message,\n                            code: e.code,\n                            data: e.data\n                        });\n                    }\n                };\n            }\n        });\n\n        builder.addResolver<{ data: any; numberOfParts: number }>({\n            path: \"FmMutation.createMultiPartUpload\",\n            dependencies: [IdentityContext],\n            resolver(identityContext: IdentityContext.Interface) {\n                return async ({ args, context }) => {\n                    await checkPermissions(identityContext, { rwd: \"w\" });\n\n                    const s3Client = new S3({ region: process.env.AWS_REGION });\n\n                    try {\n                        const useCase = new CreateMultiPartUploadUseCase(\n                            String(process.env.S3_BUCKET),\n                            s3Client\n                        );\n\n                        const normalizer = createFileNormalizerFromContext(context);\n\n                        const multiPartUpload = await useCase.execute({\n                            file: await normalizer.normalizeFile(args.data),\n                            numberOfParts: args.numberOfParts\n                        });\n\n                        return new Response(multiPartUpload);\n                    } catch (e) {\n                        return new ErrorResponse({\n                            message: e.message,\n                            code: e.code,\n                            data: e.data\n                        });\n                    }\n                };\n            }\n        });\n\n        builder.addResolver<{ fileKey: string; uploadId: string }>({\n            path: \"FmMutation.completeMultiPartUpload\",\n            dependencies: [IdentityContext],\n            resolver(identityContext: IdentityContext.Interface) {\n                return async ({ args }) => {\n                    await checkPermissions(identityContext, { rwd: \"w\" });\n\n                    const s3Client = new S3({ region: process.env.AWS_REGION });\n\n                    try {\n                        const useCase = new CompleteMultiPartUploadUseCase(\n                            String(process.env.S3_BUCKET),\n                            s3Client\n                        );\n\n                        await useCase.execute({\n                            fileKey: args.fileKey,\n                            uploadId: args.uploadId\n                        });\n\n                        return new Response(true);\n                    } catch (e) {\n                        return new ErrorResponse({\n                            message: e.message,\n                            code: e.code,\n                            data: e.data\n                        });\n                    }\n                };\n            }\n        });\n\n        return builder;\n    }\n}\n\nexport const S3GraphQLSchema = CoreGraphQLSchemaFactory.createImplementation({\n    implementation: S3GraphQLSchemaImpl,\n    dependencies: []\n});\n"],"names":["TYPE_DEFS","S3GraphQLSchemaImpl","builder","IdentityContext","GetSettingsUseCase","TenantContext","identityContext","getSettings","tenantContext","args","context","checkPermissions","settingsResult","settings","normalizer","createFileNormalizerFromContext","presignedPayload","getPresignedPostPayload","Response","e","ErrorResponse","presignedPayloads","pMap","data","s3Client","S3","process","useCase","CreateMultiPartUploadUseCase","String","multiPartUpload","CompleteMultiPartUploadUseCase","S3GraphQLSchema","CoreGraphQLSchemaFactory"],"mappings":"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"}

package/index.d.ts

@@ -1,4 +1,4 @@
-import { ContextPlugin } from "@webiny/api";
 export { createFileUploadModifier } from "./utils/FileUploadModifier.js";
 export { createAssetDelivery } from "./assetDelivery/createAssetDelivery.js";
-export declare const createFileManagerS3: () => (import("@webiny/handler-graphql/index.js").GraphQLSchemaPlugin<import("@webiny/api/types.js").Context> | ContextPlugin<import("@webiny/api/types.js").Context>)[];
+export { FileManagerS3Feature } from "./FileManagerS3Feature.js";
+export type { FileManagerS3FeatureConfig } from "./FileManagerS3Feature.js";

package/index.js

@@ -1,31 +1,3 @@
-import { ContextPlugin } from "@webiny/api";
-import { WcpContext } from "@webiny/api-core/features/wcp/WcpContext/index.js";
-import { createS3GraphQLSchema } from "./graphql/schema.js";
-import { DeleteFileFromBucketFeature } from "./features/DeleteFileFromBucket/feature.js";
-import { WriteFileMetadataFeature } from "./features/WriteFileMetadata/feature.js";
-import { ApplyThreatScanningFeature } from "./enterprise/ApplyThreatScanning/feature.js";
-import { FlushCacheFeature } from "./features/FlushCache/feature.js";
-import { ExtractMetadataFeature } from "./features/ExtractMetadata/feature.js";
-import { GetFileContentsByIdFeature } from "./features/GetFileContentsById/feature.js";
-import { GetFileContentsByKeyFeature } from "./features/GetFileContentsByKey/feature.js";
-const contextPlugin = new ContextPlugin((context)=>{
-    const container = context.container;
-    FlushCacheFeature.register(container);
-    DeleteFileFromBucketFeature.register(container);
-    ExtractMetadataFeature.register(container);
-    WriteFileMetadataFeature.register(container);
-    GetFileContentsByIdFeature.register(container);
-    GetFileContentsByKeyFeature.register(container);
-    const wcp = container.resolve(WcpContext);
-    if (wcp.canUseFileManagerThreatDetection()) ApplyThreatScanningFeature.register(container);
-});
-contextPlugin.name = "fileManagerS3.context";
-const createFileManagerS3 = ()=>[
-        contextPlugin,
-        createS3GraphQLSchema()
-    ];
 export { createFileUploadModifier } from "./utils/FileUploadModifier.js";
 export { createAssetDelivery } from "./assetDelivery/createAssetDelivery.js";
-export { createFileManagerS3 };
-
-//# sourceMappingURL=index.js.map
+export { FileManagerS3Feature } from "./FileManagerS3Feature.js";

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@webiny/api-file-manager-s3",
-	"version": "6.4.5",
+	"version": "6.6.0-alpha.0",
 	"type": "module",
 	"exports": {
 		".": "./index.js",
@@ -14,31 +14,33 @@
 	"author": "Webiny Ltd",
 	"license": "MIT",
 	"dependencies": {
-		"@webiny/api": "6.4.5",
-		"@webiny/api-core": "6.4.5",
-		"@webiny/api-file-manager": "6.4.5",
-		"@webiny/api-websockets": "6.4.5",
-		"@webiny/aws-sdk": "6.4.5",
-		"@webiny/background-tasks": "6.4.5",
-		"@webiny/feature": "6.4.5",
-		"@webiny/handler": "6.4.5",
-		"@webiny/handler-aws": "6.4.5",
-		"@webiny/handler-graphql": "6.4.5",
-		"@webiny/plugins": "6.4.5",
-		"@webiny/utils": "6.4.5",
-		"@webiny/validation": "6.4.5",
-		"exifreader": "4.41.0",
+		"@webiny/api": "6.6.0-alpha.0",
+		"@webiny/api-core": "6.6.0-alpha.0",
+		"@webiny/api-file-manager": "6.6.0-alpha.0",
+		"@webiny/api-graphql": "6.6.0-alpha.0",
+		"@webiny/api-websockets": "6.6.0-alpha.0",
+		"@webiny/aws-sdk": "6.6.0-alpha.0",
+		"@webiny/background-tasks": "6.6.0-alpha.0",
+		"@webiny/di": "1.0.2",
+		"@webiny/event-handler-aws": "6.6.0-alpha.0",
+		"@webiny/event-handler-core": "6.6.0-alpha.0",
+		"@webiny/feature": "6.6.0-alpha.0",
+		"@webiny/handler": "6.6.0-alpha.0",
+		"@webiny/plugins": "6.6.0-alpha.0",
+		"@webiny/utils": "6.6.0-alpha.0",
+		"@webiny/validation": "6.6.0-alpha.0",
+		"exifreader": "4.41.3",
 		"mime": "4.1.0",
 		"object-hash": "3.0.0",
-		"p-map": "7.0.5",
+		"p-map": "7.0.6",
 		"p-reduce": "3.0.0",
 		"sanitize-filename": "1.6.4",
 		"sharp": "0.35.3"
 	},
 	"devDependencies": {
-		"@webiny/build-tools": "6.4.5",
+		"@webiny/build-tools": "6.6.0-alpha.0",
 		"rimraf": "6.1.3",
-		"typescript": "6.0.3",
+		"typescript": "7.0.2",
 		"vitest": "4.1.10"
 	},
 	"publishConfig": {

package/utils/FileUploadModifier.d.ts

@@ -3,14 +3,14 @@ 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>;
 }

package/utils/FileUploadModifier.js

@@ -1,6 +1,7 @@
 import p_reduce from "p-reduce";
 import { Plugin } from "@webiny/plugins";
-class FileUploadModifier {
+import { createAbstraction } from "@webiny/feature/api";
+class FileUploadModifierBuilder {
     setFile(setter) {
         this.fileSetters.push(setter);
     }
@@ -27,13 +28,14 @@ class FileUploadModifierPlugin extends Plugin {
     }
 }
 const createFileUploadModifier = (cb)=>new FileUploadModifierPlugin(cb);
+const FileUploadModifier = createAbstraction("FileUploadModifier");
 const createModifierFromPlugins = (plugins = [])=>{
-    const modifier = new FileUploadModifier();
+    const modifier = new FileUploadModifierBuilder();
     plugins.forEach((pl)=>pl.execute({
             modifier
         }));
     return (file)=>modifier.execute(file);
 };
-export { FileUploadModifierPlugin, createFileUploadModifier, createModifierFromPlugins };
+export { FileUploadModifier, FileUploadModifierPlugin, createFileUploadModifier, createModifierFromPlugins };
 
 //# sourceMappingURL=FileUploadModifier.js.map

package/utils/FileUploadModifier.js.map

@@ -1 +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"}
+{"version":3,"file":"utils/FileUploadModifier.js","sources":["../../src/utils/FileUploadModifier.ts"],"sourcesContent":["import pReduce from \"p-reduce\";\nimport { Plugin } from \"@webiny/plugins\";\nimport { createAbstraction } from \"@webiny/feature/api\";\nimport type { FileToSign } from \"~/utils/FileNormalizer.js\";\n\ninterface Setter<T> {\n    (param: T): T;\n}\n\nclass FileUploadModifierBuilder {\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: FileUploadModifierBuilder[\"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\n/**\n * DI multiple-abstraction for file-upload modifiers. Replaces the old\n * `context.plugins.byType(FileUploadModifierPlugin.type)` lookup in createFileNormalizerFromContext.\n * Extensions register modifiers via `container.registerInstance(FileUploadModifier, createFileUploadModifier(cb))`.\n */\nexport const FileUploadModifier = createAbstraction<FileUploadModifierPlugin>(\"FileUploadModifier\");\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 FileUploadModifierBuilder();\n    plugins.forEach(pl => pl.execute({ modifier }));\n\n    return (file: FileToSign) => modifier.execute(file);\n};\n"],"names":["FileUploadModifierBuilder","setter","file","pReduce","FileUploadModifierPlugin","Plugin","cb","params","createFileUploadModifier","FileUploadModifier","createAbstraction","createModifierFromPlugins","plugins","modifier","pl"],"mappings":";;;AASA,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;AAQjC,MAAMG,qBAAqBC,kBAA4C;AAMvE,MAAMC,4BAA4B,CACrCC,UAAsC,EAAE;IAExC,MAAMC,WAAW,IAAIb;IACrBY,QAAQ,OAAO,CAACE,CAAAA,KAAMA,GAAG,OAAO,CAAC;YAAED;QAAS;IAE5C,OAAO,CAACX,OAAqBW,SAAS,OAAO,CAACX;AAClD"}

package/utils/createFileNormalizerFromContext.js

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

package/utils/createFileNormalizerFromContext.js.map

@@ -1 +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"}
+{"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, FileUploadModifier } from \"~/utils/FileUploadModifier.js\";\n\nexport const createFileNormalizerFromContext = (context: Context) => {\n    // Modifiers are registered as DI instances (FileUploadModifier) — was\n    // context.plugins.byType(FileUploadModifierPlugin.type).\n    const modifierPlugins = context.container.resolveAll(FileUploadModifier);\n\n    return new FileNormalizer(createModifierFromPlugins(modifierPlugins));\n};\n"],"names":["createFileNormalizerFromContext","context","modifierPlugins","FileUploadModifier","FileNormalizer","createModifierFromPlugins"],"mappings":";;AAIO,MAAMA,kCAAkC,CAACC;IAG5C,MAAMC,kBAAkBD,QAAQ,SAAS,CAAC,UAAU,CAACE;IAErD,OAAO,IAAIC,eAAeC,0BAA0BH;AACxD"}

package/utils/uploadFileToS3.d.ts

@@ -1,3 +1,3 @@
 import type { PresignedPost } from "@webiny/aws-sdk/client-s3/index.js";
-declare const _default: (buffer: Buffer, preSignedPostPayload: PresignedPost) => Promise<Response>;
 export default _default;
+declare function _default(buffer: Buffer, preSignedPostPayload: PresignedPost): Promise<Response>;

package/graphql/schema.d.ts

@@ -1 +0,0 @@
-export declare const createS3GraphQLSchema: () => import("@webiny/handler-graphql").GraphQLSchemaPlugin<import("@webiny/api/types.js").Context>;