@webiny/api-file-manager 6.4.11 → 6.6.0-alpha.1

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

@@ -0,0 +1,5 @@
+export { ImageAssetType } from "./ImageAssetType.js";
+export { ImageAssetTypeHandler } from "./ImageAssetTypeHandler.js";
+export { AssetKeyGenerator } from "./AssetKeyGenerator.js";
+export { SUPPORTED_TRANSFORMABLE_IMAGES, getImageKey, getCropSignature, getFramingSignature, getOptimizedImageKeyPrefix, getOptimizedTransformedImageKeyPrefix } from "./utils.js";
+export type { AssetCrop, AssetImageEdit, ImageRequestOptions, Framing } from "./imageTypes.js";

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

@@ -0,0 +1,4 @@
+export { ImageAssetType } from "./ImageAssetType.js";
+export { ImageAssetTypeHandler } from "./ImageAssetTypeHandler.js";
+export { AssetKeyGenerator } from "./AssetKeyGenerator.js";
+export { SUPPORTED_TRANSFORMABLE_IMAGES, getCropSignature, getFramingSignature, getImageKey, getOptimizedImageKeyPrefix, getOptimizedTransformedImageKeyPrefix } from "./utils.js";

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

@@ -0,0 +1,6 @@
+import type { ImageRequestOptions } from "./imageTypes.js";
+/**
+ * Parse raw query params into typed image request options.
+ * Returns a new `ImageRequestOptions` object; does not mutate the input.
+ */
+export declare const normalizeImageOptions: (query: Record<string, any>, acceptHeader: string | undefined) => ImageRequestOptions;

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

@@ -0,0 +1,56 @@
+import { clampQuality, resolveRequestedFormat } from "./imageFormat.js";
+const normalizeImageOptions = (query, acceptHeader)=>{
+    const result = {
+        original: "original" in query
+    };
+    const width = query.width ? parseInt(query.width, 10) : 0 / 0;
+    if (!Number.isNaN(width) && width > 0) result.width = width;
+    const quality = void 0 !== query.quality ? clampQuality(parseInt(query.quality, 10)) : void 0;
+    if (void 0 !== quality) result.quality = quality;
+    const format = resolveRequestedFormat(query.format, acceptHeader);
+    if (format) result.format = format;
+    const crop = parseCrop(query.crop);
+    if (crop) result.crop = crop;
+    const aspectRatio = parseAspectRatio(query.aspectRatio);
+    if (aspectRatio) result.aspectRatio = aspectRatio;
+    const focal = parseFocal(query.focal);
+    if (focal) result.focal = focal;
+    return result;
+};
+const parseAspectRatio = (raw)=>{
+    if ("string" != typeof raw) return;
+    if (raw.includes(":")) {
+        const [w, h] = raw.split(":").map((v)=>parseFloat(v));
+        return w > 0 && h > 0 ? w / h : void 0;
+    }
+    const value = parseFloat(raw);
+    return !Number.isNaN(value) && value > 0 ? value : void 0;
+};
+const parseFocal = (raw)=>{
+    if ("string" != typeof raw) return;
+    const parts = raw.split(",").map((v)=>parseFloat(v));
+    if (2 !== parts.length || parts.some((n)=>Number.isNaN(n))) return;
+    const clamp01 = (n)=>Math.min(1, Math.max(0, n));
+    return {
+        x: clamp01(parts[0]),
+        y: clamp01(parts[1])
+    };
+};
+const parseCrop = (raw)=>{
+    if ("string" != typeof raw) return;
+    const parts = raw.split(",").map((v)=>parseFloat(v));
+    if (4 !== parts.length || parts.some((n)=>Number.isNaN(n))) return;
+    const clamp01 = (n)=>Math.min(1, Math.max(0, n));
+    const [top, left, bottom, right] = parts.map(clamp01);
+    if (0 === top && 0 === left && 0 === bottom && 0 === right) return;
+    if (top + bottom >= 1 || left + right >= 1) return;
+    return {
+        top,
+        left,
+        bottom,
+        right
+    };
+};
+export { normalizeImageOptions };
+
+//# sourceMappingURL=normalizeImageOptions.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"features/assetDelivery/assetTypes/image/normalizeImageOptions.js","sources":["../../../../../src/features/assetDelivery/assetTypes/image/normalizeImageOptions.ts"],"sourcesContent":["import type { ImageRequestOptions } from \"./imageTypes.js\";\nimport { clampQuality, resolveRequestedFormat } from \"./imageFormat.js\";\n\n/**\n * Parse raw query params into typed image request options.\n * Returns a new `ImageRequestOptions` object; does not mutate the input.\n */\nexport const normalizeImageOptions = (\n    query: Record<string, any>,\n    acceptHeader: string | undefined\n): ImageRequestOptions => {\n    const result: ImageRequestOptions = {\n        original: \"original\" in query\n    };\n\n    const width = query.width ? parseInt(query.width, 10) : NaN;\n    if (!Number.isNaN(width) && width > 0) {\n        result.width = width;\n    }\n\n    const quality =\n        query.quality !== undefined ? clampQuality(parseInt(query.quality, 10)) : undefined;\n    if (quality !== undefined) {\n        result.quality = quality;\n    }\n\n    const format = resolveRequestedFormat(query.format, acceptHeader);\n    if (format) {\n        result.format = format;\n    }\n\n    const crop = parseCrop(query.crop);\n    if (crop) {\n        result.crop = crop;\n    }\n\n    const aspectRatio = parseAspectRatio(query.aspectRatio);\n    if (aspectRatio) {\n        result.aspectRatio = aspectRatio;\n    }\n\n    const focal = parseFocal(query.focal);\n    if (focal) {\n        result.focal = focal;\n    }\n\n    return result;\n};\n\nconst parseAspectRatio = (raw: unknown): number | undefined => {\n    if (typeof raw !== \"string\") {\n        return undefined;\n    }\n    if (raw.includes(\":\")) {\n        const [w, h] = raw.split(\":\").map(v => parseFloat(v));\n        return w > 0 && h > 0 ? w / h : undefined;\n    }\n    const value = parseFloat(raw);\n    return !Number.isNaN(value) && value > 0 ? value : undefined;\n};\n\nconst parseFocal = (raw: unknown): { x: number; y: number } | undefined => {\n    if (typeof raw !== \"string\") {\n        return undefined;\n    }\n    const parts = raw.split(\",\").map(v => parseFloat(v));\n    if (parts.length !== 2 || parts.some(n => Number.isNaN(n))) {\n        return undefined;\n    }\n    const clamp01 = (n: number) => Math.min(1, Math.max(0, n));\n    return { x: clamp01(parts[0]), y: clamp01(parts[1]) };\n};\n\nconst parseCrop = (\n    raw: unknown\n): { top: number; left: number; bottom: number; right: number } | undefined => {\n    if (typeof raw !== \"string\") {\n        return undefined;\n    }\n    const parts = raw.split(\",\").map(v => parseFloat(v));\n    if (parts.length !== 4 || parts.some(n => Number.isNaN(n))) {\n        return undefined;\n    }\n    const clamp01 = (n: number) => Math.min(1, Math.max(0, n));\n    const [top, left, bottom, right] = parts.map(clamp01);\n    if (top === 0 && left === 0 && bottom === 0 && right === 0) {\n        return undefined;\n    }\n    if (top + bottom >= 1 || left + right >= 1) {\n        return undefined;\n    }\n    return { top, left, bottom, right };\n};\n"],"names":["normalizeImageOptions","query","acceptHeader","result","width","parseInt","NaN","Number","quality","undefined","clampQuality","format","resolveRequestedFormat","crop","parseCrop","aspectRatio","parseAspectRatio","focal","parseFocal","raw","w","h","v","parseFloat","value","parts","n","clamp01","Math","top","left","bottom","right"],"mappings":";AAOO,MAAMA,wBAAwB,CACjCC,OACAC;IAEA,MAAMC,SAA8B;QAChC,UAAU,cAAcF;IAC5B;IAEA,MAAMG,QAAQH,MAAM,KAAK,GAAGI,SAASJ,MAAM,KAAK,EAAE,MAAMK,KAAG;IAC3D,IAAI,CAACC,OAAO,KAAK,CAACH,UAAUA,QAAQ,GAChCD,OAAO,KAAK,GAAGC;IAGnB,MAAMI,UACFP,AAAkBQ,WAAlBR,MAAM,OAAO,GAAiBS,aAAaL,SAASJ,MAAM,OAAO,EAAE,OAAOQ;IAC9E,IAAID,AAAYC,WAAZD,SACAL,OAAO,OAAO,GAAGK;IAGrB,MAAMG,SAASC,uBAAuBX,MAAM,MAAM,EAAEC;IACpD,IAAIS,QACAR,OAAO,MAAM,GAAGQ;IAGpB,MAAME,OAAOC,UAAUb,MAAM,IAAI;IACjC,IAAIY,MACAV,OAAO,IAAI,GAAGU;IAGlB,MAAME,cAAcC,iBAAiBf,MAAM,WAAW;IACtD,IAAIc,aACAZ,OAAO,WAAW,GAAGY;IAGzB,MAAME,QAAQC,WAAWjB,MAAM,KAAK;IACpC,IAAIgB,OACAd,OAAO,KAAK,GAAGc;IAGnB,OAAOd;AACX;AAEA,MAAMa,mBAAmB,CAACG;IACtB,IAAI,AAAe,YAAf,OAAOA,KACP;IAEJ,IAAIA,IAAI,QAAQ,CAAC,MAAM;QACnB,MAAM,CAACC,GAAGC,EAAE,GAAGF,IAAI,KAAK,CAAC,KAAK,GAAG,CAACG,CAAAA,IAAKC,WAAWD;QAClD,OAAOF,IAAI,KAAKC,IAAI,IAAID,IAAIC,IAAIZ;IACpC;IACA,MAAMe,QAAQD,WAAWJ;IACzB,OAAO,CAACZ,OAAO,KAAK,CAACiB,UAAUA,QAAQ,IAAIA,QAAQf;AACvD;AAEA,MAAMS,aAAa,CAACC;IAChB,IAAI,AAAe,YAAf,OAAOA,KACP;IAEJ,MAAMM,QAAQN,IAAI,KAAK,CAAC,KAAK,GAAG,CAACG,CAAAA,IAAKC,WAAWD;IACjD,IAAIG,AAAiB,MAAjBA,MAAM,MAAM,IAAUA,MAAM,IAAI,CAACC,CAAAA,IAAKnB,OAAO,KAAK,CAACmB,KACnD;IAEJ,MAAMC,UAAU,CAACD,IAAcE,KAAK,GAAG,CAAC,GAAGA,KAAK,GAAG,CAAC,GAAGF;IACvD,OAAO;QAAE,GAAGC,QAAQF,KAAK,CAAC,EAAE;QAAG,GAAGE,QAAQF,KAAK,CAAC,EAAE;IAAE;AACxD;AAEA,MAAMX,YAAY,CACdK;IAEA,IAAI,AAAe,YAAf,OAAOA,KACP;IAEJ,MAAMM,QAAQN,IAAI,KAAK,CAAC,KAAK,GAAG,CAACG,CAAAA,IAAKC,WAAWD;IACjD,IAAIG,AAAiB,MAAjBA,MAAM,MAAM,IAAUA,MAAM,IAAI,CAACC,CAAAA,IAAKnB,OAAO,KAAK,CAACmB,KACnD;IAEJ,MAAMC,UAAU,CAACD,IAAcE,KAAK,GAAG,CAAC,GAAGA,KAAK,GAAG,CAAC,GAAGF;IACvD,MAAM,CAACG,KAAKC,MAAMC,QAAQC,MAAM,GAAGP,MAAM,GAAG,CAACE;IAC7C,IAAIE,AAAQ,MAARA,OAAaC,AAAS,MAATA,QAAcC,AAAW,MAAXA,UAAgBC,AAAU,MAAVA,OAC3C;IAEJ,IAAIH,MAAME,UAAU,KAAKD,OAAOE,SAAS,GACrC;IAEJ,OAAO;QAAEH;QAAKC;QAAMC;QAAQC;IAAM;AACtC"}

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

