@pi-r/gulp 0.7.2 → 0.8.0

package/index.js

@@ -9,34 +9,34 @@ const Task = require('@e-mc/task');
 const BIN_NPX = Task.sanitizeCmd(which.sync('npx', { nothrow: true }) || 'npx');
 const BIN_GULP = Task.sanitizeCmd(which.sync("gulp", { nothrow: true }) || '');
 const REGEXP_TIMESTAMP = /^\[\d+:\d+:\d+\]$/;
-async function executeTasks(assets, preceding, host) {
-    if (this.aborted) {
+async function executeTasks(instance, assets, preceding, host) {
+    if (instance.aborted) {
         return (0, types_1.createAbortError)(true);
     }
-    return this.allSettled(this.collate(assets, preceding), ['Execute tasks', "gulp"]).then(result => {
+    return instance.allSettled(instance.collate(assets, preceding), ['Execute tasks', "gulp"]).then(result => {
         if (host) {
             for (const output of result) {
                 if (output.status === 'fulfilled') {
                     const { added, deleted } = output.value;
-                    if (deleted) {
-                        deleted.forEach(file => host.deleteFile(file));
-                    }
-                    if (added) {
-                        added.forEach(file => host.add(file));
-                    }
+                    deleted?.forEach(file => {
+                        host.deleteFile(file);
+                    });
+                    added?.forEach(file => {
+                        host.add(file);
+                    });
                 }
             }
         }
     });
 }
-const normalizePath = (value) => process.platform === 'win32' ? '"' + value.replace(/\\/g, '\\\\').replace(/"/g, '\\"') + '"' : Task.sanitizeArgs(value);
+const normalizePath = (value) => Task.PLATFORM_WIN32 ? '"' + value.replace(/\\/g, '\\\\').replace(/"/g, '\\"') + '"' : Task.sanitizeArgs(value);
 class Gulp extends Task {
     static async finalize(instance, assets) {
-        return executeTasks.call(instance, assets, false, this);
+        return executeTasks(instance, assets, false, this);
     }
     _moduleName = "gulp";
     async using(data) {
-        return executeTasks.call(this, [data.file], true, data.host);
+        return executeTasks(this, [data.file], true, data.host);
     }
     collate(assets, isPreceding = false) {
         const settings = this.settings;
@@ -142,16 +142,20 @@ class Gulp extends Task {
             return 0;
         });
         const result = [];
-        if (series.length) {
+        if (series.length > 0) {
             result.push(this.series(series));
         }
-        if (parallel.length) {
+        if (parallel.length > 0) {
             result.push(this.parallel(parallel));
         }
         return result;
     }
     queue(tasks) {
-        return tasks.map(async (item) => new Promise(resolve => { this.spawn(item, (result) => { resolve(result); }); }));
+        return tasks.map(async (item) => new Promise(resolve => {
+            this.spawn(item, (result) => {
+                resolve(result);
+            });
+        }));
     }
     async series(tasks) {
         let added, deleted;
@@ -191,7 +195,9 @@ class Gulp extends Task {
                 this.writeFail([value, hint || (this.moduleName + ': ' + task)], err, { type, startTime });
             }
             if (hint !== false) {
-                queueMicrotask(() => Task.removeDir(tempDir));
+                queueMicrotask(() => {
+                    Task.removeDir(tempDir);
+                });
                 callback();
             }
         };
@@ -248,7 +254,7 @@ class Gulp extends Task {
         Promise.all(items.map(async (src) => fs.promises.copyFile(src, path.join(tempDir, path.basename(src)))))
             .then(() => {
             try {
-                const args = [...Task.sanitizeArgs(tasks), ...opts, '--gulpfile', `${normalizePath(gulpfile)}`, '--cwd', `${normalizePath(tempDir)}`];
+                const args = [...Task.sanitizeArgs(tasks), ...opts, '--gulpfile', normalizePath(gulpfile), '--cwd', normalizePath(tempDir)];
                 if (!BIN_GULP) {
                     args.unshift('gulp');
                 }
@@ -300,16 +306,28 @@ class Gulp extends Task {
                         catch (err) {
                             writeError("Unable to read directory", err, false);
                         }
-                        items.forEach(value => !result.has(value) && (deleted ||= []).push(value));
-                        result.forEach(value => !items.includes(value) && (added ||= []).push(value));
-                        queueMicrotask(() => Task.removeDir(tempDir));
+                        for (const value of items) {
+                            if (!result.has(value)) {
+                                (deleted ||= []).push(value);
+                            }
+                        }
+                        for (const value of result) {
+                            if (!items.includes(value)) {
+                                (added ||= []).push(value);
+                            }
+                        }
+                        queueMicrotask(() => {
+                            Task.removeDir(tempDir);
+                        });
                         callback({ added, deleted });
                     }
                     else {
                         writeError("Unable to execute file", new Error(message || "Unknown"), '', 4);
                     }
                 })
-                    .on('error', err => writeError("Unknown", err, false, 4));
+                    .on('error', err => {
+                    writeError("Unknown", err, false, 4);
+                });
                 if (stdout) {
                     stdout.setEncoding('utf-8').on('data', (value) => {
                         if (broadcastId) {
@@ -331,7 +349,9 @@ class Gulp extends Task {
                 writeError("Unable to execute file", err);
             }
         })
-            .catch((err) => writeError("Unable to copy file", err, tempDir));
+            .catch((err) => {
+            writeError("Unable to copy file", err, tempDir);
+        });
     }
 }
 module.exports = Gulp;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pi-r/gulp",
-  "version": "0.7.2",
+  "version": "0.8.0",
   "description": "Gulp task 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/task": "^0.9.4",
-    "@e-mc/types": "^0.9.4",
+    "@e-mc/task": "^0.10.0",
+    "@e-mc/types": "^0.10.0",
     "gulp": "^5.0.0",
     "gulp-cli": "^3.0.0",
     "strip-ansi": "6.0.1",

package/types/index.d.ts

@@ -1,4 +1,5 @@
-import type { ExecAction } from '@e-mc/types/lib/settings';
+import type { IHost, ITask, TaskConstructor } from '@e-mc/types/lib';
+import type { ExecAction, TaskModule } from '@e-mc/types/lib/settings';
 
 export interface GulpCommand {
     path?: string;
@@ -16,4 +17,9 @@ export interface GulpSettings extends PlainObject {
 }
 
 export type GulpTask = string | GulpCommand;
-export type GulpUsers = GulpTask | AnyObject;
+export type GulpUsers = GulpTask | AnyObject;
+
+export interface GulpTaskConstructor<T extends IHost, U extends TaskModule = TaskModule<GulpSettings>> extends ConstructorDerived<TaskConstructor<T, U>> {
+    readonly prototype: ITask<T, U>;
+    new(module?: U, ...args: unknown[]): ITask<T, U>;
+}