@webiny/api-file-manager 0.0.0-mt-3 → 0.0.0-unstable.085ff6572f

package/handlers/manage/index.js

@@ -1,70 +1,55 @@
 "use strict";
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.default = void 0;
-
+exports.createManageFilePlugins = void 0;
 var _path = _interopRequireDefault(require("path"));
-
 var _s = _interopRequireDefault(require("aws-sdk/clients/s3"));
-
 var _utils = require("../utils");
-
 var _managers = _interopRequireDefault(require("../transform/managers"));
-
-var _default = () => ({
-  type: "handler",
-  name: "handler-download-file",
-
-  async handle(context) {
-    const event = context.invocationArgs;
-    const handler = (0, _utils.createHandler)(async event => {
-      const keys = [];
-
-      for (let i = 0; i < event.Records.length; i++) {
-        const record = event.Records[i];
-
-        if (typeof record.s3.object.key === "string") {
-          keys.push(record.s3.object.key);
-        }
+var _handlerAws = require("@webiny/handler-aws");
+/**
+ * This handler must be run through @webiny/handler-aws/s3
+ */
+const createManageFilePlugins = () => {
+  return [new _handlerAws.S3EventHandler(async ({
+    event
+  }) => {
+    const keys = [];
+    for (let i = 0; i < event.Records.length; i++) {
+      const record = event.Records[i];
+      if (typeof record.s3.object.key === "string") {
+        keys.push(record.s3.object.key);
       }
-
-      const {
-        region
-      } = (0, _utils.getEnvironment)();
-      const s3 = new _s.default({
-        region
-      });
-
-      for (let i = 0; i < keys.length; i++) {
-        const key = keys[i];
-
-        const extension = _path.default.extname(key);
-
-        for (let j = 0; j < _managers.default.length; j++) {
-          const manager = _managers.default[j];
-          const canProcess = manager.canProcess({
-            s3,
-            key,
-            extension
-          });
-
-          if (canProcess) {
-            await manager.process({
-              s3,
-              key,
-              extension
-            });
-          }
+    }
+    if (keys.length === 0) {
+      return;
+    }
+    const {
+      region
+    } = (0, _utils.getEnvironment)();
+    const s3 = new _s.default({
+      region
+    });
+    for (const key of keys) {
+      const extension = _path.default.extname(key);
+      for (const manager of _managers.default) {
+        const canProcess = manager.canProcess({
+          key,
+          extension
+        });
+        if (!canProcess) {
+          continue;
         }
+        await manager.process({
+          s3,
+          key,
+          extension
+        });
       }
-    });
-    return await handler(event);
-  }
-
-});
-
-exports.default = _default;
+    }
+  })];
+};
+exports.createManageFilePlugins = createManageFilePlugins;

package/handlers/manage/index.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["createManageFilePlugins","S3EventHandler","event","keys","i","Records","length","record","s3","object","key","push","region","getEnvironment","S3","extension","path","extname","manager","managers","canProcess","process"],"sources":["index.ts"],"sourcesContent":["import path from \"path\";\nimport S3 from \"aws-sdk/clients/s3\";\nimport { getEnvironment } from \"../utils\";\nimport managers from \"../transform/managers\";\nimport { S3EventHandler } from \"@webiny/handler-aws\";\n\n/**\n * This handler must be run through @webiny/handler-aws/s3\n */\nexport const createManageFilePlugins = () => {\n    return [\n        new S3EventHandler(async ({ event }) => {\n            const keys: string[] = [];\n            for (let i = 0; i < event.Records.length; i++) {\n                const record = event.Records[i];\n                if (typeof record.s3.object.key === \"string\") {\n                    keys.push(record.s3.object.key);\n                }\n            }\n\n            if (keys.length === 0) {\n                return;\n            }\n\n            const { region } = getEnvironment();\n            const s3 = new S3({ region });\n\n            for (const key of keys) {\n                const extension = path.extname(key);\n\n                for (const manager of managers) {\n                    const canProcess = manager.canProcess({\n                        key,\n                        extension\n                    });\n\n                    if (!canProcess) {\n                        continue;\n                    }\n                    await manager.process({\n                        s3,\n                        key,\n                        extension\n                    });\n                }\n            }\n        })\n    ];\n};\n"],"mappings":";;;;;;;AAAA;AACA;AACA;AACA;AACA;AAEA;AACA;AACA;AACO,MAAMA,uBAAuB,GAAG,MAAM;EACzC,OAAO,CACH,IAAIC,0BAAc,CAAC,OAAO;IAAEC;EAAM,CAAC,KAAK;IACpC,MAAMC,IAAc,GAAG,EAAE;IACzB,KAAK,IAAIC,CAAC,GAAG,CAAC,EAAEA,CAAC,GAAGF,KAAK,CAACG,OAAO,CAACC,MAAM,EAAEF,CAAC,EAAE,EAAE;MAC3C,MAAMG,MAAM,GAAGL,KAAK,CAACG,OAAO,CAACD,CAAC,CAAC;MAC/B,IAAI,OAAOG,MAAM,CAACC,EAAE,CAACC,MAAM,CAACC,GAAG,KAAK,QAAQ,EAAE;QAC1CP,IAAI,CAACQ,IAAI,CAACJ,MAAM,CAACC,EAAE,CAACC,MAAM,CAACC,GAAG,CAAC;MACnC;IACJ;IAEA,IAAIP,IAAI,CAACG,MAAM,KAAK,CAAC,EAAE;MACnB;IACJ;IAEA,MAAM;MAAEM;IAAO,CAAC,GAAG,IAAAC,qBAAc,GAAE;IACnC,MAAML,EAAE,GAAG,IAAIM,UAAE,CAAC;MAAEF;IAAO,CAAC,CAAC;IAE7B,KAAK,MAAMF,GAAG,IAAIP,IAAI,EAAE;MACpB,MAAMY,SAAS,GAAGC,aAAI,CAACC,OAAO,CAACP,GAAG,CAAC;MAEnC,KAAK,MAAMQ,OAAO,IAAIC,iBAAQ,EAAE;QAC5B,MAAMC,UAAU,GAAGF,OAAO,CAACE,UAAU,CAAC;UAClCV,GAAG;UACHK;QACJ,CAAC,CAAC;QAEF,IAAI,CAACK,UAAU,EAAE;UACb;QACJ;QACA,MAAMF,OAAO,CAACG,OAAO,CAAC;UAClBb,EAAE;UACFE,GAAG;UACHK;QACJ,CAAC,CAAC;MACN;IACJ;EACJ,CAAC,CAAC,CACL;AACL,CAAC;AAAC"}

package/handlers/transform/index.d.ts

@@ -1,3 +1,2 @@
-import { HandlerPlugin } from "@webiny/handler/types";
-declare const _default: () => HandlerPlugin;
-export default _default;
+import { TransformHandlerEventPayload } from "../types";
+export declare const createTransformFilePlugins: () => import("@webiny/handler").EventPlugin<TransformHandlerEventPayload, import("@webiny/handler/types").Context, any>[];

package/handlers/transform/index.js

@@ -1,96 +1,89 @@
 "use strict";
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-
+var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard").default;
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.default = void 0;
-
-var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
-
+exports.createTransformFilePlugins = void 0;
+var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
 var _s = _interopRequireDefault(require("aws-sdk/clients/s3"));
-
 var _transformImage = _interopRequireDefault(require("./transformImage"));
-
 var _optimizeImage = _interopRequireDefault(require("./optimizeImage"));
-
 var _utils = require("../utils");
-
-var _utils2 = require("./utils");
-
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
-
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
-
-var _default = () => ({
-  type: "handler",
-  name: "handler-download-file",
-
-  async handle(context) {
-    const event = context.invocationArgs;
-    const handler = (0, _utils.createHandler)(async ({
-      body: {
-        transformations,
-        key
-      }
-    }) => {
+var newUtils = _interopRequireWildcard(require("./utils"));
+var legacyUtils = _interopRequireWildcard(require("./legacyUtils"));
+var _handler = require("@webiny/handler");
+const createTransformFilePlugins = () => {
+  return [(0, _handler.createEvent)(async ({
+    payload
+  }) => {
+    const {
+      body
+    } = payload;
+    const {
+      key,
+      transformations
+    } = body;
+    try {
+      const env = (0, _utils.getEnvironment)();
+      const s3 = new _s.default({
+        region: env.region
+      });
+      let optimizedImageObject;
+      const utils = key.includes("/") ? newUtils : legacyUtils;
+      const params = {
+        initial: (0, _utils.getObjectParams)(key),
+        optimized: (0, _utils.getObjectParams)(utils.getImageKey({
+          key
+        })),
+        optimizedTransformed: (0, _utils.getObjectParams)(utils.getImageKey({
+          key,
+          transformations
+        }))
+      };
+
+      // 1. Get optimized image.
       try {
-        const env = (0, _utils.getEnvironment)();
-        const s3 = new _s.default({
-          region: env.region
-        });
-        let optimizedImageObject;
-        const params = {
-          initial: (0, _utils.getObjectParams)(key),
-          optimized: (0, _utils.getObjectParams)((0, _utils2.getImageKey)({
-            key
-          })),
-          optimizedTransformed: (0, _utils.getObjectParams)((0, _utils2.getImageKey)({
-            key,
-            transformations
-          }))
-        }; // 1. Get optimized image.
-
-        try {
-          optimizedImageObject = await s3.getObject(params.optimized).promise();
-        } catch (e) {
-          // If not found, try to create it by loading the initially uploaded image.
-          optimizedImageObject = await s3.getObject(params.initial).promise();
-          await s3.putObject(_objectSpread(_objectSpread({}, params.optimized), {}, {
-            ContentType: optimizedImageObject.ContentType,
-            Body: await (0, _optimizeImage.default)(optimizedImageObject.Body, optimizedImageObject.ContentType)
-          })).promise();
-          optimizedImageObject = await s3.getObject(params.optimized).promise();
-        } // 2. If no transformations requested, just exit.
-
-
-        if (!transformations) {
-          return {
-            error: false,
-            message: ""
-          };
-        } // 3. If transformations requested, apply them in save it into the bucket.
-
-
-        await s3.putObject(_objectSpread(_objectSpread({}, params.optimizedTransformed), {}, {
+        optimizedImageObject = await s3.getObject(params.optimized).promise();
+      } catch (e) {
+        // If not found, try to create it by loading the initially uploaded image.
+        optimizedImageObject = await s3.getObject(params.initial).promise();
+        await s3.putObject((0, _objectSpread2.default)((0, _objectSpread2.default)({}, params.optimized), {}, {
           ContentType: optimizedImageObject.ContentType,
-          Body: await (0, _transformImage.default)(optimizedImageObject.Body, transformations)
+          Body: await (0, _optimizeImage.default)(optimizedImageObject.Body, optimizedImageObject.ContentType)
         })).promise();
+        optimizedImageObject = await s3.getObject(params.optimized).promise();
+      }
+
+      // 2. If no transformations requested, just exit.
+      if (!transformations) {
         return {
           error: false,
           message: ""
         };
-      } catch (e) {
-        return {
-          error: true,
-          message: e.message
-        };
       }
-    });
-    return await handler(event);
-  }
-
-});
 
-exports.default = _default;
+      // 3. If transformations requested, apply them in save it into the bucket.
+      await s3.putObject((0, _objectSpread2.default)((0, _objectSpread2.default)({}, params.optimizedTransformed), {}, {
+        ContentType: optimizedImageObject.ContentType,
+        Body: await (0, _transformImage.default)(optimizedImageObject.Body, transformations)
+      })).promise();
+      return {
+        error: false,
+        message: ""
+      };
+    } catch (ex) {
+      console.error(JSON.stringify({
+        message: ex.message,
+        code: ex.code,
+        data: ex.data
+      }));
+      return {
+        error: true,
+        message: ex.message
+      };
+    }
+  })];
+};
+exports.createTransformFilePlugins = createTransformFilePlugins;

package/handlers/transform/index.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["createTransformFilePlugins","createEvent","payload","body","key","transformations","env","getEnvironment","s3","S3","region","optimizedImageObject","utils","includes","newUtils","legacyUtils","params","initial","getObjectParams","optimized","getImageKey","optimizedTransformed","getObject","promise","e","putObject","ContentType","Body","optimizeImage","error","message","transformImage","ex","console","JSON","stringify","code","data"],"sources":["index.ts"],"sourcesContent":["import S3 from \"aws-sdk/clients/s3\";\nimport transformImage from \"./transformImage\";\nimport optimizeImage from \"./optimizeImage\";\nimport { getEnvironment, getObjectParams } from \"../utils\";\nimport * as newUtils from \"./utils\";\nimport * as legacyUtils from \"./legacyUtils\";\nimport { TransformHandlerEventPayload } from \"~/handlers/types\";\nimport { createEvent } from \"@webiny/handler\";\n\nexport const createTransformFilePlugins = () => {\n    return [\n        createEvent<TransformHandlerEventPayload>(async ({ payload }) => {\n            const { body } = payload;\n            const { key, transformations } = body;\n            try {\n                const env = getEnvironment();\n                const s3 = new S3({ region: env.region });\n\n                let optimizedImageObject: S3.Types.GetObjectOutput;\n\n                const utils = key.includes(\"/\") ? newUtils : legacyUtils;\n\n                const params = {\n                    initial: getObjectParams(key),\n                    optimized: getObjectParams(utils.getImageKey({ key })),\n                    optimizedTransformed: getObjectParams(\n                        utils.getImageKey({ key, transformations })\n                    )\n                };\n\n                // 1. Get optimized image.\n                try {\n                    optimizedImageObject = await s3.getObject(params.optimized).promise();\n                } catch (e) {\n                    // If not found, try to create it by loading the initially uploaded image.\n                    optimizedImageObject = await s3.getObject(params.initial).promise();\n\n                    await s3\n                        .putObject({\n                            ...params.optimized,\n                            ContentType: optimizedImageObject.ContentType,\n                            Body: await optimizeImage(\n                                optimizedImageObject.Body as Buffer,\n                                optimizedImageObject.ContentType as string\n                            )\n                        })\n                        .promise();\n\n                    optimizedImageObject = await s3.getObject(params.optimized).promise();\n                }\n\n                // 2. If no transformations requested, just exit.\n                if (!transformations) {\n                    return {\n                        error: false,\n                        message: \"\"\n                    };\n                }\n\n                // 3. If transformations requested, apply them in save it into the bucket.\n                await s3\n                    .putObject({\n                        ...params.optimizedTransformed,\n                        ContentType: optimizedImageObject.ContentType,\n                        Body: await transformImage(\n                            optimizedImageObject.Body as Buffer,\n                            transformations\n                        )\n                    })\n                    .promise();\n\n                return {\n                    error: false,\n                    message: \"\"\n                };\n            } catch (ex) {\n                console.error(\n                    JSON.stringify({\n                        message: ex.message,\n                        code: ex.code,\n                        data: ex.data\n                    })\n                );\n                return {\n                    error: true,\n                    message: ex.message\n                };\n            }\n        })\n    ];\n};\n"],"mappings":";;;;;;;;;AAAA;AACA;AACA;AACA;AACA;AACA;AAEA;AAEO,MAAMA,0BAA0B,GAAG,MAAM;EAC5C,OAAO,CACH,IAAAC,oBAAW,EAA+B,OAAO;IAAEC;EAAQ,CAAC,KAAK;IAC7D,MAAM;MAAEC;IAAK,CAAC,GAAGD,OAAO;IACxB,MAAM;MAAEE,GAAG;MAAEC;IAAgB,CAAC,GAAGF,IAAI;IACrC,IAAI;MACA,MAAMG,GAAG,GAAG,IAAAC,qBAAc,GAAE;MAC5B,MAAMC,EAAE,GAAG,IAAIC,UAAE,CAAC;QAAEC,MAAM,EAAEJ,GAAG,CAACI;MAAO,CAAC,CAAC;MAEzC,IAAIC,oBAA8C;MAElD,MAAMC,KAAK,GAAGR,GAAG,CAACS,QAAQ,CAAC,GAAG,CAAC,GAAGC,QAAQ,GAAGC,WAAW;MAExD,MAAMC,MAAM,GAAG;QACXC,OAAO,EAAE,IAAAC,sBAAe,EAACd,GAAG,CAAC;QAC7Be,SAAS,EAAE,IAAAD,sBAAe,EAACN,KAAK,CAACQ,WAAW,CAAC;UAAEhB;QAAI,CAAC,CAAC,CAAC;QACtDiB,oBAAoB,EAAE,IAAAH,sBAAe,EACjCN,KAAK,CAACQ,WAAW,CAAC;UAAEhB,GAAG;UAAEC;QAAgB,CAAC,CAAC;MAEnD,CAAC;;MAED;MACA,IAAI;QACAM,oBAAoB,GAAG,MAAMH,EAAE,CAACc,SAAS,CAACN,MAAM,CAACG,SAAS,CAAC,CAACI,OAAO,EAAE;MACzE,CAAC,CAAC,OAAOC,CAAC,EAAE;QACR;QACAb,oBAAoB,GAAG,MAAMH,EAAE,CAACc,SAAS,CAACN,MAAM,CAACC,OAAO,CAAC,CAACM,OAAO,EAAE;QAEnE,MAAMf,EAAE,CACHiB,SAAS,6DACHT,MAAM,CAACG,SAAS;UACnBO,WAAW,EAAEf,oBAAoB,CAACe,WAAW;UAC7CC,IAAI,EAAE,MAAM,IAAAC,sBAAa,EACrBjB,oBAAoB,CAACgB,IAAI,EACzBhB,oBAAoB,CAACe,WAAW;QACnC,GACH,CACDH,OAAO,EAAE;QAEdZ,oBAAoB,GAAG,MAAMH,EAAE,CAACc,SAAS,CAACN,MAAM,CAACG,SAAS,CAAC,CAACI,OAAO,EAAE;MACzE;;MAEA;MACA,IAAI,CAAClB,eAAe,EAAE;QAClB,OAAO;UACHwB,KAAK,EAAE,KAAK;UACZC,OAAO,EAAE;QACb,CAAC;MACL;;MAEA;MACA,MAAMtB,EAAE,CACHiB,SAAS,6DACHT,MAAM,CAACK,oBAAoB;QAC9BK,WAAW,EAAEf,oBAAoB,CAACe,WAAW;QAC7CC,IAAI,EAAE,MAAM,IAAAI,uBAAc,EACtBpB,oBAAoB,CAACgB,IAAI,EACzBtB,eAAe;MAClB,GACH,CACDkB,OAAO,EAAE;MAEd,OAAO;QACHM,KAAK,EAAE,KAAK;QACZC,OAAO,EAAE;MACb,CAAC;IACL,CAAC,CAAC,OAAOE,EAAE,EAAE;MACTC,OAAO,CAACJ,KAAK,CACTK,IAAI,CAACC,SAAS,CAAC;QACXL,OAAO,EAAEE,EAAE,CAACF,OAAO;QACnBM,IAAI,EAAEJ,EAAE,CAACI,IAAI;QACbC,IAAI,EAAEL,EAAE,CAACK;MACb,CAAC,CAAC,CACL;MACD,OAAO;QACHR,KAAK,EAAE,IAAI;QACXC,OAAO,EAAEE,EAAE,CAACF;MAChB,CAAC;IACL;EACJ,CAAC,CAAC,CACL;AACL,CAAC;AAAC"}

package/handlers/transform/legacyUtils.d.ts

@@ -0,0 +1,17 @@
+/**
+ * BACKWARDS-COMPATIBILITY!
+ *
+ * This file contains utilities for files that don't have `id/key` structure, meaning, all files created before 5.35.0 release.
+ */
+declare const SUPPORTED_IMAGES: string[];
+declare const SUPPORTED_TRANSFORMABLE_IMAGES: string[];
+declare const OPTIMIZED_TRANSFORMED_IMAGE_PREFIX = "img-o-t-";
+declare const OPTIMIZED_IMAGE_PREFIX = "img-o-";
+declare const getOptimizedImageKeyPrefix: (key: string) => string;
+declare const getOptimizedTransformedImageKeyPrefix: (key: string) => string;
+interface GetImageKeyParams {
+    key: string;
+    transformations?: any;
+}
+declare const getImageKey: ({ key, transformations }: GetImageKeyParams) => string;
+export { SUPPORTED_IMAGES, SUPPORTED_TRANSFORMABLE_IMAGES, OPTIMIZED_TRANSFORMED_IMAGE_PREFIX, OPTIMIZED_IMAGE_PREFIX, getImageKey, getOptimizedImageKeyPrefix, getOptimizedTransformedImageKeyPrefix };

package/handlers/transform/legacyUtils.js

@@ -0,0 +1,42 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.getOptimizedTransformedImageKeyPrefix = exports.getOptimizedImageKeyPrefix = exports.getImageKey = exports.SUPPORTED_TRANSFORMABLE_IMAGES = exports.SUPPORTED_IMAGES = exports.OPTIMIZED_TRANSFORMED_IMAGE_PREFIX = exports.OPTIMIZED_IMAGE_PREFIX = void 0;
+var _objectHash = _interopRequireDefault(require("object-hash"));
+/**
+ * BACKWARDS-COMPATIBILITY!
+ *
+ * This file contains utilities for files that don't have `id/key` structure, meaning, all files created before 5.35.0 release.
+ */
+
+const SUPPORTED_IMAGES = [".jpg", ".jpeg", ".png", ".svg", ".gif"];
+exports.SUPPORTED_IMAGES = SUPPORTED_IMAGES;
+const SUPPORTED_TRANSFORMABLE_IMAGES = [".jpg", ".jpeg", ".png"];
+exports.SUPPORTED_TRANSFORMABLE_IMAGES = SUPPORTED_TRANSFORMABLE_IMAGES;
+const OPTIMIZED_TRANSFORMED_IMAGE_PREFIX = "img-o-t-";
+exports.OPTIMIZED_TRANSFORMED_IMAGE_PREFIX = OPTIMIZED_TRANSFORMED_IMAGE_PREFIX;
+const OPTIMIZED_IMAGE_PREFIX = "img-o-";
+exports.OPTIMIZED_IMAGE_PREFIX = OPTIMIZED_IMAGE_PREFIX;
+const getOptimizedImageKeyPrefix = key => {
+  return `${OPTIMIZED_IMAGE_PREFIX}${(0, _objectHash.default)(key)}-`;
+};
+exports.getOptimizedImageKeyPrefix = getOptimizedImageKeyPrefix;
+const getOptimizedTransformedImageKeyPrefix = key => {
+  return `${OPTIMIZED_TRANSFORMED_IMAGE_PREFIX}${(0, _objectHash.default)(key)}-`;
+};
+exports.getOptimizedTransformedImageKeyPrefix = getOptimizedTransformedImageKeyPrefix;
+const getImageKey = ({
+  key,
+  transformations
+}) => {
+  if (!transformations) {
+    const prefix = getOptimizedImageKeyPrefix(key);
+    return prefix + key;
+  }
+  const prefix = getOptimizedTransformedImageKeyPrefix(key);
+  return `${prefix}${(0, _objectHash.default)(transformations)}-${key}`;
+};
+exports.getImageKey = getImageKey;

package/handlers/transform/legacyUtils.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["SUPPORTED_IMAGES","SUPPORTED_TRANSFORMABLE_IMAGES","OPTIMIZED_TRANSFORMED_IMAGE_PREFIX","OPTIMIZED_IMAGE_PREFIX","getOptimizedImageKeyPrefix","key","objectHash","getOptimizedTransformedImageKeyPrefix","getImageKey","transformations","prefix"],"sources":["legacyUtils.ts"],"sourcesContent":["/**\n * BACKWARDS-COMPATIBILITY!\n *\n * This file contains utilities for files that don't have `id/key` structure, meaning, all files created before 5.35.0 release.\n */\n\nimport objectHash from \"object-hash\";\n\nconst SUPPORTED_IMAGES = [\".jpg\", \".jpeg\", \".png\", \".svg\", \".gif\"];\nconst SUPPORTED_TRANSFORMABLE_IMAGES = [\".jpg\", \".jpeg\", \".png\"];\n\nconst OPTIMIZED_TRANSFORMED_IMAGE_PREFIX = \"img-o-t-\";\nconst OPTIMIZED_IMAGE_PREFIX = \"img-o-\";\n\nconst getOptimizedImageKeyPrefix = (key: string): string => {\n    return `${OPTIMIZED_IMAGE_PREFIX}${objectHash(key)}-`;\n};\n\nconst getOptimizedTransformedImageKeyPrefix = (key: string): string => {\n    return `${OPTIMIZED_TRANSFORMED_IMAGE_PREFIX}${objectHash(key)}-`;\n};\n\ninterface GetImageKeyParams {\n    key: string;\n    transformations?: any;\n}\n\nconst getImageKey = ({ key, transformations }: GetImageKeyParams): string => {\n    if (!transformations) {\n        const prefix = getOptimizedImageKeyPrefix(key);\n        return prefix + key;\n    }\n\n    const prefix = getOptimizedTransformedImageKeyPrefix(key);\n    return `${prefix}${objectHash(transformations)}-${key}`;\n};\n\nexport {\n    SUPPORTED_IMAGES,\n    SUPPORTED_TRANSFORMABLE_IMAGES,\n    OPTIMIZED_TRANSFORMED_IMAGE_PREFIX,\n    OPTIMIZED_IMAGE_PREFIX,\n    getImageKey,\n    getOptimizedImageKeyPrefix,\n    getOptimizedTransformedImageKeyPrefix\n};\n"],"mappings":";;;;;;;AAMA;AANA;AACA;AACA;AACA;AACA;;AAIA,MAAMA,gBAAgB,GAAG,CAAC,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC;AAAC;AACnE,MAAMC,8BAA8B,GAAG,CAAC,MAAM,EAAE,OAAO,EAAE,MAAM,CAAC;AAAC;AAEjE,MAAMC,kCAAkC,GAAG,UAAU;AAAC;AACtD,MAAMC,sBAAsB,GAAG,QAAQ;AAAC;AAExC,MAAMC,0BAA0B,GAAIC,GAAW,IAAa;EACxD,OAAQ,GAAEF,sBAAuB,GAAE,IAAAG,mBAAU,EAACD,GAAG,CAAE,GAAE;AACzD,CAAC;AAAC;AAEF,MAAME,qCAAqC,GAAIF,GAAW,IAAa;EACnE,OAAQ,GAAEH,kCAAmC,GAAE,IAAAI,mBAAU,EAACD,GAAG,CAAE,GAAE;AACrE,CAAC;AAAC;AAOF,MAAMG,WAAW,GAAG,CAAC;EAAEH,GAAG;EAAEI;AAAmC,CAAC,KAAa;EACzE,IAAI,CAACA,eAAe,EAAE;IAClB,MAAMC,MAAM,GAAGN,0BAA0B,CAACC,GAAG,CAAC;IAC9C,OAAOK,MAAM,GAAGL,GAAG;EACvB;EAEA,MAAMK,MAAM,GAAGH,qCAAqC,CAACF,GAAG,CAAC;EACzD,OAAQ,GAAEK,MAAO,GAAE,IAAAJ,mBAAU,EAACG,eAAe,CAAE,IAAGJ,GAAI,EAAC;AAC3D,CAAC;AAAC"}

package/handlers/transform/loaders/imageLoader.d.ts

@@ -1,13 +1,30 @@
+import { ClientContext } from "@webiny/handler-client/types";
+import S3 from "aws-sdk/clients/s3";
+interface File {
+    extension: string;
+    name: string;
+    contentLength: number;
+}
+interface Options {
+    width?: string;
+}
+export interface CanProcessParams {
+    s3: S3;
+    file: File;
+    options?: Options;
+    context: ClientContext;
+}
+export interface ProcessParams {
+    s3: S3;
+    file: File;
+    options?: Options;
+    context: ClientContext;
+}
 declare const _default: {
-    canProcess: (opts: any) => boolean;
-    process({ s3, file, options, context }: {
-        s3: any;
-        file: any;
-        options: any;
-        context: any;
-    }): Promise<{
-        object: any;
-        params: any;
+    canProcess: ({ file }: CanProcessParams) => boolean;
+    process({ s3, file, options, context }: ProcessParams): Promise<{
+        object: import("aws-sdk/lib/request").PromiseResult<S3.GetObjectOutput, import("aws-sdk/lib/error").AWSError>;
+        params: import("../../utils/getObjectParams").ObjectParamsResponse;
     }>;
 };
 export default _default;

package/handlers/transform/loaders/imageLoader.js

@@ -1,21 +1,16 @@
 "use strict";
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-
+var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard").default;
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-
 var _sanitizeImageTransformations = _interopRequireDefault(require("./sanitizeImageTransformations"));
-
 var _utils = require("../../utils");
-
-var _utils2 = require("../utils");
-
-// @ts-ignore
+var newUtils = _interopRequireWildcard(require("../utils"));
+var legacyUtils = _interopRequireWildcard(require("../legacyUtils"));
 const IMAGE_TRANSFORMER_FUNCTION = process.env.IMAGE_TRANSFORMER_FUNCTION;
-
 const callImageTransformerLambda = async ({
   key,
   transformations,
@@ -31,12 +26,13 @@ const callImageTransformerLambda = async ({
     }
   });
 };
-
 var _default = {
-  canProcess: opts => {
-    return _utils2.SUPPORTED_IMAGES.includes(opts.file.extension);
+  canProcess: ({
+    file
+  }) => {
+    const utils = file.name.includes("/") ? newUtils : legacyUtils;
+    return utils.SUPPORTED_IMAGES.includes(file.extension);
   },
-
   async process({
     s3,
     file,
@@ -45,14 +41,13 @@ var _default = {
   }) {
     // Loaders must return {object, params} object.
     let objectParams;
+    const utils = file.name.includes("/") ? newUtils : legacyUtils;
     const transformations = (0, _sanitizeImageTransformations.default)(options);
-
-    if (transformations && _utils2.SUPPORTED_TRANSFORMABLE_IMAGES.includes(file.extension)) {
-      objectParams = (0, _utils.getObjectParams)((0, _utils2.getImageKey)({
+    if (transformations && utils.SUPPORTED_TRANSFORMABLE_IMAGES.includes(file.extension)) {
+      objectParams = (0, _utils.getObjectParams)(utils.getImageKey({
         key: file.name,
         transformations
       }));
-
       try {
         return {
           object: await s3.getObject(objectParams).promise(),
@@ -64,22 +59,18 @@ var _default = {
           transformations,
           context
         });
-
         if (imageTransformerLambdaResponse.error) {
           throw Error(imageTransformerLambdaResponse.message);
         }
-
         return {
           object: await s3.getObject(objectParams).promise(),
           params: objectParams
         };
       }
     }
-
-    objectParams = (0, _utils.getObjectParams)((0, _utils2.getImageKey)({
+    objectParams = (0, _utils.getObjectParams)(utils.getImageKey({
       key: file.name
     }));
-
     try {
       return {
         object: await s3.getObject(objectParams).promise(),
@@ -90,17 +81,14 @@ var _default = {
         key: file.name,
         context
       });
-
       if (imageTransformerLambdaResponse.error) {
         throw Error(imageTransformerLambdaResponse.message);
       }
-
       return {
         object: await s3.getObject(objectParams).promise(),
         params: objectParams
       };
     }
   }
-
 };
 exports.default = _default;

package/handlers/transform/loaders/imageLoader.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["IMAGE_TRANSFORMER_FUNCTION","process","env","callImageTransformerLambda","key","transformations","context","handlerClient","invoke","name","payload","body","canProcess","file","utils","includes","newUtils","legacyUtils","SUPPORTED_IMAGES","extension","s3","options","objectParams","sanitizeImageTransformations","SUPPORTED_TRANSFORMABLE_IMAGES","getObjectParams","getImageKey","object","getObject","promise","params","e","imageTransformerLambdaResponse","error","Error","message"],"sources":["imageLoader.ts"],"sourcesContent":["import sanitizeImageTransformations from \"./sanitizeImageTransformations\";\nimport { getObjectParams } from \"../../utils\";\nimport * as newUtils from \"../utils\";\nimport * as legacyUtils from \"../legacyUtils\";\nimport { ClientContext } from \"@webiny/handler-client/types\";\nimport S3 from \"aws-sdk/clients/s3\";\n\nconst IMAGE_TRANSFORMER_FUNCTION = process.env.IMAGE_TRANSFORMER_FUNCTION as string;\n\ninterface TransformerParams {\n    context: ClientContext;\n    key: string;\n    transformations?: {\n        width?: number;\n    };\n}\n\nconst callImageTransformerLambda = async ({ key, transformations, context }: TransformerParams) => {\n    return await context.handlerClient.invoke({\n        name: IMAGE_TRANSFORMER_FUNCTION,\n        payload: {\n            body: {\n                key,\n                transformations\n            }\n        }\n    });\n};\ninterface File {\n    extension: string;\n    name: string;\n    contentLength: number;\n}\ninterface Options {\n    width?: string;\n}\nexport interface CanProcessParams {\n    s3: S3;\n    file: File;\n    options?: Options;\n    context: ClientContext;\n}\nexport interface ProcessParams {\n    s3: S3;\n    file: File;\n    options?: Options;\n    context: ClientContext;\n}\nexport default {\n    canProcess: ({ file }: CanProcessParams) => {\n        const utils = file.name.includes(\"/\") ? newUtils : legacyUtils;\n        return utils.SUPPORTED_IMAGES.includes(file.extension);\n    },\n    async process({ s3, file, options, context }: ProcessParams) {\n        // Loaders must return {object, params} object.\n        let objectParams;\n\n        const utils = file.name.includes(\"/\") ? newUtils : legacyUtils;\n\n        const transformations = sanitizeImageTransformations(options);\n\n        if (transformations && utils.SUPPORTED_TRANSFORMABLE_IMAGES.includes(file.extension)) {\n            objectParams = getObjectParams(utils.getImageKey({ key: file.name, transformations }));\n            try {\n                return {\n                    object: await s3.getObject(objectParams).promise(),\n                    params: objectParams\n                };\n            } catch (e) {\n                const imageTransformerLambdaResponse = await callImageTransformerLambda({\n                    key: file.name,\n                    transformations,\n                    context\n                });\n\n                if (imageTransformerLambdaResponse.error) {\n                    throw Error(imageTransformerLambdaResponse.message);\n                }\n\n                return {\n                    object: await s3.getObject(objectParams).promise(),\n                    params: objectParams\n                };\n            }\n        }\n\n        objectParams = getObjectParams(utils.getImageKey({ key: file.name }));\n        try {\n            return {\n                object: await s3.getObject(objectParams).promise(),\n                params: objectParams\n            };\n        } catch (e) {\n            const imageTransformerLambdaResponse = await callImageTransformerLambda({\n                key: file.name,\n                context\n            });\n\n            if (imageTransformerLambdaResponse.error) {\n                throw Error(imageTransformerLambdaResponse.message);\n            }\n\n            return {\n                object: await s3.getObject(objectParams).promise(),\n                params: objectParams\n            };\n        }\n    }\n};\n"],"mappings":"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"}

package/handlers/transform/loaders/index.d.ts

@@ -1,13 +1,8 @@
 declare const _default: {
-    canProcess: (opts: any) => boolean;
-    process({ s3, file, options, context }: {
-        s3: any;
-        file: any;
-        options: any;
-        context: any;
-    }): Promise<{
-        object: any;
-        params: any;
+    canProcess: ({ file }: import("./imageLoader").CanProcessParams) => boolean;
+    process({ s3, file, options, context }: import("./imageLoader").ProcessParams): Promise<{
+        object: import("aws-sdk/lib/request").PromiseResult<import("aws-sdk/clients/s3").GetObjectOutput, import("aws-sdk/lib/error").AWSError>;
+        params: import("../../utils/getObjectParams").ObjectParamsResponse;
     }>;
 }[];
 export default _default;

package/handlers/transform/loaders/index.js

@@ -1,13 +1,10 @@
 "use strict";
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-
 var _imageLoader = _interopRequireDefault(require("./imageLoader"));
-
 var _default = [_imageLoader.default];
 exports.default = _default;

package/handlers/transform/loaders/index.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["imageLoader"],"sources":["index.ts"],"sourcesContent":["import imageLoader from \"./imageLoader\";\n\nexport default [imageLoader];\n"],"mappings":";;;;;;;AAAA;AAAwC,eAEzB,CAACA,oBAAW,CAAC;AAAA"}

package/handlers/transform/loaders/sanitizeImageTransformations.d.ts

@@ -1,7 +1,11 @@
-declare const _default: (args: any) => {
-    [key: string]: any;
-};
+export interface SanitizeImageArgs {
+    width?: string;
+}
+export interface SanitizeImageTransformations {
+    width: number;
+}
 /**
  * Takes only allowed transformations into consideration, and discards the rest.
  */
+declare const _default: (args?: SanitizeImageArgs) => SanitizeImageTransformations | null;
 export default _default;