@travetto/image 5.0.3 → 5.0.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@travetto/image",
-  "version": "5.0.3",
+  "version": "5.0.5",
   "description": "Image support, resizing, and optimization",
   "keywords": [
     "images",
@@ -23,8 +23,8 @@
     "directory": "module/image"
   },
   "dependencies": {
-    "@travetto/command": "^5.0.3",
-    "@travetto/runtime": "^5.0.3",
+    "@travetto/command": "^5.0.4",
+    "@travetto/runtime": "^5.0.4",
     "sharp": "^0.33.5"
   },
   "travetto": {

package/src/util.ts

@@ -25,10 +25,6 @@ export interface ResizeOptions {
    * Should the image be optimized?
    */
   optimize?: boolean;
-  /**
-   * Strict resolution
-   */
-  strictResolution?: boolean;
   /**
    * Sub process, allows for externalization of memory
    */
@@ -106,10 +102,12 @@ export class ImageUtil {
    * Resize image
    */
   static async resize<T extends ImageType>(image: T, options: ResizeOptions = {}): Promise<T> {
-    const dims = [options.w, options.h].map(d => (!d && options.strictResolution === false) ? undefined : d);
+    const dims = [options.w, options.h].map(x => x ? Math.trunc(x) : undefined);
+    const fluid = dims.some(x => !x);
+
     if (options.asSubprocess) {
       return this.#subprocessReturn(
-        await this.CONVERTER.exec('gm', 'convert', '-resize', dims.join('x'), '-auto-orient',
+        await this.CONVERTER.exec('gm', 'convert', '-resize', dims.map(x => x || '').join('x'), '-auto-orient',
           ...(options.optimize ? ['-strip', '-quality', '86'] : []), '-', '-'),
         image);
     } else {
@@ -119,7 +117,7 @@ export class ImageUtil {
         sharp().resize({
           width: dims[0],
           height: dims[1],
-          fit: options.strictResolution !== false ? 'fill' : 'inside'
+          fit: fluid ? 'inside' : 'fill'
         }),
         image,
         options.optimize,
@@ -148,8 +146,8 @@ export class ImageUtil {
   /**
    * Get Image Dimensions
    */
-  static async getDimensions(image: Buffer | string): Promise<{ width: number, height: number }> {
+  static async getDimensions(image: Buffer | string): Promise<{ width: number, height: number, aspect: number }> {
     const { default: sharp } = await import('sharp');
-    return sharp(image).metadata().then(v => ({ width: v.width!, height: v.height! }));
+    return sharp(image).metadata().then(v => ({ width: v.width!, height: v.height!, aspect: v.width! / v.height! }));
   }
 }