@orion-js/file-manager 3.9.3 → 3.9.5

package/lib/File/index.js

@@ -9,9 +9,7 @@ const pick_1 = __importDefault(require("lodash/pick"));
 const omit_1 = __importDefault(require("lodash/omit"));
 const schema_1 = require("./schema");
 const typed_model_1 = require("@orion-js/typed-model");
-const isImage_1 = require("./resolvers/isImage");
-const credentials_1 = require("../credentials");
-const lodash_1 = require("lodash");
+const generateImageInfo_1 = require("../resolvers/generateImageInfo");
 const schema = (0, typed_model_1.getModelForClass)(schema_1.FileSchema).getSchema();
 exports.default = (0, models_1.createModel)({
     name: 'File',
@@ -25,31 +23,7 @@ exports.default = (0, models_1.createModel)({
         const file = await Files_1.Files.findOne({ _id: fileId });
         if (!file)
             return null;
-        if ((0, isImage_1.isImage)(file)) {
-            const options = (0, credentials_1.getFileManagerOptions)();
-            if (!file.resizedData && options.getResizedImages) {
-                try {
-                    file.resizedData = await options.getResizedImages(file);
-                    if (!(0, lodash_1.isEmpty)(file.resizedData)) {
-                        await Files_1.Files.updateOne(file, { $set: { resizedData: file.resizedData } });
-                    }
-                }
-                catch (error) {
-                    console.error('Error getting resized images', error);
-                }
-            }
-            if (!file.colorsData && options.getImageColors) {
-                try {
-                    file.colorsData = await options.getImageColors(file);
-                    if (!(0, lodash_1.isEmpty)(file.colorsData)) {
-                        await Files_1.Files.updateOne(file, { $set: { colorsData: file.colorsData } });
-                    }
-                }
-                catch (error) {
-                    console.error('Error getting image colors', error);
-                }
-            }
-        }
+        await (0, generateImageInfo_1.generateImageInfo)(file);
         const keys = Object.keys((0, omit_1.default)(schema, 'createdBy', 'createdAt', 'status'));
         const data = (0, pick_1.default)(file, keys);
         return data;

package/lib/File/schema.d.ts

@@ -5,6 +5,10 @@ export declare class FileSchemaResizeData {
     largeURL?: string;
     extraLargeURL?: string;
 }
+export declare class FileSchemaDimensionsData {
+    width?: number;
+    height?: number;
+}
 export declare class FileSchemaColorsData {
     vibrant?: string;
     lightVibrant?: string;
@@ -26,6 +30,7 @@ export declare class FileSchema {
     status?: string;
     createdBy?: string;
     createdAt?: Date;
+    dimensions?: FileSchemaDimensionsData;
     resizedData?: FileSchemaResizeData;
     colorsData?: FileSchemaColorsData;
 }

package/lib/File/schema.js

@@ -9,7 +9,7 @@ var __metadata = (this && this.__metadata) || function (k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.FileSchema = exports.FileSchemaColorsData = exports.FileSchemaResizeData = void 0;
+exports.FileSchema = exports.FileSchemaColorsData = exports.FileSchemaDimensionsData = exports.FileSchemaResizeData = void 0;
 const typed_model_1 = require("@orion-js/typed-model");
 let FileSchemaResizeData = class FileSchemaResizeData {
 };
@@ -37,6 +37,20 @@ FileSchemaResizeData = __decorate([
     (0, typed_model_1.TypedSchema)()
 ], FileSchemaResizeData);
 exports.FileSchemaResizeData = FileSchemaResizeData;
+let FileSchemaDimensionsData = class FileSchemaDimensionsData {
+};
+__decorate([
+    (0, typed_model_1.Prop)({ optional: true }),
+    __metadata("design:type", Number)
+], FileSchemaDimensionsData.prototype, "width", void 0);
+__decorate([
+    (0, typed_model_1.Prop)({ optional: true }),
+    __metadata("design:type", Number)
+], FileSchemaDimensionsData.prototype, "height", void 0);
+FileSchemaDimensionsData = __decorate([
+    (0, typed_model_1.TypedSchema)()
+], FileSchemaDimensionsData);
+exports.FileSchemaDimensionsData = FileSchemaDimensionsData;
 let FileSchemaColorsData = class FileSchemaColorsData {
 };
 __decorate([
@@ -120,6 +134,10 @@ __decorate([
     (0, typed_model_1.Prop)({ optional: true }),
     __metadata("design:type", Date)
 ], FileSchema.prototype, "createdAt", void 0);
+__decorate([
+    (0, typed_model_1.Prop)({ optional: true, type: (0, typed_model_1.getModelForClass)(FileSchemaDimensionsData) }),
+    __metadata("design:type", FileSchemaDimensionsData)
+], FileSchema.prototype, "dimensions", void 0);
 __decorate([
     (0, typed_model_1.Prop)({ optional: true, type: (0, typed_model_1.getModelForClass)(FileSchemaResizeData) }),
     __metadata("design:type", FileSchemaResizeData)

package/lib/credentials.d.ts

@@ -1,4 +1,4 @@
-import { FileSchema, FileSchemaColorsData, FileSchemaResizeData } from './File/schema';
+import { FileSchema, FileSchemaColorsData, FileSchemaDimensionsData, FileSchemaResizeData } from './File/schema';
 export interface FileManagerOptions {
     accessKeyId: string;
     secretAccessKey: string;
@@ -9,6 +9,7 @@ export interface FileManagerOptions {
     basePath: string;
     endpoint?: string;
     s3ForcePathStyle?: boolean;
+    getImageDimensions?: (file: FileSchema) => Promise<FileSchemaDimensionsData>;
     getResizedImages?: (file: FileSchema) => Promise<FileSchemaResizeData>;
     getImageColors?: (file: FileSchema) => Promise<FileSchemaColorsData>;
 }

package/lib/resolvers/completeUpload.js

@@ -6,17 +6,20 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const resolvers_1 = require("@orion-js/resolvers");
 const File_1 = __importDefault(require("../File"));
 const Files_1 = require("../Files");
+const generateImageInfo_1 = require("./generateImageInfo");
 exports.default = (0, resolvers_1.resolver)({
     params: {
         fileId: {
-            type: 'ID'
-        }
+            type: 'ID',
+        },
     },
     returns: File_1.default,
     mutation: true,
     async resolve({ fileId }, viewer) {
         const file = await Files_1.Files.findOne({ createdBy: viewer.userId, _id: fileId });
         await Files_1.Files.updateOne(file, { $set: { status: 'uploaded' } });
+        // mientras el usuario sigue editando el formulario, se generan los resizes y colores
+        (0, generateImageInfo_1.generateImageInfo)(file);
         return file;
-    }
+    },
 });

package/lib/resolvers/generateImageInfo.d.ts

@@ -0,0 +1,2 @@
+import { FileSchema } from '../File/schema';
+export declare function generateImageInfo(file: FileSchema): Promise<void>;

package/lib/resolvers/generateImageInfo.js

@@ -0,0 +1,48 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.generateImageInfo = void 0;
+const lodash_1 = require("lodash");
+const credentials_1 = require("../credentials");
+const isImage_1 = require("../File/resolvers/isImage");
+const Files_1 = require("../Files");
+async function generateImageInfo(file) {
+    if (!file._id)
+        return;
+    const options = (0, credentials_1.getFileManagerOptions)();
+    if ((0, isImage_1.isImage)(file)) {
+        if (!file.dimensions && options.getImageDimensions) {
+            try {
+                file.dimensions = await options.getImageDimensions(file);
+                if (!(0, lodash_1.isEmpty)(file.dimensions)) {
+                    await Files_1.Files.updateOne(file._id, { $set: { dimensions: file.dimensions } });
+                }
+            }
+            catch (error) {
+                console.error('Error getting image dimensions', error);
+            }
+        }
+        if (!file.resizedData && options.getResizedImages) {
+            try {
+                file.resizedData = await options.getResizedImages(file);
+                if (!(0, lodash_1.isEmpty)(file.resizedData)) {
+                    await Files_1.Files.updateOne(file._id, { $set: { resizedData: file.resizedData } });
+                }
+            }
+            catch (error) {
+                console.error('Error getting resized images', error);
+            }
+        }
+        if (!file.colorsData && options.getImageColors) {
+            try {
+                file.colorsData = await options.getImageColors(file);
+                if (!(0, lodash_1.isEmpty)(file.colorsData)) {
+                    await Files_1.Files.updateOne(file._id, { $set: { colorsData: file.colorsData } });
+                }
+            }
+            catch (error) {
+                console.error('Error getting image colors', error);
+            }
+        }
+    }
+}
+exports.generateImageInfo = generateImageInfo;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@orion-js/file-manager",
-  "version": "3.9.3",
+  "version": "3.9.5",
   "main": "lib/index.js",
   "author": "nicolaslopezj",
   "license": "MIT",
@@ -36,5 +36,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "57a7323d78585ce1d823548d464709f46aed84b7"
+  "gitHead": "d8f629a931e623f0efdc94a47ef75f19f759fe6a"
 }