@@ -0,0 +1,59 @@
+import { type ImageFormat } from "./imageFormat.js";
+export interface TransformImageParams {
+    buffer: Buffer;
+    animated: boolean;
+    sourceContentType: string;
+    widths: number[];
+    options: {
+        width?: number;
+        format?: ImageFormat;
+        quality?: number;
+    };
+    qualityDefaults?: Record<ImageFormat, number>;
+}
+export interface TransformImageResult {
+    buffer: Buffer;
+    contentType: string;
+}
+/**
+ * Single sharp pipeline shared by the S3 and local transform strategies: optional
+ * resize (snapped to the configured width ladder) → optional format conversion +
+ * quality. Returns the resulting buffer and its content type.
+ */
+interface CropInsets {
+    top: number;
+    left: number;
+    bottom: number;
+    right: number;
+}
+/**
+ * Extract the crop region (edge insets, 0..1) from an image buffer. Returns the
+ * original buffer unchanged if the crop is empty/full or the dimensions are unknown.
+ */
+export declare const cropImageBuffer: (buffer: Buffer, crop: CropInsets) => Promise<Buffer>;
+interface NormalizedRect {
+    x: number;
+    y: number;
+    width: number;
+    height: number;
+}
+/**
+ * The visible region (normalized 0–1) for the given framing. The largest rectangle
+ * of `aspectRatio` that fits inside the crop, centered on the focal point.
+ */
+export declare const getVisibleRect: (imageWidth: number, imageHeight: number, crop?: CropInsets, focal?: {
+    x: number;
+    y: number;
+}, aspectRatio?: number) => NormalizedRect;
+export interface Framing {
+    crop?: CropInsets;
+    focal?: {
+        x: number;
+        y: number;
+    };
+    aspectRatio?: number;
+}
+export declare const hasFraming: (framing: Framing) => boolean;
+export declare const extractFramedRegion: (buffer: Buffer, framing: Framing) => Promise<Buffer>;
+export declare const transformImageBuffer: (params: TransformImageParams) => Promise<TransformImageResult>;
+export {};

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

