@pi-r/jimp 0.7.3 → 0.7.5

package/LICENSE

@@ -1,7 +1,7 @@
-Copyright 2024 An Pham
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-
+Copyright 2024 An Pham
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

package/README.md

@@ -1,7 +1,7 @@
-### @pi-r/jimp
-
-https://e-mc.readthedocs.io/en/latest/image
-
-### LICENSE
-
+### @pi-r/jimp
+
+https://e-mc.readthedocs.io/en/latest/image
+
+### LICENSE
+
 MIT

package/index.js

@@ -67,17 +67,17 @@ const METHOD_ALIAS = {
     threshold: 'th'
 };
 function getMethodName(value) {
-    const name = value.toLowerCase();
-    if (METHOD_ALIAS[name]) {
-        return name;
-    }
-    if (name.length === 2) {
+    if (value.length === 2) {
+        value = value.toLowerCase();
         for (const alias in METHOD_ALIAS) {
-            if (METHOD_ALIAS[alias] === name) {
+            if (METHOD_ALIAS[alias] === value) {
                 return alias;
             }
         }
     }
+    else if (METHOD_ALIAS[value] || METHOD_ALIAS[value = value.toLowerCase()]) {
+        return value;
+    }
 }
 async function performCommand(host, instance, localUri, command, outputType, finalAs, buffer, parent) {
     return jimp.read((buffer || localUri))
@@ -119,9 +119,9 @@ async function transformCommand(localFile, handler, command, outputType, outputA
             return handler.rotate();
         default:
             return handler.rotate(localFile, (err, result) => {
-                if (!err && handler.host?.moduleName === 'filemanager') {
+                if (!err) {
                     try {
-                        handler.host.add(result, parent);
+                        handler.host?.add(result, parent);
                     }
                     catch {
                     }
@@ -232,12 +232,10 @@ function getTempPath(ext) {
 }
 const removeFile = (pathname) => fs.unlink(pathname, () => { });
 class JimpHandler {
-    handler;
-    instance;
-    _host = null;
     constructor(handler, instance, host) {
         this.handler = handler;
         this.instance = instance;
+        this._host = null;
         if (host) {
             this._host = host;
         }
@@ -562,6 +560,11 @@ class JimpHandler {
     }
 }
 class Jimp extends Image {
+    constructor() {
+        super(...arguments);
+        this._moduleName = "jimp";
+        this._threadable = true;
+    }
     static async transform(file, command, options = {}) {
         const [outputType, saveAs, finalAs] = (0, util_1.parseFormat)(command = command.trim(), options.mimeType);
         const empty = () => options.tempFile ? '' : null;
@@ -627,8 +630,6 @@ class Jimp extends Image {
             .catch(() => empty())
             .finally(() => buffer && !options.cache && removeFile(file));
     }
-    _moduleName = "jimp";
-    _threadable = true;
     parseRotate(value) {
         const data = super.parseRotate(value);
         if (data && this.settings.jimp?.rotate_clockwise) {

package/package.json

@@ -1,29 +1,29 @@
-{
-  "name": "@pi-r/jimp",
-  "version": "0.7.3",
-  "description": "Jimp image constructor for E-mc.",
-  "main": "index.js",
-  "publishConfig": {
-    "access": "public"
-  },
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/anpham6/pi-r.git",
-    "directory": "src/module/jimp"
-  },
-  "keywords": [
-    "squared",
-    "e-mc",
-    "squared-functions"
-  ],
-  "author": "An Pham <anpham6@gmail.com>",
-  "license": "MIT",
-  "homepage": "https://github.com/anpham6/pi-r#readme",
-  "dependencies": {
-    "@e-mc/image": "^0.9.6",
-    "@e-mc/types": "^0.9.6",
-    "bmp-js": "^0.1.0",
-    "gifwrap": "^0.10.1",
-    "jimp": "^0.22.12"
-  }
-}
+{
+  "name": "@pi-r/jimp",
+  "version": "0.7.5",
+  "description": "Jimp image constructor for E-mc.",
+  "main": "index.js",
+  "publishConfig": {
+    "access": "public"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/anpham6/pi-r.git",
+    "directory": "src/module/jimp"
+  },
+  "keywords": [
+    "squared",
+    "e-mc",
+    "squared-functions"
+  ],
+  "author": "An Pham <anpham6@gmail.com>",
+  "license": "MIT",
+  "homepage": "https://github.com/anpham6/pi-r#readme",
+  "dependencies": {
+    "@e-mc/image": "^0.9.18",
+    "@e-mc/types": "^0.9.18",
+    "bmp-js": "^0.1.0",
+    "gifwrap": "^0.10.1",
+    "jimp": "^0.22.12"
+  }
+}

package/types/index.d.ts

@@ -1,19 +1,20 @@
-import type { IHost, IImage, ImageConstructor } from '@e-mc/types/lib';
-import type { ImageModule } from '@e-mc/types/lib/settings';
-
-import type { ImageHandler } from '@e-mc/image/types';
-
-import type * as jimp from 'jimp';
-
-export interface IJimpHandler<T extends IHost = IHost, U extends ImageModule = ImageModule> extends ImageHandler<jimp, T, IImage<T, U>> {
-    method(): Promise<void>;
-    rotate(localFile?: string, callback?: ResultCallback<string>): Promise<this>;
-    background(value: number | [number, number, number, number]): void;
-    writeAsync(output: string, callback?: ResultCallback): Promise<void>;
-}
-
-export interface JimpImageConstructor extends ImageConstructor {
-    new(handler: jimp, instance: IImage, host?: Null<IHost>): IJimpHandler;
-}
-
+import type { IHost, IImage, ImageConstructor } from '@e-mc/types/lib';
+import type { ImageModule } from '@e-mc/types/lib/settings';
+
+import type { ImageHandler } from '@e-mc/image/types';
+
+import type * as jimp from 'jimp';
+
+export interface IJimpHandler<T extends IHost = IHost, U extends ImageModule = ImageModule> extends ImageHandler<jimp, T, IImage<T, U>> {
+    method(): Promise<void>;
+    quality(): void;
+    rotate(localFile?: string, callback?: ResultCallback<string>): Promise<this>;
+    background(value: number | [number, number, number, number]): void;
+    writeAsync(output: string, callback?: ResultCallback): Promise<void>;
+}
+
+export interface JimpImageConstructor extends ImageConstructor {
+    new(handler: jimp, instance: IImage, host?: Null<IHost>): IJimpHandler;
+}
+
 export type ResultCallback<T = unknown, U = void, V = unknown> = (err: V, result: T) => U;

package/util.d.ts

@@ -1,10 +1,10 @@
-declare namespace util {
-    function parseFormat(command: string, mimeType?: string, gif?: boolean): [string, string, string];
-    function renameExt(output: string, ext: string, replace?: boolean): string;
-    function normalizePath(value: string): string;
-    function getWebP_bin(name: string, pathname: string | undefined): string;
-    function showInputType(value: string | undefined, outputType: string, finalAs: string): string;
-    function showOutputType(value: string | undefined, outputType: string, finalAs: string): string;
-}
-
+declare namespace util {
+    function parseFormat(command: string, mimeType?: string, gif?: boolean): [string, string, string];
+    function renameExt(output: string, ext: string, replace?: boolean): string;
+    function normalizePath(value: string): string;
+    function getWebP_bin(name: string, pathname: string | undefined): string;
+    function showInputType(value: string | undefined, outputType: string, finalAs: string): string;
+    function showOutputType(value: string | undefined, outputType: string, finalAs: string): string;
+}
+
 export = util;