@pi-r/gulp 0.11.3 → 0.12.1

package/index.js

@@ -1,10 +1,11 @@
 "use strict";
-const path = require("node:path");
-const fs = require("node:fs");
-const child_process = require("node:child_process");
-const which = require("which");
-const node_util_1 = require("node:util");
-const types_1 = require("@e-mc/types");
+
+const path = require('node:path');
+const fs = require('node:fs');
+const child_process = require('node:child_process');
+const which = require('which');
+const { stripVTControlCharacters } = require('node:util');
+const { createAbortError, errorMessage, getTempDir, ignoreFlag, isErrorCode, isObject, isPlainObject, isString, sanitizeArgs, sanitizeCmd } = require('@e-mc/types');
 const Task = require('@e-mc/task');
 const kGulp = Symbol.for('gulp:constructor');
 const BIN_NPX = which.sync('npx', { nothrow: true }) || 'npx';
@@ -12,7 +13,7 @@ const BIN_GULP = which.sync("gulp", { nothrow: true }) || '';
 const REGEXP_TIMESTAMP = /^\[\d+:\d+:\d+\]$/;
 async function executeTasks(instance, assets, preceding, host) {
     if (instance.aborted) {
-        return (0, types_1.createAbortError)(true);
+        return createAbortError(true);
     }
     return instance.allSettled(instance.collate(assets, preceding), ['Execute tasks', "gulp"]).then(result => {
         if (host) {
@@ -30,7 +31,7 @@ async function executeTasks(instance, assets, preceding, host) {
         }
     });
 }
-const normalizePath = (value) => Task.PLATFORM_WIN32 ? '"' + value.replace(/\\/g, '\\\\').replace(/"/g, '\\"') + '"' : (0, types_1.sanitizeArgs)(value);
+const normalizePath = (value) => Task.PLATFORM_WIN32 ? '"' + value.replace(/\\/g, '\\\\').replace(/"/g, '\\"') + '"' : sanitizeArgs(value);
 class Gulp extends Task {
     static [kGulp] = true;
     static async finalize(instance, assets) {
@@ -47,19 +48,22 @@ class Gulp extends Task {
         const username = this.host?.username || '';
         for (const item of assets) {
             const localUri = item.localUri;
-            if (!localUri || !item.tasks || (0, types_1.ignoreFlag)(item.flags) || !this.canWrite(localUri, { ownPermissionOnly: true })) {
+            if (!localUri || !item.tasks || ignoreFlag(item.flags) || !this.canWrite(localUri, { ownPermissionOnly: true })) {
                 continue;
             }
             const origDir = path.dirname(localUri);
             const scheduled = new Set();
             for (let { task, handler, preceding } of item.tasks) {
                 if (task && handler === "gulp" && !!preceding === isPreceding) {
-                    let gulpfile = (0, types_1.isString)(task) ? username && (0, types_1.isObject)(settings.users) && settings.users[username]?.[task] || settings[task] : task, tasks, opts;
-                    if ((0, types_1.isObject)(gulpfile)) {
+                    let gulpfile = isString(task) ? username && isObject(settings.users) && settings.users[username]?.[task] || settings[task] : task, tasks, opts;
+                    if (isObject(gulpfile)) {
                         ({ path: gulpfile, tasks, opts } = gulpfile);
                     }
-                    if ((0, types_1.isString)(gulpfile) && Task.isPath(gulpfile = path.resolve(gulpfile), true) && ((0, types_1.isString)(task) || this.canRead(gulpfile, { ownPermissionOnly: true }))) {
-                        if (!scheduled.has((0, types_1.isString)(task) ? task : task = JSON.stringify(task))) {
+                    if (gulpfile && Task.isPath(gulpfile = path.resolve(gulpfile), true) && (isString(task) || this.canRead(gulpfile, { ownPermissionOnly: true }))) {
+                        if (!isString(task)) {
+                            task = JSON.stringify(task);
+                        }
+                        if (!scheduled.has(task)) {
                             try {
                                 const buffer = item.sourceUTF8 || item.buffer;
                                 if (buffer) {
@@ -85,10 +89,10 @@ class Gulp extends Task {
                         }
                     }
                     else {
-                        if (!(0, types_1.isString)(task)) {
+                        if (!isString(task)) {
                             task = gulpfile && path.basename(gulpfile);
                         }
-                        this.writeFail(["Unable to perform task", task ? "gulp" + ': ' + task : ''], (0, types_1.errorMessage)(task || "gulp", "Unknown", username), 4);
+                        this.writeFail(["Unable to perform task", task ? "gulp" + ': ' + task : ''], errorMessage(task || "gulp", "Unknown", username), 4);
                     }
                 }
             }
@@ -175,24 +179,25 @@ class Gulp extends Task {
         return { added, deleted };
     }
     async parallel(tasks) {
-        return Promise.allSettled(this.queue(tasks)).then(result => {
-            let added, deleted, value;
-            for (const item of result) {
+        return Promise.allSettled(this.queue(tasks)).then(items => {
+            const result = {};
+            let value;
+            for (const item of items) {
                 if (item.status === 'fulfilled' && (value = item.value)) {
                     if (value.added) {
-                        (added ||= []).push(...value.added);
+                        (result.added ||= []).push(...value.added);
                     }
                     if (value.deleted) {
-                        (deleted ||= []).push(...value.deleted);
+                        (result.deleted ||= []).push(...value.deleted);
                     }
                 }
             }
-            return { added, deleted };
+            return result;
         });
     }
     spawn(gulp, callback) {
         const { task, origDir, data } = gulp;
-        const tempDir = (0, types_1.getTempDir)(true, "gulp");
+        const tempDir = getTempDir(true, "gulp");
         const writeError = (value, err, hint, type = 32) => {
             if (err) {
                 this.writeFail([value, hint || (this.moduleName + ': ' + task)], err, { type, startTime });
@@ -201,13 +206,14 @@ class Gulp extends Task {
                 callback();
             }
         };
+        const broadcastId = this.broadcastId;
         const exec = this.settings.exec;
         let { path: gulpfile, tasks, opts, items } = data, uid, gid;
         if (!Array.isArray(tasks)) {
-            tasks = (0, types_1.isString)(tasks) ? [tasks] : [task];
+            tasks = isString(tasks) ? [tasks] : [task];
         }
         if (!Array.isArray(opts)) {
-            opts = (0, types_1.isString)(opts) ? [opts] : [];
+            opts = isString(opts) ? [opts] : [];
         }
         for (let i = 0; i < opts.length; ++i) {
             switch (opts[i]) {
@@ -235,7 +241,7 @@ class Gulp extends Task {
             }
             opts.splice(i--, 1);
         }
-        if ((0, types_1.isPlainObject)(exec)) {
+        if (isPlainObject(exec)) {
             let { uid: u, gid: g } = exec;
             if ((u = parseInt(u)) >= 0) {
                 uid = u;
@@ -245,18 +251,17 @@ class Gulp extends Task {
             }
         }
         const startTime = process.hrtime();
-        const broadcastId = this.broadcastId;
         this.formatMessage(4, "gulp", ['Executing task...', task], gulpfile);
         Promise.all(items.map(async (src) => fs.promises.copyFile(src, path.join(tempDir, path.basename(src)))))
             .then(() => {
             try {
-                const args = (0, types_1.sanitizeArgs)(tasks).concat(opts, ['--gulpfile', normalizePath(gulpfile), '--cwd', normalizePath(tempDir)]);
+                const args = sanitizeArgs(tasks).concat(opts, ['--gulpfile', normalizePath(gulpfile), '--cwd', normalizePath(tempDir)]);
                 if (!BIN_GULP) {
                     args.unshift('gulp');
                 }
                 let out = '', timeStamp = '', message = '';
                 const setMessage = (type, value) => {
-                    if (REGEXP_TIMESTAMP.test((0, node_util_1.stripVTControlCharacters)(value = value.trim()))) {
+                    if (REGEXP_TIMESTAMP.test(stripVTControlCharacters(value = value.trim()))) {
                         timeStamp = value + ' ';
                     }
                     else {
@@ -264,7 +269,7 @@ class Gulp extends Task {
                         timeStamp = '';
                     }
                 };
-                const { stdout, stderr } = child_process.spawn((0, types_1.sanitizeCmd)(BIN_GULP || BIN_NPX, args), { cwd: process.cwd(), shell: true, stdio: Task.hasLogType(32768) && !broadcastId ? 'inherit' : undefined, signal: this.signal, uid, gid })
+                const { stdout, stderr } = child_process.spawn(sanitizeCmd(BIN_GULP || BIN_NPX, args), { cwd: process.cwd(), shell: true, stdio: Task.hasLogType(32768) && !broadcastId ? 'inherit' : undefined, signal: this.signal, uid, gid })
                     .on('exit', code => {
                     if (!code) {
                         this.addLog(4, out);
@@ -288,7 +293,7 @@ class Gulp extends Task {
                                     }
                                 }
                                 catch (err) {
-                                    if (!copy && (0, types_1.isErrorCode)(err, 'EXDEV')) {
+                                    if (!copy && isErrorCode(err, 'EXDEV')) {
                                         copy = true;
                                         --i;
                                     }
@@ -347,4 +352,5 @@ class Gulp extends Task {
         });
     }
 }
+
 module.exports = Gulp;

package/package.json

@@ -1,11 +1,8 @@
 {
   "name": "@pi-r/gulp",
-  "version": "0.11.3",
+  "version": "0.12.1",
   "description": "Gulp task constructor for E-mc.",
   "main": "index.js",
-  "publishConfig": {
-    "access": "public"
-  },
   "repository": {
     "type": "git",
     "url": "git+https://github.com/anpham6/pi-r.git",
@@ -19,8 +16,8 @@
   "license": "MIT",
   "homepage": "https://github.com/anpham6/pi-r#readme",
   "dependencies": {
-    "@e-mc/task": "^0.13.10",
-    "@e-mc/types": "^0.13.10",
+    "@e-mc/task": "^0.14.1",
+    "@e-mc/types": "^0.14.1",
     "gulp": "^5.0.1",
     "gulp-cli": "^3.1.0",
     "which": "^4.0.0"