@@ -0,0 +1,146 @@
+import sharp from "sharp";
+import { WidthCollection } from "./WidthCollection.js";
+import { DEFAULT_IMAGE_QUALITY, contentTypeForFormat, formatFromContentType } from "./imageFormat.js";
+const applyOutputFormat = (pipeline, sourceContentType, options, qualityDefaults)=>{
+    const targetFormat = options.format ?? formatFromContentType(sourceContentType);
+    if (!targetFormat || !options.format && void 0 === options.quality) return {
+        pipeline,
+        contentType: sourceContentType
+    };
+    const quality = options.quality ?? qualityDefaults[targetFormat];
+    switch(targetFormat){
+        case "jpeg":
+            return {
+                pipeline: pipeline.jpeg({
+                    quality
+                }),
+                contentType: contentTypeForFormat("jpeg")
+            };
+        case "webp":
+            return {
+                pipeline: pipeline.webp({
+                    quality
+                }),
+                contentType: contentTypeForFormat("webp")
+            };
+        case "avif":
+            return {
+                pipeline: pipeline.avif({
+                    quality
+                }),
+                contentType: contentTypeForFormat("avif")
+            };
+        case "png":
+            return {
+                pipeline: pipeline.png({
+                    quality,
+                    compressionLevel: 9,
+                    adaptiveFiltering: true
+                }),
+                contentType: contentTypeForFormat("png")
+            };
+    }
+};
+const clamp01 = (n)=>Math.min(1, Math.max(0, n));
+const cropImageBuffer = async (buffer, crop)=>{
+    const image = sharp(buffer);
+    const meta = await image.metadata();
+    const w = meta.width ?? 0;
+    const h = meta.height ?? 0;
+    if (!w || !h) return buffer;
+    const left = Math.max(0, Math.min(w - 1, Math.round(clamp01(crop.left) * w)));
+    const top = Math.max(0, Math.min(h - 1, Math.round(clamp01(crop.top) * h)));
+    const width = Math.max(1, Math.min(w - left, Math.round((1 - clamp01(crop.left) - clamp01(crop.right)) * w)));
+    const height = Math.max(1, Math.min(h - top, Math.round((1 - clamp01(crop.top) - clamp01(crop.bottom)) * h)));
+    if (0 === left && 0 === top && width === w && height === h) return buffer;
+    return image.extract({
+        left,
+        top,
+        width,
+        height
+    }).toBuffer();
+};
+const cropToRect = (crop)=>{
+    const left = clamp01(crop?.left ?? 0);
+    const top = clamp01(crop?.top ?? 0);
+    return {
+        x: left,
+        y: top,
+        width: Math.max(0, 1 - left - clamp01(crop?.right ?? 0)),
+        height: Math.max(0, 1 - top - clamp01(crop?.bottom ?? 0))
+    };
+};
+const getVisibleRect = (imageWidth, imageHeight, crop, focal, aspectRatio)=>{
+    const cr = cropToRect(crop);
+    if (void 0 === aspectRatio || aspectRatio <= 0 || cr.width <= 0 || cr.height <= 0) return cr;
+    const iw = imageWidth > 0 ? imageWidth : 1;
+    const ih = imageHeight > 0 ? imageHeight : 1;
+    const cropAR = cr.width * iw / (cr.height * ih);
+    let w;
+    let h;
+    if (aspectRatio > cropAR) {
+        w = cr.width;
+        h = cr.width * iw / aspectRatio / ih;
+    } else {
+        h = cr.height;
+        w = cr.height * ih * aspectRatio / iw;
+    }
+    const fx = clamp01(focal?.x ?? 0.5);
+    const fy = clamp01(focal?.y ?? 0.5);
+    const maxX = cr.x + cr.width - w;
+    const maxY = cr.y + cr.height - h;
+    const x = Math.min(Math.max(fx - w / 2, cr.x), Math.max(cr.x, maxX));
+    const y = Math.min(Math.max(fy - h / 2, cr.y), Math.max(cr.y, maxY));
+    return {
+        x,
+        y,
+        width: w,
+        height: h
+    };
+};
+const hasFraming = (framing)=>{
+    const c = framing.crop;
+    const cropped = !!c && !(0 === c.top && 0 === c.left && 0 === c.bottom && 0 === c.right);
+    return cropped || void 0 !== framing.aspectRatio;
+};
+const extractFramedRegion = async (buffer, framing)=>{
+    if (!hasFraming(framing)) return buffer;
+    const image = sharp(buffer);
+    const meta = await image.metadata();
+    const w = meta.width ?? 0;
+    const h = meta.height ?? 0;
+    if (!w || !h) return buffer;
+    const rect = getVisibleRect(w, h, framing.crop, framing.focal, framing.aspectRatio);
+    const left = Math.max(0, Math.min(w - 1, Math.round(rect.x * w)));
+    const top = Math.max(0, Math.min(h - 1, Math.round(rect.y * h)));
+    const width = Math.max(1, Math.min(w - left, Math.round(rect.width * w)));
+    const height = Math.max(1, Math.min(h - top, Math.round(rect.height * h)));
+    if (0 === left && 0 === top && width === w && height === h) return buffer;
+    return image.extract({
+        left,
+        top,
+        width,
+        height
+    }).toBuffer();
+};
+const transformImageBuffer = async (params)=>{
+    let pipeline = sharp(params.buffer, {
+        animated: params.animated
+    }).withMetadata();
+    if (params.options.width) {
+        const width = WidthCollection.create(params.widths).getClosestOrMax(params.options.width);
+        pipeline = pipeline.resize({
+            width,
+            withoutEnlargement: true
+        });
+    }
+    const { pipeline: encoded, contentType } = applyOutputFormat(pipeline, params.sourceContentType, params.options, params.qualityDefaults ?? DEFAULT_IMAGE_QUALITY);
+    const buffer = await encoded.toBuffer();
+    return {
+        buffer,
+        contentType
+    };
+};
+export { cropImageBuffer, extractFramedRegion, getVisibleRect, hasFraming, transformImageBuffer };
+
+//# sourceMappingURL=transformImage.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"features/assetDelivery/assetTypes/image/transformImage.js","sources":["../../../../../src/features/assetDelivery/assetTypes/image/transformImage.ts"],"sourcesContent":["/**\n * The sharp-backed image pipeline. This module imports `sharp` (a native module),\n * so it must ONLY be imported by the transform strategies (the image Lambda) —\n * never from the barrel (`index.ts`) or from anything the GraphQL API handler\n * loads. See `imageFormat.ts` for the reasoning.\n */\nimport sharp from \"sharp\";\nimport type { Sharp } from \"sharp\";\nimport { WidthCollection } from \"./WidthCollection.js\";\nimport {\n    contentTypeForFormat,\n    DEFAULT_IMAGE_QUALITY,\n    formatFromContentType,\n    type ImageFormat\n} from \"./imageFormat.js\";\n\ninterface ApplyOutputFormatResult {\n    pipeline: Sharp;\n    contentType: string;\n}\n\n/**\n * Apply the target format + quality to a sharp pipeline. When no `format` is given,\n * re-encodes in the source format only if a `quality` was requested; otherwise the\n * pipeline is left untouched.\n */\nconst applyOutputFormat = (\n    pipeline: Sharp,\n    sourceContentType: string,\n    options: { format?: ImageFormat; quality?: number },\n    qualityDefaults: Record<ImageFormat, number>\n): ApplyOutputFormatResult => {\n    const targetFormat = options.format ?? formatFromContentType(sourceContentType);\n\n    // Nothing to change: unknown source format, or neither a conversion nor a quality.\n    if (!targetFormat || (!options.format && options.quality === undefined)) {\n        return { pipeline, contentType: sourceContentType };\n    }\n\n    const quality = options.quality ?? qualityDefaults[targetFormat];\n\n    switch (targetFormat) {\n        case \"jpeg\":\n            return {\n                pipeline: pipeline.jpeg({ quality }),\n                contentType: contentTypeForFormat(\"jpeg\")\n            };\n        case \"webp\":\n            return {\n                pipeline: pipeline.webp({ quality }),\n                contentType: contentTypeForFormat(\"webp\")\n            };\n        case \"avif\":\n            return {\n                pipeline: pipeline.avif({ quality }),\n                contentType: contentTypeForFormat(\"avif\")\n            };\n        case \"png\":\n            return {\n                pipeline: pipeline.png({ quality, compressionLevel: 9, adaptiveFiltering: true }),\n                contentType: contentTypeForFormat(\"png\")\n            };\n    }\n};\n\nexport interface TransformImageParams {\n    buffer: Buffer;\n    animated: boolean;\n    sourceContentType: string;\n    widths: number[];\n    options: { width?: number; format?: ImageFormat; quality?: number };\n    qualityDefaults?: Record<ImageFormat, number>;\n}\n\nexport interface TransformImageResult {\n    buffer: Buffer;\n    contentType: string;\n}\n\n/**\n * Single sharp pipeline shared by the S3 and local transform strategies: optional\n * resize (snapped to the configured width ladder) → optional format conversion +\n * quality. Returns the resulting buffer and its content type.\n */\ninterface CropInsets {\n    top: number;\n    left: number;\n    bottom: number;\n    right: number;\n}\n\nconst clamp01 = (n: number) => Math.min(1, Math.max(0, n));\n\n/**\n * Extract the crop region (edge insets, 0..1) from an image buffer. Returns the\n * original buffer unchanged if the crop is empty/full or the dimensions are unknown.\n */\nexport const cropImageBuffer = async (buffer: Buffer, crop: CropInsets): Promise<Buffer> => {\n    const image = sharp(buffer);\n    const meta = await image.metadata();\n    const w = meta.width ?? 0;\n    const h = meta.height ?? 0;\n    if (!w || !h) {\n        return buffer;\n    }\n\n    const left = Math.max(0, Math.min(w - 1, Math.round(clamp01(crop.left) * w)));\n    const top = Math.max(0, Math.min(h - 1, Math.round(clamp01(crop.top) * h)));\n    const width = Math.max(\n        1,\n        Math.min(w - left, Math.round((1 - clamp01(crop.left) - clamp01(crop.right)) * w))\n    );\n    const height = Math.max(\n        1,\n        Math.min(h - top, Math.round((1 - clamp01(crop.top) - clamp01(crop.bottom)) * h))\n    );\n\n    if (left === 0 && top === 0 && width === w && height === h) {\n        return buffer;\n    }\n\n    return image.extract({ left, top, width, height }).toBuffer();\n};\n\ninterface NormalizedRect {\n    x: number;\n    y: number;\n    width: number;\n    height: number;\n}\n\nconst cropToRect = (crop?: CropInsets): NormalizedRect => {\n    const left = clamp01(crop?.left ?? 0);\n    const top = clamp01(crop?.top ?? 0);\n    return {\n        x: left,\n        y: top,\n        width: Math.max(0, 1 - left - clamp01(crop?.right ?? 0)),\n        height: Math.max(0, 1 - top - clamp01(crop?.bottom ?? 0))\n    };\n};\n\n/**\n * The visible region (normalized 0–1) for the given framing. The largest rectangle\n * of `aspectRatio` that fits inside the crop, centered on the focal point.\n */\nexport const getVisibleRect = (\n    imageWidth: number,\n    imageHeight: number,\n    crop?: CropInsets,\n    focal?: { x: number; y: number },\n    aspectRatio?: number\n): NormalizedRect => {\n    const cr = cropToRect(crop);\n    if (aspectRatio === undefined || aspectRatio <= 0 || cr.width <= 0 || cr.height <= 0) {\n        return cr;\n    }\n    const iw = imageWidth > 0 ? imageWidth : 1;\n    const ih = imageHeight > 0 ? imageHeight : 1;\n    const cropAR = (cr.width * iw) / (cr.height * ih);\n\n    let w: number;\n    let h: number;\n    if (aspectRatio > cropAR) {\n        w = cr.width;\n        h = (cr.width * iw) / aspectRatio / ih;\n    } else {\n        h = cr.height;\n        w = (cr.height * ih * aspectRatio) / iw;\n    }\n\n    const fx = clamp01(focal?.x ?? 0.5);\n    const fy = clamp01(focal?.y ?? 0.5);\n    const maxX = cr.x + cr.width - w;\n    const maxY = cr.y + cr.height - h;\n    const x = Math.min(Math.max(fx - w / 2, cr.x), Math.max(cr.x, maxX));\n    const y = Math.min(Math.max(fy - h / 2, cr.y), Math.max(cr.y, maxY));\n    return { x, y, width: w, height: h };\n};\n\nexport interface Framing {\n    crop?: CropInsets;\n    focal?: { x: number; y: number };\n    aspectRatio?: number;\n}\n\nexport const hasFraming = (framing: Framing): boolean => {\n    const c = framing.crop;\n    const cropped = !!c && !(c.top === 0 && c.left === 0 && c.bottom === 0 && c.right === 0);\n    return cropped || framing.aspectRatio !== undefined;\n};\n\nexport const extractFramedRegion = async (buffer: Buffer, framing: Framing): Promise<Buffer> => {\n    if (!hasFraming(framing)) {\n        return buffer;\n    }\n    const image = sharp(buffer);\n    const meta = await image.metadata();\n    const w = meta.width ?? 0;\n    const h = meta.height ?? 0;\n    if (!w || !h) {\n        return buffer;\n    }\n\n    const rect = getVisibleRect(w, h, framing.crop, framing.focal, framing.aspectRatio);\n    const left = Math.max(0, Math.min(w - 1, Math.round(rect.x * w)));\n    const top = Math.max(0, Math.min(h - 1, Math.round(rect.y * h)));\n    const width = Math.max(1, Math.min(w - left, Math.round(rect.width * w)));\n    const height = Math.max(1, Math.min(h - top, Math.round(rect.height * h)));\n\n    if (left === 0 && top === 0 && width === w && height === h) {\n        return buffer;\n    }\n    return image.extract({ left, top, width, height }).toBuffer();\n};\n\nexport const transformImageBuffer = async (\n    params: TransformImageParams\n): Promise<TransformImageResult> => {\n    let pipeline = sharp(params.buffer, { animated: params.animated }).withMetadata();\n\n    if (params.options.width) {\n        const width = WidthCollection.create(params.widths).getClosestOrMax(params.options.width);\n        pipeline = pipeline.resize({ width, withoutEnlargement: true });\n    }\n\n    const { pipeline: encoded, contentType } = applyOutputFormat(\n        pipeline,\n        params.sourceContentType,\n        params.options,\n        params.qualityDefaults ?? DEFAULT_IMAGE_QUALITY\n    );\n\n    const buffer = await encoded.toBuffer();\n\n    return { buffer, contentType };\n};\n"],"names":["applyOutputFormat","pipeline","sourceContentType","options","qualityDefaults","targetFormat","formatFromContentType","undefined","quality","contentTypeForFormat","clamp01","n","Math","cropImageBuffer","buffer","crop","image","sharp","meta","w","h","left","top","width","height","cropToRect","getVisibleRect","imageWidth","imageHeight","focal","aspectRatio","cr","iw","ih","cropAR","fx","fy","maxX","maxY","x","y","hasFraming","framing","c","cropped","extractFramedRegion","rect","transformImageBuffer","params","WidthCollection","encoded","contentType","DEFAULT_IMAGE_QUALITY"],"mappings":"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"}

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

