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

package/FileManagerAppFeature.js

@@ -1,19 +1,19 @@
 import { createFeature } from "@webiny/feature/api";
 import { AssetDeliveryFeature } from "./features/assetDelivery/feature.js";
-import { AssetDeliveryRoute } from "./delivery/AssetDeliveryRoute.js";
+import { AssetDeliveryRouteDefinition } from "./delivery/AssetDeliveryRoute.js";
 import { FileModel } from "./domain/file/file.model.js";
 import { FmPermissionsFeature } from "./features/permissions/feature.js";
 import { FileManagerFeature } from "./features/FileManagerFeature.js";
-import { FileModelContextualSchema } from "./features/FileModelContextualSchema.js";
+import { FileModelProvider } from "./features/file/FileModelProvider.js";
 const FileManagerAppFeature = createFeature({
     name: "FileManagerApp",
     register (container) {
         AssetDeliveryFeature.register(container);
-        container.register(AssetDeliveryRoute);
+        container.register(AssetDeliveryRouteDefinition);
         container.register(FileModel);
         FmPermissionsFeature.register(container);
         FileManagerFeature.register(container);
-        container.register(FileModelContextualSchema);
+        container.register(FileModelProvider);
     }
 });
 export { FileManagerAppFeature };

package/FileManagerAppFeature.js.map

@@ -1 +1 @@
-{"version":3,"file":"FileManagerAppFeature.js","sources":["../src/FileManagerAppFeature.ts"],"sourcesContent":["import { type Container, createFeature } from \"@webiny/feature/api\";\nimport { AssetDeliveryFeature } from \"~/features/assetDelivery/feature.js\";\nimport { AssetDeliveryRoute } from \"./delivery/AssetDeliveryRoute.js\";\nimport { FileModel } from \"~/domain/file/file.model.js\";\nimport { FmPermissionsFeature } from \"~/features/permissions/feature.js\";\nimport { FileManagerFeature } from \"~/features/FileManagerFeature.js\";\nimport { FileModelContextualSchema } from \"~/features/FileModelContextualSchema.js\";\n\nexport const FileManagerAppFeature = createFeature({\n    name: \"FileManagerApp\",\n    register(container: Container) {\n        AssetDeliveryFeature.register(container);\n        container.register(AssetDeliveryRoute);\n        container.register(FileModel);\n        FmPermissionsFeature.register(container);\n        FileManagerFeature.register(container);\n        container.register(FileModelContextualSchema);\n    }\n});\n"],"names":["FileManagerAppFeature","createFeature","container","AssetDeliveryFeature","AssetDeliveryRoute","FileModel","FmPermissionsFeature","FileManagerFeature","FileModelContextualSchema"],"mappings":";;;;;;;AAQO,MAAMA,wBAAwBC,cAAc;IAC/C,MAAM;IACN,UAASC,SAAoB;QACzBC,qBAAqB,QAAQ,CAACD;QAC9BA,UAAU,QAAQ,CAACE;QACnBF,UAAU,QAAQ,CAACG;QACnBC,qBAAqB,QAAQ,CAACJ;QAC9BK,mBAAmB,QAAQ,CAACL;QAC5BA,UAAU,QAAQ,CAACM;IACvB;AACJ"}
+{"version":3,"file":"FileManagerAppFeature.js","sources":["../src/FileManagerAppFeature.ts"],"sourcesContent":["import { type Container, createFeature } from \"@webiny/feature/api\";\nimport { AssetDeliveryFeature } from \"~/features/assetDelivery/feature.js\";\nimport { AssetDeliveryRouteDefinition } from \"./delivery/AssetDeliveryRoute.js\";\nimport { FileModel } from \"~/domain/file/file.model.js\";\nimport { FmPermissionsFeature } from \"~/features/permissions/feature.js\";\nimport { FileManagerFeature } from \"~/features/FileManagerFeature.js\";\nimport { FileModelProvider } from \"~/features/file/FileModelProvider.js\";\n\nexport const FileManagerAppFeature = createFeature({\n    name: \"FileManagerApp\",\n    register(container: Container) {\n        AssetDeliveryFeature.register(container);\n        container.register(AssetDeliveryRouteDefinition);\n        container.register(FileModel);\n        FmPermissionsFeature.register(container);\n        FileManagerFeature.register(container);\n\n        // Stateless — the model list is already cached per request by the CMS (`ModelCache`), so the\n        // provider holds nothing and needs no lifetime of its own.\n        container.register(FileModelProvider);\n    }\n});\n"],"names":["FileManagerAppFeature","createFeature","container","AssetDeliveryFeature","AssetDeliveryRouteDefinition","FileModel","FmPermissionsFeature","FileManagerFeature","FileModelProvider"],"mappings":";;;;;;;AAQO,MAAMA,wBAAwBC,cAAc;IAC/C,MAAM;IACN,UAASC,SAAoB;QACzBC,qBAAqB,QAAQ,CAACD;QAC9BA,UAAU,QAAQ,CAACE;QACnBF,UAAU,QAAQ,CAACG;QACnBC,qBAAqB,QAAQ,CAACJ;QAC9BK,mBAAmB,QAAQ,CAACL;QAI5BA,UAAU,QAAQ,CAACM;IACvB;AACJ"}

package/delivery/AssetDelivery/AssetRequest.d.ts

