@pi-r/jimp 0.11.0 → 0.11.1

package/index.js

@@ -800,7 +800,7 @@ class Jimp extends Image {
             }
             if (method) {
                 const values = method.map(item => [getMethodName(item[0]) || item[0], item[1]]);
-                if (values.find(item => !item[0] || item[0] === 'composite')) {
+                if (values.find(item => !item[0])) {
                     return null;
                 }
                 command.method = values;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pi-r/jimp",
-  "version": "0.11.0",
+  "version": "0.11.1",
   "description": "Jimp V1 image constructor for E-mc.",
   "main": "index.js",
   "types": "index.d.ts",
@@ -20,9 +20,9 @@
   "license": "MIT",
   "homepage": "https://github.com/anpham6/pi-r2#readme",
   "dependencies": {
-    "@e-mc/core": "^0.13.0",
-    "@e-mc/image": "^0.13.0",
-    "@e-mc/types": "^0.13.0",
+    "@e-mc/core": "^0.13.5",
+    "@e-mc/image": "^0.13.5",
+    "@e-mc/types": "^0.13.5",
     "@jimp/utils": "^1.6.0",
     "bmp-js": "^0.1.0",
     "gifwrap": "^0.10.1",

package/worker/jimp.js

@@ -1,29 +1,41 @@
 'use strict';
 
 var node_worker_threads = require('node:worker_threads');
-var jimp$1 = require('jimp');
+var jimp = require('jimp');
+var types = require('@e-mc/types');
 
 const Image = require("@e-mc/image");
-const jimp = require("@pi-r/jimp");
+const JimpApp = require("@pi-r/jimp");
 const PORT = node_worker_threads.workerData[0];
 node_worker_threads.parentPort.on('message', (value) => {
     const { data, commandData, output, options } = value;
-    jimp$1.Jimp.read(typeof data === 'string' ? data : Image.asBuffer(data))
+    jimp.Jimp.read(typeof data === 'string' ? data : Image.asBuffer(data))
         .then(async (img) => {
         const { method, resize, crop, rotate, opacity = -1 } = commandData;
         if (method) {
             for (const [name, args = []] of method) {
-                jimp.applyMethod(img, name, ...args);
+                if (name === 'composite') {
+                    const [src, x, y, opts] = args;
+                    if (types.isString(src) && typeof x === 'number' && typeof y === 'number') {
+                        img.composite(await jimp.Jimp.read(src), x, y, opts);
+                    }
+                    else {
+                        throw types.errorMessage(name, "Invalid parameters", JSON.stringify(value));
+                    }
+                }
+                else {
+                    JimpApp.applyMethod(img, name, ...args);
+                }
             }
         }
         if (resize) {
-            jimp.applyResize(img, resize);
+            JimpApp.applyResize(img, resize);
         }
         if (crop) {
-            jimp.applyCrop(img, crop);
+            JimpApp.applyCrop(img, crop);
         }
         if (rotate) {
-            jimp.applyRotate(img, rotate);
+            JimpApp.applyRotate(img, rotate);
         }
         if (opacity >= 0) {
             img.opacity(opacity);