@@ -0,0 +1,26 @@
+import type { Framing } from "./imageTypes.js";
+declare const SUPPORTED_TRANSFORMABLE_IMAGES: string[];
+declare const getOptimizedImageKeyPrefix: (key: string, cropSignature?: string) => string;
+declare const getOptimizedTransformedImageKeyPrefix: (key: string, transformationsHash: string, cropSignature?: string) => string;
+interface Crop {
+    top: number;
+    left: number;
+    bottom: number;
+    right: number;
+}
+/** Short, stable signature of a crop; `undefined` for no/empty crop (so keys are unchanged). */
+declare const getCropSignature: (crop?: Crop) => string | undefined;
+interface GetImageKeyParams {
+    key: string;
+    transformations?: any;
+    cropSignature?: string;
+}
+declare const getImageKey: ({ key, transformations, cropSignature }: GetImageKeyParams) => string;
+/**
+ * Signature for a full framing (crop + focal + aspect ratio) used to namespace
+ * cached derivatives. `undefined` when the framing is a no-op. A crop-only framing
+ * intentionally hashes to the same value as `getCropSignature`, so existing
+ * asset-level-crop derivatives keep their cache keys (backward compatible).
+ */
+declare const getFramingSignature: (framing: Framing) => string | undefined;
+export { SUPPORTED_TRANSFORMABLE_IMAGES, getImageKey, getCropSignature, getFramingSignature, getOptimizedImageKeyPrefix, getOptimizedTransformedImageKeyPrefix };

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

@@ -0,0 +1,47 @@
+import object_hash from "object-hash";
+import node_path from "node:path";
+const SUPPORTED_TRANSFORMABLE_IMAGES = [
+    "jpg",
+    "jpeg",
+    "png",
+    "webp"
+];
+const parseKey = (key)=>{
+    const filename = node_path.basename(key);
+    const dirname = node_path.dirname(key);
+    return {
+        filename,
+        dirname
+    };
+};
+const cropSegment = (cropSignature)=>cropSignature ? `${cropSignature}/` : "";
+const getOptimizedImageKeyPrefix = (key, cropSignature)=>{
+    const { filename, dirname } = parseKey(key);
+    return `${dirname}/optimized/${cropSegment(cropSignature)}${filename}`;
+};
+const getOptimizedTransformedImageKeyPrefix = (key, transformationsHash, cropSignature)=>{
+    const { filename, dirname } = parseKey(key);
+    return `${dirname}/optimized/${cropSegment(cropSignature)}${transformationsHash}-${filename}`;
+};
+const getCropSignature = (crop)=>{
+    if (!crop || 0 === crop.top && 0 === crop.left && 0 === crop.bottom && 0 === crop.right) return;
+    return object_hash(crop).slice(0, 16);
+};
+const getImageKey = ({ key, transformations, cropSignature })=>{
+    if (!transformations) return getOptimizedImageKeyPrefix(key, cropSignature);
+    return getOptimizedTransformedImageKeyPrefix(key, object_hash(transformations), cropSignature);
+};
+const getFramingSignature = (framing)=>{
+    const { crop, focal, aspectRatio } = framing;
+    const cropped = !!crop && !(0 === crop.top && 0 === crop.left && 0 === crop.bottom && 0 === crop.right);
+    if (!cropped && void 0 === aspectRatio) return;
+    if (cropped && void 0 === focal && void 0 === aspectRatio) return object_hash(crop).slice(0, 16);
+    return object_hash({
+        crop: cropped ? crop : void 0,
+        focal,
+        aspectRatio
+    }).slice(0, 16);
+};
+export { SUPPORTED_TRANSFORMABLE_IMAGES, getCropSignature, getFramingSignature, getImageKey, getOptimizedImageKeyPrefix, getOptimizedTransformedImageKeyPrefix };
+
+//# sourceMappingURL=utils.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"features/assetDelivery/assetTypes/image/utils.js","sources":["../../../../../src/features/assetDelivery/assetTypes/image/utils.ts"],"sourcesContent":["import objectHash from \"object-hash\";\nimport path from \"node:path\";\nimport type { Framing } from \"./imageTypes.js\";\n\nconst SUPPORTED_TRANSFORMABLE_IMAGES = [\"jpg\", \"jpeg\", \"png\", \"webp\"];\n\nconst parseKey = (key: string) => {\n    const filename = path.basename(key);\n    const dirname = path.dirname(key);\n\n    return { filename, dirname };\n};\n\n// An optional per-file crop signature segment. Keeps un-cropped keys unchanged\n// (backward compatible) while giving cropped files their own cache namespace, so\n// changing a file's crop invalidates its derivatives.\nconst cropSegment = (cropSignature?: string): string => {\n    return cropSignature ? `${cropSignature}/` : \"\";\n};\n\nconst getOptimizedImageKeyPrefix = (key: string, cropSignature?: string): string => {\n    const { filename, dirname } = parseKey(key);\n\n    return `${dirname}/optimized/${cropSegment(cropSignature)}${filename}`;\n};\n\nconst getOptimizedTransformedImageKeyPrefix = (\n    key: string,\n    transformationsHash: string,\n    cropSignature?: string\n): string => {\n    const { filename, dirname } = parseKey(key);\n\n    return `${dirname}/optimized/${cropSegment(cropSignature)}${transformationsHash}-${filename}`;\n};\n\ninterface Crop {\n    top: number;\n    left: number;\n    bottom: number;\n    right: number;\n}\n\n/** Short, stable signature of a crop; `undefined` for no/empty crop (so keys are unchanged). */\nconst getCropSignature = (crop?: Crop): string | undefined => {\n    if (!crop || (crop.top === 0 && crop.left === 0 && crop.bottom === 0 && crop.right === 0)) {\n        return undefined;\n    }\n    return objectHash(crop).slice(0, 16);\n};\n\ninterface GetImageKeyParams {\n    key: string;\n    transformations?: any;\n    cropSignature?: string;\n}\n\nconst getImageKey = ({ key, transformations, cropSignature }: GetImageKeyParams): string => {\n    if (!transformations) {\n        return getOptimizedImageKeyPrefix(key, cropSignature);\n    }\n\n    return getOptimizedTransformedImageKeyPrefix(key, objectHash(transformations), cropSignature);\n};\n\n/**\n * Signature for a full framing (crop + focal + aspect ratio) used to namespace\n * cached derivatives. `undefined` when the framing is a no-op. A crop-only framing\n * intentionally hashes to the same value as `getCropSignature`, so existing\n * asset-level-crop derivatives keep their cache keys (backward compatible).\n */\nconst getFramingSignature = (framing: Framing): string | undefined => {\n    const { crop, focal, aspectRatio } = framing;\n    const cropped =\n        !!crop && !(crop.top === 0 && crop.left === 0 && crop.bottom === 0 && crop.right === 0);\n\n    if (!cropped && aspectRatio === undefined) {\n        return undefined;\n    }\n    if (cropped && focal === undefined && aspectRatio === undefined) {\n        return objectHash(crop).slice(0, 16);\n    }\n    return objectHash({ crop: cropped ? crop : undefined, focal, aspectRatio }).slice(0, 16);\n};\n\nexport {\n    SUPPORTED_TRANSFORMABLE_IMAGES,\n    getImageKey,\n    getCropSignature,\n    getFramingSignature,\n    getOptimizedImageKeyPrefix,\n    getOptimizedTransformedImageKeyPrefix\n};\n"],"names":["SUPPORTED_TRANSFORMABLE_IMAGES","parseKey","key","filename","path","dirname","cropSegment","cropSignature","getOptimizedImageKeyPrefix","getOptimizedTransformedImageKeyPrefix","transformationsHash","getCropSignature","crop","objectHash","getImageKey","transformations","getFramingSignature","framing","focal","aspectRatio","cropped","undefined"],"mappings":";;AAIA,MAAMA,iCAAiC;IAAC;IAAO;IAAQ;IAAO;CAAO;AAErE,MAAMC,WAAW,CAACC;IACd,MAAMC,WAAWC,UAAAA,QAAa,CAACF;IAC/B,MAAMG,UAAUD,UAAAA,OAAY,CAACF;IAE7B,OAAO;QAAEC;QAAUE;IAAQ;AAC/B;AAKA,MAAMC,cAAc,CAACC,gBACVA,gBAAgB,GAAGA,cAAc,CAAC,CAAC,GAAG;AAGjD,MAAMC,6BAA6B,CAACN,KAAaK;IAC7C,MAAM,EAAEJ,QAAQ,EAAEE,OAAO,EAAE,GAAGJ,SAASC;IAEvC,OAAO,GAAGG,QAAQ,WAAW,EAAEC,YAAYC,iBAAiBJ,UAAU;AAC1E;AAEA,MAAMM,wCAAwC,CAC1CP,KACAQ,qBACAH;IAEA,MAAM,EAAEJ,QAAQ,EAAEE,OAAO,EAAE,GAAGJ,SAASC;IAEvC,OAAO,GAAGG,QAAQ,WAAW,EAAEC,YAAYC,iBAAiBG,oBAAoB,CAAC,EAAEP,UAAU;AACjG;AAUA,MAAMQ,mBAAmB,CAACC;IACtB,IAAI,CAACA,QAASA,AAAa,MAAbA,KAAK,GAAG,IAAUA,AAAc,MAAdA,KAAK,IAAI,IAAUA,AAAgB,MAAhBA,KAAK,MAAM,IAAUA,AAAe,MAAfA,KAAK,KAAK,EAC9E;IAEJ,OAAOC,YAAWD,MAAM,KAAK,CAAC,GAAG;AACrC;AAQA,MAAME,cAAc,CAAC,EAAEZ,GAAG,EAAEa,eAAe,EAAER,aAAa,EAAqB;IAC3E,IAAI,CAACQ,iBACD,OAAOP,2BAA2BN,KAAKK;IAG3C,OAAOE,sCAAsCP,KAAKW,YAAWE,kBAAkBR;AACnF;AAQA,MAAMS,sBAAsB,CAACC;IACzB,MAAM,EAAEL,IAAI,EAAEM,KAAK,EAAEC,WAAW,EAAE,GAAGF;IACrC,MAAMG,UACF,CAAC,CAACR,QAAQ,CAAEA,CAAAA,AAAa,MAAbA,KAAK,GAAG,IAAUA,AAAc,MAAdA,KAAK,IAAI,IAAUA,AAAgB,MAAhBA,KAAK,MAAM,IAAUA,AAAe,MAAfA,KAAK,KAAK,AAAK;IAEzF,IAAI,CAACQ,WAAWD,AAAgBE,WAAhBF,aACZ;IAEJ,IAAIC,WAAWF,AAAUG,WAAVH,SAAuBC,AAAgBE,WAAhBF,aAClC,OAAON,YAAWD,MAAM,KAAK,CAAC,GAAG;IAErC,OAAOC,YAAW;QAAE,MAAMO,UAAUR,OAAOS;QAAWH;QAAOC;IAAY,GAAG,KAAK,CAAC,GAAG;AACzF"}

