@plugjs/plug 0.3.5 → 0.4.1

package/dist/utils/exec.mjs

@@ -1,16 +1,14 @@
 // utils/exec.ts
+import { spawn } from "node:child_process";
 import path from "node:path";
 import readline from "node:readline";
-import { fork as forkProcess, spawn as spawnProcess } from "node:child_process";
 import { assert, BuildFailure } from "../asserts.mjs";
-import { $p, logOptions } from "../logging.mjs";
+import { $p } from "../logging.mjs";
 import { getCurrentWorkingDirectory, resolveDirectory } from "../paths.mjs";
 async function execChild(cmd, args, options = {}, context) {
   const {
     env = {},
     // default empty environment
-    fork = false,
-    // by default do not fork
     shell = false,
     // by default do not use a shell
     cwd = void 0,
@@ -21,7 +19,6 @@ async function execChild(cmd, args, options = {}, context) {
   } = options;
   const childCwd = cwd ? context.resolve(cwd) : getCurrentWorkingDirectory();
   assert(resolveDirectory(childCwd), `Current working directory ${$p(childCwd)} does not exist`);
-  assert(!(fork && shell), 'Options "fork" and "shell" can not coexist');
   const childPaths = [];
   const baseNodePath = context.resolve("@node_modules", ".bin");
   if (resolveDirectory(baseNodePath))
@@ -33,20 +30,19 @@ async function execChild(cmd, args, options = {}, context) {
   if (extraPath)
     childPaths.push(extraPath);
   const PATH = childPaths.join(path.delimiter);
-  const logForkEnv = logOptions.forkEnv(context.taskName, 4);
-  const childEnv = { ...process.env, ...env, ...logForkEnv, PATH };
+  const childEnv = { ...process.env, ...env, PATH };
   if (coverageDir)
     childEnv.NODE_V8_COVERAGE = context.resolve(coverageDir);
   const childOptions = {
     ...extraOptions,
-    stdio: ["ignore", "pipe", "pipe", "ipc", "pipe"],
+    stdio: ["ignore", "pipe", "pipe"],
     cwd: childCwd,
     env: childEnv,
     shell
   };
-  context.log.info(fork ? "Forking" : "Executing", [cmd, ...args]);
+  context.log.info("Executing", [cmd, ...args]);
   context.log.debug("Child process options", childOptions);
-  const child = fork ? forkProcess(cmd, args, childOptions) : spawnProcess(cmd, args, childOptions);
+  const child = spawn(cmd, args, childOptions);
   try {
     context.log.info("Child process PID", child.pid);
     if (child.stdout) {
@@ -57,9 +53,6 @@ async function execChild(cmd, args, options = {}, context) {
       const err = readline.createInterface(child.stderr);
       err.on("line", (line) => context.log.warn(line || "\xA0"));
     }
-    if (child.stdio[4]) {
-      child.stdio[4].on("data", (data) => logOptions.output.write(data));
-    }
   } catch (error) {
     child.kill();
     throw error;

package/dist/utils/exec.mjs.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../src/utils/exec.ts"],
-  "mappings": ";AAAA,OAAO,UAAU;AACjB,OAAO,cAAc;AACrB,SAAS,QAAQ,aAAa,SAAS,oBAAoB;AAE3D,SAAS,QAAQ,oBAAoB;AACrC,SAAS,IAAI,kBAAkB;AAC/B,SAAS,4BAA4B,wBAAwB;AAoB7D,eAAsB,UAClB,KACA,MACA,UAA4B,CAAC,GAC7B,SACa;AACf,QAAM;AAAA,IACJ,MAAM,CAAC;AAAA;AAAA,IACP,OAAO;AAAA;AAAA,IACP,QAAQ;AAAA;AAAA,IACR,MAAM;AAAA;AAAA,IACN;AAAA;AAAA,IACA,GAAG;AAAA,EACL,IAAI;AAEJ,QAAM,WAAW,MAAM,QAAQ,QAAQ,GAAG,IAAI,2BAA2B;AACzE,SAAO,iBAAiB,QAAQ,GAAG,6BAA6B,GAAG,QAAQ,kBAAkB;AAG7F,SAAO,EAAE,QAAQ,QAAQ,4CAA4C;AAGrE,QAAM,aAA6B,CAAC;AAGpC,QAAM,eAAe,QAAQ,QAAQ,iBAAiB,MAAM;AAC5D,MAAI,iBAAiB,YAAY;AAAG,eAAW,KAAK,YAAY;AAGhE,QAAM,gBAAgB,QAAQ,QAAQ,kBAAkB,MAAM;AAC9D,MAAI,iBAAiB,aAAa;AAAG,eAAW,KAAK,aAAa;AAGlE,QAAM,YAAY,IAAI,QAAQ,QAAQ,IAAI;AAC1C,MAAI;AAAW,eAAW,KAAK,SAAS;AAGxC,QAAM,OAAO,WAAW,KAAK,KAAK,SAAS;AAC3C,QAAM,aAAa,WAAW,QAAQ,QAAQ,UAAU,CAAC;AACzD,QAAM,WAAmC,EAAE,GAAG,QAAQ,KAAK,GAAG,KAAK,GAAG,YAAY,KAAK;AAGvF,MAAI;AAAa,aAAS,mBAAmB,QAAQ,QAAQ,WAAW;AAGxE,QAAM,eAA6B;AAAA,IACjC,GAAG;AAAA,IACH,OAAO,CAAE,UAAU,QAAQ,QAAQ,OAAO,MAAO;AAAA,IACjD,KAAK;AAAA,IACL,KAAK;AAAA,IACL;AAAA,EACF;AAGA,UAAQ,IAAI,KAAK,OAAO,YAAY,aAAa,CAAE,KAAK,GAAG,IAAK,CAAC;AACjE,UAAQ,IAAI,MAAM,yBAAyB,YAAY;AAEvD,QAAM,QAAQ,OACZ,YAAY,KAAK,MAAM,YAAY,IACnC,aAAa,KAAK,MAAM,YAAY;AAEtC,MAAI;AACF,YAAQ,IAAI,KAAK,qBAAqB,MAAM,GAAG;AAG/C,QAAI,MAAM,QAAQ;AAChB,YAAM,MAAM,SAAS,gBAAgB,MAAM,MAAM;AACjD,UAAI,GAAG,QAAQ,CAAC,SAAS,QAAQ,IAAI,OAAO,QAAQ,MAAQ,CAAC;AAAA,IAC/D;AAGA,QAAI,MAAM,QAAQ;AAChB,YAAM,MAAM,SAAS,gBAAgB,MAAM,MAAM;AACjD,UAAI,GAAG,QAAQ,CAAC,SAAS,QAAQ,IAAI,KAAK,QAAO,MAAQ,CAAC;AAAA,IAC5D;AAGA,QAAI,MAAM,MAAM,CAAC,GAAG;AAClB,YAAM,MAAM,CAAC,EAAE,GAAG,QAAQ,CAAC,SAAS,WAAW,OAAO,MAAM,IAAI,CAAC;AAAA,IACnE;AAAA,EACF,SAAS,OAAP;AAEA,UAAM,KAAK;AACX,UAAM;AAAA,EACR;AAGA,SAAO,IAAI,QAAc,CAAC,SAAS,WAAW;AAC5C,UAAM,GAAG,SAAS,CAAC,UAAU,OAAO,KAAK,CAAC;AAC1C,UAAM,GAAG,QAAQ,CAAC,MAAM,WAAW;AACjC,UAAI,SAAS;AAAG,eAAO,QAAQ;AAC/B,UAAI;AAAQ,eAAO,OAAO,aAAa,YAAY,oCAAoC,QAAQ,CAAC;AAChG,UAAI;AAAM,eAAO,OAAO,aAAa,YAAY,kCAAkC,MAAM,CAAC;AAC1F,aAAO,aAAa,YAAY,4CAA4C,CAAC;AAAA,IAC/E,CAAC;AAAA,EACH,CAAC;AACH;",
+  "mappings": ";AAAA,SAAS,aAAa;AACtB,OAAO,UAAU;AACjB,OAAO,cAAc;AAErB,SAAS,QAAQ,oBAAoB;AACrC,SAAS,UAAU;AACnB,SAAS,4BAA4B,wBAAwB;AAkB7D,eAAsB,UAClB,KACA,MACA,UAA4B,CAAC,GAC7B,SACa;AACf,QAAM;AAAA,IACJ,MAAM,CAAC;AAAA;AAAA,IACP,QAAQ;AAAA;AAAA,IACR,MAAM;AAAA;AAAA,IACN;AAAA;AAAA,IACA,GAAG;AAAA,EACL,IAAI;AAEJ,QAAM,WAAW,MAAM,QAAQ,QAAQ,GAAG,IAAI,2BAA2B;AACzE,SAAO,iBAAiB,QAAQ,GAAG,6BAA6B,GAAG,QAAQ,kBAAkB;AAG7F,QAAM,aAA6B,CAAC;AAGpC,QAAM,eAAe,QAAQ,QAAQ,iBAAiB,MAAM;AAC5D,MAAI,iBAAiB,YAAY;AAAG,eAAW,KAAK,YAAY;AAGhE,QAAM,gBAAgB,QAAQ,QAAQ,kBAAkB,MAAM;AAC9D,MAAI,iBAAiB,aAAa;AAAG,eAAW,KAAK,aAAa;AAGlE,QAAM,YAAY,IAAI,QAAQ,QAAQ,IAAI;AAC1C,MAAI;AAAW,eAAW,KAAK,SAAS;AAGxC,QAAM,OAAO,WAAW,KAAK,KAAK,SAAS;AAC3C,QAAM,WAAmC,EAAE,GAAG,QAAQ,KAAK,GAAG,KAAK,KAAK;AAGxE,MAAI;AAAa,aAAS,mBAAmB,QAAQ,QAAQ,WAAW;AAGxE,QAAM,eAA6B;AAAA,IACjC,GAAG;AAAA,IACH,OAAO,CAAE,UAAU,QAAQ,MAAO;AAAA,IAClC,KAAK;AAAA,IACL,KAAK;AAAA,IACL;AAAA,EACF;AAGA,UAAQ,IAAI,KAAK,aAAa,CAAE,KAAK,GAAG,IAAK,CAAC;AAC9C,UAAQ,IAAI,MAAM,yBAAyB,YAAY;AAEvD,QAAM,QAAQ,MAAM,KAAK,MAAM,YAAY;AAE3C,MAAI;AACF,YAAQ,IAAI,KAAK,qBAAqB,MAAM,GAAG;AAG/C,QAAI,MAAM,QAAQ;AAChB,YAAM,MAAM,SAAS,gBAAgB,MAAM,MAAM;AACjD,UAAI,GAAG,QAAQ,CAAC,SAAS,QAAQ,IAAI,OAAO,QAAQ,MAAQ,CAAC;AAAA,IAC/D;AAGA,QAAI,MAAM,QAAQ;AAChB,YAAM,MAAM,SAAS,gBAAgB,MAAM,MAAM;AACjD,UAAI,GAAG,QAAQ,CAAC,SAAS,QAAQ,IAAI,KAAK,QAAO,MAAQ,CAAC;AAAA,IAC5D;AAAA,EACF,SAAS,OAAP;AAEA,UAAM,KAAK;AACX,UAAM;AAAA,EACR;AAGA,SAAO,IAAI,QAAc,CAAC,SAAS,WAAW;AAC5C,UAAM,GAAG,SAAS,CAAC,UAAU,OAAO,KAAK,CAAC;AAC1C,UAAM,GAAG,QAAQ,CAAC,MAAM,WAAW;AACjC,UAAI,SAAS;AAAG,eAAO,QAAQ;AAC/B,UAAI;AAAQ,eAAO,OAAO,aAAa,YAAY,oCAAoC,QAAQ,CAAC;AAChG,UAAI;AAAM,eAAO,OAAO,aAAa,YAAY,kCAAkC,MAAM,CAAC;AAC1F,aAAO,aAAa,YAAY,4CAA4C,CAAC;AAAA,IAC/E,CAAC;AAAA,EACH,CAAC;AACH;",
   "names": []
 }

package/dist/utils/{types.cjs → singleton.cjs}

@@ -17,21 +17,22 @@ var __copyProps = (to, from, except, desc) => {
 };
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
-// utils/types.ts
-var types_exports = {};
-__export(types_exports, {
-  getTypeOf: () => getTypeOf
+// utils/singleton.ts
+var singleton_exports = {};
+__export(singleton_exports, {
+  getSingleton: () => getSingleton
 });
-module.exports = __toCommonJS(types_exports);
-function getTypeOf(what) {
-  if (Array.isArray(what))
-    return "array";
-  if (what === null)
-    return "null";
-  return typeof what;
+module.exports = __toCommonJS(singleton_exports);
+function getSingleton(symbol, factory) {
+  const anyGlobalThis = globalThis;
+  if (anyGlobalThis[symbol])
+    return anyGlobalThis[symbol];
+  const value = factory();
+  Object.defineProperty(anyGlobalThis, symbol, { value });
+  return value;
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  getTypeOf
+  getSingleton
 });
-//# sourceMappingURL=types.cjs.map
+//# sourceMappingURL=singleton.cjs.map

package/dist/utils/singleton.cjs.map

@@ -0,0 +1,6 @@
+{
+  "version": 3,
+  "sources": ["../../src/utils/singleton.ts"],
+  "mappings": ";;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAWO,SAAS,aAAgB,QAAgB,SAAqB;AACnE,QAAM,gBAAgB;AACtB,MAAI,cAAc,MAAM;AAAG,WAAO,cAAc,MAAM;AAEtD,QAAM,QAAQ,QAAQ;AACtB,SAAO,eAAe,eAAe,QAAQ,EAAE,MAAM,CAAC;AACtD,SAAO;AACT;",
+  "names": []
+}

package/dist/utils/singleton.d.ts

@@ -0,0 +1,12 @@
+/**
+ * Get the instance of a _singleton_ variable.
+ *
+ * Sometimes we need unique instances _per process_ (for example our async
+ * context). The problem is that the code might get called from two (or three)
+ * different versions of this file: the .cjs transpiled code, the .mjs
+ * transpiled one, or the .ts dynamically transpiled by our dynamic loader.
+ *
+ * A _singleton_ associates an instance with a symbol in `globalThis` and ensure
+ * there is only _one_ instance per process (per `globalThis`).
+ */
+export declare function getSingleton<T>(symbol: symbol, factory: () => T): T;

package/dist/utils/singleton.mjs

@@ -0,0 +1,13 @@
+// utils/singleton.ts
+function getSingleton(symbol, factory) {
+  const anyGlobalThis = globalThis;
+  if (anyGlobalThis[symbol])
+    return anyGlobalThis[symbol];
+  const value = factory();
+  Object.defineProperty(anyGlobalThis, symbol, { value });
+  return value;
+}
+export {
+  getSingleton
+};
+//# sourceMappingURL=singleton.mjs.map

package/dist/utils/singleton.mjs.map

@@ -0,0 +1,6 @@
+{
+  "version": 3,
+  "sources": ["../../src/utils/singleton.ts"],
+  "mappings": ";AAWO,SAAS,aAAgB,QAAgB,SAAqB;AACnE,QAAM,gBAAgB;AACtB,MAAI,cAAc,MAAM;AAAG,WAAO,cAAc,MAAM;AAEtD,QAAM,QAAQ,QAAQ;AACtB,SAAO,eAAe,eAAe,QAAQ,EAAE,MAAM,CAAC;AACtD,SAAO;AACT;",
+  "names": []
+}

package/dist/utils.cjs

@@ -21,7 +21,7 @@ __reExport(utils_exports, require("./utils/diff.cjs"), module.exports);
 __reExport(utils_exports, require("./utils/exec.cjs"), module.exports);
 __reExport(utils_exports, require("./utils/match.cjs"), module.exports);
 __reExport(utils_exports, require("./utils/options.cjs"), module.exports);
-__reExport(utils_exports, require("./utils/types.cjs"), module.exports);
+__reExport(utils_exports, require("./utils/singleton.cjs"), module.exports);
 __reExport(utils_exports, require("./utils/walk.cjs"), module.exports);
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
@@ -29,7 +29,7 @@ __reExport(utils_exports, require("./utils/walk.cjs"), module.exports);
   ...require("./utils/exec.cjs"),
   ...require("./utils/match.cjs"),
   ...require("./utils/options.cjs"),
-  ...require("./utils/types.cjs"),
+  ...require("./utils/singleton.cjs"),
   ...require("./utils/walk.cjs")
 });
 //# sourceMappingURL=utils.cjs.map

package/dist/utils.cjs.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../src/utils.ts"],
-  "mappings": ";;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA,0BAAc,6BAAd;AACA,0BAAc,6BADd;AAEA,0BAAc,8BAFd;AAGA,0BAAc,gCAHd;AAIA,0BAAc,8BAJd;AAKA,0BAAc,6BALd;",
+  "mappings": ";;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA,0BAAc,6BAAd;AACA,0BAAc,6BADd;AAEA,0BAAc,8BAFd;AAGA,0BAAc,gCAHd;AAIA,0BAAc,kCAJd;AAKA,0BAAc,6BALd;",
   "names": []
 }

package/dist/utils.d.ts

@@ -2,5 +2,5 @@ export * from './utils/diff';
 export * from './utils/exec';
 export * from './utils/match';
 export * from './utils/options';
-export * from './utils/types';
+export * from './utils/singleton';
 export * from './utils/walk';

package/dist/utils.mjs

@@ -3,6 +3,6 @@ export * from "./utils/diff.mjs";
 export * from "./utils/exec.mjs";
 export * from "./utils/match.mjs";
 export * from "./utils/options.mjs";
-export * from "./utils/types.mjs";
+export * from "./utils/singleton.mjs";
 export * from "./utils/walk.mjs";
 //# sourceMappingURL=utils.mjs.map

package/package.json

@@ -1,10 +1,13 @@
 {
   "name": "@plugjs/plug",
-  "version": "0.3.5",
+  "version": "0.4.1",
   "type": "module",
   "main": "./dist/index.cjs",
   "module": "./dist/index.mjs",
   "types": "./dist/index.d.ts",
+  "bin": {
+    "plug": "./dist/cli.mjs"
+  },
   "exports": {
     ".": {
       "require": {
@@ -97,21 +100,16 @@
       }
     }
   },
-  "bin": {
-    "plug": "./cli/plug.mjs",
-    "tsrun": "./cli/tsrun.mjs"
-  },
   "author": "Juit Developers <developers@juit.com>",
   "license": "Apache-2.0",
   "dependencies": {
+    "@plugjs/tsrun": "^0.4.0",
     "@types/node": "<19",
-    "esbuild": "^0.17.16",
+    "esbuild": "^0.17.17",
     "picomatch": "^2.3.1"
   },
   "devDependencies": {
-    "@types/picomatch": "^2.3.0",
-    "@types/yargs-parser": "^21.0.0",
-    "yargs-parser": "^21.1.1"
+    "@types/picomatch": "^2.3.0"
   },
   "files": [
     "*.md",

package/src/asserts.ts

@@ -5,12 +5,7 @@
 import { githubAnnotation } from './logging/github'
 
 /** A symbol marking {@link BuildFailure} instances */
-const buildFailure = Symbol.for('plugjs:buildFailure')
-
-/** Check if the specified argument is a {@link BuildFailure} */
-export function isBuildFailure(arg: any): arg is BuildFailure {
-  return arg && arg[buildFailure] === buildFailure
-}
+const buildFailure = Symbol.for('plugjs:plug:types:BuildFailure')
 
 /** A {@link BuildFailure} represents an error _already logged_ in our build. */
 export class BuildFailure extends Error {
@@ -28,12 +23,6 @@ export class BuildFailure extends Error {
     /* Basic error setup: stack and errors */
     Error.captureStackTrace(this, BuildFailure)
     if (errors.length) this.errors = Object.freeze([ ...errors ])
-
-    /* Other properties: marker and name */
-    Object.defineProperties(this, {
-      [buildFailure]: { value: buildFailure },
-      'name': { value: 'BuildFailure' },
-    })
   }
 
   static fail(): BuildFailure {
@@ -47,6 +36,15 @@ export class BuildFailure extends Error {
   static withErrors(errors: any[]): BuildFailure {
     return new BuildFailure(undefined, errors)
   }
+
+  static [Symbol.hasInstance](instance: any): boolean {
+    return instance && instance[buildFailure] === buildFailure
+  }
+
+  static {
+    (this.prototype as any)[buildFailure] = buildFailure
+    this.prototype.name = this.name
+  }
 }
 
 /** Await and assert that all specified promises were fulfilled */

package/src/async.ts

@@ -1,6 +1,7 @@
 import { AsyncLocalStorage } from 'node:async_hooks'
 
 import { assert } from './asserts'
+import { getSingleton } from './utils/singleton'
 
 import type { Context } from './pipe'
 
@@ -56,33 +57,9 @@ export function runningTasks(): string[] {
  * INTERNALS                                                                  *
  * ========================================================================== */
 
-/*
- * Storage and task names must be unique _per process_. We might get called
- * from two (or three) different versions of this file: the .cjs transpiled one,
- * the .mjs transpiled one (or the .ts dynamically transpiled by ts-loader).
- * In all these cases, we must return the _same_ object, so we store those as
- * a global variables associated with a couple of global symbols
- */
-const storageKey = Symbol.for('plugjs.plug.async.storage')
-const tasksKey = Symbol.for('plugjs.plug.async.tasks')
-
-function getStorage(): AsyncLocalStorage<Context> {
-  let storage: AsyncLocalStorage<Context> = (<any> globalThis)[storageKey]
-  if (! storage) {
-    storage = new AsyncLocalStorage<Context>()
-    ;(<any> globalThis)[storageKey] = storage
-  }
-  return storage
-}
-
-function getTasks(): Set<string> {
-  let tasks: Set<string> = (<any> globalThis)[tasksKey]
-  if (! tasks) {
-    tasks = new Set<string>
-    ;(<any> globalThis)[tasksKey] = tasks
-  }
-  return tasks
-}
+/* Storage and task names must be unique _per process_ */
+const storageKey = Symbol.for('plugjs:plug:singleton:contextStorage')
+const tasksKey = Symbol.for('plugjs:plug:singleton:runningTasksStorage')
 
-const storage = getStorage()
-const tasks = getTasks()
+const storage = getSingleton(storageKey, () => new AsyncLocalStorage<Context>())
+const tasks = getSingleton(tasksKey, () => new Set<string>())