@webiny/api-file-manager-s3 6.3.0 → 6.4.0-beta.1

package/assetDelivery/s3/SharpTransform.js

@@ -1,182 +1,152 @@
 import sharp from "sharp";
 import { WidthCollection } from "./transformation/WidthCollection.js";
-import * as utils from "./transformation/utils.js";
 import { CallableContentsReader } from "./transformation/CallableContentsReader.js";
 import { AssetKeyGenerator } from "./transformation/AssetKeyGenerator.js";
-export class SharpTransform {
-  constructor(params) {
-    this.params = params;
-  }
-  async transform(assetRequest, asset) {
-    if (!utils.SUPPORTED_TRANSFORMABLE_IMAGES.includes(asset.getExtension())) {
-      console.log(`Transformations/optimizations of ${asset.getContentType()} assets are not supported. Skipping.`);
-      return asset;
+import * as __rspack_external__transformation_utils_js_d3dc8821 from "./transformation/utils.js";
+class SharpTransform {
+    constructor(params){
+        this.params = params;
     }
-
-    // `original` is part of the request, but it won't even get to this point in the execution.
-    // oxlint-disable-next-line typescript/no-unused-vars
-    const {
-      original,
-      ...options
-    } = assetRequest.getOptions();
-    const transformedAsset = asset.clone();
-    if (Object.keys(options).length > 0) {
-      // Transformations were requested.
-      return this.transformAsset(transformedAsset, options);
+    async transform(assetRequest, asset) {
+        if (!__rspack_external__transformation_utils_js_d3dc8821.SUPPORTED_TRANSFORMABLE_IMAGES.includes(asset.getExtension())) {
+            console.log(`Transformations/optimizations of ${asset.getContentType()} assets are not supported. Skipping.`);
+            return asset;
+        }
+        const { original, ...options } = assetRequest.getOptions();
+        const transformedAsset = asset.clone();
+        if (Object.keys(options).length > 0) return this.transformAsset(transformedAsset, options);
+        return this.optimizeAsset(transformedAsset);
     }
-
-    // Return an optimized asset.
-    return this.optimizeAsset(transformedAsset);
-  }
-  async transformAsset(asset, options) {
-    if (options.width) {
-      const {
-        s3,
-        bucket
-      } = this.params;
-      const assetKey = new AssetKeyGenerator(asset);
-      const transformedAssetKey = assetKey.getTransformedImageKey(options);
-      try {
-        const {
-          Body
-        } = await s3.getObject({
-          Bucket: bucket,
-          Key: transformedAssetKey
-        });
-        if (!Body) {
-          throw new Error(`Missing image body!`);
+    async transformAsset(asset, options) {
+        if (options.width) {
+            const { s3, bucket } = this.params;
+            const assetKey = new AssetKeyGenerator(asset);
+            const transformedAssetKey = assetKey.getTransformedImageKey(options);
+            try {
+                const { Body } = await s3.getObject({
+                    Bucket: bucket,
+                    Key: transformedAssetKey
+                });
+                if (!Body) throw new Error("Missing image body!");
+                const buffer = Buffer.from(await Body.transformToByteArray());
+                const newAsset = asset.withProps({
+                    size: buffer.length
+                });
+                newAsset.setContentsReader(new CallableContentsReader(()=>buffer));
+                console.log("Return a previously transformed asset", {
+                    key: transformedAssetKey,
+                    size: newAsset.getSize()
+                });
+                return newAsset;
+            } catch  {
+                const optimizedImage = await this.optimizeAsset(asset);
+                const widths = new WidthCollection(this.params.imageResizeWidths);
+                const width = widths.getClosestOrMax(options.width);
+                console.log(`Resize the asset (width: ${width})`);
+                const buffer = await optimizedImage.getContents();
+                const transformedBuffer = await sharp(buffer, {
+                    animated: this.isAssetAnimated(asset)
+                }).withMetadata().resize({
+                    width,
+                    withoutEnlargement: true
+                }).toBuffer();
+                const newAsset = asset.withProps({
+                    size: transformedBuffer.length
+                });
+                newAsset.setContentsReader(new CallableContentsReader(()=>transformedBuffer));
+                await s3.putObject({
+                    Bucket: bucket,
+                    Key: transformedAssetKey,
+                    ContentType: newAsset.getContentType(),
+                    Body: await newAsset.getContents()
+                });
+                console.log("Return the resized asset", {
+                    key: transformedAssetKey,
+                    size: newAsset.getSize()
+                });
+                return newAsset;
+            }
         }
-        const buffer = Buffer.from(await Body.transformToByteArray());
-        const newAsset = asset.withProps({
-          size: buffer.length
-        });
-        newAsset.setContentsReader(new CallableContentsReader(() => buffer));
-        console.log(`Return a previously transformed asset`, {
-          key: transformedAssetKey,
-          size: newAsset.getSize()
-        });
-        return newAsset;
-      } catch {
-        const optimizedImage = await this.optimizeAsset(asset);
-        const widths = new WidthCollection(this.params.imageResizeWidths);
-        const width = widths.getClosestOrMax(options.width);
-
-        /**
-         * `width` is the only transformation we currently support.
-         */
-        console.log(`Resize the asset (width: ${width})`);
-        const buffer = await optimizedImage.getContents();
-        const transformedBuffer = await sharp(buffer, {
-          animated: this.isAssetAnimated(asset)
-        }).withMetadata().resize({
-          width,
-          withoutEnlargement: true
-        }).toBuffer();
-
-        /**
-         * Transformations are applied to the optimized image.
-         */
-        const newAsset = asset.withProps({
-          size: transformedBuffer.length
-        });
-        newAsset.setContentsReader(new CallableContentsReader(() => transformedBuffer));
-        await s3.putObject({
-          Bucket: bucket,
-          Key: transformedAssetKey,
-          ContentType: newAsset.getContentType(),
-          Body: await newAsset.getContents()
-        });
-        console.log(`Return the resized asset`, {
-          key: transformedAssetKey,
-          size: newAsset.getSize()
+        return asset;
+    }
+    async optimizeAsset(asset) {
+        const { s3, bucket } = this.params;
+        console.log("Optimize asset", {
+            id: asset.getId(),
+            key: asset.getKey(),
+            size: asset.getSize(),
+            type: asset.getContentType()
         });
-        return newAsset;
-      }
+        const assetKey = new AssetKeyGenerator(asset);
+        const optimizedAssetKey = assetKey.getOptimizedImageKey();
+        try {
+            const { Body } = await s3.getObject({
+                Bucket: bucket,
+                Key: optimizedAssetKey
+            });
+            if (!Body) throw new Error("Missing image body!");
+            console.log("Return a previously optimized asset", optimizedAssetKey);
+            const buffer = Buffer.from(await Body.transformToByteArray());
+            const newAsset = asset.withProps({
+                size: buffer.length
+            });
+            newAsset.setContentsReader(new CallableContentsReader(()=>buffer));
+            return newAsset;
+        } catch  {
+            console.log("Create an optimized version of the original asset", asset.getKey());
+            const buffer = await asset.getContents();
+            const optimizationMap = {
+                "image/png": (buffer)=>this.optimizePng(buffer),
+                "image/jpeg": (buffer)=>this.optimizeJpeg(buffer),
+                "image/jpg": (buffer)=>this.optimizeJpeg(buffer)
+            };
+            const optimization = optimizationMap[asset.getContentType()];
+            if (!optimization) {
+                console.log(`No optimizations defined for ${asset.getContentType()}`);
+                return asset;
+            }
+            const optimizedBuffer = await optimization(buffer).toBuffer();
+            console.log("Optimized asset size", optimizedBuffer.length);
+            const newAsset = asset.withProps({
+                size: optimizedBuffer.length
+            });
+            newAsset.setContentsReader(new CallableContentsReader(()=>optimizedBuffer));
+            await s3.putObject({
+                Bucket: bucket,
+                Key: optimizedAssetKey,
+                ContentType: newAsset.getContentType(),
+                Body: await newAsset.getContents()
+            });
+            return newAsset;
+        }
     }
-    return asset;
-  }
-  async optimizeAsset(asset) {
-    const {
-      s3,
-      bucket
-    } = this.params;
-    console.log("Optimize asset", {
-      id: asset.getId(),
-      key: asset.getKey(),
-      size: asset.getSize(),
-      type: asset.getContentType()
-    });
-    const assetKey = new AssetKeyGenerator(asset);
-    const optimizedAssetKey = assetKey.getOptimizedImageKey();
-    try {
-      const {
-        Body
-      } = await s3.getObject({
-        Bucket: bucket,
-        Key: optimizedAssetKey
-      });
-      if (!Body) {
-        throw new Error(`Missing image body!`);
-      }
-      console.log("Return a previously optimized asset", optimizedAssetKey);
-      const buffer = Buffer.from(await Body.transformToByteArray());
-      const newAsset = asset.withProps({
-        size: buffer.length
-      });
-      newAsset.setContentsReader(new CallableContentsReader(() => buffer));
-      return newAsset;
-    } catch {
-      console.log("Create an optimized version of the original asset", asset.getKey());
-      // If not found, create an optimized version of the original asset.
-      const buffer = await asset.getContents();
-      const optimizationMap = {
-        "image/png": buffer => this.optimizePng(buffer),
-        "image/jpeg": buffer => this.optimizeJpeg(buffer),
-        "image/jpg": buffer => this.optimizeJpeg(buffer)
-      };
-      const optimization = optimizationMap[asset.getContentType()];
-      if (!optimization) {
-        console.log(`No optimizations defined for ${asset.getContentType()}`);
-        return asset;
-      }
-      const optimizedBuffer = await optimization(buffer).toBuffer();
-      console.log("Optimized asset size", optimizedBuffer.length);
-      const newAsset = asset.withProps({
-        size: optimizedBuffer.length
-      });
-      newAsset.setContentsReader(new CallableContentsReader(() => optimizedBuffer));
-      await s3.putObject({
-        Bucket: bucket,
-        Key: optimizedAssetKey,
-        ContentType: newAsset.getContentType(),
-        Body: await newAsset.getContents()
-      });
-      return newAsset;
+    isAssetAnimated(asset) {
+        return [
+            "gif",
+            "webp"
+        ].includes(asset.getExtension());
+    }
+    optimizePng(buffer) {
+        return sharp(buffer).resize({
+            width: 2560,
+            withoutEnlargement: true,
+            fit: "inside"
+        }).png({
+            compressionLevel: 9,
+            adaptiveFiltering: true,
+            force: true
+        }).withMetadata();
+    }
+    optimizeJpeg(buffer) {
+        return sharp(buffer).resize({
+            width: 2560,
+            withoutEnlargement: true,
+            fit: "inside"
+        }).withMetadata().toFormat("jpeg", {
+            quality: 90
+        });
     }
-  }
-  isAssetAnimated(asset) {
-    return ["gif", "webp"].includes(asset.getExtension());
-  }
-  optimizePng(buffer) {
-    return sharp(buffer).resize({
-      width: 2560,
-      withoutEnlargement: true,
-      fit: "inside"
-    }).png({
-      compressionLevel: 9,
-      adaptiveFiltering: true,
-      force: true
-    }).withMetadata();
-  }
-  optimizeJpeg(buffer) {
-    return sharp(buffer).resize({
-      width: 2560,
-      withoutEnlargement: true,
-      fit: "inside"
-    }).withMetadata().toFormat("jpeg", {
-      quality: 90
-    });
-  }
 }
+export { SharpTransform };
 
 //# sourceMappingURL=SharpTransform.js.map

package/assetDelivery/s3/SharpTransform.js.map

@@ -1 +1 @@
-{"version":3,"names":["sharp","WidthCollection","utils","CallableContentsReader","AssetKeyGenerator","SharpTransform","constructor","params","transform","assetRequest","asset","SUPPORTED_TRANSFORMABLE_IMAGES","includes","getExtension","console","log","getContentType","original","options","getOptions","transformedAsset","clone","Object","keys","length","transformAsset","optimizeAsset","width","s3","bucket","assetKey","transformedAssetKey","getTransformedImageKey","Body","getObject","Bucket","Key","Error","buffer","Buffer","from","transformToByteArray","newAsset","withProps","size","setContentsReader","key","getSize","optimizedImage","widths","imageResizeWidths","getClosestOrMax","getContents","transformedBuffer","animated","isAssetAnimated","withMetadata","resize","withoutEnlargement","toBuffer","putObject","ContentType","id","getId","getKey","type","optimizedAssetKey","getOptimizedImageKey","optimizationMap","optimizePng","optimizeJpeg","optimization","optimizedBuffer","fit","png","compressionLevel","adaptiveFiltering","force","toFormat","quality"],"sources":["SharpTransform.ts"],"sourcesContent":["import sharp from \"sharp\";\nimport type { S3 } from \"@webiny/aws-sdk/client-s3/index.js\";\nimport type {\n    Asset,\n    AssetRequest,\n    AssetRequestOptions,\n    AssetTransformationStrategy\n} from \"@webiny/api-file-manager\";\nimport { WidthCollection } from \"./transformation/WidthCollection.js\";\nimport * as utils from \"./transformation/utils.js\";\nimport { CallableContentsReader } from \"./transformation/CallableContentsReader.js\";\nimport { AssetKeyGenerator } from \"./transformation/AssetKeyGenerator.js\";\n\ninterface SharpTransformationParams {\n    s3: S3;\n    bucket: string;\n    imageResizeWidths: number[];\n}\n\nexport class SharpTransform implements AssetTransformationStrategy {\n    private readonly params: SharpTransformationParams;\n\n    constructor(params: SharpTransformationParams) {\n        this.params = params;\n    }\n\n    async transform(assetRequest: AssetRequest, asset: Asset): Promise<Asset> {\n        if (!utils.SUPPORTED_TRANSFORMABLE_IMAGES.includes(asset.getExtension())) {\n            console.log(\n                `Transformations/optimizations of ${asset.getContentType()} assets are not supported. Skipping.`\n            );\n            return asset;\n        }\n\n        // `original` is part of the request, but it won't even get to this point in the execution.\n        // oxlint-disable-next-line typescript/no-unused-vars\n        const { original, ...options } = assetRequest.getOptions();\n\n        const transformedAsset = asset.clone();\n\n        if (Object.keys(options).length > 0) {\n            // Transformations were requested.\n            return this.transformAsset(transformedAsset, options);\n        }\n\n        // Return an optimized asset.\n        return this.optimizeAsset(transformedAsset);\n    }\n\n    private async transformAsset(asset: Asset, options: Omit<AssetRequestOptions, \"original\">) {\n        if (options.width) {\n            const { s3, bucket } = this.params;\n\n            const assetKey = new AssetKeyGenerator(asset);\n            const transformedAssetKey = assetKey.getTransformedImageKey(options);\n\n            try {\n                const { Body } = await s3.getObject({\n                    Bucket: bucket,\n                    Key: transformedAssetKey\n                });\n\n                if (!Body) {\n                    throw new Error(`Missing image body!`);\n                }\n\n                const buffer = Buffer.from(await Body.transformToByteArray());\n\n                const newAsset = asset.withProps({ size: buffer.length });\n                newAsset.setContentsReader(new CallableContentsReader(() => buffer));\n\n                console.log(`Return a previously transformed asset`, {\n                    key: transformedAssetKey,\n                    size: newAsset.getSize()\n                });\n\n                return newAsset;\n            } catch {\n                const optimizedImage = await this.optimizeAsset(asset);\n\n                const widths = new WidthCollection(this.params.imageResizeWidths);\n                const width = widths.getClosestOrMax(options.width);\n\n                /**\n                 * `width` is the only transformation we currently support.\n                 */\n                console.log(`Resize the asset (width: ${width})`);\n                const buffer = await optimizedImage.getContents();\n                const transformedBuffer = await sharp(buffer, {\n                    animated: this.isAssetAnimated(asset)\n                })\n                    .withMetadata()\n                    .resize({ width, withoutEnlargement: true })\n                    .toBuffer();\n\n                /**\n                 * Transformations are applied to the optimized image.\n                 */\n                const newAsset = asset.withProps({ size: transformedBuffer.length });\n                newAsset.setContentsReader(new CallableContentsReader(() => transformedBuffer));\n\n                await s3.putObject({\n                    Bucket: bucket,\n                    Key: transformedAssetKey,\n                    ContentType: newAsset.getContentType(),\n                    Body: await newAsset.getContents()\n                });\n\n                console.log(`Return the resized asset`, {\n                    key: transformedAssetKey,\n                    size: newAsset.getSize()\n                });\n\n                return newAsset;\n            }\n        }\n\n        return asset;\n    }\n\n    private async optimizeAsset(asset: Asset) {\n        const { s3, bucket } = this.params;\n\n        console.log(\"Optimize asset\", {\n            id: asset.getId(),\n            key: asset.getKey(),\n            size: asset.getSize(),\n            type: asset.getContentType()\n        });\n\n        const assetKey = new AssetKeyGenerator(asset);\n        const optimizedAssetKey = assetKey.getOptimizedImageKey();\n\n        try {\n            const { Body } = await s3.getObject({\n                Bucket: bucket,\n                Key: optimizedAssetKey\n            });\n\n            if (!Body) {\n                throw new Error(`Missing image body!`);\n            }\n\n            console.log(\"Return a previously optimized asset\", optimizedAssetKey);\n\n            const buffer = Buffer.from(await Body.transformToByteArray());\n\n            const newAsset = asset.withProps({ size: buffer.length });\n            newAsset.setContentsReader(new CallableContentsReader(() => buffer));\n\n            return newAsset;\n        } catch {\n            console.log(\"Create an optimized version of the original asset\", asset.getKey());\n            // If not found, create an optimized version of the original asset.\n            const buffer = await asset.getContents();\n\n            const optimizationMap: Record<string, ((buffer: Buffer) => sharp.Sharp) | undefined> = {\n                \"image/png\": (buffer: Buffer) => this.optimizePng(buffer),\n                \"image/jpeg\": (buffer: Buffer) => this.optimizeJpeg(buffer),\n                \"image/jpg\": (buffer: Buffer) => this.optimizeJpeg(buffer)\n            };\n\n            const optimization = optimizationMap[asset.getContentType()];\n\n            if (!optimization) {\n                console.log(`No optimizations defined for ${asset.getContentType()}`);\n                return asset;\n            }\n\n            const optimizedBuffer = await optimization(buffer).toBuffer();\n\n            console.log(\"Optimized asset size\", optimizedBuffer.length);\n\n            const newAsset = asset.withProps({ size: optimizedBuffer.length });\n            newAsset.setContentsReader(new CallableContentsReader(() => optimizedBuffer));\n\n            await s3.putObject({\n                Bucket: bucket,\n                Key: optimizedAssetKey,\n                ContentType: newAsset.getContentType(),\n                Body: await newAsset.getContents()\n            });\n\n            return newAsset;\n        }\n    }\n\n    private isAssetAnimated(asset: Asset) {\n        return [\"gif\", \"webp\"].includes(asset.getExtension());\n    }\n\n    private optimizePng(buffer: Buffer) {\n        return sharp(buffer)\n            .resize({ width: 2560, withoutEnlargement: true, fit: \"inside\" })\n            .png({ compressionLevel: 9, adaptiveFiltering: true, force: true })\n            .withMetadata();\n    }\n\n    private optimizeJpeg(buffer: Buffer) {\n        return sharp(buffer)\n            .resize({ width: 2560, withoutEnlargement: true, fit: \"inside\" })\n            .withMetadata()\n            .toFormat(\"jpeg\", { quality: 90 });\n    }\n}\n"],"mappings":"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","ignoreList":[]}
+{"version":3,"file":"assetDelivery/s3/SharpTransform.js","sources":["../../../src/assetDelivery/s3/SharpTransform.ts"],"sourcesContent":["import sharp from \"sharp\";\nimport type { S3 } from \"@webiny/aws-sdk/client-s3/index.js\";\nimport type {\n    Asset,\n    AssetRequest,\n    AssetRequestOptions,\n    AssetTransformationStrategy\n} from \"@webiny/api-file-manager\";\nimport { WidthCollection } from \"./transformation/WidthCollection.js\";\nimport * as utils from \"./transformation/utils.js\";\nimport { CallableContentsReader } from \"./transformation/CallableContentsReader.js\";\nimport { AssetKeyGenerator } from \"./transformation/AssetKeyGenerator.js\";\n\ninterface SharpTransformationParams {\n    s3: S3;\n    bucket: string;\n    imageResizeWidths: number[];\n}\n\nexport class SharpTransform implements AssetTransformationStrategy {\n    private readonly params: SharpTransformationParams;\n\n    constructor(params: SharpTransformationParams) {\n        this.params = params;\n    }\n\n    async transform(assetRequest: AssetRequest, asset: Asset): Promise<Asset> {\n        if (!utils.SUPPORTED_TRANSFORMABLE_IMAGES.includes(asset.getExtension())) {\n            console.log(\n                `Transformations/optimizations of ${asset.getContentType()} assets are not supported. Skipping.`\n            );\n            return asset;\n        }\n\n        // `original` is part of the request, but it won't even get to this point in the execution.\n        // oxlint-disable-next-line typescript/no-unused-vars\n        const { original, ...options } = assetRequest.getOptions();\n\n        const transformedAsset = asset.clone();\n\n        if (Object.keys(options).length > 0) {\n            // Transformations were requested.\n            return this.transformAsset(transformedAsset, options);\n        }\n\n        // Return an optimized asset.\n        return this.optimizeAsset(transformedAsset);\n    }\n\n    private async transformAsset(asset: Asset, options: Omit<AssetRequestOptions, \"original\">) {\n        if (options.width) {\n            const { s3, bucket } = this.params;\n\n            const assetKey = new AssetKeyGenerator(asset);\n            const transformedAssetKey = assetKey.getTransformedImageKey(options);\n\n            try {\n                const { Body } = await s3.getObject({\n                    Bucket: bucket,\n                    Key: transformedAssetKey\n                });\n\n                if (!Body) {\n                    throw new Error(`Missing image body!`);\n                }\n\n                const buffer = Buffer.from(await Body.transformToByteArray());\n\n                const newAsset = asset.withProps({ size: buffer.length });\n                newAsset.setContentsReader(new CallableContentsReader(() => buffer));\n\n                console.log(`Return a previously transformed asset`, {\n                    key: transformedAssetKey,\n                    size: newAsset.getSize()\n                });\n\n                return newAsset;\n            } catch {\n                const optimizedImage = await this.optimizeAsset(asset);\n\n                const widths = new WidthCollection(this.params.imageResizeWidths);\n                const width = widths.getClosestOrMax(options.width);\n\n                /**\n                 * `width` is the only transformation we currently support.\n                 */\n                console.log(`Resize the asset (width: ${width})`);\n                const buffer = await optimizedImage.getContents();\n                const transformedBuffer = await sharp(buffer, {\n                    animated: this.isAssetAnimated(asset)\n                })\n                    .withMetadata()\n                    .resize({ width, withoutEnlargement: true })\n                    .toBuffer();\n\n                /**\n                 * Transformations are applied to the optimized image.\n                 */\n                const newAsset = asset.withProps({ size: transformedBuffer.length });\n                newAsset.setContentsReader(new CallableContentsReader(() => transformedBuffer));\n\n                await s3.putObject({\n                    Bucket: bucket,\n                    Key: transformedAssetKey,\n                    ContentType: newAsset.getContentType(),\n                    Body: await newAsset.getContents()\n                });\n\n                console.log(`Return the resized asset`, {\n                    key: transformedAssetKey,\n                    size: newAsset.getSize()\n                });\n\n                return newAsset;\n            }\n        }\n\n        return asset;\n    }\n\n    private async optimizeAsset(asset: Asset) {\n        const { s3, bucket } = this.params;\n\n        console.log(\"Optimize asset\", {\n            id: asset.getId(),\n            key: asset.getKey(),\n            size: asset.getSize(),\n            type: asset.getContentType()\n        });\n\n        const assetKey = new AssetKeyGenerator(asset);\n        const optimizedAssetKey = assetKey.getOptimizedImageKey();\n\n        try {\n            const { Body } = await s3.getObject({\n                Bucket: bucket,\n                Key: optimizedAssetKey\n            });\n\n            if (!Body) {\n                throw new Error(`Missing image body!`);\n            }\n\n            console.log(\"Return a previously optimized asset\", optimizedAssetKey);\n\n            const buffer = Buffer.from(await Body.transformToByteArray());\n\n            const newAsset = asset.withProps({ size: buffer.length });\n            newAsset.setContentsReader(new CallableContentsReader(() => buffer));\n\n            return newAsset;\n        } catch {\n            console.log(\"Create an optimized version of the original asset\", asset.getKey());\n            // If not found, create an optimized version of the original asset.\n            const buffer = await asset.getContents();\n\n            const optimizationMap: Record<string, ((buffer: Buffer) => sharp.Sharp) | undefined> = {\n                \"image/png\": (buffer: Buffer) => this.optimizePng(buffer),\n                \"image/jpeg\": (buffer: Buffer) => this.optimizeJpeg(buffer),\n                \"image/jpg\": (buffer: Buffer) => this.optimizeJpeg(buffer)\n            };\n\n            const optimization = optimizationMap[asset.getContentType()];\n\n            if (!optimization) {\n                console.log(`No optimizations defined for ${asset.getContentType()}`);\n                return asset;\n            }\n\n            const optimizedBuffer = await optimization(buffer).toBuffer();\n\n            console.log(\"Optimized asset size\", optimizedBuffer.length);\n\n            const newAsset = asset.withProps({ size: optimizedBuffer.length });\n            newAsset.setContentsReader(new CallableContentsReader(() => optimizedBuffer));\n\n            await s3.putObject({\n                Bucket: bucket,\n                Key: optimizedAssetKey,\n                ContentType: newAsset.getContentType(),\n                Body: await newAsset.getContents()\n            });\n\n            return newAsset;\n        }\n    }\n\n    private isAssetAnimated(asset: Asset) {\n        return [\"gif\", \"webp\"].includes(asset.getExtension());\n    }\n\n    private optimizePng(buffer: Buffer) {\n        return sharp(buffer)\n            .resize({ width: 2560, withoutEnlargement: true, fit: \"inside\" })\n            .png({ compressionLevel: 9, adaptiveFiltering: true, force: true })\n            .withMetadata();\n    }\n\n    private optimizeJpeg(buffer: Buffer) {\n        return sharp(buffer)\n            .resize({ width: 2560, withoutEnlargement: true, fit: \"inside\" })\n            .withMetadata()\n            .toFormat(\"jpeg\", { quality: 90 });\n    }\n}\n"],"names":["SharpTransform","params","assetRequest","asset","utils","console","original","options","transformedAsset","Object","s3","bucket","assetKey","AssetKeyGenerator","transformedAssetKey","Body","Error","buffer","Buffer","newAsset","CallableContentsReader","optimizedImage","widths","WidthCollection","width","transformedBuffer","sharp","optimizedAssetKey","optimizationMap","optimization","optimizedBuffer"],"mappings":"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"}

package/assetDelivery/s3/transformation/AssetKeyGenerator.js

@@ -1,20 +1,21 @@
-import * as newUtils from "./utils.js";
-export class AssetKeyGenerator {
-  constructor(asset) {
-    this.asset = asset;
-    this.utils = newUtils;
-  }
-  getOptimizedImageKey() {
-    return this.utils.getImageKey({
-      key: this.asset.getKey()
-    });
-  }
-  getTransformedImageKey(transformations) {
-    return this.utils.getImageKey({
-      key: this.asset.getKey(),
-      transformations
-    });
-  }
+import * as __rspack_external__utils_js_d88b7fe1 from "./utils.js";
+class AssetKeyGenerator {
+    constructor(asset){
+        this.asset = asset;
+        this.utils = __rspack_external__utils_js_d88b7fe1;
+    }
+    getOptimizedImageKey() {
+        return this.utils.getImageKey({
+            key: this.asset.getKey()
+        });
+    }
+    getTransformedImageKey(transformations) {
+        return this.utils.getImageKey({
+            key: this.asset.getKey(),
+            transformations
+        });
+    }
 }
+export { AssetKeyGenerator };
 
 //# sourceMappingURL=AssetKeyGenerator.js.map

package/assetDelivery/s3/transformation/AssetKeyGenerator.js.map

@@ -1 +1 @@
-{"version":3,"names":["newUtils","AssetKeyGenerator","constructor","asset","utils","getOptimizedImageKey","getImageKey","key","getKey","getTransformedImageKey","transformations"],"sources":["AssetKeyGenerator.ts"],"sourcesContent":["import type { Asset } from \"@webiny/api-file-manager\";\nimport * as newUtils from \"./utils.js\";\n\nexport class AssetKeyGenerator {\n    private utils: typeof newUtils;\n    private asset: Asset;\n\n    constructor(asset: Asset) {\n        this.asset = asset;\n        this.utils = newUtils;\n    }\n\n    getOptimizedImageKey() {\n        return this.utils.getImageKey({ key: this.asset.getKey() });\n    }\n    getTransformedImageKey(transformations: Record<string, any>) {\n        return this.utils.getImageKey({ key: this.asset.getKey(), transformations });\n    }\n}\n"],"mappings":"AACA,OAAO,KAAKA,QAAQ;AAEpB,OAAO,MAAMC,iBAAiB,CAAC;EAI3BC,WAAWA,CAACC,KAAY,EAAE;IACtB,IAAI,CAACA,KAAK,GAAGA,KAAK;IAClB,IAAI,CAACC,KAAK,GAAGJ,QAAQ;EACzB;EAEAK,oBAAoBA,CAAA,EAAG;IACnB,OAAO,IAAI,CAACD,KAAK,CAACE,WAAW,CAAC;MAAEC,GAAG,EAAE,IAAI,CAACJ,KAAK,CAACK,MAAM,CAAC;IAAE,CAAC,CAAC;EAC/D;EACAC,sBAAsBA,CAACC,eAAoC,EAAE;IACzD,OAAO,IAAI,CAACN,KAAK,CAACE,WAAW,CAAC;MAAEC,GAAG,EAAE,IAAI,CAACJ,KAAK,CAACK,MAAM,CAAC,CAAC;MAAEE;IAAgB,CAAC,CAAC;EAChF;AACJ","ignoreList":[]}
+{"version":3,"file":"assetDelivery/s3/transformation/AssetKeyGenerator.js","sources":["../../../../src/assetDelivery/s3/transformation/AssetKeyGenerator.ts"],"sourcesContent":["import type { Asset } from \"@webiny/api-file-manager\";\nimport * as newUtils from \"./utils.js\";\n\nexport class AssetKeyGenerator {\n    private utils: typeof newUtils;\n    private asset: Asset;\n\n    constructor(asset: Asset) {\n        this.asset = asset;\n        this.utils = newUtils;\n    }\n\n    getOptimizedImageKey() {\n        return this.utils.getImageKey({ key: this.asset.getKey() });\n    }\n    getTransformedImageKey(transformations: Record<string, any>) {\n        return this.utils.getImageKey({ key: this.asset.getKey(), transformations });\n    }\n}\n"],"names":["AssetKeyGenerator","asset","newUtils","transformations"],"mappings":";AAGO,MAAMA;IAIT,YAAYC,KAAY,CAAE;QACtB,IAAI,CAAC,KAAK,GAAGA;QACb,IAAI,CAAC,KAAK,GAAGC;IACjB;IAEA,uBAAuB;QACnB,OAAO,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC;YAAE,KAAK,IAAI,CAAC,KAAK,CAAC,MAAM;QAAG;IAC7D;IACA,uBAAuBC,eAAoC,EAAE;QACzD,OAAO,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC;YAAE,KAAK,IAAI,CAAC,KAAK,CAAC,MAAM;YAAIA;QAAgB;IAC9E;AACJ"}

package/assetDelivery/s3/transformation/CallableContentsReader.js

@@ -1,10 +1,11 @@
-export class CallableContentsReader {
-  constructor(callable) {
-    this.callable = callable;
-  }
-  async read() {
-    return this.callable();
-  }
+class CallableContentsReader {
+    constructor(callable){
+        this.callable = callable;
+    }
+    async read() {
+        return this.callable();
+    }
 }
+export { CallableContentsReader };
 
 //# sourceMappingURL=CallableContentsReader.js.map

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

@@ -1 +1 @@
-{"version":3,"names":["CallableContentsReader","constructor","callable","read"],"sources":["CallableContentsReader.ts"],"sourcesContent":["import type { AssetContentsReader } from \"@webiny/api-file-manager\";\n\ninterface ContentsCallable {\n    (): Promise<Buffer> | Buffer;\n}\n\nexport class CallableContentsReader implements AssetContentsReader {\n    private readonly callable: ContentsCallable;\n\n    constructor(callable: ContentsCallable) {\n        this.callable = callable;\n    }\n\n    async read(): Promise<Buffer> {\n        return this.callable();\n    }\n}\n"],"mappings":"AAMA,OAAO,MAAMA,sBAAsB,CAAgC;EAG/DC,WAAWA,CAACC,QAA0B,EAAE;IACpC,IAAI,CAACA,QAAQ,GAAGA,QAAQ;EAC5B;EAEA,MAAMC,IAAIA,CAAA,EAAoB;IAC1B,OAAO,IAAI,CAACD,QAAQ,CAAC,CAAC;EAC1B;AACJ","ignoreList":[]}
+{"version":3,"file":"assetDelivery/s3/transformation/CallableContentsReader.js","sources":["../../../../src/assetDelivery/s3/transformation/CallableContentsReader.ts"],"sourcesContent":["import type { AssetContentsReader } from \"@webiny/api-file-manager\";\n\ninterface ContentsCallable {\n    (): Promise<Buffer> | Buffer;\n}\n\nexport class CallableContentsReader implements AssetContentsReader {\n    private readonly callable: ContentsCallable;\n\n    constructor(callable: ContentsCallable) {\n        this.callable = callable;\n    }\n\n    async read(): Promise<Buffer> {\n        return this.callable();\n    }\n}\n"],"names":["CallableContentsReader","callable"],"mappings":"AAMO,MAAMA;IAGT,YAAYC,QAA0B,CAAE;QACpC,IAAI,CAAC,QAAQ,GAAGA;IACpB;IAEA,MAAM,OAAwB;QAC1B,OAAO,IAAI,CAAC,QAAQ;IACxB;AACJ"}

package/assetDelivery/s3/transformation/WidthCollection.js

@@ -1,20 +1,19 @@
-export class WidthCollection {
-  constructor(values) {
-    this.values = values.sort((a, b) => a - b);
-  }
-  max() {
-    return Math.max(...this.values);
-  }
-  min() {
-    return Math.min(...this.values);
-  }
-  getClosestOrMax(value) {
-    if (!value) {
-      return this.max();
+class WidthCollection {
+    constructor(values){
+        this.values = values.sort((a, b)=>a - b);
+    }
+    max() {
+        return Math.max(...this.values);
+    }
+    min() {
+        return Math.min(...this.values);
+    }
+    getClosestOrMax(value) {
+        if (!value) return this.max();
+        const gteGivenValue = this.values.filter((w)=>w >= value);
+        return gteGivenValue.length > 0 ? gteGivenValue[0] : this.max();
     }
-    const gteGivenValue = this.values.filter(w => w >= value);
-    return gteGivenValue.length > 0 ? gteGivenValue[0] : this.max();
-  }
 }
+export { WidthCollection };
 
 //# sourceMappingURL=WidthCollection.js.map

package/assetDelivery/s3/transformation/WidthCollection.js.map

@@ -1 +1 @@
-{"version":3,"names":["WidthCollection","constructor","values","sort","a","b","max","Math","min","getClosestOrMax","value","gteGivenValue","filter","w","length"],"sources":["WidthCollection.ts"],"sourcesContent":["export class WidthCollection {\n    private readonly values: number[];\n\n    constructor(values: number[]) {\n        this.values = values.sort((a, b) => a - b);\n    }\n\n    max() {\n        return Math.max(...this.values);\n    }\n\n    min() {\n        return Math.min(...this.values);\n    }\n\n    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"],"mappings":"AAAA,OAAO,MAAMA,eAAe,CAAC;EAGzBC,WAAWA,CAACC,MAAgB,EAAE;IAC1B,IAAI,CAACA,MAAM,GAAGA,MAAM,CAACC,IAAI,CAAC,CAACC,CAAC,EAAEC,CAAC,KAAKD,CAAC,GAAGC,CAAC,CAAC;EAC9C;EAEAC,GAAGA,CAAA,EAAG;IACF,OAAOC,IAAI,CAACD,GAAG,CAAC,GAAG,IAAI,CAACJ,MAAM,CAAC;EACnC;EAEAM,GAAGA,CAAA,EAAG;IACF,OAAOD,IAAI,CAACC,GAAG,CAAC,GAAG,IAAI,CAACN,MAAM,CAAC;EACnC;EAEAO,eAAeA,CAACC,KAAyB,EAAU;IAC/C,IAAI,CAACA,KAAK,EAAE;MACR,OAAO,IAAI,CAACJ,GAAG,CAAC,CAAC;IACrB;IACA,MAAMK,aAAa,GAAG,IAAI,CAACT,MAAM,CAACU,MAAM,CAACC,CAAC,IAAIA,CAAC,IAAIH,KAAK,CAAC;IACzD,OAAOC,aAAa,CAACG,MAAM,GAAG,CAAC,GAAGH,aAAa,CAAC,CAAC,CAAC,GAAG,IAAI,CAACL,GAAG,CAAC,CAAC;EACnE;AACJ","ignoreList":[]}
+{"version":3,"file":"assetDelivery/s3/transformation/WidthCollection.js","sources":["../../../../src/assetDelivery/s3/transformation/WidthCollection.ts"],"sourcesContent":["export class WidthCollection {\n    private readonly values: number[];\n\n    constructor(values: number[]) {\n        this.values = values.sort((a, b) => a - b);\n    }\n\n    max() {\n        return Math.max(...this.values);\n    }\n\n    min() {\n        return Math.min(...this.values);\n    }\n\n    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,YAAYC,MAAgB,CAAE;QAC1B,IAAI,CAAC,MAAM,GAAGA,OAAO,IAAI,CAAC,CAACC,GAAGC,IAAMD,IAAIC;IAC5C;IAEA,MAAM;QACF,OAAOC,KAAK,GAAG,IAAI,IAAI,CAAC,MAAM;IAClC;IAEA,MAAM;QACF,OAAOA,KAAK,GAAG,IAAI,IAAI,CAAC,MAAM;IAClC;IAEA,gBAAgBC,KAAyB,EAAU;QAC/C,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/assetDelivery/s3/transformation/utils.js

@@ -1,36 +1,30 @@
-import objectHash from "object-hash";
-import path from "node:path";
-const SUPPORTED_TRANSFORMABLE_IMAGES = ["jpg", "jpeg", "png", "webp"];
-const parseKey = key => {
-  const filename = path.basename(key);
-  const dirname = path.dirname(key);
-  return {
-    filename,
-    dirname
-  };
+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 getOptimizedImageKeyPrefix = key => {
-  const {
-    filename,
-    dirname
-  } = parseKey(key);
-  return `${dirname}/optimized/${filename}`;
+const getOptimizedImageKeyPrefix = (key)=>{
+    const { filename, dirname } = parseKey(key);
+    return `${dirname}/optimized/${filename}`;
 };
-const getOptimizedTransformedImageKeyPrefix = (key, transformationsHash) => {
-  const {
-    filename,
-    dirname
-  } = parseKey(key);
-  return `${dirname}/optimized/${transformationsHash}-${filename}`;
+const getOptimizedTransformedImageKeyPrefix = (key, transformationsHash)=>{
+    const { filename, dirname } = parseKey(key);
+    return `${dirname}/optimized/${transformationsHash}-${filename}`;
 };
-const getImageKey = ({
-  key,
-  transformations
-}) => {
-  if (!transformations) {
-    return getOptimizedImageKeyPrefix(key);
-  }
-  return getOptimizedTransformedImageKeyPrefix(key, objectHash(transformations));
+const getImageKey = ({ key, transformations })=>{
+    if (!transformations) return getOptimizedImageKeyPrefix(key);
+    return getOptimizedTransformedImageKeyPrefix(key, object_hash(transformations));
 };
 export { SUPPORTED_TRANSFORMABLE_IMAGES, getImageKey, getOptimizedImageKeyPrefix, getOptimizedTransformedImageKeyPrefix };
 

package/assetDelivery/s3/transformation/utils.js.map

@@ -1 +1 @@
-{"version":3,"names":["objectHash","path","SUPPORTED_TRANSFORMABLE_IMAGES","parseKey","key","filename","basename","dirname","getOptimizedImageKeyPrefix","getOptimizedTransformedImageKeyPrefix","transformationsHash","getImageKey","transformations"],"sources":["utils.ts"],"sourcesContent":["import objectHash from \"object-hash\";\nimport path from \"node:path\";\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\nconst getOptimizedImageKeyPrefix = (key: string): string => {\n    const { filename, dirname } = parseKey(key);\n\n    return `${dirname}/optimized/${filename}`;\n};\n\nconst getOptimizedTransformedImageKeyPrefix = (\n    key: string,\n    transformationsHash: string\n): string => {\n    const { filename, dirname } = parseKey(key);\n\n    return `${dirname}/optimized/${transformationsHash}-${filename}`;\n};\n\ninterface GetImageKeyParams {\n    key: string;\n    transformations?: any;\n}\n\nconst getImageKey = ({ key, transformations }: GetImageKeyParams): string => {\n    if (!transformations) {\n        return getOptimizedImageKeyPrefix(key);\n    }\n\n    return getOptimizedTransformedImageKeyPrefix(key, objectHash(transformations));\n};\n\nexport {\n    SUPPORTED_TRANSFORMABLE_IMAGES,\n    getImageKey,\n    getOptimizedImageKeyPrefix,\n    getOptimizedTransformedImageKeyPrefix\n};\n"],"mappings":"AAAA,OAAOA,UAAU,MAAM,aAAa;AACpC,OAAOC,IAAI,MAAM,WAAW;AAE5B,MAAMC,8BAA8B,GAAG,CAAC,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,CAAC;AAErE,MAAMC,QAAQ,GAAIC,GAAW,IAAK;EAC9B,MAAMC,QAAQ,GAAGJ,IAAI,CAACK,QAAQ,CAACF,GAAG,CAAC;EACnC,MAAMG,OAAO,GAAGN,IAAI,CAACM,OAAO,CAACH,GAAG,CAAC;EAEjC,OAAO;IAAEC,QAAQ;IAAEE;EAAQ,CAAC;AAChC,CAAC;AAED,MAAMC,0BAA0B,GAAIJ,GAAW,IAAa;EACxD,MAAM;IAAEC,QAAQ;IAAEE;EAAQ,CAAC,GAAGJ,QAAQ,CAACC,GAAG,CAAC;EAE3C,OAAO,GAAGG,OAAO,cAAcF,QAAQ,EAAE;AAC7C,CAAC;AAED,MAAMI,qCAAqC,GAAGA,CAC1CL,GAAW,EACXM,mBAA2B,KAClB;EACT,MAAM;IAAEL,QAAQ;IAAEE;EAAQ,CAAC,GAAGJ,QAAQ,CAACC,GAAG,CAAC;EAE3C,OAAO,GAAGG,OAAO,cAAcG,mBAAmB,IAAIL,QAAQ,EAAE;AACpE,CAAC;AAOD,MAAMM,WAAW,GAAGA,CAAC;EAAEP,GAAG;EAAEQ;AAAmC,CAAC,KAAa;EACzE,IAAI,CAACA,eAAe,EAAE;IAClB,OAAOJ,0BAA0B,CAACJ,GAAG,CAAC;EAC1C;EAEA,OAAOK,qCAAqC,CAACL,GAAG,EAAEJ,UAAU,CAACY,eAAe,CAAC,CAAC;AAClF,CAAC;AAED,SACIV,8BAA8B,EAC9BS,WAAW,EACXH,0BAA0B,EAC1BC,qCAAqC","ignoreList":[]}
+{"version":3,"file":"assetDelivery/s3/transformation/utils.js","sources":["../../../../src/assetDelivery/s3/transformation/utils.ts"],"sourcesContent":["import objectHash from \"object-hash\";\nimport path from \"node:path\";\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\nconst getOptimizedImageKeyPrefix = (key: string): string => {\n    const { filename, dirname } = parseKey(key);\n\n    return `${dirname}/optimized/${filename}`;\n};\n\nconst getOptimizedTransformedImageKeyPrefix = (\n    key: string,\n    transformationsHash: string\n): string => {\n    const { filename, dirname } = parseKey(key);\n\n    return `${dirname}/optimized/${transformationsHash}-${filename}`;\n};\n\ninterface GetImageKeyParams {\n    key: string;\n    transformations?: any;\n}\n\nconst getImageKey = ({ key, transformations }: GetImageKeyParams): string => {\n    if (!transformations) {\n        return getOptimizedImageKeyPrefix(key);\n    }\n\n    return getOptimizedTransformedImageKeyPrefix(key, objectHash(transformations));\n};\n\nexport {\n    SUPPORTED_TRANSFORMABLE_IMAGES,\n    getImageKey,\n    getOptimizedImageKeyPrefix,\n    getOptimizedTransformedImageKeyPrefix\n};\n"],"names":["SUPPORTED_TRANSFORMABLE_IMAGES","parseKey","key","filename","path","dirname","getOptimizedImageKeyPrefix","getOptimizedTransformedImageKeyPrefix","transformationsHash","getImageKey","transformations","objectHash"],"mappings":";;AAGA,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;AAEA,MAAMC,6BAA6B,CAACJ;IAChC,MAAM,EAAEC,QAAQ,EAAEE,OAAO,EAAE,GAAGJ,SAASC;IAEvC,OAAO,GAAGG,QAAQ,WAAW,EAAEF,UAAU;AAC7C;AAEA,MAAMI,wCAAwC,CAC1CL,KACAM;IAEA,MAAM,EAAEL,QAAQ,EAAEE,OAAO,EAAE,GAAGJ,SAASC;IAEvC,OAAO,GAAGG,QAAQ,WAAW,EAAEG,oBAAoB,CAAC,EAAEL,UAAU;AACpE;AAOA,MAAMM,cAAc,CAAC,EAAEP,GAAG,EAAEQ,eAAe,EAAqB;IAC5D,IAAI,CAACA,iBACD,OAAOJ,2BAA2BJ;IAGtC,OAAOK,sCAAsCL,KAAKS,YAAWD;AACjE"}

package/assetDelivery/threatDetection/ObjectKey.js

@@ -1,17 +1,18 @@
-export class ObjectKey {
-  static from(key) {
-    return new ObjectKey(key);
-  }
-  constructor(key) {
-    this.bucketKey = key;
-  }
-  id() {
-    const [id] = this.relativeKey().split("/");
-    return id;
-  }
-  relativeKey() {
-    return this.bucketKey.replace(/^tenants\/[^/]+\/files\//, "");
-  }
+class ObjectKey {
+    static from(key) {
+        return new ObjectKey(key);
+    }
+    constructor(key){
+        this.bucketKey = key;
+    }
+    id() {
+        const [id] = this.relativeKey().split("/");
+        return id;
+    }
+    relativeKey() {
+        return this.bucketKey.replace(/^tenants\/[^/]+\/files\//, "");
+    }
 }
+export { ObjectKey };
 
 //# sourceMappingURL=ObjectKey.js.map

package/assetDelivery/threatDetection/ObjectKey.js.map

@@ -1 +1 @@
-{"version":3,"names":["ObjectKey","from","key","constructor","bucketKey","id","relativeKey","split","replace"],"sources":["ObjectKey.ts"],"sourcesContent":["export class ObjectKey {\n    private bucketKey: string;\n\n    static from(key: string) {\n        return new ObjectKey(key);\n    }\n\n    private constructor(key: string) {\n        this.bucketKey = key;\n    }\n\n    id() {\n        const [id] = this.relativeKey().split(\"/\");\n        return id;\n    }\n\n    relativeKey() {\n        return this.bucketKey.replace(/^tenants\\/[^/]+\\/files\\//, \"\");\n    }\n}\n"],"mappings":"AAAA,OAAO,MAAMA,SAAS,CAAC;EAGnB,OAAOC,IAAIA,CAACC,GAAW,EAAE;IACrB,OAAO,IAAIF,SAAS,CAACE,GAAG,CAAC;EAC7B;EAEQC,WAAWA,CAACD,GAAW,EAAE;IAC7B,IAAI,CAACE,SAAS,GAAGF,GAAG;EACxB;EAEAG,EAAEA,CAAA,EAAG;IACD,MAAM,CAACA,EAAE,CAAC,GAAG,IAAI,CAACC,WAAW,CAAC,CAAC,CAACC,KAAK,CAAC,GAAG,CAAC;IAC1C,OAAOF,EAAE;EACb;EAEAC,WAAWA,CAAA,EAAG;IACV,OAAO,IAAI,CAACF,SAAS,CAACI,OAAO,CAAC,0BAA0B,EAAE,EAAE,CAAC;EACjE;AACJ","ignoreList":[]}
+{"version":3,"file":"assetDelivery/threatDetection/ObjectKey.js","sources":["../../../src/assetDelivery/threatDetection/ObjectKey.ts"],"sourcesContent":["export class ObjectKey {\n    private bucketKey: string;\n\n    static from(key: string) {\n        return new ObjectKey(key);\n    }\n\n    private constructor(key: string) {\n        this.bucketKey = key;\n    }\n\n    id() {\n        const [id] = this.relativeKey().split(\"/\");\n        return id;\n    }\n\n    relativeKey() {\n        return this.bucketKey.replace(/^tenants\\/[^/]+\\/files\\//, \"\");\n    }\n}\n"],"names":["ObjectKey","key","id"],"mappings":"AAAO,MAAMA;IAGT,OAAO,KAAKC,GAAW,EAAE;QACrB,OAAO,IAAID,UAAUC;IACzB;IAEA,YAAoBA,GAAW,CAAE;QAC7B,IAAI,CAAC,SAAS,GAAGA;IACrB;IAEA,KAAK;QACD,MAAM,CAACC,GAAG,GAAG,IAAI,CAAC,WAAW,GAAG,KAAK,CAAC;QACtC,OAAOA;IACX;IAEA,cAAc;QACV,OAAO,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,4BAA4B;IAC9D;AACJ"}