package/features/assetDelivery/feature.js

@@ -1,10 +1,14 @@
 import { createFeature } from "@webiny/feature/api";
-import { WcpContext } from "@webiny/api-core/features/wcp/WcpContext/index.js";
+import { FeatureFlags } from "@webiny/api-core/features/featureFlags/abstractions.js";
+import { AssetProcessor } from "./abstractions.js";
 import { FilesAssetRequestResolverImpl } from "./FilesAssetRequestResolver.js";
 import { NullAssetResolverImpl } from "./NullAssetResolver.js";
 import { NullAssetOutputStrategyImpl } from "./NullAssetOutputStrategy.js";
-import { PassthroughAssetTransformationStrategyImpl } from "./transformation/PassthroughAssetTransformationStrategy.js";
-import { TransformationAssetProcessorImpl } from "./transformation/TransformationAssetProcessor.js";
+import { AssetFactory } from "./Asset/Asset.js";
+import { ObjectKey } from "./ObjectKey/ObjectKey.js";
+import { StreamAssetReply } from "./StreamAssetReply/StreamAssetReply.js";
+import { TransformationAssetProcessor } from "./transformation/TransformationAssetProcessor.js";
+import { ImageAssetType } from "./assetTypes/image/ImageAssetType.js";
 import { PrivateFileAssetRequestResolverDecorator } from "./privateFiles/PrivateFileAssetRequestResolver.js";
 import { PrivateAuthenticatedAuthorizerImpl } from "./privateFiles/PrivateAuthenticatedAuthorizer.js";
 import { PrivateFilesAssetProcessorDecorator } from "./privateFiles/PrivateFilesAssetProcessor.js";
