@webiny/api-file-manager 0.0.0-unstable.c2780f51fe → 0.0.0-unstable.c7dec08bb0

package/handlers/transform/index.js

@@ -8,7 +8,7 @@ Object.defineProperty(exports, "__esModule", {
 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 _transformImage = require("./transformImage");
 var _optimizeImage = _interopRequireDefault(require("./optimizeImage"));
 var _utils = require("../utils");
 var newUtils = _interopRequireWildcard(require("./utils"));
@@ -65,9 +65,12 @@ const createTransformFilePlugins = () => {
       }
 
       // 3. If transformations requested, apply them in save it into the bucket.
+      const isAnimated = key.endsWith(".gif") || key.endsWith(".webp");
       await s3.putObject((0, _objectSpread2.default)((0, _objectSpread2.default)({}, params.optimizedTransformed), {}, {
         ContentType: optimizedImageObject.ContentType,
-        Body: await (0, _transformImage.default)(optimizedImageObject.Body, transformations)
+        Body: await (0, _transformImage.transformImage)(optimizedImageObject.Body, transformations, {
+          animated: isAnimated
+        })
       })).promise();
       return {
         error: false,

package/handlers/transform/index.js.map

@@ -1 +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"}
+{"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","isAnimated","endsWith","transformImage","animated","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                const isAnimated = key.endsWith(\".gif\") || key.endsWith(\".webp\");\n\n                await s3\n                    .putObject({\n                        ...params.optimizedTransformed,\n                        ContentType: optimizedImageObject.ContentType,\n                        Body: await transformImage(\n                            optimizedImageObject.Body as Buffer,\n                            transformations,\n                            { animated: isAnimated }\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,MAAMC,UAAU,GAAG3B,GAAG,CAAC4B,QAAQ,CAAC,MAAM,CAAC,IAAI5B,GAAG,CAAC4B,QAAQ,CAAC,OAAO,CAAC;MAEhE,MAAMxB,EAAE,CACHiB,SAAS,6DACHT,MAAM,CAACK,oBAAoB;QAC9BK,WAAW,EAAEf,oBAAoB,CAACe,WAAW;QAC7CC,IAAI,EAAE,MAAM,IAAAM,8BAAc,EACtBtB,oBAAoB,CAACgB,IAAI,EACzBtB,eAAe,EACf;UAAE6B,QAAQ,EAAEH;QAAW,CAAC;MAC3B,GACH,CACDR,OAAO,EAAE;MAEd,OAAO;QACHM,KAAK,EAAE,KAAK;QACZC,OAAO,EAAE;MACb,CAAC;IACL,CAAC,CAAC,OAAOK,EAAE,EAAE;MACTC,OAAO,CAACP,KAAK,CACTQ,IAAI,CAACC,SAAS,CAAC;QACXR,OAAO,EAAEK,EAAE,CAACL,OAAO;QACnBS,IAAI,EAAEJ,EAAE,CAACI,IAAI;QACbC,IAAI,EAAEL,EAAE,CAACK;MACb,CAAC,CAAC,CACL;MACD,OAAO;QACHX,KAAK,EAAE,IAAI;QACXC,OAAO,EAAEK,EAAE,CAACL;MAChB,CAAC;IACL;EACJ,CAAC,CAAC,CACL;AACL,CAAC;AAAC"}

package/handlers/transform/transformImage.d.ts

@@ -2,9 +2,12 @@ import { Body } from "aws-sdk/clients/s3";
 interface Transformation {
     width: string;
 }
+export interface TransformOptions {
+    animated?: boolean;
+}
 /**
  * Only processing "width" at the moment.
  * Check "sanitizeImageTransformations.js" to allow additional image processing transformations.
  */
-declare const _default: (buffer: Body, transformations: Transformation) => Promise<Body>;
-export default _default;
+export declare const transformImage: (buffer: Body, transformations: Transformation, options?: TransformOptions) => Promise<Body>;
+export {};

package/handlers/transform/transformImage.js

@@ -4,22 +4,25 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.default = void 0;
+exports.transformImage = void 0;
 var _sharp = _interopRequireDefault(require("sharp"));
 /**
  * Sharp is included in the AWS Lambda layer
  */
 // @ts-ignore
+
 /**
  * Only processing "width" at the moment.
  * Check "sanitizeImageTransformations.js" to allow additional image processing transformations.
  */
-var _default = async (buffer, transformations) => {
+const transformImage = async (buffer, transformations, options = {}) => {
   const {
     width
   } = transformations;
-  return await (0, _sharp.default)(buffer).resize({
+  return await (0, _sharp.default)(buffer, {
+    animated: options.animated ?? false
+  }).resize({
     width
   }).toBuffer();
 };
-exports.default = _default;
+exports.transformImage = transformImage;

package/handlers/transform/transformImage.js.map

@@ -1 +1 @@
-{"version":3,"names":["buffer","transformations","width","sharp","resize","toBuffer"],"sources":["transformImage.ts"],"sourcesContent":["/**\n * Sharp is included in the AWS Lambda layer\n */\n// @ts-ignore\nimport sharp from \"sharp\";\nimport { Body } from \"aws-sdk/clients/s3\";\n\ninterface Transformation {\n    width: string;\n}\n/**\n * Only processing \"width\" at the moment.\n * Check \"sanitizeImageTransformations.js\" to allow additional image processing transformations.\n */\nexport default async (buffer: Body, transformations: Transformation): Promise<Body> => {\n    const { width } = transformations;\n    return await sharp(buffer).resize({ width }).toBuffer();\n};\n"],"mappings":";;;;;;;AAIA;AAJA;AACA;AACA;AACA;AAOA;AACA;AACA;AACA;AAHA,eAIe,OAAOA,MAAY,EAAEC,eAA+B,KAAoB;EACnF,MAAM;IAAEC;EAAM,CAAC,GAAGD,eAAe;EACjC,OAAO,MAAM,IAAAE,cAAK,EAACH,MAAM,CAAC,CAACI,MAAM,CAAC;IAAEF;EAAM,CAAC,CAAC,CAACG,QAAQ,EAAE;AAC3D,CAAC;AAAA"}
+{"version":3,"names":["transformImage","buffer","transformations","options","width","sharp","animated","resize","toBuffer"],"sources":["transformImage.ts"],"sourcesContent":["/**\n * Sharp is included in the AWS Lambda layer\n */\n// @ts-ignore\nimport sharp from \"sharp\";\nimport { Body } from \"aws-sdk/clients/s3\";\n\ninterface Transformation {\n    width: string;\n}\n\nexport interface TransformOptions {\n    animated?: boolean;\n}\n\n/**\n * Only processing \"width\" at the moment.\n * Check \"sanitizeImageTransformations.js\" to allow additional image processing transformations.\n */\nexport const transformImage = async (\n    buffer: Body,\n    transformations: Transformation,\n    options: TransformOptions = {}\n): Promise<Body> => {\n    const { width } = transformations;\n    return await sharp(buffer, { animated: options.animated ?? false })\n        .resize({ width })\n        .toBuffer();\n};\n"],"mappings":";;;;;;;AAIA;AAJA;AACA;AACA;AACA;;AAYA;AACA;AACA;AACA;AACO,MAAMA,cAAc,GAAG,OAC1BC,MAAY,EACZC,eAA+B,EAC/BC,OAAyB,GAAG,CAAC,CAAC,KACd;EAChB,MAAM;IAAEC;EAAM,CAAC,GAAGF,eAAe;EACjC,OAAO,MAAM,IAAAG,cAAK,EAACJ,MAAM,EAAE;IAAEK,QAAQ,EAAEH,OAAO,CAACG,QAAQ,IAAI;EAAM,CAAC,CAAC,CAC9DC,MAAM,CAAC;IAAEH;EAAM,CAAC,CAAC,CACjBI,QAAQ,EAAE;AACnB,CAAC;AAAC"}

package/handlers/transform/utils.js

@@ -6,9 +6,9 @@ Object.defineProperty(exports, "__esModule", {
 });
 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"));
-const SUPPORTED_IMAGES = [".jpg", ".jpeg", ".png", ".svg", ".gif"];
+const SUPPORTED_IMAGES = [".jpg", ".jpeg", ".png", ".svg", ".gif", ".webp"];
 exports.SUPPORTED_IMAGES = SUPPORTED_IMAGES;
-const SUPPORTED_TRANSFORMABLE_IMAGES = [".jpg", ".jpeg", ".png"];
+const SUPPORTED_TRANSFORMABLE_IMAGES = [".jpg", ".jpeg", ".png", ".gif", ".webp"];
 exports.SUPPORTED_TRANSFORMABLE_IMAGES = SUPPORTED_TRANSFORMABLE_IMAGES;
 const OPTIMIZED_TRANSFORMED_IMAGE_PREFIX = "img-o-t-";
 exports.OPTIMIZED_TRANSFORMED_IMAGE_PREFIX = OPTIMIZED_TRANSFORMED_IMAGE_PREFIX;

package/handlers/transform/utils.js.map

@@ -1 +1 @@
-{"version":3,"names":["SUPPORTED_IMAGES","SUPPORTED_TRANSFORMABLE_IMAGES","OPTIMIZED_TRANSFORMED_IMAGE_PREFIX","OPTIMIZED_IMAGE_PREFIX","getOptimizedImageKeyPrefix","key","id","name","split","getOptimizedTransformedImageKeyPrefix","transformationsHash","getImageKey","transformations","objectHash"],"sources":["utils.ts"],"sourcesContent":["import 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    const [id, name] = key.split(\"/\");\n    return `${id}/${OPTIMIZED_IMAGE_PREFIX}${name}`;\n};\n\nconst getOptimizedTransformedImageKeyPrefix = (\n    key: string,\n    transformationsHash: string\n): string => {\n    const [id, name] = key.split(\"/\");\n    return `${id}/${OPTIMIZED_TRANSFORMED_IMAGE_PREFIX}${transformationsHash}-${name}`;\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_IMAGES,\n    SUPPORTED_TRANSFORMABLE_IMAGES,\n    OPTIMIZED_TRANSFORMED_IMAGE_PREFIX,\n    OPTIMIZED_IMAGE_PREFIX,\n    getImageKey,\n    getOptimizedImageKeyPrefix,\n    getOptimizedTransformedImageKeyPrefix\n};\n"],"mappings":";;;;;;;AAAA;AAEA,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,MAAM,CAACC,EAAE,EAAEC,IAAI,CAAC,GAAGF,GAAG,CAACG,KAAK,CAAC,GAAG,CAAC;EACjC,OAAQ,GAAEF,EAAG,IAAGH,sBAAuB,GAAEI,IAAK,EAAC;AACnD,CAAC;AAAC;AAEF,MAAME,qCAAqC,GAAG,CAC1CJ,GAAW,EACXK,mBAA2B,KAClB;EACT,MAAM,CAACJ,EAAE,EAAEC,IAAI,CAAC,GAAGF,GAAG,CAACG,KAAK,CAAC,GAAG,CAAC;EACjC,OAAQ,GAAEF,EAAG,IAAGJ,kCAAmC,GAAEQ,mBAAoB,IAAGH,IAAK,EAAC;AACtF,CAAC;AAAC;AAOF,MAAMI,WAAW,GAAG,CAAC;EAAEN,GAAG;EAAEO;AAAmC,CAAC,KAAa;EACzE,IAAI,CAACA,eAAe,EAAE;IAClB,OAAOR,0BAA0B,CAACC,GAAG,CAAC;EAC1C;EAEA,OAAOI,qCAAqC,CAACJ,GAAG,EAAE,IAAAQ,mBAAU,EAACD,eAAe,CAAC,CAAC;AAClF,CAAC;AAAC"}
+{"version":3,"names":["SUPPORTED_IMAGES","SUPPORTED_TRANSFORMABLE_IMAGES","OPTIMIZED_TRANSFORMED_IMAGE_PREFIX","OPTIMIZED_IMAGE_PREFIX","getOptimizedImageKeyPrefix","key","id","name","split","getOptimizedTransformedImageKeyPrefix","transformationsHash","getImageKey","transformations","objectHash"],"sources":["utils.ts"],"sourcesContent":["import objectHash from \"object-hash\";\n\nconst SUPPORTED_IMAGES = [\".jpg\", \".jpeg\", \".png\", \".svg\", \".gif\", \".webp\"];\nconst SUPPORTED_TRANSFORMABLE_IMAGES = [\".jpg\", \".jpeg\", \".png\", \".gif\", \".webp\"];\n\nconst OPTIMIZED_TRANSFORMED_IMAGE_PREFIX = \"img-o-t-\";\nconst OPTIMIZED_IMAGE_PREFIX = \"img-o-\";\n\nconst getOptimizedImageKeyPrefix = (key: string): string => {\n    const [id, name] = key.split(\"/\");\n    return `${id}/${OPTIMIZED_IMAGE_PREFIX}${name}`;\n};\n\nconst getOptimizedTransformedImageKeyPrefix = (\n    key: string,\n    transformationsHash: string\n): string => {\n    const [id, name] = key.split(\"/\");\n    return `${id}/${OPTIMIZED_TRANSFORMED_IMAGE_PREFIX}${transformationsHash}-${name}`;\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_IMAGES,\n    SUPPORTED_TRANSFORMABLE_IMAGES,\n    OPTIMIZED_TRANSFORMED_IMAGE_PREFIX,\n    OPTIMIZED_IMAGE_PREFIX,\n    getImageKey,\n    getOptimizedImageKeyPrefix,\n    getOptimizedTransformedImageKeyPrefix\n};\n"],"mappings":";;;;;;;AAAA;AAEA,MAAMA,gBAAgB,GAAG,CAAC,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,CAAC;AAAC;AAC5E,MAAMC,8BAA8B,GAAG,CAAC,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,CAAC;AAAC;AAElF,MAAMC,kCAAkC,GAAG,UAAU;AAAC;AACtD,MAAMC,sBAAsB,GAAG,QAAQ;AAAC;AAExC,MAAMC,0BAA0B,GAAIC,GAAW,IAAa;EACxD,MAAM,CAACC,EAAE,EAAEC,IAAI,CAAC,GAAGF,GAAG,CAACG,KAAK,CAAC,GAAG,CAAC;EACjC,OAAQ,GAAEF,EAAG,IAAGH,sBAAuB,GAAEI,IAAK,EAAC;AACnD,CAAC;AAAC;AAEF,MAAME,qCAAqC,GAAG,CAC1CJ,GAAW,EACXK,mBAA2B,KAClB;EACT,MAAM,CAACJ,EAAE,EAAEC,IAAI,CAAC,GAAGF,GAAG,CAACG,KAAK,CAAC,GAAG,CAAC;EACjC,OAAQ,GAAEF,EAAG,IAAGJ,kCAAmC,GAAEQ,mBAAoB,IAAGH,IAAK,EAAC;AACtF,CAAC;AAAC;AAOF,MAAMI,WAAW,GAAG,CAAC;EAAEN,GAAG;EAAEO;AAAmC,CAAC,KAAa;EACzE,IAAI,CAACA,eAAe,EAAE;IAClB,OAAOR,0BAA0B,CAACC,GAAG,CAAC;EAC1C;EAEA,OAAOI,qCAAqC,CAACJ,GAAG,EAAE,IAAAQ,mBAAU,EAACD,eAAe,CAAC,CAAC;AAClF,CAAC;AAAC"}

package/index.d.ts

@@ -2,5 +2,6 @@ import { ContextPlugin } from "@webiny/api";
 import { FileManagerConfig } from "./createFileManager";
 import { FileManagerContext } from "./types";
 export * from "./plugins";
-export declare const createFileManagerContext: (config: Pick<FileManagerConfig, "storageOperations">) => ContextPlugin<FileManagerContext>;
-export declare const createFileManagerGraphQL: () => import("@webiny/handler-graphql").GraphQLSchemaPlugin<FileManagerContext>;
+export declare const createFileManagerContext: ({ storageOperations }: Pick<FileManagerConfig, "storageOperations">) => ContextPlugin<FileManagerContext>;
+export declare const createFileManagerGraphQL: () => (import("@webiny/handler-graphql").GraphQLSchemaPlugin<FileManagerContext> | ContextPlugin<FileManagerContext>)[];
+export * from "./modelModifier/CmsModelModifier";

package/index.js

@@ -1,6 +1,5 @@
 "use strict";
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
@@ -9,11 +8,9 @@ var _exportNames = {
   createFileManagerGraphQL: true
 };
 exports.createFileManagerGraphQL = exports.createFileManagerContext = void 0;
-var _error = _interopRequireDefault(require("@webiny/error"));
 var _api = require("@webiny/api");
-var _createFileManager = require("./createFileManager");
+var _FileManagerContextSetup = require("./FileManagerContextSetup");
 var _graphql = require("./graphql");
-var _FileStorage = require("./storage/FileStorage");
 var _plugins = require("./plugins");
 Object.keys(_plugins).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
@@ -26,40 +23,27 @@ Object.keys(_plugins).forEach(function (key) {
     }
   });
 });
-const createFileManagerContext = config => {
-  return new _api.ContextPlugin(async context => {
-    const getLocaleCode = () => {
-      const locale = context.i18n.getContentLocale();
-      if (!locale) {
-        throw new _error.default("Missing locale on context.i18n locale in File Manager API.", "LOCALE_ERROR");
-      }
-      return locale.code;
-    };
-    const getIdentity = () => {
-      return context.security.getIdentity();
-    };
-    const getTenantId = () => {
-      return context.tenancy.getCurrentTenant().id;
-    };
-    const getPermission = async name => {
-      await context.i18n.checkI18NContentPermission();
-      return context.security.getPermission(name);
-    };
-    if (config.storageOperations.beforeInit) {
-      await config.storageOperations.beforeInit(context);
+var _CmsModelModifier = require("./modelModifier/CmsModelModifier");
+Object.keys(_CmsModelModifier).forEach(function (key) {
+  if (key === "default" || key === "__esModule") return;
+  if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
+  if (key in exports && exports[key] === _CmsModelModifier[key]) return;
+  Object.defineProperty(exports, key, {
+    enumerable: true,
+    get: function () {
+      return _CmsModelModifier[key];
     }
-    context.fileManager = (0, _createFileManager.createFileManager)({
-      storageOperations: config.storageOperations,
-      getTenantId,
-      getLocaleCode,
-      getIdentity,
-      getPermission,
-      storage: new _FileStorage.FileStorage({
-        context
-      }),
-      WEBINY_VERSION: context.WEBINY_VERSION
-    });
   });
+});
+const createFileManagerContext = ({
+  storageOperations
+}) => {
+  const plugin = new _api.ContextPlugin(async context => {
+    const fmContext = new _FileManagerContextSetup.FileManagerContextSetup(context);
+    context.fileManager = await fmContext.setupContext(storageOperations);
+  });
+  plugin.name = "file-manager.createContext";
+  return plugin;
 };
 exports.createFileManagerContext = createFileManagerContext;
 const createFileManagerGraphQL = () => {

package/index.js.map

@@ -1 +1 @@
-{"version":3,"names":["createFileManagerContext","config","ContextPlugin","context","getLocaleCode","locale","i18n","getContentLocale","WebinyError","code","getIdentity","security","getTenantId","tenancy","getCurrentTenant","id","getPermission","name","checkI18NContentPermission","storageOperations","beforeInit","fileManager","createFileManager","storage","FileStorage","WEBINY_VERSION","createFileManagerGraphQL","createGraphQLSchemaPlugin"],"sources":["index.ts"],"sourcesContent":["import WebinyError from \"@webiny/error\";\nimport { ContextPlugin } from \"@webiny/api\";\nimport { SecurityPermission } from \"@webiny/api-security/types\";\nimport { FileManagerConfig, createFileManager } from \"~/createFileManager\";\nimport { FileManagerContext } from \"~/types\";\nimport { createGraphQLSchemaPlugin } from \"./graphql\";\nimport { FileStorage } from \"~/storage/FileStorage\";\n\nexport * from \"./plugins\";\n\nexport const createFileManagerContext = (config: Pick<FileManagerConfig, \"storageOperations\">) => {\n    return new ContextPlugin<FileManagerContext>(async context => {\n        const getLocaleCode = () => {\n            const locale = context.i18n.getContentLocale();\n            if (!locale) {\n                throw new WebinyError(\n                    \"Missing locale on context.i18n locale in File Manager API.\",\n                    \"LOCALE_ERROR\"\n                );\n            }\n            return locale.code;\n        };\n\n        const getIdentity = () => {\n            return context.security.getIdentity();\n        };\n\n        const getTenantId = () => {\n            return context.tenancy.getCurrentTenant().id;\n        };\n\n        const getPermission = async <T extends SecurityPermission = SecurityPermission>(\n            name: string\n        ): Promise<T | null> => {\n            await context.i18n.checkI18NContentPermission();\n\n            return context.security.getPermission(name);\n        };\n\n        if (config.storageOperations.beforeInit) {\n            await config.storageOperations.beforeInit(context);\n        }\n\n        context.fileManager = createFileManager({\n            storageOperations: config.storageOperations,\n            getTenantId,\n            getLocaleCode,\n            getIdentity,\n            getPermission,\n            storage: new FileStorage({\n                context\n            }),\n            WEBINY_VERSION: context.WEBINY_VERSION\n        });\n    });\n};\n\nexport const createFileManagerGraphQL = () => {\n    return createGraphQLSchemaPlugin();\n};\n"],"mappings":";;;;;;;;;;;AAAA;AACA;AAEA;AAEA;AACA;AAEA;AAAA;EAAA;EAAA;EAAA;EAAA;IAAA;IAAA;MAAA;IAAA;EAAA;AAAA;AAEO,MAAMA,wBAAwB,GAAIC,MAAoD,IAAK;EAC9F,OAAO,IAAIC,kBAAa,CAAqB,MAAMC,OAAO,IAAI;IAC1D,MAAMC,aAAa,GAAG,MAAM;MACxB,MAAMC,MAAM,GAAGF,OAAO,CAACG,IAAI,CAACC,gBAAgB,EAAE;MAC9C,IAAI,CAACF,MAAM,EAAE;QACT,MAAM,IAAIG,cAAW,CACjB,4DAA4D,EAC5D,cAAc,CACjB;MACL;MACA,OAAOH,MAAM,CAACI,IAAI;IACtB,CAAC;IAED,MAAMC,WAAW,GAAG,MAAM;MACtB,OAAOP,OAAO,CAACQ,QAAQ,CAACD,WAAW,EAAE;IACzC,CAAC;IAED,MAAME,WAAW,GAAG,MAAM;MACtB,OAAOT,OAAO,CAACU,OAAO,CAACC,gBAAgB,EAAE,CAACC,EAAE;IAChD,CAAC;IAED,MAAMC,aAAa,GAAG,MAClBC,IAAY,IACQ;MACpB,MAAMd,OAAO,CAACG,IAAI,CAACY,0BAA0B,EAAE;MAE/C,OAAOf,OAAO,CAACQ,QAAQ,CAACK,aAAa,CAACC,IAAI,CAAC;IAC/C,CAAC;IAED,IAAIhB,MAAM,CAACkB,iBAAiB,CAACC,UAAU,EAAE;MACrC,MAAMnB,MAAM,CAACkB,iBAAiB,CAACC,UAAU,CAACjB,OAAO,CAAC;IACtD;IAEAA,OAAO,CAACkB,WAAW,GAAG,IAAAC,oCAAiB,EAAC;MACpCH,iBAAiB,EAAElB,MAAM,CAACkB,iBAAiB;MAC3CP,WAAW;MACXR,aAAa;MACbM,WAAW;MACXM,aAAa;MACbO,OAAO,EAAE,IAAIC,wBAAW,CAAC;QACrBrB;MACJ,CAAC,CAAC;MACFsB,cAAc,EAAEtB,OAAO,CAACsB;IAC5B,CAAC,CAAC;EACN,CAAC,CAAC;AACN,CAAC;AAAC;AAEK,MAAMC,wBAAwB,GAAG,MAAM;EAC1C,OAAO,IAAAC,kCAAyB,GAAE;AACtC,CAAC;AAAC"}
+{"version":3,"names":["createFileManagerContext","storageOperations","plugin","ContextPlugin","context","fmContext","FileManagerContextSetup","fileManager","setupContext","name","createFileManagerGraphQL","createGraphQLSchemaPlugin"],"sources":["index.ts"],"sourcesContent":["import { ContextPlugin } from \"@webiny/api\";\nimport { FileManagerConfig } from \"~/createFileManager\";\nimport { FileManagerContext } from \"~/types\";\nimport { FileManagerContextSetup } from \"./FileManagerContextSetup\";\nimport { createGraphQLSchemaPlugin } from \"./graphql\";\n\nexport * from \"./plugins\";\n\nexport const createFileManagerContext = ({\n    storageOperations\n}: Pick<FileManagerConfig, \"storageOperations\">) => {\n    const plugin = new ContextPlugin<FileManagerContext>(async context => {\n        const fmContext = new FileManagerContextSetup(context);\n        context.fileManager = await fmContext.setupContext(storageOperations);\n    });\n\n    plugin.name = \"file-manager.createContext\";\n\n    return plugin;\n};\n\nexport const createFileManagerGraphQL = () => {\n    return createGraphQLSchemaPlugin();\n};\n\nexport * from \"./modelModifier/CmsModelModifier\";\n"],"mappings":";;;;;;;;;;AAAA;AAGA;AACA;AAEA;AAAA;EAAA;EAAA;EAAA;EAAA;IAAA;IAAA;MAAA;IAAA;EAAA;AAAA;AAmBA;AAAA;EAAA;EAAA;EAAA;EAAA;IAAA;IAAA;MAAA;IAAA;EAAA;AAAA;AAjBO,MAAMA,wBAAwB,GAAG,CAAC;EACrCC;AAC0C,CAAC,KAAK;EAChD,MAAMC,MAAM,GAAG,IAAIC,kBAAa,CAAqB,MAAMC,OAAO,IAAI;IAClE,MAAMC,SAAS,GAAG,IAAIC,gDAAuB,CAACF,OAAO,CAAC;IACtDA,OAAO,CAACG,WAAW,GAAG,MAAMF,SAAS,CAACG,YAAY,CAACP,iBAAiB,CAAC;EACzE,CAAC,CAAC;EAEFC,MAAM,CAACO,IAAI,GAAG,4BAA4B;EAE1C,OAAOP,MAAM;AACjB,CAAC;AAAC;AAEK,MAAMQ,wBAAwB,GAAG,MAAM;EAC1C,OAAO,IAAAC,kCAAyB,GAAE;AACtC,CAAC;AAAC"}

package/modelModifier/CmsModelModifier.d.ts

@@ -0,0 +1,24 @@
+import { Plugin } from "@webiny/plugins";
+import { CmsModelField as BaseModelField } from "@webiny/api-headless-cms/types";
+import { CmsPrivateModelFull } from "@webiny/api-headless-cms";
+declare type CmsModelField = Omit<BaseModelField, "storageId">;
+declare class CmsModelFieldsModifier {
+    private fields;
+    constructor(fields: BaseModelField[]);
+    addField(field: CmsModelField): void;
+}
+interface CmsModelModifierCallableParams {
+    modifier: CmsModelFieldsModifier;
+}
+interface CmsModelModifierCallable {
+    (params: CmsModelModifierCallableParams): Promise<void> | void;
+}
+export declare class CmsModelModifierPlugin extends Plugin {
+    static type: string;
+    private readonly modelId;
+    private readonly cb;
+    constructor(modelId: string, cb: CmsModelModifierCallable);
+    modifyModel(model: CmsPrivateModelFull): Promise<void>;
+}
+export declare const createFileModelModifier: (cb: CmsModelModifierCallable) => CmsModelModifierPlugin;
+export {};

package/modelModifier/CmsModelModifier.js

@@ -0,0 +1,59 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.createFileModelModifier = exports.CmsModelModifierPlugin = void 0;
+var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
+var _plugins = require("@webiny/plugins");
+var _file = require("../cmsFileStorage/file.model");
+var _createModelField = require("../cmsFileStorage/createModelField");
+class CmsModelFieldsModifier {
+  constructor(fields) {
+    (0, _defineProperty2.default)(this, "fields", void 0);
+    this.fields = fields;
+  }
+  addField(field) {
+    this.fields.push((0, _objectSpread2.default)((0, _objectSpread2.default)({}, field), {}, {
+      storageId: `${field.type}@${field.id}`
+    }));
+  }
+}
+class CmsModelModifierPlugin extends _plugins.Plugin {
+  constructor(modelId, cb) {
+    super();
+    (0, _defineProperty2.default)(this, "modelId", void 0);
+    (0, _defineProperty2.default)(this, "cb", void 0);
+    this.modelId = modelId;
+    this.cb = cb;
+  }
+  async modifyModel(model) {
+    if (model.modelId !== this.modelId) {
+      return;
+    }
+    let extensionsField = model.fields.find(field => field.fieldId === "extensions");
+    if (!extensionsField) {
+      extensionsField = (0, _createModelField.createModelField)({
+        label: "Extensions",
+        type: "object",
+        settings: {
+          layout: [],
+          fields: []
+        }
+      });
+      model.fields.push(extensionsField);
+    }
+    const modifier = new CmsModelFieldsModifier(extensionsField.settings.fields);
+    await this.cb({
+      modifier
+    });
+  }
+}
+exports.CmsModelModifierPlugin = CmsModelModifierPlugin;
+(0, _defineProperty2.default)(CmsModelModifierPlugin, "type", "fm.cms-model-modifier");
+const createFileModelModifier = cb => {
+  return new CmsModelModifierPlugin(_file.FILE_MODEL_ID, cb);
+};
+exports.createFileModelModifier = createFileModelModifier;

package/modelModifier/CmsModelModifier.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["CmsModelFieldsModifier","constructor","fields","addField","field","push","storageId","type","id","CmsModelModifierPlugin","Plugin","modelId","cb","modifyModel","model","extensionsField","find","fieldId","createModelField","label","settings","layout","modifier","createFileModelModifier","FILE_MODEL_ID"],"sources":["CmsModelModifier.ts"],"sourcesContent":["import { Plugin } from \"@webiny/plugins\";\nimport { CmsModelField as BaseModelField } from \"@webiny/api-headless-cms/types\";\nimport { FILE_MODEL_ID } from \"~/cmsFileStorage/file.model\";\nimport { createModelField } from \"~/cmsFileStorage/createModelField\";\nimport { CmsPrivateModelFull } from \"@webiny/api-headless-cms\";\n\ntype CmsModelField = Omit<BaseModelField, \"storageId\">;\n\nclass CmsModelFieldsModifier {\n    private fields: BaseModelField[];\n\n    constructor(fields: BaseModelField[]) {\n        this.fields = fields;\n    }\n\n    addField(field: CmsModelField) {\n        this.fields.push({\n            ...field,\n            storageId: `${field.type}@${field.id}`\n        });\n    }\n}\n\ninterface CmsModelModifierCallableParams {\n    modifier: CmsModelFieldsModifier;\n}\n\ninterface CmsModelModifierCallable {\n    (params: CmsModelModifierCallableParams): Promise<void> | void;\n}\n\nexport class CmsModelModifierPlugin extends Plugin {\n    public static override type = \"fm.cms-model-modifier\";\n    private readonly modelId: string;\n    private readonly cb: CmsModelModifierCallable;\n\n    constructor(modelId: string, cb: CmsModelModifierCallable) {\n        super();\n        this.modelId = modelId;\n        this.cb = cb;\n    }\n\n    async modifyModel(model: CmsPrivateModelFull): Promise<void> {\n        if (model.modelId !== this.modelId) {\n            return;\n        }\n\n        let extensionsField = model.fields.find(field => field.fieldId === \"extensions\");\n        if (!extensionsField) {\n            extensionsField = createModelField({\n                label: \"Extensions\",\n                type: \"object\",\n                settings: {\n                    layout: [],\n                    fields: []\n                }\n            });\n            model.fields.push(extensionsField);\n        }\n\n        const modifier = new CmsModelFieldsModifier(extensionsField.settings!.fields!);\n        await this.cb({ modifier });\n    }\n}\n\nexport const createFileModelModifier = (cb: CmsModelModifierCallable) => {\n    return new CmsModelModifierPlugin(FILE_MODEL_ID, cb);\n};\n"],"mappings":";;;;;;;;;AAAA;AAEA;AACA;AAKA,MAAMA,sBAAsB,CAAC;EAGzBC,WAAW,CAACC,MAAwB,EAAE;IAAA;IAClC,IAAI,CAACA,MAAM,GAAGA,MAAM;EACxB;EAEAC,QAAQ,CAACC,KAAoB,EAAE;IAC3B,IAAI,CAACF,MAAM,CAACG,IAAI,6DACTD,KAAK;MACRE,SAAS,EAAG,GAAEF,KAAK,CAACG,IAAK,IAAGH,KAAK,CAACI,EAAG;IAAC,GACxC;EACN;AACJ;AAUO,MAAMC,sBAAsB,SAASC,eAAM,CAAC;EAK/CT,WAAW,CAACU,OAAe,EAAEC,EAA4B,EAAE;IACvD,KAAK,EAAE;IAAC;IAAA;IACR,IAAI,CAACD,OAAO,GAAGA,OAAO;IACtB,IAAI,CAACC,EAAE,GAAGA,EAAE;EAChB;EAEA,MAAMC,WAAW,CAACC,KAA0B,EAAiB;IACzD,IAAIA,KAAK,CAACH,OAAO,KAAK,IAAI,CAACA,OAAO,EAAE;MAChC;IACJ;IAEA,IAAII,eAAe,GAAGD,KAAK,CAACZ,MAAM,CAACc,IAAI,CAACZ,KAAK,IAAIA,KAAK,CAACa,OAAO,KAAK,YAAY,CAAC;IAChF,IAAI,CAACF,eAAe,EAAE;MAClBA,eAAe,GAAG,IAAAG,kCAAgB,EAAC;QAC/BC,KAAK,EAAE,YAAY;QACnBZ,IAAI,EAAE,QAAQ;QACda,QAAQ,EAAE;UACNC,MAAM,EAAE,EAAE;UACVnB,MAAM,EAAE;QACZ;MACJ,CAAC,CAAC;MACFY,KAAK,CAACZ,MAAM,CAACG,IAAI,CAACU,eAAe,CAAC;IACtC;IAEA,MAAMO,QAAQ,GAAG,IAAItB,sBAAsB,CAACe,eAAe,CAACK,QAAQ,CAAElB,MAAM,CAAE;IAC9E,MAAM,IAAI,CAACU,EAAE,CAAC;MAAEU;IAAS,CAAC,CAAC;EAC/B;AACJ;AAAC;AAAA,8BAhCYb,sBAAsB,UACD,uBAAuB;AAiClD,MAAMc,uBAAuB,GAAIX,EAA4B,IAAK;EACrE,OAAO,IAAIH,sBAAsB,CAACe,mBAAa,EAAEZ,EAAE,CAAC;AACxD,CAAC;AAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@webiny/api-file-manager",
-	"version": "0.0.0-unstable.c2780f51fe",
+	"version": "0.0.0-unstable.c7dec08bb0",
 	"main": "index.js",
 	"keywords": [
 		"fm:base"
@@ -20,35 +20,36 @@
 	"dependencies": {
 		"@babel/runtime": "7.20.13",
 		"@commodo/fields": "1.1.2-beta.20",
-		"@webiny/api": "0.0.0-unstable.c2780f51fe",
-		"@webiny/api-security": "0.0.0-unstable.c2780f51fe",
-		"@webiny/api-tenancy": "0.0.0-unstable.c2780f51fe",
-		"@webiny/error": "0.0.0-unstable.c2780f51fe",
-		"@webiny/handler": "0.0.0-unstable.c2780f51fe",
-		"@webiny/handler-aws": "0.0.0-unstable.c2780f51fe",
-		"@webiny/handler-client": "0.0.0-unstable.c2780f51fe",
-		"@webiny/handler-graphql": "0.0.0-unstable.c2780f51fe",
-		"@webiny/plugins": "0.0.0-unstable.c2780f51fe",
-		"@webiny/project-utils": "0.0.0-unstable.c2780f51fe",
-		"@webiny/pubsub": "0.0.0-unstable.c2780f51fe",
-		"@webiny/validation": "0.0.0-unstable.c2780f51fe",
+		"@webiny/api": "0.0.0-unstable.c7dec08bb0",
+		"@webiny/api-headless-cms": "0.0.0-unstable.c7dec08bb0",
+		"@webiny/api-security": "0.0.0-unstable.c7dec08bb0",
+		"@webiny/api-tenancy": "0.0.0-unstable.c7dec08bb0",
+		"@webiny/error": "0.0.0-unstable.c7dec08bb0",
+		"@webiny/handler": "0.0.0-unstable.c7dec08bb0",
+		"@webiny/handler-aws": "0.0.0-unstable.c7dec08bb0",
+		"@webiny/handler-client": "0.0.0-unstable.c7dec08bb0",
+		"@webiny/handler-graphql": "0.0.0-unstable.c7dec08bb0",
+		"@webiny/plugins": "0.0.0-unstable.c7dec08bb0",
+		"@webiny/project-utils": "0.0.0-unstable.c7dec08bb0",
+		"@webiny/pubsub": "0.0.0-unstable.c7dec08bb0",
+		"@webiny/validation": "0.0.0-unstable.c7dec08bb0",
 		"aws-sdk": "2.1310.0",
+		"lodash": "4.17.21",
 		"object-hash": "2.2.0"
 	},
 	"devDependencies": {
-		"@babel/cli": "^7.19.3",
-		"@babel/core": "^7.19.3",
-		"@babel/plugin-proposal-object-rest-spread": "^7.16.0",
-		"@babel/plugin-transform-runtime": "^7.16.4",
-		"@babel/preset-env": "^7.19.4",
-		"@babel/preset-typescript": "^7.18.6",
-		"@webiny/api-i18n": "^0.0.0-unstable.c2780f51fe",
-		"@webiny/api-i18n-ddb": "^0.0.0-unstable.c2780f51fe",
-		"@webiny/cli": "^0.0.0-unstable.c2780f51fe",
-		"jest": "^28.1.0",
-		"mdbid": "^1.0.0",
-		"rimraf": "^3.0.2",
-		"ttypescript": "^1.5.12",
+		"@babel/cli": "7.20.7",
+		"@babel/core": "7.20.12",
+		"@babel/plugin-proposal-object-rest-spread": "7.20.7",
+		"@babel/plugin-transform-runtime": "7.19.6",
+		"@babel/preset-env": "7.20.2",
+		"@babel/preset-typescript": "7.18.6",
+		"@webiny/api-i18n": "0.0.0-unstable.c7dec08bb0",
+		"@webiny/cli": "0.0.0-unstable.c7dec08bb0",
+		"@webiny/utils": "0.0.0-unstable.c7dec08bb0",
+		"jest": "29.5.0",
+		"rimraf": "3.0.2",
+		"ttypescript": "1.5.15",
 		"typescript": "4.7.4"
 	},
 	"publishConfig": {
@@ -70,5 +71,5 @@
 			]
 		}
 	},
-	"gitHead": "c2780f51fe628e1ef0f6b55c2bce9b74d3470d79"
+	"gitHead": "c7dec08bb095467cca6a61381bd399d66b7bb147"
 }

package/types/file.d.ts

@@ -5,9 +5,13 @@ export interface File {
     type: string;
     name: string;
     meta: Record<string, any>;
+    location: {
+        folderId: string;
+    };
     tags: string[];
     aliases: string[];
     createdOn: string;
+    savedOn: string;
     createdBy: CreatedBy;
     /**
      * Added with new storage operations refactoring.
@@ -16,7 +20,7 @@ export interface File {
     locale: string;
     webinyVersion: string;
     /**
-     * User can add new fields to the File object so we must allow it in the types.
+     * User can add new fields to the File object, so we must allow it in the types.
      */
     [key: string]: any;
 }

package/types/file.js.map

@@ -1 +1 @@
-{"version":3,"names":[],"sources":["file.ts"],"sourcesContent":["export interface File {\n    id: string;\n    key: string;\n    size: number;\n    type: string;\n    name: string;\n    meta: Record<string, any>;\n    tags: string[];\n    aliases: string[];\n    createdOn: string;\n    createdBy: CreatedBy;\n    /**\n     * Added with new storage operations refactoring.\n     */\n    tenant: string;\n    locale: string;\n    webinyVersion: string;\n    /**\n     * User can add new fields to the File object so we must allow it in the types.\n     */\n    [key: string]: any;\n}\n\nexport interface FileAlias {\n    tenant: string;\n    locale: string;\n    fileId: string;\n    alias: string;\n}\n\nexport interface CreatedBy {\n    id: string;\n    displayName: string | null;\n    type: string;\n}\n"],"mappings":""}
+{"version":3,"names":[],"sources":["file.ts"],"sourcesContent":["export interface File {\n    id: string;\n    key: string;\n    size: number;\n    type: string;\n    name: string;\n    meta: Record<string, any>;\n    location: {\n        folderId: string;\n    };\n    tags: string[];\n    aliases: string[];\n    createdOn: string;\n    savedOn: string;\n    createdBy: CreatedBy;\n    /**\n     * Added with new storage operations refactoring.\n     */\n    tenant: string;\n    locale: string;\n    webinyVersion: string;\n    /**\n     * User can add new fields to the File object, so we must allow it in the types.\n     */\n    [key: string]: any;\n}\n\nexport interface FileAlias {\n    tenant: string;\n    locale: string;\n    fileId: string;\n    alias: string;\n}\n\nexport interface CreatedBy {\n    id: string;\n    displayName: string | null;\n    type: string;\n}\n"],"mappings":""}

package/types/file.lifecycle.d.ts

@@ -2,15 +2,19 @@ import { Topic } from "@webiny/pubsub/types";
 import { File } from "./file";
 export interface OnFileBeforeCreateTopicParams<TFile extends File = File> {
     file: TFile;
+    meta?: Record<string, any>;
 }
 export interface OnFileAfterCreateTopicParams<TFile extends File = File> {
     file: TFile;
+    meta?: Record<string, any>;
 }
 export interface OnFileBeforeBatchCreateTopicParams<TFile extends File = File> {
     files: TFile[];
+    meta?: Record<string, any>;
 }
 export interface OnFileAfterBatchCreateTopicParams<TFile extends File = File> {
     files: TFile[];
+    meta?: Record<string, any>;
 }
 export interface OnFileBeforeUpdateTopicParams<TFile extends File = File> {
     original: TFile;

package/types/file.lifecycle.js.map

@@ -1 +1 @@
-{"version":3,"names":[],"sources":["file.lifecycle.ts"],"sourcesContent":["import { Topic } from \"@webiny/pubsub/types\";\nimport { File } from \"./file\";\n\nexport interface OnFileBeforeCreateTopicParams<TFile extends File = File> {\n    file: TFile;\n}\n\nexport interface OnFileAfterCreateTopicParams<TFile extends File = File> {\n    file: TFile;\n}\n\nexport interface OnFileBeforeBatchCreateTopicParams<TFile extends File = File> {\n    files: TFile[];\n}\n\nexport interface OnFileAfterBatchCreateTopicParams<TFile extends File = File> {\n    files: TFile[];\n}\n\nexport interface OnFileBeforeUpdateTopicParams<TFile extends File = File> {\n    original: TFile;\n    file: TFile;\n    input: Record<string, any>;\n}\n\nexport interface OnFileAfterUpdateTopicParams<TFile extends File = File> {\n    original: TFile;\n    file: TFile;\n    input: Record<string, any>;\n}\n\nexport interface OnFileBeforeDeleteTopicParams<TFile extends File = File> {\n    file: TFile;\n}\n\nexport interface OnFileAfterDeleteTopicParams<TFile extends File = File> {\n    file: TFile;\n}\n\nexport interface FileLifecycleEvents {\n    onFileBeforeCreate: Topic<OnFileBeforeCreateTopicParams>;\n    onFileAfterCreate: Topic<OnFileAfterCreateTopicParams>;\n    onFileBeforeBatchCreate: Topic<OnFileBeforeBatchCreateTopicParams>;\n    onFileAfterBatchCreate: Topic<OnFileAfterBatchCreateTopicParams>;\n    onFileBeforeUpdate: Topic<OnFileBeforeUpdateTopicParams>;\n    onFileAfterUpdate: Topic<OnFileAfterUpdateTopicParams>;\n    onFileBeforeDelete: Topic<OnFileBeforeDeleteTopicParams>;\n    onFileAfterDelete: Topic<OnFileAfterDeleteTopicParams>;\n}\n"],"mappings":""}
+{"version":3,"names":[],"sources":["file.lifecycle.ts"],"sourcesContent":["import { Topic } from \"@webiny/pubsub/types\";\nimport { File } from \"./file\";\n\nexport interface OnFileBeforeCreateTopicParams<TFile extends File = File> {\n    file: TFile;\n    meta?: Record<string, any>;\n}\n\nexport interface OnFileAfterCreateTopicParams<TFile extends File = File> {\n    file: TFile;\n    meta?: Record<string, any>;\n}\n\nexport interface OnFileBeforeBatchCreateTopicParams<TFile extends File = File> {\n    files: TFile[];\n    meta?: Record<string, any>;\n}\n\nexport interface OnFileAfterBatchCreateTopicParams<TFile extends File = File> {\n    files: TFile[];\n    meta?: Record<string, any>;\n}\n\nexport interface OnFileBeforeUpdateTopicParams<TFile extends File = File> {\n    original: TFile;\n    file: TFile;\n    input: Record<string, any>;\n}\n\nexport interface OnFileAfterUpdateTopicParams<TFile extends File = File> {\n    original: TFile;\n    file: TFile;\n    input: Record<string, any>;\n}\n\nexport interface OnFileBeforeDeleteTopicParams<TFile extends File = File> {\n    file: TFile;\n}\n\nexport interface OnFileAfterDeleteTopicParams<TFile extends File = File> {\n    file: TFile;\n}\n\nexport interface FileLifecycleEvents {\n    onFileBeforeCreate: Topic<OnFileBeforeCreateTopicParams>;\n    onFileAfterCreate: Topic<OnFileAfterCreateTopicParams>;\n    onFileBeforeBatchCreate: Topic<OnFileBeforeBatchCreateTopicParams>;\n    onFileAfterBatchCreate: Topic<OnFileAfterBatchCreateTopicParams>;\n    onFileBeforeUpdate: Topic<OnFileBeforeUpdateTopicParams>;\n    onFileAfterUpdate: Topic<OnFileAfterUpdateTopicParams>;\n    onFileBeforeDelete: Topic<OnFileBeforeDeleteTopicParams>;\n    onFileAfterDelete: Topic<OnFileAfterDeleteTopicParams>;\n}\n"],"mappings":""}

package/types.d.ts

@@ -6,12 +6,13 @@ import { Context } from "@webiny/api/types";
 import { FileLifecycleEvents } from "./types/file.lifecycle";
 import { File } from "./types/file";
 import { Topic } from "@webiny/pubsub/types";
+import { CmsContext } from "@webiny/api-headless-cms/types";
 export * from "./types/file.lifecycle";
 export * from "./types/file";
 export interface FileManagerContextObject extends FilesCRUD, SettingsCRUD, SystemCRUD {
     storage: FileStorage;
 }
-export interface FileManagerContext extends Context, SecurityContext, TenancyContext, I18NContext {
+export interface FileManagerContext extends Context, SecurityContext, TenancyContext, I18NContext, CmsContext {
     fileManager: FileManagerContextObject;
 }
 export interface FilePermission extends SecurityPermission {
@@ -26,24 +27,20 @@ export interface FileInput {
     size: number;
     type: string;
     meta: Record<string, any>;
+    location?: {
+        folderId: string;
+    };
     tags: string[];
     aliases: string[];
+    extensions?: Record<string, any>;
 }
 export interface FileListWhereParams {
-    search?: string;
-    type?: string;
-    type_in?: string[];
-    tag?: string;
-    tag_in?: string[];
-    tag_and_in?: string[];
-    id_in?: string[];
-    id?: string;
+    AND?: FileListWhereParams[];
+    OR?: FileListWhereParams[];
+    [key: string]: any;
 }
 export interface FilesListOpts {
     search?: string;
-    types?: string[];
-    tags?: string[];
-    ids?: string[];
     limit?: number;
     after?: string;
     where?: FileListWhereParams;
@@ -66,14 +63,18 @@ interface FilesCrudListTagsParams {
     limit?: number;
     after?: string;
 }
+export interface ListTagsResponse {
+    tag: string;
+    count: number;
+}
 export interface FilesCRUD extends FileLifecycleEvents {
     getFile(id: string): Promise<File>;
     listFiles(opts?: FilesListOpts): Promise<[File[], FileListMeta]>;
-    listTags(params: FilesCrudListTagsParams): Promise<string[]>;
-    createFile(data: FileInput): Promise<File>;
+    listTags(params: FilesCrudListTagsParams): Promise<ListTagsResponse[]>;
+    createFile(data: FileInput, meta?: Record<string, any>): Promise<File>;
     updateFile(id: string, data: Partial<FileInput>): Promise<File>;
     deleteFile(id: string): Promise<boolean>;
-    createFilesInBatch(data: FileInput[]): Promise<File[]>;
+    createFilesInBatch(data: FileInput[], meta?: Record<string, any>): Promise<File[]>;
 }
 export interface SystemCRUD {
     onSystemBeforeInstall: Topic;
@@ -256,20 +257,7 @@ export interface FileManagerFilesStorageOperationsCreateBatchParams {
  * @category FilesStorageOperationsParams
  */
 export interface FileManagerFilesStorageOperationsListParamsWhere {
-    id?: string;
-    id_in?: string[];
-    name?: string;
-    name_contains?: string;
-    tag?: string;
-    tag_contains?: string;
-    tag_in?: string[];
-    createdBy?: string;
-    locale: string;
-    tenant: string;
-    private?: boolean;
-    type?: string;
-    type_in?: string[];
-    search?: string;
+    [key: string]: any;
 }
 /**
  * @category StorageOperations
@@ -281,6 +269,7 @@ export interface FileManagerFilesStorageOperationsListParams {
     sort: string[];
     limit: number;
     after: string | null;
+    search?: string;
 }
 /**
  * @category StorageOperations
@@ -296,10 +285,10 @@ export declare type FileManagerFilesStorageOperationsListResponse = [
     File[],
     FileManagerFilesStorageOperationsListResponseMeta
 ];
-export declare type FileManagerFilesStorageOperationsTagsResponse = [
-    string[],
-    FileManagerFilesStorageOperationsListResponseMeta
-];
+export interface FileManagerFilesStorageOperationsTagsResponse {
+    tag: string;
+    count: number;
+}
 export interface FileManagerFilesStorageOperationsTagsParamsWhere extends FilesCrudListTagsWhere {
     locale: string;
     tenant: string;
@@ -346,11 +335,16 @@ export interface FileManagerFilesStorageOperations {
     /**
      * Get a list of all file tags filtered by given parameters.
      */
-    tags: (params: FileManagerFilesStorageOperationsTagsParams) => Promise<FileManagerFilesStorageOperationsTagsResponse>;
+    tags: (params: FileManagerFilesStorageOperationsTagsParams) => Promise<FileManagerFilesStorageOperationsTagsResponse[]>;
+}
+export interface FileManagerAliasesStorageOperations {
+    storeAliases(file: File): Promise<void>;
+    deleteAliases(file: File): Promise<void>;
 }
 export interface FileManagerStorageOperations<TContext = FileManagerContext> {
     beforeInit?: (context: TContext) => Promise<void>;
     files: FileManagerFilesStorageOperations;
+    aliases: FileManagerAliasesStorageOperations;
     settings: FileManagerSettingsStorageOperations;
     system: FileManagerSystemStorageOperations;
 }