@pi-r/jimp 0.5.0 → 0.6.0

package/index.js

@@ -73,9 +73,9 @@ function getMethodName(value) {
         }
     }
 }
-function performCommand(host, instance, localUri, command, outputType, finalAs, buffer, parent) {
+async function performCommand(host, instance, localUri, command, outputType, finalAs, buffer, parent) {
     return jimp.read((buffer || localUri))
-        .then(img => {
+        .then(async (img) => {
         return transformCommand(localUri, new JimpHandler(img, instance, host), command, outputType, finalAs, parent);
     });
 }
@@ -381,7 +381,7 @@ class JimpHandler {
             const settings = instance.settings;
             const webp = settings.webp || (settings.webp = {});
             const data = instance.qualityData;
-            const replace = instance.getCommand().indexOf('@') !== -1;
+            const replace = instance.getCommand().includes('@');
             const filename = (0, util_1.renameExt)(output, 'webp', replace);
             const args = [(0, util_1.normalizePath)(output)];
             if (data) {
@@ -453,10 +453,10 @@ class JimpHandler {
             callback(null, output);
         }
     }
-    getBuffer(tempFile, saveAs) {
+    async getBuffer(tempFile, saveAs) {
         const empty = () => tempFile ? '' : null;
         const output = getTempPath.call(this.instance, this.instance.outputAs || (saveAs && util_1.MIME_OUTPUT.has('image/' + (saveAs === 'jpg' ? 'jpeg' : saveAs)) ? saveAs : this.handler.getMIME().split('/').pop()));
-        return !output ? Promise.resolve(empty()) : new Promise(resolve => {
+        return !output ? empty() : new Promise(resolve => {
             this.handler.write(output, error => {
                 if (error) {
                     resolve(empty());
@@ -526,12 +526,12 @@ class JimpHandler {
             }
         });
     }
-    writeAsync(output, callback) {
+    async writeAsync(output, callback) {
         if (this.aborted) {
             if (callback) {
                 callback((0, types_1.createAbortError)(), '');
             }
-            return Promise.resolve();
+            return;
         }
         return this.handler.writeAsync(output)
             .then(() => this.finalize(output, callback))
@@ -608,7 +608,7 @@ class Jimp extends Image {
             [buffer, tempFile, ctimeMs] = getImageCache.call(instance, tempKey = file + command + (options.mimeType || ''));
             if (buffer) {
                 writeMessage(false, ctimeMs);
-                return Promise.resolve(buffer);
+                return buffer;
             }
         }
         instance.formatMessage(Image.LOG_TYPE.IMAGE, "jimp" /* STRINGS.MODULE_NAME */, ["Transforming image..." /* STRINGS.TRANSFORM */, filename], command);
@@ -657,7 +657,7 @@ class Jimp extends Image {
                 reject((0, types_1.errorValue)("Invalid format" /* ERR_MESSAGE.FORMAT */, /^\w+/.exec(command)?.[0] || "Unknown" /* ERR_MESSAGE.UNKNOWN */));
                 return;
             }
-            const replace = command.indexOf('@') !== -1;
+            const replace = command.includes('@');
             const output = host.addCopy(data.getObject({ command, outputType }), saveAs, replace);
             if (!output) {
                 reject((0, types_1.errorValue)("Not able to copy file" /* ERR_MESSAGE.NOT_COPYABLE */, outputType));
@@ -675,7 +675,7 @@ class Jimp extends Image {
                     host.writeImage(document, data.getObject({ command, output: result }));
                 }
                 if (host.getLocalUri(data) !== result) {
-                    if (command.indexOf('%') !== -1) {
+                    if (command.includes('%')) {
                         const files = host.filesToCompare.get(file);
                         if (files) {
                             files.push(result);
@@ -850,7 +850,7 @@ class Jimp extends Image {
                             GifUtil.read(file.buffer || localUri)
                                 .then(gif => {
                                 rotateAnim(cmd);
-                                Promise.all(gif.frames.map(frame => {
+                                Promise.all(gif.frames.map(async (frame) => {
                                     const handler = new JimpHandler(GifUtil.shareAsJimp(jimp, frame), this);
                                     return transformCommand(localUri, handler, cmd, jimp.MIME_GIF);
                                 }))

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pi-r/jimp",
-  "version": "0.5.0",
+  "version": "0.6.0",
   "description": "Jimp image constructor for E-mc.",
   "main": "index.js",
   "publishConfig": {
@@ -20,8 +20,8 @@
   "license": "MIT",
   "homepage": "https://github.com/anpham6/pi-r#readme",
   "dependencies": {
-    "@e-mc/image": "^0.7.0",
-    "@e-mc/types": "^0.7.0",
+    "@e-mc/image": "^0.8.0",
+    "@e-mc/types": "^0.8.0",
     "bmp-js": "^0.1.0",
     "gifwrap": "^0.10.1",
     "jimp": "^0.22.10"