@@ -1,7 +1,7 @@
 import type { GenericRecord } from "@webiny/api/types.js";
 export interface AssetRequestOptions {
     original?: boolean;
-    width?: number;
+    [key: string]: unknown;
 }
 export type AssetRequestContext<T extends GenericRecord = GenericRecord> = T & {
     /**

package/delivery/AssetDelivery/AssetRequest.js.map

@@ -1 +1 @@
-{"version":3,"file":"delivery/AssetDelivery/AssetRequest.js","sources":["../../../src/delivery/AssetDelivery/AssetRequest.ts"],"sourcesContent":["import type { GenericRecord } from \"@webiny/api/types.js\";\n\nexport interface AssetRequestOptions {\n    original?: boolean;\n    width?: number;\n}\n\nexport type AssetRequestContext<T extends GenericRecord = GenericRecord> = T & {\n    /**\n     * Asset request URL.\n     */\n    url: string;\n};\n\nexport interface AssetRequestData<TOptions> {\n    key: string;\n    context: AssetRequestContext;\n    options: TOptions;\n}\n\nexport class AssetRequest<TOptions extends AssetRequestOptions = AssetRequestOptions> {\n    private data: AssetRequestData<TOptions>;\n\n    constructor(data: AssetRequestData<TOptions>) {\n        this.data = data;\n    }\n\n    getKey() {\n        return this.data.key;\n    }\n\n    getOptions(): TOptions {\n        return this.data.options;\n    }\n\n    setOptions(options: TOptions) {\n        this.data.options = options;\n    }\n\n    getContext<T extends GenericRecord = GenericRecord>() {\n        return this.data.context as AssetRequestContext<T>;\n    }\n\n    getExtension() {\n        return this.data.key.split(\".\").pop();\n    }\n}\n"],"names":["AssetRequest","data","options"],"mappings":"AAoBO,MAAMA;IAGT,YAAYC,IAAgC,CAAE;QAC1C,IAAI,CAAC,IAAI,GAAGA;IAChB;IAEA,SAAS;QACL,OAAO,IAAI,CAAC,IAAI,CAAC,GAAG;IACxB;IAEA,aAAuB;QACnB,OAAO,IAAI,CAAC,IAAI,CAAC,OAAO;IAC5B;IAEA,WAAWC,OAAiB,EAAE;QAC1B,IAAI,CAAC,IAAI,CAAC,OAAO,GAAGA;IACxB;IAEA,aAAsD;QAClD,OAAO,IAAI,CAAC,IAAI,CAAC,OAAO;IAC5B;IAEA,eAAe;QACX,OAAO,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,KAAK,GAAG;IACvC;AACJ"}
+{"version":3,"file":"delivery/AssetDelivery/AssetRequest.js","sources":["../../../src/delivery/AssetDelivery/AssetRequest.ts"],"sourcesContent":["import type { GenericRecord } from \"@webiny/api/types.js\";\n\nexport interface AssetRequestOptions {\n    original?: boolean;\n    [key: string]: unknown;\n}\n\nexport type AssetRequestContext<T extends GenericRecord = GenericRecord> = T & {\n    /**\n     * Asset request URL.\n     */\n    url: string;\n};\n\nexport interface AssetRequestData<TOptions> {\n    key: string;\n    context: AssetRequestContext;\n    options: TOptions;\n}\n\nexport class AssetRequest<TOptions extends AssetRequestOptions = AssetRequestOptions> {\n    private data: AssetRequestData<TOptions>;\n\n    constructor(data: AssetRequestData<TOptions>) {\n        this.data = data;\n    }\n\n    getKey() {\n        return this.data.key;\n    }\n\n    getOptions(): TOptions {\n        return this.data.options;\n    }\n\n    setOptions(options: TOptions) {\n        this.data.options = options;\n    }\n\n    getContext<T extends GenericRecord = GenericRecord>() {\n        return this.data.context as AssetRequestContext<T>;\n    }\n\n    getExtension() {\n        return this.data.key.split(\".\").pop();\n    }\n}\n"],"names":["AssetRequest","data","options"],"mappings":"AAoBO,MAAMA;IAGT,YAAYC,IAAgC,CAAE;QAC1C,IAAI,CAAC,IAAI,GAAGA;IAChB;IAEA,SAAS;QACL,OAAO,IAAI,CAAC,IAAI,CAAC,GAAG;IACxB;IAEA,aAAuB;QACnB,OAAO,IAAI,CAAC,IAAI,CAAC,OAAO;IAC5B;IAEA,WAAWC,OAAiB,EAAE;QAC1B,IAAI,CAAC,IAAI,CAAC,OAAO,GAAGA;IACxB;IAEA,aAAsD;QAClD,OAAO,IAAI,CAAC,IAAI,CAAC,OAAO;IAC5B;IAEA,eAAe;QACX,OAAO,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,KAAK,GAAG;IACvC;AACJ"}

package/delivery/AssetDeliveryRoute.d.ts

@@ -1,14 +1,23 @@
-import { HttpRoute } from "@webiny/event-handler-core";
-import type { IHttpRequest, IHttpResponse } from "@webiny/event-handler-core";
+import { HttpRouteDefinition, HttpRouteHandler } from "@webiny/event-handler-core";
 import type { Container } from "@webiny/di";
-declare class AssetDeliveryRouteImpl implements HttpRoute.Interface {
+declare class AssetDeliveryRouteImpl implements HttpRouteHandler.Interface {
     private container;
-    readonly method = "GET";
-    readonly path = "/files/*";
     constructor(container: Container);
-    handle(request: IHttpRequest): Promise<IHttpResponse>;
+    handle(request: HttpRouteHandler.Request, response: HttpRouteHandler.Response): Promise<import("@webiny/event-handler-core").IHttpResponseBuilder>;
 }
 export declare const AssetDeliveryRoute: typeof AssetDeliveryRouteImpl & {
     __abstraction: import("@webiny/di").Abstraction<import("@webiny/event-handler-core").IHttpRoute>;
 };
+declare class AssetDeliveryRouteDefinitionImpl implements HttpRouteDefinition.Interface {
+    readonly name = "asset-delivery";
+    readonly method = "GET";
+    readonly path = "/files/*";
+    readonly handler: typeof AssetDeliveryRouteImpl & {
+        __abstraction: import("@webiny/di").Abstraction<import("@webiny/event-handler-core").IHttpRoute>;
+    };
+}
+/** What the router matches on. Zero dependencies, so building it costs nothing. */
+export declare const AssetDeliveryRouteDefinition: typeof AssetDeliveryRouteDefinitionImpl & {
+    __abstraction: import("@webiny/di").Abstraction<import("@webiny/event-handler-core").IHttpRouteDefinition>;
+};
 export {};

package/delivery/AssetDeliveryRoute.js

@@ -1,16 +1,11 @@
-import { HttpRoute, RequestContainer } from "@webiny/event-handler-core";
+import { HttpRouteDefinition, HttpRouteHandler, RequestContainer } from "@webiny/event-handler-core";
 import { AssetOutputStrategy, AssetProcessor, AssetRequestResolver, AssetResolver } from "../features/assetDelivery/abstractions.js";
-const NO_CACHE_HEADERS = {
-    "content-type": "application/json",
-    "cache-control": "no-cache, no-store, must-revalidate"
-};
+const NO_CACHE = "no-cache, no-store, must-revalidate";
 class AssetDeliveryRouteImpl {
     constructor(container){
         this.container = container;
-        this.method = "GET";
-        this.path = "/files/*";
     }
-    async handle(request) {
+    async handle(request, response) {
         const requestResolver = this.container.resolve(AssetRequestResolver);
         const assetResolver = this.container.resolve(AssetResolver);
         const assetProcessor = this.container.resolve(AssetProcessor);
@@ -24,42 +19,40 @@ class AssetDeliveryRouteImpl {
             headers: request.headers ?? {}
         };
         const resolvedRequest = await requestResolver.resolve(fakeRequest);
-        if (!resolvedRequest) return {
-            statusCode: 404,
-            headers: NO_CACHE_HEADERS,
-            body: JSON.stringify({
-                error: "Unable to resolve the request!"
-            })
-        };
+        if (!resolvedRequest) return response.status(404).header("cache-control", NO_CACHE).json({
+            error: "Unable to resolve the request!"
+        });
         const resolvedAsset = await assetResolver.resolve(resolvedRequest);
-        if (!resolvedAsset) return {
-            statusCode: 404,
-            headers: NO_CACHE_HEADERS,
-            body: JSON.stringify({
-                error: "Asset not found!"
-            })
-        };
+        if (!resolvedAsset) return response.status(404).header("cache-control", NO_CACHE).json({
+            error: "Asset not found!"
+        });
         resolvedAsset.setOutputStrategy(outputStrategy);
         const processedAsset = await assetProcessor.process(resolvedRequest, resolvedAsset);
         const assetReply = await processedAsset.output();
         const rawHeaders = assetReply.getHeaders().getHeaders();
-        const headers = {};
-        for (const [k, v] of Object.entries(rawHeaders))if (void 0 !== v) headers[k] = String(v);
+        for (const [k, v] of Object.entries(rawHeaders))if (void 0 !== v) response.header(k, String(v));
         const body = await assetReply.getBody();
-        const statusCode = assetReply.getCode();
-        return {
-            statusCode,
-            headers,
-            body: body ?? ""
-        };
+        return response.status(assetReply.getCode()).end(body ?? "");
     }
 }
-const AssetDeliveryRoute = HttpRoute.createImplementation({
+const AssetDeliveryRoute = HttpRouteHandler.createImplementation({
     implementation: AssetDeliveryRouteImpl,
     dependencies: [
         RequestContainer
     ]
 });
-export { AssetDeliveryRoute };
+class AssetDeliveryRouteDefinitionImpl {
+    constructor(){
+        this.name = "asset-delivery";
+        this.method = "GET";
+        this.path = "/files/*";
+        this.handler = AssetDeliveryRoute;
+    }
+}
+const AssetDeliveryRouteDefinition = HttpRouteDefinition.createImplementation({
+    implementation: AssetDeliveryRouteDefinitionImpl,
+    dependencies: []
+});
+export { AssetDeliveryRoute, AssetDeliveryRouteDefinition };
 
 //# sourceMappingURL=AssetDeliveryRoute.js.map

package/delivery/AssetDeliveryRoute.js.map

@@ -1 +1 @@
-{"version":3,"file":"delivery/AssetDeliveryRoute.js","sources":["../../src/delivery/AssetDeliveryRoute.ts"],"sourcesContent":["import { HttpRoute, RequestContainer } from \"@webiny/event-handler-core\";\nimport type { IHttpRequest, IHttpResponse } from \"@webiny/event-handler-core\";\nimport type { Container } from \"@webiny/di\";\nimport {\n    AssetRequestResolver,\n    AssetResolver,\n    AssetProcessor,\n    AssetOutputStrategy\n} from \"~/features/assetDelivery/abstractions.js\";\n\nconst NO_CACHE_HEADERS = {\n    \"content-type\": \"application/json\",\n    \"cache-control\": \"no-cache, no-store, must-revalidate\"\n};\n\nclass AssetDeliveryRouteImpl implements HttpRoute.Interface {\n    readonly method = \"GET\";\n    readonly path = \"/files/*\";\n\n    constructor(private container: Container) {}\n\n    async handle(request: IHttpRequest): Promise<IHttpResponse> {\n        // Resolve asset-delivery collaborators lazily (request time), not as constructor deps.\n        // HttpRouter eagerly constructs every route to match paths, and AssetProcessor's\n        // PrivateFilesAssetProcessor decorator pulls in GetFileUseCase -> CMS entry repositories\n        // that depend on EntryFromStorageTransform, which is only registered while a CMS GraphQL\n        // request is in flight. Resolving here keeps route construction cheap so non-asset\n        // requests (e.g. /graphql) don't trigger that chain before it is registered.\n        const requestResolver = this.container.resolve(AssetRequestResolver);\n        const assetResolver = this.container.resolve(AssetResolver);\n        const assetProcessor = this.container.resolve(AssetProcessor);\n        const outputStrategy = this.container.resolve(AssetOutputStrategy);\n\n        // Reconstruct a minimal request object compatible with IAssetRequestResolver\n        const fakeRequest = {\n            url: request.path,\n            params: { \"*\": request.path.replace(\"/files/\", \"\") },\n            query: request.query ?? {},\n            headers: request.headers ?? {}\n        };\n\n        const resolvedRequest = await requestResolver.resolve(fakeRequest as any);\n        if (!resolvedRequest) {\n            return {\n                statusCode: 404,\n                headers: NO_CACHE_HEADERS,\n                body: JSON.stringify({ error: \"Unable to resolve the request!\" })\n            };\n        }\n\n        const resolvedAsset = await assetResolver.resolve(resolvedRequest);\n        if (!resolvedAsset) {\n            return {\n                statusCode: 404,\n                headers: NO_CACHE_HEADERS,\n                body: JSON.stringify({ error: \"Asset not found!\" })\n            };\n        }\n\n        resolvedAsset.setOutputStrategy(outputStrategy);\n\n        const processedAsset = await assetProcessor.process(resolvedRequest, resolvedAsset);\n        const assetReply = await processedAsset.output();\n\n        const rawHeaders = assetReply.getHeaders().getHeaders();\n        const headers: Record<string, string> = {};\n        for (const [k, v] of Object.entries(rawHeaders)) {\n            if (v !== undefined) {\n                headers[k] = String(v);\n            }\n        }\n\n        const body = await assetReply.getBody();\n        const statusCode = assetReply.getCode();\n\n        // Return the raw body (a Buffer for binary assets). The transport translator\n        // (e.g. httpResponseToApiGatewayResult) base64-encodes Buffers and sets isBase64Encoded so\n        // API Gateway returns proper binary. Pre-encoding to a base64 STRING here defeated that —\n        // the string passed through undecoded and browsers received base64 text, not an image.\n        return {\n            statusCode,\n            headers,\n            body: body ?? \"\"\n        };\n    }\n}\n\nexport const AssetDeliveryRoute = HttpRoute.createImplementation({\n    implementation: AssetDeliveryRouteImpl,\n    dependencies: [RequestContainer]\n});\n"],"names":["NO_CACHE_HEADERS","AssetDeliveryRouteImpl","container","request","requestResolver","AssetRequestResolver","assetResolver","AssetResolver","assetProcessor","AssetProcessor","outputStrategy","AssetOutputStrategy","fakeRequest","resolvedRequest","JSON","resolvedAsset","processedAsset","assetReply","rawHeaders","headers","k","v","Object","undefined","String","body","statusCode","AssetDeliveryRoute","HttpRoute","RequestContainer"],"mappings":";;AAUA,MAAMA,mBAAmB;IACrB,gBAAgB;IAChB,iBAAiB;AACrB;AAEA,MAAMC;IAIF,YAAoBC,SAAoB,CAAE;aAAtBA,SAAS,GAATA;aAHX,MAAM,GAAG;aACT,IAAI,GAAG;IAE2B;IAE3C,MAAM,OAAOC,OAAqB,EAA0B;QAOxD,MAAMC,kBAAkB,IAAI,CAAC,SAAS,CAAC,OAAO,CAACC;QAC/C,MAAMC,gBAAgB,IAAI,CAAC,SAAS,CAAC,OAAO,CAACC;QAC7C,MAAMC,iBAAiB,IAAI,CAAC,SAAS,CAAC,OAAO,CAACC;QAC9C,MAAMC,iBAAiB,IAAI,CAAC,SAAS,CAAC,OAAO,CAACC;QAG9C,MAAMC,cAAc;YAChB,KAAKT,QAAQ,IAAI;YACjB,QAAQ;gBAAE,KAAKA,QAAQ,IAAI,CAAC,OAAO,CAAC,WAAW;YAAI;YACnD,OAAOA,QAAQ,KAAK,IAAI,CAAC;YACzB,SAASA,QAAQ,OAAO,IAAI,CAAC;QACjC;QAEA,MAAMU,kBAAkB,MAAMT,gBAAgB,OAAO,CAACQ;QACtD,IAAI,CAACC,iBACD,OAAO;YACH,YAAY;YACZ,SAASb;YACT,MAAMc,KAAK,SAAS,CAAC;gBAAE,OAAO;YAAiC;QACnE;QAGJ,MAAMC,gBAAgB,MAAMT,cAAc,OAAO,CAACO;QAClD,IAAI,CAACE,eACD,OAAO;YACH,YAAY;YACZ,SAASf;YACT,MAAMc,KAAK,SAAS,CAAC;gBAAE,OAAO;YAAmB;QACrD;QAGJC,cAAc,iBAAiB,CAACL;QAEhC,MAAMM,iBAAiB,MAAMR,eAAe,OAAO,CAACK,iBAAiBE;QACrE,MAAME,aAAa,MAAMD,eAAe,MAAM;QAE9C,MAAME,aAAaD,WAAW,UAAU,GAAG,UAAU;QACrD,MAAME,UAAkC,CAAC;QACzC,KAAK,MAAM,CAACC,GAAGC,EAAE,IAAIC,OAAO,OAAO,CAACJ,YAChC,IAAIG,AAAME,WAANF,GACAF,OAAO,CAACC,EAAE,GAAGI,OAAOH;QAI5B,MAAMI,OAAO,MAAMR,WAAW,OAAO;QACrC,MAAMS,aAAaT,WAAW,OAAO;QAMrC,OAAO;YACHS;YACAP;YACA,MAAMM,QAAQ;QAClB;IACJ;AACJ;AAEO,MAAME,qBAAqBC,UAAU,oBAAoB,CAAC;IAC7D,gBAAgB3B;IAChB,cAAc;QAAC4B;KAAiB;AACpC"}
+{"version":3,"file":"delivery/AssetDeliveryRoute.js","sources":["../../src/delivery/AssetDeliveryRoute.ts"],"sourcesContent":["import {\n    HttpRouteDefinition,\n    HttpRouteHandler,\n    RequestContainer\n} from \"@webiny/event-handler-core\";\nimport type { Container } from \"@webiny/di\";\nimport {\n    AssetRequestResolver,\n    AssetResolver,\n    AssetProcessor,\n    AssetOutputStrategy\n} from \"~/features/assetDelivery/abstractions.js\";\n\nconst NO_CACHE = \"no-cache, no-store, must-revalidate\";\n\nclass AssetDeliveryRouteImpl implements HttpRouteHandler.Interface {\n    constructor(private container: Container) {}\n\n    async handle(request: HttpRouteHandler.Request, response: HttpRouteHandler.Response) {\n        // Resolve asset-delivery collaborators lazily (request time), not as constructor deps.\n        // HttpRouter eagerly constructs every route to match paths, and AssetProcessor's\n        // PrivateFilesAssetProcessor decorator pulls in GetFileUseCase -> CMS entry repositories\n        // that depend on EntryFromStorageTransform, which is only registered while a CMS GraphQL\n        // request is in flight. Resolving here keeps route construction cheap so non-asset\n        // requests (e.g. /graphql) don't trigger that chain before it is registered.\n        const requestResolver = this.container.resolve(AssetRequestResolver);\n        const assetResolver = this.container.resolve(AssetResolver);\n        const assetProcessor = this.container.resolve(AssetProcessor);\n        const outputStrategy = this.container.resolve(AssetOutputStrategy);\n\n        // Reconstruct a minimal request object compatible with IAssetRequestResolver\n        const fakeRequest = {\n            url: request.path,\n            params: { \"*\": request.path.replace(\"/files/\", \"\") },\n            query: request.query ?? {},\n            headers: request.headers ?? {}\n        };\n\n        const resolvedRequest = await requestResolver.resolve(fakeRequest as any);\n        if (!resolvedRequest) {\n            return response\n                .status(404)\n                .header(\"cache-control\", NO_CACHE)\n                .json({ error: \"Unable to resolve the request!\" });\n        }\n\n        const resolvedAsset = await assetResolver.resolve(resolvedRequest);\n        if (!resolvedAsset) {\n            return response\n                .status(404)\n                .header(\"cache-control\", NO_CACHE)\n                .json({ error: \"Asset not found!\" });\n        }\n\n        resolvedAsset.setOutputStrategy(outputStrategy);\n\n        const processedAsset = await assetProcessor.process(resolvedRequest, resolvedAsset);\n        const assetReply = await processedAsset.output();\n\n        const rawHeaders = assetReply.getHeaders().getHeaders();\n        for (const [k, v] of Object.entries(rawHeaders)) {\n            if (v !== undefined) {\n                response.header(k, String(v));\n            }\n        }\n\n        const body = await assetReply.getBody();\n\n        // `end()` (not `send()`) so the raw body passes through untouched and the asset's OWN\n        // Content-Type — set from `rawHeaders` above — is preserved. The transport translator\n        // (e.g. httpResponseToApiGatewayResult) base64-encodes Buffers and sets isBase64Encoded so\n        // API Gateway returns proper binary. Pre-encoding to a base64 STRING here defeated that —\n        // the string passed through undecoded and browsers received base64 text, not an image.\n        return response.status(assetReply.getCode()).end(body ?? \"\");\n    }\n}\n\nexport const AssetDeliveryRoute = HttpRouteHandler.createImplementation({\n    implementation: AssetDeliveryRouteImpl,\n    dependencies: [RequestContainer]\n});\n\nclass AssetDeliveryRouteDefinitionImpl implements HttpRouteDefinition.Interface {\n    readonly name = \"asset-delivery\";\n    readonly method = \"GET\";\n    readonly path = \"/files/*\";\n    readonly handler = AssetDeliveryRoute;\n}\n\n/** What the router matches on. Zero dependencies, so building it costs nothing. */\nexport const AssetDeliveryRouteDefinition = HttpRouteDefinition.createImplementation({\n    implementation: AssetDeliveryRouteDefinitionImpl,\n    dependencies: []\n});\n"],"names":["NO_CACHE","AssetDeliveryRouteImpl","container","request","response","requestResolver","AssetRequestResolver","assetResolver","AssetResolver","assetProcessor","AssetProcessor","outputStrategy","AssetOutputStrategy","fakeRequest","resolvedRequest","resolvedAsset","processedAsset","assetReply","rawHeaders","k","v","Object","undefined","String","body","AssetDeliveryRoute","HttpRouteHandler","RequestContainer","AssetDeliveryRouteDefinitionImpl","AssetDeliveryRouteDefinition","HttpRouteDefinition"],"mappings":";;AAaA,MAAMA,WAAW;AAEjB,MAAMC;IACF,YAAoBC,SAAoB,CAAE;aAAtBA,SAAS,GAATA;IAAuB;IAE3C,MAAM,OAAOC,OAAiC,EAAEC,QAAmC,EAAE;QAOjF,MAAMC,kBAAkB,IAAI,CAAC,SAAS,CAAC,OAAO,CAACC;QAC/C,MAAMC,gBAAgB,IAAI,CAAC,SAAS,CAAC,OAAO,CAACC;QAC7C,MAAMC,iBAAiB,IAAI,CAAC,SAAS,CAAC,OAAO,CAACC;QAC9C,MAAMC,iBAAiB,IAAI,CAAC,SAAS,CAAC,OAAO,CAACC;QAG9C,MAAMC,cAAc;YAChB,KAAKV,QAAQ,IAAI;YACjB,QAAQ;gBAAE,KAAKA,QAAQ,IAAI,CAAC,OAAO,CAAC,WAAW;YAAI;YACnD,OAAOA,QAAQ,KAAK,IAAI,CAAC;YACzB,SAASA,QAAQ,OAAO,IAAI,CAAC;QACjC;QAEA,MAAMW,kBAAkB,MAAMT,gBAAgB,OAAO,CAACQ;QACtD,IAAI,CAACC,iBACD,OAAOV,SACF,MAAM,CAAC,KACP,MAAM,CAAC,iBAAiBJ,UACxB,IAAI,CAAC;YAAE,OAAO;QAAiC;QAGxD,MAAMe,gBAAgB,MAAMR,cAAc,OAAO,CAACO;QAClD,IAAI,CAACC,eACD,OAAOX,SACF,MAAM,CAAC,KACP,MAAM,CAAC,iBAAiBJ,UACxB,IAAI,CAAC;YAAE,OAAO;QAAmB;QAG1Ce,cAAc,iBAAiB,CAACJ;QAEhC,MAAMK,iBAAiB,MAAMP,eAAe,OAAO,CAACK,iBAAiBC;QACrE,MAAME,aAAa,MAAMD,eAAe,MAAM;QAE9C,MAAME,aAAaD,WAAW,UAAU,GAAG,UAAU;QACrD,KAAK,MAAM,CAACE,GAAGC,EAAE,IAAIC,OAAO,OAAO,CAACH,YAChC,IAAIE,AAAME,WAANF,GACAhB,SAAS,MAAM,CAACe,GAAGI,OAAOH;QAIlC,MAAMI,OAAO,MAAMP,WAAW,OAAO;QAOrC,OAAOb,SAAS,MAAM,CAACa,WAAW,OAAO,IAAI,GAAG,CAACO,QAAQ;IAC7D;AACJ;AAEO,MAAMC,qBAAqBC,iBAAiB,oBAAoB,CAAC;IACpE,gBAAgBzB;IAChB,cAAc;QAAC0B;KAAiB;AACpC;AAEA,MAAMC;;aACO,IAAI,GAAG;aACP,MAAM,GAAG;aACT,IAAI,GAAG;aACP,OAAO,GAAGH;;AACvB;AAGO,MAAMI,+BAA+BC,oBAAoB,oBAAoB,CAAC;IACjF,gBAAgBF;IAChB,cAAc,EAAE;AACpB"}

package/domain/file/abstractions.d.ts

@@ -1,9 +1,17 @@
 import type { CmsModel } from "@webiny/api-headless-cms/types";
 /**
- * FileModel abstraction - represents the fmFile CMS model.
- * This will be registered via container.registerInstance in the composite feature.
+ * Provides the `fmFile` CMS model for the current request's tenant.
+ *
+ * Fetching a model is asynchronous and tenant-dependent, which is why this is a provider rather
+ * than the model itself: DI resolution is synchronous, so an already-resolved `CmsModel` could only
+ * be supplied by a per-request hook running before any consumer (what `FileModelContextualSchema`
+ * used to do). Consumers instead `await get()` at the point of use — by which time the tenant is
+ * established — and the provider memoizes for the rest of the request.
  */
-export declare const FileModel: import("@webiny/di").Abstraction<CmsModel>;
-export declare namespace FileModel {
-    type Interface = CmsModel;
+export interface IFileModelProvider {
+    get(): Promise<CmsModel>;
+}
+export declare const FileModelProvider: import("@webiny/di").Abstraction<IFileModelProvider>;
+export declare namespace FileModelProvider {
+    type Interface = IFileModelProvider;
 }

package/domain/file/abstractions.js

@@ -1,5 +1,5 @@
 import { createAbstraction } from "@webiny/feature/api";
-const FileModel = createAbstraction("FileModel");
-export { FileModel };
+const FileModelProvider = createAbstraction("FileModelProvider");
+export { FileModelProvider };
 
 //# sourceMappingURL=abstractions.js.map

package/domain/file/abstractions.js.map

@@ -1 +1 @@
-{"version":3,"file":"domain/file/abstractions.js","sources":["../../../src/domain/file/abstractions.ts"],"sourcesContent":["import { createAbstraction } from \"@webiny/feature/api\";\nimport type { CmsModel } from \"@webiny/api-headless-cms/types\";\n\n/**\n * FileModel abstraction - represents the fmFile CMS model.\n * This will be registered via container.registerInstance in the composite feature.\n */\nexport const FileModel = createAbstraction<CmsModel>(\"FileModel\");\n\nexport namespace FileModel {\n    export type Interface = CmsModel;\n}\n"],"names":["FileModel","createAbstraction"],"mappings":";AAOO,MAAMA,YAAYC,kBAA4B"}
+{"version":3,"file":"domain/file/abstractions.js","sources":["../../../src/domain/file/abstractions.ts"],"sourcesContent":["import { createAbstraction } from \"@webiny/feature/api\";\nimport type { CmsModel } from \"@webiny/api-headless-cms/types\";\n\n/**\n * Provides the `fmFile` CMS model for the current request's tenant.\n *\n * Fetching a model is asynchronous and tenant-dependent, which is why this is a provider rather\n * than the model itself: DI resolution is synchronous, so an already-resolved `CmsModel` could only\n * be supplied by a per-request hook running before any consumer (what `FileModelContextualSchema`\n * used to do). Consumers instead `await get()` at the point of use — by which time the tenant is\n * established — and the provider memoizes for the rest of the request.\n */\nexport interface IFileModelProvider {\n    get(): Promise<CmsModel>;\n}\n\nexport const FileModelProvider = createAbstraction<IFileModelProvider>(\"FileModelProvider\");\n\nexport namespace FileModelProvider {\n    export type Interface = IFileModelProvider;\n}\n"],"names":["FileModelProvider","createAbstraction"],"mappings":";AAgBO,MAAMA,oBAAoBC,kBAAsC"}

package/domain/file/file.model.d.ts

@@ -1,9 +1,9 @@
 import { ModelFactory } from "@webiny/api-headless-cms/features/modelBuilder/index.js";
-import { WcpContext } from "@webiny/api-core/features/wcp/WcpContext/index.js";
+import { FeatureFlags } from "@webiny/api-core/features/featureFlags/abstractions.js";
 export declare const FILE_MODEL_ID: string;
 declare class FilePrivateModelImpl implements ModelFactory.Interface {
-    private wcp;
-    constructor(wcp: WcpContext.Interface);
+    private featureFlags;
+    constructor(featureFlags: FeatureFlags.Interface);
     execute(builder: ModelFactory.Builder): Promise<import("@webiny/api-headless-cms/features/modelBuilder/index.js").PrivateModelBuilder[]>;
 }
 export declare const FileModel: typeof FilePrivateModelImpl & {

package/domain/file/file.model.js

@@ -1,16 +1,16 @@
 import { ModelFactory } from "@webiny/api-headless-cms/features/modelBuilder/index.js";
-import { WcpContext } from "@webiny/api-core/features/wcp/WcpContext/index.js";
+import { FeatureFlags } from "@webiny/api-core/features/featureFlags/abstractions.js";
 const FILE_MODEL_ID = process.env.WEBINY_API_LEGACY_MODELS ? "fmFile" : "wbyFmFile";
 class FilePrivateModelImpl {
-    constructor(wcp){
-        this.wcp = wcp;
+    constructor(featureFlags){
+        this.featureFlags = featureFlags;
     }
     async execute(builder) {
         const model = builder.private({
             modelId: FILE_MODEL_ID,
             name: "FmFile"
         });
-        const privateFiles = this.wcp.canUsePrivateFiles();
+        const privateFiles = this.featureFlags.get().isEnabled("advancedAccessControlLayer.privateFiles");
         model.fields((fields)=>({
                 name: fields.text().label("Name").required("Value is required."),
                 key: fields.text().label("Key").required("Value is required."),
@@ -21,7 +21,11 @@ class FilePrivateModelImpl {
                                 width: fields.number().label("Width"),
                                 height: fields.number().label("Height"),
                                 format: fields.text().label("Format"),
-                                orientation: fields.number().label("Orientation")
+                                orientation: fields.number().label("Orientation"),
+                                crop: fields.json().label("Crop"),
+                                focalPoint: fields.json().label("Focal point"),
+                                alt: fields.text().label("Alt text"),
+                                caption: fields.text().label("Caption")
                             })),
                         exif: fields.searchableJson().label("EXIF Data"),
                         iptc: fields.searchableJson().label("IPTC Data")
@@ -57,7 +61,7 @@ class FilePrivateModelImpl {
 const FileModel = ModelFactory.createImplementation({
     implementation: FilePrivateModelImpl,
     dependencies: [
-        WcpContext
+        FeatureFlags
     ]
 });
 export { FILE_MODEL_ID, FileModel };

package/domain/file/file.model.js.map

@@ -1 +1 @@
-{"version":3,"file":"domain/file/file.model.js","sources":["../../../src/domain/file/file.model.ts"],"sourcesContent":["import { ModelFactory } from \"@webiny/api-headless-cms/features/modelBuilder/index.js\";\nimport { WcpContext } from \"@webiny/api-core/features/wcp/WcpContext/index.js\";\n\nexport const FILE_MODEL_ID = process.env.WEBINY_API_LEGACY_MODELS ? \"fmFile\" : \"wbyFmFile\";\n\nclass FilePrivateModelImpl implements ModelFactory.Interface {\n    public constructor(private wcp: WcpContext.Interface) {}\n\n    public async execute(builder: ModelFactory.Builder) {\n        const model = builder.private({\n            modelId: FILE_MODEL_ID,\n            name: \"FmFile\"\n        });\n        const privateFiles = this.wcp.canUsePrivateFiles();\n\n        model.fields(fields => ({\n            name: fields.text().label(\"Name\").required(\"Value is required.\"),\n            key: fields.text().label(\"Key\").required(\"Value is required.\"),\n            type: fields.text().label(\"Type\").required(\"Value is required.\"),\n            size: fields.number().label(\"Size\").required(\"Value is required.\"),\n            metadata: fields\n                .object()\n                .label(\"Metadata\")\n                .renderer(\"hidden\")\n                .fields(fields => ({\n                    image: fields\n                        .object()\n                        .label(\"Image\")\n                        .fields(fields => ({\n                            width: fields.number().label(\"Width\"),\n                            height: fields.number().label(\"Height\"),\n                            format: fields.text().label(\"Format\"),\n                            orientation: fields.number().label(\"Orientation\")\n                        })),\n                    // Store complete raw EXIF as JSON\n                    exif: fields.searchableJson().label(\"EXIF Data\"),\n                    // Store complete raw IPTC as JSON\n                    iptc: fields.searchableJson().label(\"IPTC Data\")\n                })),\n            tags: fields\n                .text()\n                .label(\"Tags\")\n                .tags([\"$bulk-edit\"])\n                .list()\n                .required(\"Value is required.\"),\n            description: fields.text().label(\"Description\").defaultValue(\"\")\n        }));\n\n        if (privateFiles) {\n            model.fields(fields => ({\n                accessControl: fields\n                    .object()\n                    .label(\"Access Control\")\n                    .tags([\"$bulk-edit\"])\n                    .fields(fields => ({\n                        type: fields\n                            .text()\n                            .label(\"Type\")\n                            .predefinedValues([\n                                {\n                                    label: \"Public\",\n                                    value: \"public\",\n                                    selected: true\n                                },\n                                {\n                                    label: \"Private\",\n                                    value: \"private-authenticated\",\n                                    selected: false\n                                }\n                            ])\n                    }))\n            }));\n        }\n\n        return [model];\n    }\n}\n\nexport const FileModel = ModelFactory.createImplementation({\n    implementation: FilePrivateModelImpl,\n    dependencies: [WcpContext]\n});\n"],"names":["FILE_MODEL_ID","process","FilePrivateModelImpl","wcp","builder","model","privateFiles","fields","FileModel","ModelFactory","WcpContext"],"mappings":";;AAGO,MAAMA,gBAAgBC,QAAQ,GAAG,CAAC,wBAAwB,GAAG,WAAW;AAE/E,MAAMC;IACF,YAA2BC,GAAyB,CAAE;aAA3BA,GAAG,GAAHA;IAA4B;IAEvD,MAAa,QAAQC,OAA6B,EAAE;QAChD,MAAMC,QAAQD,QAAQ,OAAO,CAAC;YAC1B,SAASJ;YACT,MAAM;QACV;QACA,MAAMM,eAAe,IAAI,CAAC,GAAG,CAAC,kBAAkB;QAEhDD,MAAM,MAAM,CAACE,CAAAA,SAAW;gBACpB,MAAMA,OAAO,IAAI,GAAG,KAAK,CAAC,QAAQ,QAAQ,CAAC;gBAC3C,KAAKA,OAAO,IAAI,GAAG,KAAK,CAAC,OAAO,QAAQ,CAAC;gBACzC,MAAMA,OAAO,IAAI,GAAG,KAAK,CAAC,QAAQ,QAAQ,CAAC;gBAC3C,MAAMA,OAAO,MAAM,GAAG,KAAK,CAAC,QAAQ,QAAQ,CAAC;gBAC7C,UAAUA,OACL,MAAM,GACN,KAAK,CAAC,YACN,QAAQ,CAAC,UACT,MAAM,CAACA,CAAAA,SAAW;wBACf,OAAOA,OACF,MAAM,GACN,KAAK,CAAC,SACN,MAAM,CAACA,CAAAA,SAAW;gCACf,OAAOA,OAAO,MAAM,GAAG,KAAK,CAAC;gCAC7B,QAAQA,OAAO,MAAM,GAAG,KAAK,CAAC;gCAC9B,QAAQA,OAAO,IAAI,GAAG,KAAK,CAAC;gCAC5B,aAAaA,OAAO,MAAM,GAAG,KAAK,CAAC;4BACvC;wBAEJ,MAAMA,OAAO,cAAc,GAAG,KAAK,CAAC;wBAEpC,MAAMA,OAAO,cAAc,GAAG,KAAK,CAAC;oBACxC;gBACJ,MAAMA,OACD,IAAI,GACJ,KAAK,CAAC,QACN,IAAI,CAAC;oBAAC;iBAAa,EACnB,IAAI,GACJ,QAAQ,CAAC;gBACd,aAAaA,OAAO,IAAI,GAAG,KAAK,CAAC,eAAe,YAAY,CAAC;YACjE;QAEA,IAAID,cACAD,MAAM,MAAM,CAACE,CAAAA,SAAW;gBACpB,eAAeA,OACV,MAAM,GACN,KAAK,CAAC,kBACN,IAAI,CAAC;oBAAC;iBAAa,EACnB,MAAM,CAACA,CAAAA,SAAW;wBACf,MAAMA,OACD,IAAI,GACJ,KAAK,CAAC,QACN,gBAAgB,CAAC;4BACd;gCACI,OAAO;gCACP,OAAO;gCACP,UAAU;4BACd;4BACA;gCACI,OAAO;gCACP,OAAO;gCACP,UAAU;4BACd;yBACH;oBACT;YACR;QAGJ,OAAO;YAACF;SAAM;IAClB;AACJ;AAEO,MAAMG,YAAYC,aAAa,oBAAoB,CAAC;IACvD,gBAAgBP;IAChB,cAAc;QAACQ;KAAW;AAC9B"}
+{"version":3,"file":"domain/file/file.model.js","sources":["../../../src/domain/file/file.model.ts"],"sourcesContent":["import { ModelFactory } from \"@webiny/api-headless-cms/features/modelBuilder/index.js\";\nimport { FeatureFlags } from \"@webiny/api-core/features/featureFlags/abstractions.js\";\n\nexport const FILE_MODEL_ID = process.env.WEBINY_API_LEGACY_MODELS ? \"fmFile\" : \"wbyFmFile\";\n\nclass FilePrivateModelImpl implements ModelFactory.Interface {\n    public constructor(private featureFlags: FeatureFlags.Interface) {}\n\n    public async execute(builder: ModelFactory.Builder) {\n        const model = builder.private({\n            modelId: FILE_MODEL_ID,\n            name: \"FmFile\"\n        });\n        const privateFiles = this.featureFlags\n            .get()\n            .isEnabled(\"advancedAccessControlLayer.privateFiles\");\n\n        model.fields(fields => ({\n            name: fields.text().label(\"Name\").required(\"Value is required.\"),\n            key: fields.text().label(\"Key\").required(\"Value is required.\"),\n            type: fields.text().label(\"Type\").required(\"Value is required.\"),\n            size: fields.number().label(\"Size\").required(\"Value is required.\"),\n            metadata: fields\n                .object()\n                .label(\"Metadata\")\n                .renderer(\"hidden\")\n                .fields(fields => ({\n                    image: fields\n                        .object()\n                        .label(\"Image\")\n                        .fields(fields => ({\n                            width: fields.number().label(\"Width\"),\n                            height: fields.number().label(\"Height\"),\n                            format: fields.text().label(\"Format\"),\n                            orientation: fields.number().label(\"Orientation\"),\n                            crop: fields.json().label(\"Crop\"),\n                            focalPoint: fields.json().label(\"Focal point\"),\n                            alt: fields.text().label(\"Alt text\"),\n                            caption: fields.text().label(\"Caption\")\n                        })),\n                    // Store complete raw EXIF as JSON\n                    exif: fields.searchableJson().label(\"EXIF Data\"),\n                    // Store complete raw IPTC as JSON\n                    iptc: fields.searchableJson().label(\"IPTC Data\")\n                })),\n            tags: fields\n                .text()\n                .label(\"Tags\")\n                .tags([\"$bulk-edit\"])\n                .list()\n                .required(\"Value is required.\"),\n            description: fields.text().label(\"Description\").defaultValue(\"\")\n        }));\n\n        if (privateFiles) {\n            model.fields(fields => ({\n                accessControl: fields\n                    .object()\n                    .label(\"Access Control\")\n                    .tags([\"$bulk-edit\"])\n                    .fields(fields => ({\n                        type: fields\n                            .text()\n                            .label(\"Type\")\n                            .predefinedValues([\n                                {\n                                    label: \"Public\",\n                                    value: \"public\",\n                                    selected: true\n                                },\n                                {\n                                    label: \"Private\",\n                                    value: \"private-authenticated\",\n                                    selected: false\n                                }\n                            ])\n                    }))\n            }));\n        }\n\n        return [model];\n    }\n}\n\nexport const FileModel = ModelFactory.createImplementation({\n    implementation: FilePrivateModelImpl,\n    dependencies: [FeatureFlags]\n});\n"],"names":["FILE_MODEL_ID","process","FilePrivateModelImpl","featureFlags","builder","model","privateFiles","fields","FileModel","ModelFactory","FeatureFlags"],"mappings":";;AAGO,MAAMA,gBAAgBC,QAAQ,GAAG,CAAC,wBAAwB,GAAG,WAAW;AAE/E,MAAMC;IACF,YAA2BC,YAAoC,CAAE;aAAtCA,YAAY,GAAZA;IAAuC;IAElE,MAAa,QAAQC,OAA6B,EAAE;QAChD,MAAMC,QAAQD,QAAQ,OAAO,CAAC;YAC1B,SAASJ;YACT,MAAM;QACV;QACA,MAAMM,eAAe,IAAI,CAAC,YAAY,CACjC,GAAG,GACH,SAAS,CAAC;QAEfD,MAAM,MAAM,CAACE,CAAAA,SAAW;gBACpB,MAAMA,OAAO,IAAI,GAAG,KAAK,CAAC,QAAQ,QAAQ,CAAC;gBAC3C,KAAKA,OAAO,IAAI,GAAG,KAAK,CAAC,OAAO,QAAQ,CAAC;gBACzC,MAAMA,OAAO,IAAI,GAAG,KAAK,CAAC,QAAQ,QAAQ,CAAC;gBAC3C,MAAMA,OAAO,MAAM,GAAG,KAAK,CAAC,QAAQ,QAAQ,CAAC;gBAC7C,UAAUA,OACL,MAAM,GACN,KAAK,CAAC,YACN,QAAQ,CAAC,UACT,MAAM,CAACA,CAAAA,SAAW;wBACf,OAAOA,OACF,MAAM,GACN,KAAK,CAAC,SACN,MAAM,CAACA,CAAAA,SAAW;gCACf,OAAOA,OAAO,MAAM,GAAG,KAAK,CAAC;gCAC7B,QAAQA,OAAO,MAAM,GAAG,KAAK,CAAC;gCAC9B,QAAQA,OAAO,IAAI,GAAG,KAAK,CAAC;gCAC5B,aAAaA,OAAO,MAAM,GAAG,KAAK,CAAC;gCACnC,MAAMA,OAAO,IAAI,GAAG,KAAK,CAAC;gCAC1B,YAAYA,OAAO,IAAI,GAAG,KAAK,CAAC;gCAChC,KAAKA,OAAO,IAAI,GAAG,KAAK,CAAC;gCACzB,SAASA,OAAO,IAAI,GAAG,KAAK,CAAC;4BACjC;wBAEJ,MAAMA,OAAO,cAAc,GAAG,KAAK,CAAC;wBAEpC,MAAMA,OAAO,cAAc,GAAG,KAAK,CAAC;oBACxC;gBACJ,MAAMA,OACD,IAAI,GACJ,KAAK,CAAC,QACN,IAAI,CAAC;oBAAC;iBAAa,EACnB,IAAI,GACJ,QAAQ,CAAC;gBACd,aAAaA,OAAO,IAAI,GAAG,KAAK,CAAC,eAAe,YAAY,CAAC;YACjE;QAEA,IAAID,cACAD,MAAM,MAAM,CAACE,CAAAA,SAAW;gBACpB,eAAeA,OACV,MAAM,GACN,KAAK,CAAC,kBACN,IAAI,CAAC;oBAAC;iBAAa,EACnB,MAAM,CAACA,CAAAA,SAAW;wBACf,MAAMA,OACD,IAAI,GACJ,KAAK,CAAC,QACN,gBAAgB,CAAC;4BACd;gCACI,OAAO;gCACP,OAAO;gCACP,UAAU;4BACd;4BACA;gCACI,OAAO;gCACP,OAAO;gCACP,UAAU;4BACd;yBACH;oBACT;YACR;QAGJ,OAAO;YAACF;SAAM;IAClB;AACJ;AAEO,MAAMG,YAAYC,aAAa,oBAAoB,CAAC;IACvD,gBAAgBP;IAChB,cAAc;QAACQ;KAAa;AAChC"}

package/features/assetDelivery/abstractions/AssetType.d.ts

@@ -0,0 +1,17 @@
+import { Abstraction } from "@webiny/di";
+import type { AssetRequest as IAssetRequest } from "../../../delivery/AssetDelivery/AssetRequest.js";
+import type { Asset as IAsset } from "../../../delivery/AssetDelivery/Asset.js";
+export interface IAssetTypeHandler {
+    handle(assetRequest: IAssetRequest, asset: IAsset): Promise<IAsset>;
+}
+export interface IAssetType {
+    canHandle(asset: IAsset): boolean;
+    getHandlerAbstraction(): Abstraction<IAssetTypeHandler>;
+}
+export declare const AssetType: Abstraction<IAssetType>;
+export declare namespace AssetType {
+    type Interface = IAssetType;
+    type AssetRequest = IAssetRequest;
+    type Asset = IAsset;
+    type Handler = IAssetTypeHandler;
+}

package/features/assetDelivery/abstractions/AssetType.js

@@ -0,0 +1,5 @@
+import { createAbstraction } from "@webiny/feature/api";
+const AssetType = createAbstraction("AssetDelivery/AssetType");
+export { AssetType };
+
+//# sourceMappingURL=AssetType.js.map

package/features/assetDelivery/abstractions/AssetType.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"features/assetDelivery/abstractions/AssetType.js","sources":["../../../../src/features/assetDelivery/abstractions/AssetType.ts"],"sourcesContent":["import { Abstraction } from \"@webiny/di\";\nimport { createAbstraction } from \"@webiny/feature/api\";\nimport type { AssetRequest as IAssetRequest } from \"~/delivery/AssetDelivery/AssetRequest.js\";\nimport type { Asset as IAsset } from \"~/delivery/AssetDelivery/Asset.js\";\n\nexport interface IAssetTypeHandler {\n    handle(assetRequest: IAssetRequest, asset: IAsset): Promise<IAsset>;\n}\n\nexport interface IAssetType {\n    canHandle(asset: IAsset): boolean;\n    getHandlerAbstraction(): Abstraction<IAssetTypeHandler>;\n}\n\nexport const AssetType = createAbstraction<IAssetType>(\"AssetDelivery/AssetType\");\n\nexport namespace AssetType {\n    export type Interface = IAssetType;\n    export type AssetRequest = IAssetRequest;\n    export type Asset = IAsset;\n    export type Handler = IAssetTypeHandler;\n}\n"],"names":["AssetType","createAbstraction"],"mappings":";AAcO,MAAMA,YAAYC,kBAA8B"}

package/features/assetDelivery/{transformation → assetTypes/image}/AssetKeyGenerator.d.ts

@@ -1,9 +1,12 @@
-import type { Asset } from "../../../delivery/index.js";
+import type { Asset } from "../../../../delivery/index.js";
+import type { Framing } from "./imageTypes.js";
 export declare class AssetKeyGenerator {
     private readonly utils;
     private readonly asset;
-    static create(asset: Asset): AssetKeyGenerator;
+    private readonly framing?;
+    static create(asset: Asset, framing?: Framing): AssetKeyGenerator;
     private constructor();
+    private signature;
     getOptimizedImageKey(): string;
     getTransformedImageKey(transformations: Record<string, any>): string;
 }

package/features/assetDelivery/assetTypes/image/AssetKeyGenerator.js

@@ -0,0 +1,30 @@
+import * as __rspack_external__utils_js_a9c81ddd from "./utils.js";
+class AssetKeyGenerator {
+    static create(asset, framing) {
+        return new AssetKeyGenerator(asset, framing);
+    }
+    constructor(asset, framing){
+        this.asset = asset;
+        this.utils = __rspack_external__utils_js_a9c81ddd;
+        this.framing = framing;
+    }
+    signature() {
+        if (this.framing) return this.utils.getFramingSignature(this.framing);
+    }
+    getOptimizedImageKey() {
+        return this.utils.getImageKey({
+            key: this.asset.getKey(),
+            cropSignature: this.signature()
+        });
+    }
+    getTransformedImageKey(transformations) {
+        return this.utils.getImageKey({
+            key: this.asset.getKey(),
+            transformations,
+            cropSignature: this.signature()
+        });
+    }
+}
+export { AssetKeyGenerator };
+
+//# sourceMappingURL=AssetKeyGenerator.js.map

package/features/assetDelivery/assetTypes/image/AssetKeyGenerator.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"features/assetDelivery/assetTypes/image/AssetKeyGenerator.js","sources":["../../../../../src/features/assetDelivery/assetTypes/image/AssetKeyGenerator.ts"],"sourcesContent":["import type { Asset } from \"../../../../delivery/index.js\";\nimport type { Framing } from \"./imageTypes.js\";\nimport * as newUtils from \"./utils.js\";\n\nexport class AssetKeyGenerator {\n    private readonly utils: typeof newUtils;\n    private readonly asset: Asset;\n    private readonly framing?: Framing;\n\n    public static create(asset: Asset, framing?: Framing) {\n        return new AssetKeyGenerator(asset, framing);\n    }\n\n    private constructor(asset: Asset, framing?: Framing) {\n        this.asset = asset;\n        this.utils = newUtils;\n        this.framing = framing;\n    }\n\n    private signature() {\n        if (this.framing) {\n            return this.utils.getFramingSignature(this.framing);\n        }\n        return undefined;\n    }\n\n    public getOptimizedImageKey() {\n        return this.utils.getImageKey({\n            key: this.asset.getKey(),\n            cropSignature: this.signature()\n        });\n    }\n\n    public getTransformedImageKey(transformations: Record<string, any>) {\n        return this.utils.getImageKey({\n            key: this.asset.getKey(),\n            transformations,\n            cropSignature: this.signature()\n        });\n    }\n}\n"],"names":["AssetKeyGenerator","asset","framing","newUtils","transformations"],"mappings":";AAIO,MAAMA;IAKT,OAAc,OAAOC,KAAY,EAAEC,OAAiB,EAAE;QAClD,OAAO,IAAIF,kBAAkBC,OAAOC;IACxC;IAEA,YAAoBD,KAAY,EAAEC,OAAiB,CAAE;QACjD,IAAI,CAAC,KAAK,GAAGD;QACb,IAAI,CAAC,KAAK,GAAGE;QACb,IAAI,CAAC,OAAO,GAAGD;IACnB;IAEQ,YAAY;QAChB,IAAI,IAAI,CAAC,OAAO,EACZ,OAAO,IAAI,CAAC,KAAK,CAAC,mBAAmB,CAAC,IAAI,CAAC,OAAO;IAG1D;IAEO,uBAAuB;QAC1B,OAAO,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC;YAC1B,KAAK,IAAI,CAAC,KAAK,CAAC,MAAM;YACtB,eAAe,IAAI,CAAC,SAAS;QACjC;IACJ;IAEO,uBAAuBE,eAAoC,EAAE;QAChE,OAAO,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC;YAC1B,KAAK,IAAI,CAAC,KAAK,CAAC,MAAM;YACtBA;YACA,eAAe,IAAI,CAAC,SAAS;QACjC;IACJ;AACJ"}

package/features/assetDelivery/assetTypes/image/ImageAssetType.d.ts

@@ -0,0 +1,9 @@
+import { AssetType } from "../../abstractions/AssetType.js";
+declare class ImageAssetTypeImpl implements AssetType.Interface {
+    canHandle(asset: AssetType.Asset): boolean;
+    getHandlerAbstraction(): import("@webiny/di").Abstraction<import("../../abstractions/AssetType.js").IAssetTypeHandler>;
+}
+export declare const ImageAssetType: typeof ImageAssetTypeImpl & {
+    __abstraction: import("@webiny/di").Abstraction<import("../../abstractions/AssetType.js").IAssetType>;
+};
+export {};

package/features/assetDelivery/assetTypes/image/ImageAssetType.js

@@ -0,0 +1,18 @@
+import { AssetType } from "../../abstractions/AssetType.js";
+import { SUPPORTED_TRANSFORMABLE_IMAGES } from "./utils.js";
+import { ImageAssetTypeHandler } from "./ImageAssetTypeHandler.js";
+class ImageAssetTypeImpl {
+    canHandle(asset) {
+        return SUPPORTED_TRANSFORMABLE_IMAGES.includes(asset.getExtension());
+    }
+    getHandlerAbstraction() {
+        return ImageAssetTypeHandler;
+    }
+}
+const ImageAssetType = AssetType.createImplementation({
+    implementation: ImageAssetTypeImpl,
+    dependencies: []
+});
+export { ImageAssetType };
+
+//# sourceMappingURL=ImageAssetType.js.map

package/features/assetDelivery/assetTypes/image/ImageAssetType.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"features/assetDelivery/assetTypes/image/ImageAssetType.js","sources":["../../../../../src/features/assetDelivery/assetTypes/image/ImageAssetType.ts"],"sourcesContent":["import { AssetType } from \"../../abstractions/AssetType.js\";\nimport { SUPPORTED_TRANSFORMABLE_IMAGES } from \"./utils.js\";\nimport { ImageAssetTypeHandler } from \"./ImageAssetTypeHandler.js\";\n\nclass ImageAssetTypeImpl implements AssetType.Interface {\n    canHandle(asset: AssetType.Asset): boolean {\n        return SUPPORTED_TRANSFORMABLE_IMAGES.includes(asset.getExtension());\n    }\n\n    getHandlerAbstraction() {\n        return ImageAssetTypeHandler;\n    }\n}\n\nexport const ImageAssetType = AssetType.createImplementation({\n    implementation: ImageAssetTypeImpl,\n    dependencies: []\n});\n"],"names":["ImageAssetTypeImpl","asset","SUPPORTED_TRANSFORMABLE_IMAGES","ImageAssetTypeHandler","ImageAssetType","AssetType"],"mappings":";;;AAIA,MAAMA;IACF,UAAUC,KAAsB,EAAW;QACvC,OAAOC,+BAA+B,QAAQ,CAACD,MAAM,YAAY;IACrE;IAEA,wBAAwB;QACpB,OAAOE;IACX;AACJ;AAEO,MAAMC,iBAAiBC,UAAU,oBAAoB,CAAC;IACzD,gBAAgBL;IAChB,cAAc,EAAE;AACpB"}

package/features/assetDelivery/assetTypes/image/ImageAssetTypeHandler.d.ts

@@ -0,0 +1,5 @@
+import type { IAssetTypeHandler } from "../../abstractions/AssetType.js";
+export declare const ImageAssetTypeHandler: import("@webiny/di").Abstraction<IAssetTypeHandler>;
+export declare namespace ImageAssetTypeHandler {
+    type Interface = IAssetTypeHandler;
+}

package/features/assetDelivery/assetTypes/image/ImageAssetTypeHandler.js

@@ -0,0 +1,5 @@
+import { createAbstraction } from "@webiny/feature/api";
+const ImageAssetTypeHandler = createAbstraction("AssetDelivery/ImageAssetTypeHandler");
+export { ImageAssetTypeHandler };
+
+//# sourceMappingURL=ImageAssetTypeHandler.js.map

package/features/assetDelivery/assetTypes/image/ImageAssetTypeHandler.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"features/assetDelivery/assetTypes/image/ImageAssetTypeHandler.js","sources":["../../../../../src/features/assetDelivery/assetTypes/image/ImageAssetTypeHandler.ts"],"sourcesContent":["import { createAbstraction } from \"@webiny/feature/api\";\nimport type { IAssetTypeHandler } from \"../../abstractions/AssetType.js\";\n\nexport const ImageAssetTypeHandler = createAbstraction<IAssetTypeHandler>(\n    \"AssetDelivery/ImageAssetTypeHandler\"\n);\n\nexport namespace ImageAssetTypeHandler {\n    export type Interface = IAssetTypeHandler;\n}\n"],"names":["ImageAssetTypeHandler","createAbstraction"],"mappings":";AAGO,MAAMA,wBAAwBC,kBACjC"}

package/features/assetDelivery/assetTypes/image/SharpTransformer.d.ts

@@ -0,0 +1,18 @@
+import type { TransformImageParams, TransformImageResult } from "./transformImage.js";
+import type { Framing } from "./imageTypes.js";
+export declare class SharpTransformer {
+    private module?;
+    private sharp?;
+    private load;
+    private getSharp;
+    transformBuffer(params: TransformImageParams): Promise<TransformImageResult>;
+    extractFramedRegion(buffer: Buffer, framing: Framing): Promise<Buffer>;
+    cropBuffer(buffer: Buffer, crop: {
+        top: number;
+        left: number;
+        bottom: number;
+        right: number;
+    }): Promise<Buffer>;
+    optimizePng(buffer: Buffer): Promise<import("sharp").Sharp>;
+    optimizeJpeg(buffer: Buffer): Promise<import("sharp").Sharp>;
+}

package/features/assetDelivery/assetTypes/image/SharpTransformer.js

@@ -0,0 +1,47 @@
+class SharpTransformer {
+    async load() {
+        if (!this.module) this.module = await import("./transformImage.js");
+        return this.module;
+    }
+    async getSharp() {
+        if (!this.sharp) this.sharp = (await import("sharp")).default;
+        return this.sharp;
+    }
+    async transformBuffer(params) {
+        const m = await this.load();
+        return m.transformImageBuffer(params);
+    }
+    async extractFramedRegion(buffer, framing) {
+        const m = await this.load();
+        return m.extractFramedRegion(buffer, framing);
+    }
+    async cropBuffer(buffer, crop) {
+        const m = await this.load();
+        return m.cropImageBuffer(buffer, crop);
+    }
+    async optimizePng(buffer) {
+        const s = await this.getSharp();
+        return s(buffer).resize({
+            width: 2560,
+            withoutEnlargement: true,
+            fit: "inside"
+        }).png({
+            compressionLevel: 9,
+            adaptiveFiltering: true,
+            force: true
+        }).withMetadata();
+    }
+    async optimizeJpeg(buffer) {
+        const s = await this.getSharp();
+        return s(buffer).resize({
+            width: 2560,
+            withoutEnlargement: true,
+            fit: "inside"
+        }).withMetadata().toFormat("jpeg", {
+            quality: 90
+        });
+    }
+}
+export { SharpTransformer };
+
+//# sourceMappingURL=SharpTransformer.js.map

package/features/assetDelivery/assetTypes/image/SharpTransformer.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"features/assetDelivery/assetTypes/image/SharpTransformer.js","sources":["../../../../../src/features/assetDelivery/assetTypes/image/SharpTransformer.ts"],"sourcesContent":["import type { TransformImageParams, TransformImageResult } from \"./transformImage.js\";\nimport type { Framing } from \"./imageTypes.js\";\n\nexport class SharpTransformer {\n    private module?: typeof import(\"./transformImage.js\");\n    private sharp?: typeof import(\"sharp\").default;\n\n    private async load() {\n        if (!this.module) {\n            this.module = await import(\"./transformImage.js\");\n        }\n        return this.module;\n    }\n\n    private async getSharp() {\n        if (!this.sharp) {\n            this.sharp = (await import(\"sharp\")).default;\n        }\n        return this.sharp;\n    }\n\n    async transformBuffer(params: TransformImageParams): Promise<TransformImageResult> {\n        const m = await this.load();\n        return m.transformImageBuffer(params);\n    }\n\n    async extractFramedRegion(buffer: Buffer, framing: Framing): Promise<Buffer> {\n        const m = await this.load();\n        return m.extractFramedRegion(buffer, framing);\n    }\n\n    async cropBuffer(\n        buffer: Buffer,\n        crop: { top: number; left: number; bottom: number; right: number }\n    ): Promise<Buffer> {\n        const m = await this.load();\n        return m.cropImageBuffer(buffer, crop);\n    }\n\n    async optimizePng(buffer: Buffer) {\n        const s = await this.getSharp();\n        return s(buffer)\n            .resize({ width: 2560, withoutEnlargement: true, fit: \"inside\" })\n            .png({ compressionLevel: 9, adaptiveFiltering: true, force: true })\n            .withMetadata();\n    }\n\n    async optimizeJpeg(buffer: Buffer) {\n        const s = await this.getSharp();\n        return s(buffer)\n            .resize({ width: 2560, withoutEnlargement: true, fit: \"inside\" })\n            .withMetadata()\n            .toFormat(\"jpeg\", { quality: 90 });\n    }\n}\n"],"names":["SharpTransformer","params","m","buffer","framing","crop","s"],"mappings":"AAGO,MAAMA;IAIT,MAAc,OAAO;QACjB,IAAI,CAAC,IAAI,CAAC,MAAM,EACZ,IAAI,CAAC,MAAM,GAAG,MAAM,MAAM,CAAC;QAE/B,OAAO,IAAI,CAAC,MAAM;IACtB;IAEA,MAAc,WAAW;QACrB,IAAI,CAAC,IAAI,CAAC,KAAK,EACX,IAAI,CAAC,KAAK,GAAI,OAAM,MAAM,CAAC,QAAO,EAAG,OAAO;QAEhD,OAAO,IAAI,CAAC,KAAK;IACrB;IAEA,MAAM,gBAAgBC,MAA4B,EAAiC;QAC/E,MAAMC,IAAI,MAAM,IAAI,CAAC,IAAI;QACzB,OAAOA,EAAE,oBAAoB,CAACD;IAClC;IAEA,MAAM,oBAAoBE,MAAc,EAAEC,OAAgB,EAAmB;QACzE,MAAMF,IAAI,MAAM,IAAI,CAAC,IAAI;QACzB,OAAOA,EAAE,mBAAmB,CAACC,QAAQC;IACzC;IAEA,MAAM,WACFD,MAAc,EACdE,IAAkE,EACnD;QACf,MAAMH,IAAI,MAAM,IAAI,CAAC,IAAI;QACzB,OAAOA,EAAE,eAAe,CAACC,QAAQE;IACrC;IAEA,MAAM,YAAYF,MAAc,EAAE;QAC9B,MAAMG,IAAI,MAAM,IAAI,CAAC,QAAQ;QAC7B,OAAOA,EAAEH,QACJ,MAAM,CAAC;YAAE,OAAO;YAAM,oBAAoB;YAAM,KAAK;QAAS,GAC9D,GAAG,CAAC;YAAE,kBAAkB;YAAG,mBAAmB;YAAM,OAAO;QAAK,GAChE,YAAY;IACrB;IAEA,MAAM,aAAaA,MAAc,EAAE;QAC/B,MAAMG,IAAI,MAAM,IAAI,CAAC,QAAQ;QAC7B,OAAOA,EAAEH,QACJ,MAAM,CAAC;YAAE,OAAO;YAAM,oBAAoB;YAAM,KAAK;QAAS,GAC9D,YAAY,GACZ,QAAQ,CAAC,QAAQ;YAAE,SAAS;QAAG;IACxC;AACJ"}

package/features/assetDelivery/assetTypes/image/WidthCollection.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"features/assetDelivery/assetTypes/image/WidthCollection.js","sources":["../../../../../src/features/assetDelivery/assetTypes/image/WidthCollection.ts"],"sourcesContent":["export class WidthCollection {\n    private readonly values: number[];\n\n    public static create(values: number[]) {\n        return new WidthCollection(values);\n    }\n\n    private constructor(values: number[]) {\n        this.values = values.sort((a, b) => a - b);\n    }\n\n    public max() {\n        return Math.max(...this.values);\n    }\n\n    public min() {\n        return Math.min(...this.values);\n    }\n\n    public getClosestOrMax(value: number | undefined): number {\n        if (!value) {\n            return this.max();\n        }\n        const gteGivenValue = this.values.filter(w => w >= value);\n        return gteGivenValue.length > 0 ? gteGivenValue[0] : this.max();\n    }\n}\n"],"names":["WidthCollection","values","a","b","Math","value","gteGivenValue","w"],"mappings":"AAAO,MAAMA;IAGT,OAAc,OAAOC,MAAgB,EAAE;QACnC,OAAO,IAAID,gBAAgBC;IAC/B;IAEA,YAAoBA,MAAgB,CAAE;QAClC,IAAI,CAAC,MAAM,GAAGA,OAAO,IAAI,CAAC,CAACC,GAAGC,IAAMD,IAAIC;IAC5C;IAEO,MAAM;QACT,OAAOC,KAAK,GAAG,IAAI,IAAI,CAAC,MAAM;IAClC;IAEO,MAAM;QACT,OAAOA,KAAK,GAAG,IAAI,IAAI,CAAC,MAAM;IAClC;IAEO,gBAAgBC,KAAyB,EAAU;QACtD,IAAI,CAACA,OACD,OAAO,IAAI,CAAC,GAAG;QAEnB,MAAMC,gBAAgB,IAAI,CAAC,MAAM,CAAC,MAAM,CAACC,CAAAA,IAAKA,KAAKF;QACnD,OAAOC,cAAc,MAAM,GAAG,IAAIA,aAAa,CAAC,EAAE,GAAG,IAAI,CAAC,GAAG;IACjE;AACJ"}

package/features/assetDelivery/assetTypes/image/imageFormat.d.ts

@@ -0,0 +1,26 @@
+/**
+ * Pure image-format helpers. IMPORTANT: this module must NOT import `sharp` (a
+ * native module). It is reachable from the GraphQL API handler via the asset
+ * request resolvers, and loading `sharp` there would crash that Lambda. The
+ * actual sharp pipeline lives in `transformImage.ts`, which only the transform
+ * strategies (the image Lambda) import.
+ */
+export type ImageFormat = "jpeg" | "png" | "webp" | "avif";
+export declare const SUPPORTED_OUTPUT_FORMATS: ImageFormat[];
+/**
+ * Default encoder quality per output format. AVIF reaches a comparable visual
+ * quality at a lower number than JPEG/WebP, hence the lower default.
+ */
+export declare const DEFAULT_IMAGE_QUALITY: Record<ImageFormat, number>;
+export declare const contentTypeForFormat: (format: ImageFormat) => string;
+export declare const formatFromContentType: (contentType: string) => ImageFormat | undefined;
+/**
+ * Resolve a requested format string into a concrete output format.
+ *
+ * `"auto"` negotiates from the `Accept` header (AVIF ▸ WebP ▸ keep original), which
+ * is how we approach `next/image`'s automatic modern-format delivery. Returns
+ * `undefined` when the original format should be kept.
+ */
+export declare const resolveRequestedFormat: (requested: string | undefined, acceptHeader: string | undefined) => ImageFormat | undefined;
+/** Clamp a requested quality into the valid 1–100 range; `undefined` when absent/invalid. */
+export declare const clampQuality: (value: number | undefined) => number | undefined;