@@ -14,11 +18,13 @@ const AssetDeliveryFeature = createFeature({
         container.register(FilesAssetRequestResolverImpl);
         container.register(NullAssetResolverImpl);
         container.register(NullAssetOutputStrategyImpl);
-        container.register(PassthroughAssetTransformationStrategyImpl);
-        container.register(TransformationAssetProcessorImpl);
+        container.register(AssetFactory).inSingletonScope();
+        container.register(ObjectKey).inSingletonScope();
+        container.register(StreamAssetReply).inSingletonScope();
+        container.register(ImageAssetType);
+        container.registerInstance(AssetProcessor, new TransformationAssetProcessor(container));
         container.registerDecorator(PrivateFileAssetRequestResolverDecorator);
-        const wcp = container.resolve(WcpContext);
-        if (wcp.canUsePrivateFiles()) {
+        if (container.resolve(FeatureFlags).get().isEnabled("advancedAccessControlLayer.privateFiles")) {
             container.register(PrivateAuthenticatedAuthorizerImpl);
             container.registerDecorator(PrivateFilesAssetProcessorDecorator);
         }

package/features/assetDelivery/feature.js.map

@@ -1 +1 @@
-{"version":3,"file":"features/assetDelivery/feature.js","sources":["../../../src/features/assetDelivery/feature.ts"],"sourcesContent":["import { createFeature } from \"@webiny/feature/api\";\nimport { WcpContext } from \"@webiny/api-core/features/wcp/WcpContext/index.js\";\nimport { FilesAssetRequestResolverImpl } from \"./FilesAssetRequestResolver.js\";\nimport { NullAssetResolverImpl } from \"./NullAssetResolver.js\";\nimport { NullAssetOutputStrategyImpl } from \"./NullAssetOutputStrategy.js\";\nimport { PassthroughAssetTransformationStrategyImpl } from \"./transformation/PassthroughAssetTransformationStrategy.js\";\nimport { TransformationAssetProcessorImpl } from \"./transformation/TransformationAssetProcessor.js\";\nimport { PrivateFileAssetRequestResolverDecorator } from \"./privateFiles/PrivateFileAssetRequestResolver.js\";\nimport { PrivateAuthenticatedAuthorizerImpl } from \"./privateFiles/PrivateAuthenticatedAuthorizer.js\";\nimport { PrivateFilesAssetProcessorDecorator } from \"./privateFiles/PrivateFilesAssetProcessor.js\";\n\nexport const AssetDeliveryFeature = createFeature({\n    name: \"AssetDelivery\",\n    register(container) {\n        container.register(FilesAssetRequestResolverImpl);\n        container.register(NullAssetResolverImpl);\n        container.register(NullAssetOutputStrategyImpl);\n        container.register(PassthroughAssetTransformationStrategyImpl);\n        container.register(TransformationAssetProcessorImpl);\n\n        container.registerDecorator(PrivateFileAssetRequestResolverDecorator);\n\n        const wcp = container.resolve(WcpContext);\n        if (wcp.canUsePrivateFiles()) {\n            container.register(PrivateAuthenticatedAuthorizerImpl);\n            container.registerDecorator(PrivateFilesAssetProcessorDecorator);\n        }\n    }\n});\n"],"names":["AssetDeliveryFeature","createFeature","container","FilesAssetRequestResolverImpl","NullAssetResolverImpl","NullAssetOutputStrategyImpl","PassthroughAssetTransformationStrategyImpl","TransformationAssetProcessorImpl","PrivateFileAssetRequestResolverDecorator","wcp","WcpContext","PrivateAuthenticatedAuthorizerImpl","PrivateFilesAssetProcessorDecorator"],"mappings":";;;;;;;;;;AAWO,MAAMA,uBAAuBC,cAAc;IAC9C,MAAM;IACN,UAASC,SAAS;QACdA,UAAU,QAAQ,CAACC;QACnBD,UAAU,QAAQ,CAACE;QACnBF,UAAU,QAAQ,CAACG;QACnBH,UAAU,QAAQ,CAACI;QACnBJ,UAAU,QAAQ,CAACK;QAEnBL,UAAU,iBAAiB,CAACM;QAE5B,MAAMC,MAAMP,UAAU,OAAO,CAACQ;QAC9B,IAAID,IAAI,kBAAkB,IAAI;YAC1BP,UAAU,QAAQ,CAACS;YACnBT,UAAU,iBAAiB,CAACU;QAChC;IACJ;AACJ"}
+{"version":3,"file":"features/assetDelivery/feature.js","sources":["../../../src/features/assetDelivery/feature.ts"],"sourcesContent":["import { createFeature } from \"@webiny/feature/api\";\nimport { FeatureFlags } from \"@webiny/api-core/features/featureFlags/abstractions.js\";\nimport { AssetProcessor } from \"./abstractions.js\";\nimport { FilesAssetRequestResolverImpl } from \"./FilesAssetRequestResolver.js\";\nimport { NullAssetResolverImpl } from \"./NullAssetResolver.js\";\nimport { NullAssetOutputStrategyImpl } from \"./NullAssetOutputStrategy.js\";\nimport { AssetFactory } from \"./Asset/Asset.js\";\nimport { ObjectKey } from \"./ObjectKey/ObjectKey.js\";\nimport { StreamAssetReply } from \"./StreamAssetReply/StreamAssetReply.js\";\nimport { TransformationAssetProcessor } from \"./transformation/TransformationAssetProcessor.js\";\nimport { ImageAssetType } from \"./assetTypes/image/ImageAssetType.js\";\nimport { PrivateFileAssetRequestResolverDecorator } from \"./privateFiles/PrivateFileAssetRequestResolver.js\";\nimport { PrivateAuthenticatedAuthorizerImpl } from \"./privateFiles/PrivateAuthenticatedAuthorizer.js\";\nimport { PrivateFilesAssetProcessorDecorator } from \"./privateFiles/PrivateFilesAssetProcessor.js\";\n\nexport const AssetDeliveryFeature = createFeature({\n    name: \"AssetDelivery\",\n    register(container) {\n        container.register(FilesAssetRequestResolverImpl);\n        container.register(NullAssetResolverImpl);\n        container.register(NullAssetOutputStrategyImpl);\n        container.register(AssetFactory).inSingletonScope();\n        container.register(ObjectKey).inSingletonScope();\n        container.register(StreamAssetReply).inSingletonScope();\n        container.register(ImageAssetType);\n        container.registerInstance(AssetProcessor, new TransformationAssetProcessor(container));\n\n        container.registerDecorator(PrivateFileAssetRequestResolverDecorator);\n\n        // Register-time gate on the effective feature flags (userFlag && live WCP license). Valid at\n        // register() time because the license is refreshed PRE-register (WcpLicenseLoader.load in\n        // registerApiRequestStack) and FeatureFlags reads that process cache — and it re-evaluates per\n        // request since the child re-registers, so a license change takes effect on the next request.\n        if (\n            container\n                .resolve(FeatureFlags)\n                .get()\n                .isEnabled(\"advancedAccessControlLayer.privateFiles\")\n        ) {\n            container.register(PrivateAuthenticatedAuthorizerImpl);\n            container.registerDecorator(PrivateFilesAssetProcessorDecorator);\n        }\n    }\n});\n"],"names":["AssetDeliveryFeature","createFeature","container","FilesAssetRequestResolverImpl","NullAssetResolverImpl","NullAssetOutputStrategyImpl","AssetFactory","ObjectKey","StreamAssetReply","ImageAssetType","AssetProcessor","TransformationAssetProcessor","PrivateFileAssetRequestResolverDecorator","FeatureFlags","PrivateAuthenticatedAuthorizerImpl","PrivateFilesAssetProcessorDecorator"],"mappings":";;;;;;;;;;;;;;AAeO,MAAMA,uBAAuBC,cAAc;IAC9C,MAAM;IACN,UAASC,SAAS;QACdA,UAAU,QAAQ,CAACC;QACnBD,UAAU,QAAQ,CAACE;QACnBF,UAAU,QAAQ,CAACG;QACnBH,UAAU,QAAQ,CAACI,cAAc,gBAAgB;QACjDJ,UAAU,QAAQ,CAACK,WAAW,gBAAgB;QAC9CL,UAAU,QAAQ,CAACM,kBAAkB,gBAAgB;QACrDN,UAAU,QAAQ,CAACO;QACnBP,UAAU,gBAAgB,CAACQ,gBAAgB,IAAIC,6BAA6BT;QAE5EA,UAAU,iBAAiB,CAACU;QAM5B,IACIV,UACK,OAAO,CAACW,cACR,GAAG,GACH,SAAS,CAAC,4CACjB;YACEX,UAAU,QAAQ,CAACY;YACnBZ,UAAU,iBAAiB,CAACa;QAChC;IACJ;AACJ"}

package/features/assetDelivery/privateFiles/PrivateFileAssetRequestResolver.js

@@ -5,14 +5,14 @@ class PrivateFileAssetRequestResolver {
         this.resolver = resolver;
     }
     async resolve(request) {
-        if (!request.url.startsWith("/private/")) return this.resolver.resolve(request);
+        if (!request.url?.startsWith("/private/")) return this.resolver.resolve(request);
         const params = request.params ?? {};
         const query = request.query ?? {};
         const path = params["*"];
         return new AssetRequest({
             key: decodeURI(path).replace("/private/", ""),
             context: {
-                url: request.url,
+                url: request.url ?? "",
                 private: true
             },
             options: {

package/features/assetDelivery/privateFiles/PrivateFileAssetRequestResolver.js.map

@@ -1 +1 @@
-{"version":3,"file":"features/assetDelivery/privateFiles/PrivateFileAssetRequestResolver.js","sources":["../../../../src/features/assetDelivery/privateFiles/PrivateFileAssetRequestResolver.ts"],"sourcesContent":["import type { Request } from \"@webiny/handler/types.js\";\nimport { AssetRequest } from \"~/delivery/AssetDelivery/AssetRequest.js\";\nimport { AssetRequestResolver, type IAssetRequestResolver } from \"../abstractions.js\";\n\nexport class PrivateFileAssetRequestResolver implements IAssetRequestResolver {\n    private readonly resolver: IAssetRequestResolver;\n\n    constructor(resolver: IAssetRequestResolver) {\n        this.resolver = resolver;\n    }\n\n    async resolve(request: Request): Promise<AssetRequest | undefined> {\n        if (!request.url.startsWith(\"/private/\")) {\n            return this.resolver.resolve(request);\n        }\n\n        const params = (request.params ?? {}) as Record<string, any>;\n        const query = (request.query ?? {}) as Record<string, any>;\n\n        const path = params[\"*\"];\n\n        return new AssetRequest({\n            key: decodeURI(path).replace(\"/private/\", \"\"),\n            context: {\n                url: request.url,\n                private: true\n            },\n            options: {\n                ...query,\n                width: query.width ? parseInt(query.width) : undefined\n            }\n        });\n    }\n}\n\nexport const PrivateFileAssetRequestResolverDecorator = AssetRequestResolver.createDecorator({\n    decorator: PrivateFileAssetRequestResolver,\n    dependencies: []\n});\n"],"names":["PrivateFileAssetRequestResolver","resolver","request","params","query","path","AssetRequest","decodeURI","parseInt","undefined","PrivateFileAssetRequestResolverDecorator","AssetRequestResolver"],"mappings":";;AAIO,MAAMA;IAGT,YAAYC,QAA+B,CAAE;QACzC,IAAI,CAAC,QAAQ,GAAGA;IACpB;IAEA,MAAM,QAAQC,OAAgB,EAAqC;QAC/D,IAAI,CAACA,QAAQ,GAAG,CAAC,UAAU,CAAC,cACxB,OAAO,IAAI,CAAC,QAAQ,CAAC,OAAO,CAACA;QAGjC,MAAMC,SAAUD,QAAQ,MAAM,IAAI,CAAC;QACnC,MAAME,QAASF,QAAQ,KAAK,IAAI,CAAC;QAEjC,MAAMG,OAAOF,MAAM,CAAC,IAAI;QAExB,OAAO,IAAIG,aAAa;YACpB,KAAKC,UAAUF,MAAM,OAAO,CAAC,aAAa;YAC1C,SAAS;gBACL,KAAKH,QAAQ,GAAG;gBAChB,SAAS;YACb;YACA,SAAS;gBACL,GAAGE,KAAK;gBACR,OAAOA,MAAM,KAAK,GAAGI,SAASJ,MAAM,KAAK,IAAIK;YACjD;QACJ;IACJ;AACJ;AAEO,MAAMC,2CAA2CC,qBAAqB,eAAe,CAAC;IACzF,WAAWX;IACX,cAAc,EAAE;AACpB"}
+{"version":3,"file":"features/assetDelivery/privateFiles/PrivateFileAssetRequestResolver.js","sources":["../../../../src/features/assetDelivery/privateFiles/PrivateFileAssetRequestResolver.ts"],"sourcesContent":["import type { Request } from \"@webiny/handler/types.js\";\nimport { AssetRequest } from \"~/delivery/AssetDelivery/AssetRequest.js\";\nimport { AssetRequestResolver, type IAssetRequestResolver } from \"../abstractions.js\";\n\nexport class PrivateFileAssetRequestResolver implements IAssetRequestResolver {\n    private readonly resolver: IAssetRequestResolver;\n\n    constructor(resolver: IAssetRequestResolver) {\n        this.resolver = resolver;\n    }\n\n    async resolve(request: Request): Promise<AssetRequest | undefined> {\n        if (!request.url?.startsWith(\"/private/\")) {\n            return this.resolver.resolve(request);\n        }\n\n        const params = (request.params ?? {}) as Record<string, any>;\n        const query = (request.query ?? {}) as Record<string, any>;\n\n        const path = params[\"*\"];\n\n        return new AssetRequest({\n            key: decodeURI(path).replace(\"/private/\", \"\"),\n            context: {\n                url: request.url ?? \"\",\n                private: true\n            },\n            options: {\n                ...query,\n                width: query.width ? parseInt(query.width) : undefined\n            }\n        });\n    }\n}\n\nexport const PrivateFileAssetRequestResolverDecorator = AssetRequestResolver.createDecorator({\n    decorator: PrivateFileAssetRequestResolver,\n    dependencies: []\n});\n"],"names":["PrivateFileAssetRequestResolver","resolver","request","params","query","path","AssetRequest","decodeURI","parseInt","undefined","PrivateFileAssetRequestResolverDecorator","AssetRequestResolver"],"mappings":";;AAIO,MAAMA;IAGT,YAAYC,QAA+B,CAAE;QACzC,IAAI,CAAC,QAAQ,GAAGA;IACpB;IAEA,MAAM,QAAQC,OAAgB,EAAqC;QAC/D,IAAI,CAACA,QAAQ,GAAG,EAAE,WAAW,cACzB,OAAO,IAAI,CAAC,QAAQ,CAAC,OAAO,CAACA;QAGjC,MAAMC,SAAUD,QAAQ,MAAM,IAAI,CAAC;QACnC,MAAME,QAASF,QAAQ,KAAK,IAAI,CAAC;QAEjC,MAAMG,OAAOF,MAAM,CAAC,IAAI;QAExB,OAAO,IAAIG,aAAa;YACpB,KAAKC,UAAUF,MAAM,OAAO,CAAC,aAAa;YAC1C,SAAS;gBACL,KAAKH,QAAQ,GAAG,IAAI;gBACpB,SAAS;YACb;YACA,SAAS;gBACL,GAAGE,KAAK;gBACR,OAAOA,MAAM,KAAK,GAAGI,SAASJ,MAAM,KAAK,IAAIK;YACjD;QACJ;IACJ;AACJ;AAEO,MAAMC,2CAA2CC,qBAAqB,eAAe,CAAC;IACzF,WAAWX;IACX,cAAc,EAAE;AACpB"}

package/features/assetDelivery/privateFiles/PrivateFilesAssetProcessor.js.map

@@ -1 +1 @@
-{"version":3,"file":"features/assetDelivery/privateFiles/PrivateFilesAssetProcessor.js","sources":["../../../../src/features/assetDelivery/privateFiles/PrivateFilesAssetProcessor.ts"],"sourcesContent":["import type { File } from \"~/domain/file/types.js\";\nimport type { Asset } from \"~/delivery/AssetDelivery/Asset.js\";\nimport type { AssetRequest } from \"~/delivery/AssetDelivery/AssetRequest.js\";\nimport { IdentityContext } from \"@webiny/api-core/features/security/IdentityContext/index.js\";\nimport { GetFileUseCase } from \"~/features/file/GetFile/index.js\";\nimport { NotAuthorizedOutputStrategy } from \"./NotAuthorizedOutputStrategy.js\";\nimport { RedirectToPublicUrlOutputStrategy } from \"./RedirectToPublicUrlOutputStrategy.js\";\nimport { RedirectToPrivateUrlOutputStrategy } from \"./RedirectToPrivateUrlOutputStrategy.js\";\nimport { PrivateCache } from \"./PrivateCache.js\";\nimport { PublicCache } from \"./PublicCache.js\";\nimport {\n    AssetProcessor,\n    AssetAuthorizer,\n    type IAssetProcessor,\n    type IAssetAuthorizer\n} from \"../abstractions.js\";\n\ninterface MaybePrivate {\n    private?: boolean;\n}\n\nexport class PrivateFilesAssetProcessor implements IAssetProcessor {\n    private readonly identityContext: IdentityContext.Interface;\n    private readonly getFile: GetFileUseCase.Interface;\n    private readonly assetAuthorizer: IAssetAuthorizer;\n    private readonly assetProcessor: IAssetProcessor;\n\n    constructor(\n        identityContext: IdentityContext.Interface,\n        getFile: GetFileUseCase.Interface,\n        assetAuthorizer: IAssetAuthorizer,\n        assetProcessor: IAssetProcessor\n    ) {\n        this.identityContext = identityContext;\n        this.getFile = getFile;\n        this.assetAuthorizer = assetAuthorizer;\n        this.assetProcessor = assetProcessor;\n    }\n\n    async process(assetRequest: AssetRequest, asset: Asset): Promise<Asset> {\n        const id = asset.getId();\n\n        const file = await this.identityContext.withoutAuthorization(async () => {\n            const fileResult = await this.getFile.execute(id);\n            if (fileResult.isFail()) {\n                throw fileResult.error;\n            }\n            return fileResult.value;\n        });\n\n        const isPrivateFile = this.isPrivate(file);\n\n        if (!isPrivateFile && this.requestedViaPrivateEndpoint(assetRequest)) {\n            asset.setOutputStrategy(new RedirectToPublicUrlOutputStrategy(assetRequest));\n            return asset;\n        }\n\n        if (isPrivateFile && this.requestedViaPublicEndpoint(assetRequest)) {\n            asset.setOutputStrategy(new RedirectToPrivateUrlOutputStrategy(assetRequest));\n            return asset;\n        }\n\n        try {\n            await this.assetAuthorizer.authorize(file);\n        } catch {\n            asset.setOutputStrategy(new NotAuthorizedOutputStrategy());\n            return asset;\n        }\n\n        const processedAsset = await this.assetProcessor.process(assetRequest, asset);\n\n        processedAsset.setOutputStrategy(strategy => {\n            if (!strategy) {\n                throw Error(`No asset output strategy is configured!`);\n            }\n            return isPrivateFile ? new PrivateCache(strategy) : new PublicCache(strategy);\n        });\n\n        return processedAsset;\n    }\n\n    private isPrivate(file: File) {\n        return file.accessControl && file.accessControl.type.startsWith(\"private-\");\n    }\n\n    private requestedViaPrivateEndpoint(assetRequest: AssetRequest) {\n        return assetRequest.getContext<MaybePrivate>().private;\n    }\n\n    private requestedViaPublicEndpoint(assetRequest: AssetRequest) {\n        return !this.requestedViaPrivateEndpoint(assetRequest);\n    }\n}\n\nexport const PrivateFilesAssetProcessorDecorator = AssetProcessor.createDecorator({\n    decorator: PrivateFilesAssetProcessor,\n    dependencies: [IdentityContext, GetFileUseCase, AssetAuthorizer]\n});\n"],"names":["PrivateFilesAssetProcessor","identityContext","getFile","assetAuthorizer","assetProcessor","assetRequest","asset","id","file","fileResult","isPrivateFile","RedirectToPublicUrlOutputStrategy","RedirectToPrivateUrlOutputStrategy","NotAuthorizedOutputStrategy","processedAsset","strategy","Error","PrivateCache","PublicCache","PrivateFilesAssetProcessorDecorator","AssetProcessor","IdentityContext","GetFileUseCase","AssetAuthorizer"],"mappings":";;;;;;;;AAqBO,MAAMA;IAMT,YACIC,eAA0C,EAC1CC,OAAiC,EACjCC,eAAiC,EACjCC,cAA+B,CACjC;QACE,IAAI,CAAC,eAAe,GAAGH;QACvB,IAAI,CAAC,OAAO,GAAGC;QACf,IAAI,CAAC,eAAe,GAAGC;QACvB,IAAI,CAAC,cAAc,GAAGC;IAC1B;IAEA,MAAM,QAAQC,YAA0B,EAAEC,KAAY,EAAkB;QACpE,MAAMC,KAAKD,MAAM,KAAK;QAEtB,MAAME,OAAO,MAAM,IAAI,CAAC,eAAe,CAAC,oBAAoB,CAAC;YACzD,MAAMC,aAAa,MAAM,IAAI,CAAC,OAAO,CAAC,OAAO,CAACF;YAC9C,IAAIE,WAAW,MAAM,IACjB,MAAMA,WAAW,KAAK;YAE1B,OAAOA,WAAW,KAAK;QAC3B;QAEA,MAAMC,gBAAgB,IAAI,CAAC,SAAS,CAACF;QAErC,IAAI,CAACE,iBAAiB,IAAI,CAAC,2BAA2B,CAACL,eAAe;YAClEC,MAAM,iBAAiB,CAAC,IAAIK,kCAAkCN;YAC9D,OAAOC;QACX;QAEA,IAAII,iBAAiB,IAAI,CAAC,0BAA0B,CAACL,eAAe;YAChEC,MAAM,iBAAiB,CAAC,IAAIM,mCAAmCP;YAC/D,OAAOC;QACX;QAEA,IAAI;YACA,MAAM,IAAI,CAAC,eAAe,CAAC,SAAS,CAACE;QACzC,EAAE,OAAM;YACJF,MAAM,iBAAiB,CAAC,IAAIO;YAC5B,OAAOP;QACX;QAEA,MAAMQ,iBAAiB,MAAM,IAAI,CAAC,cAAc,CAAC,OAAO,CAACT,cAAcC;QAEvEQ,eAAe,iBAAiB,CAACC,CAAAA;YAC7B,IAAI,CAACA,UACD,MAAMC,MAAM;YAEhB,OAAON,gBAAgB,IAAIO,aAAaF,YAAY,IAAIG,YAAYH;QACxE;QAEA,OAAOD;IACX;IAEQ,UAAUN,IAAU,EAAE;QAC1B,OAAOA,KAAK,aAAa,IAAIA,KAAK,aAAa,CAAC,IAAI,CAAC,UAAU,CAAC;IACpE;IAEQ,4BAA4BH,YAA0B,EAAE;QAC5D,OAAOA,aAAa,UAAU,GAAiB,OAAO;IAC1D;IAEQ,2BAA2BA,YAA0B,EAAE;QAC3D,OAAO,CAAC,IAAI,CAAC,2BAA2B,CAACA;IAC7C;AACJ;AAEO,MAAMc,sCAAsCC,eAAe,eAAe,CAAC;IAC9E,WAAWpB;IACX,cAAc;QAACqB;QAAiBC;QAAgBC;KAAgB;AACpE"}
+{"version":3,"file":"features/assetDelivery/privateFiles/PrivateFilesAssetProcessor.js","sources":["../../../../src/features/assetDelivery/privateFiles/PrivateFilesAssetProcessor.ts"],"sourcesContent":["import type { File } from \"~/domain/file/types.js\";\nimport type { Asset } from \"~/delivery/AssetDelivery/Asset.js\";\nimport type { AssetRequest } from \"~/delivery/AssetDelivery/AssetRequest.js\";\nimport { IdentityContext } from \"@webiny/api-core/features/security/IdentityContext/index.js\";\nimport { GetFileUseCase } from \"~/features/file/GetFile/index.js\";\nimport { NotAuthorizedOutputStrategy } from \"./NotAuthorizedOutputStrategy.js\";\nimport { RedirectToPublicUrlOutputStrategy } from \"./RedirectToPublicUrlOutputStrategy.js\";\nimport { RedirectToPrivateUrlOutputStrategy } from \"./RedirectToPrivateUrlOutputStrategy.js\";\nimport { PrivateCache } from \"./PrivateCache.js\";\nimport { PublicCache } from \"./PublicCache.js\";\nimport {\n    AssetProcessor,\n    AssetAuthorizer,\n    type IAssetProcessor,\n    type IAssetAuthorizer\n} from \"../abstractions.js\";\n\ninterface MaybePrivate {\n    private?: boolean;\n}\n\nexport class PrivateFilesAssetProcessor implements IAssetProcessor {\n    private readonly identityContext: IdentityContext.Interface;\n    private readonly getFile: GetFileUseCase.Interface;\n    private readonly assetAuthorizer: IAssetAuthorizer;\n    private readonly assetProcessor: IAssetProcessor;\n\n    constructor(\n        identityContext: IdentityContext.Interface,\n        getFile: GetFileUseCase.Interface,\n        assetAuthorizer: IAssetAuthorizer,\n        assetProcessor: IAssetProcessor\n    ) {\n        this.identityContext = identityContext;\n        this.getFile = getFile;\n        this.assetAuthorizer = assetAuthorizer;\n        this.assetProcessor = assetProcessor;\n    }\n\n    async process(assetRequest: AssetRequest, asset: Asset): Promise<Asset> {\n        // Only registered when private files are licensed (register-time gate in AssetDeliveryFeature),\n        // so no per-request license guard is needed here.\n        const id = asset.getId();\n\n        const file = await this.identityContext.withoutAuthorization(async () => {\n            const fileResult = await this.getFile.execute(id);\n            if (fileResult.isFail()) {\n                throw fileResult.error;\n            }\n            return fileResult.value;\n        });\n\n        const isPrivateFile = this.isPrivate(file);\n\n        if (!isPrivateFile && this.requestedViaPrivateEndpoint(assetRequest)) {\n            asset.setOutputStrategy(new RedirectToPublicUrlOutputStrategy(assetRequest));\n            return asset;\n        }\n\n        if (isPrivateFile && this.requestedViaPublicEndpoint(assetRequest)) {\n            asset.setOutputStrategy(new RedirectToPrivateUrlOutputStrategy(assetRequest));\n            return asset;\n        }\n\n        try {\n            await this.assetAuthorizer.authorize(file);\n        } catch {\n            asset.setOutputStrategy(new NotAuthorizedOutputStrategy());\n            return asset;\n        }\n\n        const processedAsset = await this.assetProcessor.process(assetRequest, asset);\n\n        processedAsset.setOutputStrategy(strategy => {\n            if (!strategy) {\n                throw Error(`No asset output strategy is configured!`);\n            }\n            return isPrivateFile ? new PrivateCache(strategy) : new PublicCache(strategy);\n        });\n\n        return processedAsset;\n    }\n\n    private isPrivate(file: File) {\n        return file.accessControl && file.accessControl.type.startsWith(\"private-\");\n    }\n\n    private requestedViaPrivateEndpoint(assetRequest: AssetRequest) {\n        return assetRequest.getContext<MaybePrivate>().private;\n    }\n\n    private requestedViaPublicEndpoint(assetRequest: AssetRequest) {\n        return !this.requestedViaPrivateEndpoint(assetRequest);\n    }\n}\n\nexport const PrivateFilesAssetProcessorDecorator = AssetProcessor.createDecorator({\n    decorator: PrivateFilesAssetProcessor,\n    dependencies: [IdentityContext, GetFileUseCase, AssetAuthorizer]\n});\n"],"names":["PrivateFilesAssetProcessor","identityContext","getFile","assetAuthorizer","assetProcessor","assetRequest","asset","id","file","fileResult","isPrivateFile","RedirectToPublicUrlOutputStrategy","RedirectToPrivateUrlOutputStrategy","NotAuthorizedOutputStrategy","processedAsset","strategy","Error","PrivateCache","PublicCache","PrivateFilesAssetProcessorDecorator","AssetProcessor","IdentityContext","GetFileUseCase","AssetAuthorizer"],"mappings":";;;;;;;;AAqBO,MAAMA;IAMT,YACIC,eAA0C,EAC1CC,OAAiC,EACjCC,eAAiC,EACjCC,cAA+B,CACjC;QACE,IAAI,CAAC,eAAe,GAAGH;QACvB,IAAI,CAAC,OAAO,GAAGC;QACf,IAAI,CAAC,eAAe,GAAGC;QACvB,IAAI,CAAC,cAAc,GAAGC;IAC1B;IAEA,MAAM,QAAQC,YAA0B,EAAEC,KAAY,EAAkB;QAGpE,MAAMC,KAAKD,MAAM,KAAK;QAEtB,MAAME,OAAO,MAAM,IAAI,CAAC,eAAe,CAAC,oBAAoB,CAAC;YACzD,MAAMC,aAAa,MAAM,IAAI,CAAC,OAAO,CAAC,OAAO,CAACF;YAC9C,IAAIE,WAAW,MAAM,IACjB,MAAMA,WAAW,KAAK;YAE1B,OAAOA,WAAW,KAAK;QAC3B;QAEA,MAAMC,gBAAgB,IAAI,CAAC,SAAS,CAACF;QAErC,IAAI,CAACE,iBAAiB,IAAI,CAAC,2BAA2B,CAACL,eAAe;YAClEC,MAAM,iBAAiB,CAAC,IAAIK,kCAAkCN;YAC9D,OAAOC;QACX;QAEA,IAAII,iBAAiB,IAAI,CAAC,0BAA0B,CAACL,eAAe;YAChEC,MAAM,iBAAiB,CAAC,IAAIM,mCAAmCP;YAC/D,OAAOC;QACX;QAEA,IAAI;YACA,MAAM,IAAI,CAAC,eAAe,CAAC,SAAS,CAACE;QACzC,EAAE,OAAM;YACJF,MAAM,iBAAiB,CAAC,IAAIO;YAC5B,OAAOP;QACX;QAEA,MAAMQ,iBAAiB,MAAM,IAAI,CAAC,cAAc,CAAC,OAAO,CAACT,cAAcC;QAEvEQ,eAAe,iBAAiB,CAACC,CAAAA;YAC7B,IAAI,CAACA,UACD,MAAMC,MAAM;YAEhB,OAAON,gBAAgB,IAAIO,aAAaF,YAAY,IAAIG,YAAYH;QACxE;QAEA,OAAOD;IACX;IAEQ,UAAUN,IAAU,EAAE;QAC1B,OAAOA,KAAK,aAAa,IAAIA,KAAK,aAAa,CAAC,IAAI,CAAC,UAAU,CAAC;IACpE;IAEQ,4BAA4BH,YAA0B,EAAE;QAC5D,OAAOA,aAAa,UAAU,GAAiB,OAAO;IAC1D;IAEQ,2BAA2BA,YAA0B,EAAE;QAC3D,OAAO,CAAC,IAAI,CAAC,2BAA2B,CAACA;IAC7C;AACJ;AAEO,MAAMc,sCAAsCC,eAAe,eAAe,CAAC;IAC9E,WAAWpB;IACX,cAAc;QAACqB;QAAiBC;QAAgBC;KAAgB;AACpE"}

package/features/assetDelivery/transformation/CallableContentsReader.d.ts

@@ -0,0 +1,11 @@
+import { AssetContentsReader } from "../../../features/assetDelivery/abstractions.js";
+interface ContentsCallable {
+    (): Promise<Buffer> | Buffer;
+}
+export declare class CallableContentsReader implements AssetContentsReader.Interface {
+    private readonly callable;
+    static create(callable: ContentsCallable): CallableContentsReader;
+    private constructor();
+    read(): Promise<Buffer>;
+}
+export {};

package/features/assetDelivery/transformation/CallableContentsReader.js

@@ -0,0 +1,14 @@
+class CallableContentsReader {
+    static create(callable) {
+        return new CallableContentsReader(callable);
+    }
+    constructor(callable){
+        this.callable = callable;
+    }
+    async read() {
+        return this.callable();
+    }
+}
+export { CallableContentsReader };
+
+//# sourceMappingURL=CallableContentsReader.js.map

package/features/assetDelivery/transformation/CallableContentsReader.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"features/assetDelivery/transformation/CallableContentsReader.js","sources":["../../../../src/features/assetDelivery/transformation/CallableContentsReader.ts"],"sourcesContent":["import { AssetContentsReader } from \"~/features/assetDelivery/abstractions.js\";\n\ninterface ContentsCallable {\n    (): Promise<Buffer> | Buffer;\n}\n\nexport class CallableContentsReader implements AssetContentsReader.Interface {\n    private readonly callable: ContentsCallable;\n\n    public static create(callable: ContentsCallable) {\n        return new CallableContentsReader(callable);\n    }\n\n    private constructor(callable: ContentsCallable) {\n        this.callable = callable;\n    }\n\n    public async read(): Promise<Buffer> {\n        return this.callable();\n    }\n}\n"],"names":["CallableContentsReader","callable"],"mappings":"AAMO,MAAMA;IAGT,OAAc,OAAOC,QAA0B,EAAE;QAC7C,OAAO,IAAID,uBAAuBC;IACtC;IAEA,YAAoBA,QAA0B,CAAE;QAC5C,IAAI,CAAC,QAAQ,GAAGA;IACpB;IAEA,MAAa,OAAwB;QACjC,OAAO,IAAI,CAAC,QAAQ;IACxB;AACJ"}

package/features/assetDelivery/transformation/TransformationAssetProcessor.d.ts

@@ -1,11 +1,9 @@
+import type { Container } from "@webiny/di";
 import type { Asset } from "../../../delivery/AssetDelivery/Asset.js";
 import type { AssetRequest } from "../../../delivery/AssetDelivery/AssetRequest.js";
-import { type IAssetProcessor, type IAssetTransformationStrategy } from "../abstractions.js";
+import type { IAssetProcessor } from "../abstractions.js";
 export declare class TransformationAssetProcessor implements IAssetProcessor {
-    private strategy;
-    constructor(strategy: IAssetTransformationStrategy);
+    private readonly container;
+    constructor(container: Container);
     process(assetRequest: AssetRequest, asset: Asset): Promise<Asset>;
 }
-export declare const TransformationAssetProcessorImpl: typeof TransformationAssetProcessor & {
-    __abstraction: import("@webiny/di").Abstraction<IAssetProcessor>;
-};

package/features/assetDelivery/transformation/TransformationAssetProcessor.js

@@ -1,7 +1,7 @@
-import { AssetProcessor, AssetTransformationStrategy } from "../abstractions.js";
+import { AssetType } from "../abstractions/AssetType.js";
 class TransformationAssetProcessor {
-    constructor(strategy){
-        this.strategy = strategy;
+    constructor(container){
+        this.container = container;
     }
     async process(assetRequest, asset) {
         const { original } = assetRequest.getOptions();
@@ -9,15 +9,17 @@ class TransformationAssetProcessor {
             console.log("Skip transformations; original asset was requested.");
             return asset;
         }
-        return this.strategy.transform(assetRequest, asset);
+        const assetTypes = this.container.resolveAll(AssetType);
+        const match = assetTypes.find((assetType)=>assetType.canHandle(asset));
+        if (!match) return asset;
+        try {
+            const handler = this.container.resolve(match.getHandlerAbstraction());
+            return handler.handle(assetRequest, asset);
+        } catch  {
+            return asset;
+        }
     }
 }
-const TransformationAssetProcessorImpl = AssetProcessor.createImplementation({
-    implementation: TransformationAssetProcessor,
-    dependencies: [
-        AssetTransformationStrategy
-    ]
-});
-export { TransformationAssetProcessor, TransformationAssetProcessorImpl };
+export { TransformationAssetProcessor };
 
 //# sourceMappingURL=TransformationAssetProcessor.js.map