@fynjs/run 1.1.6 → 1.1.7

package/README.md

@@ -31,6 +31,11 @@ Alias for the options:
 
 - `-s`: `--serial`
 
+npm scripts run through `xrun` get the same environment variables `npm run` sets, so scripts
+that branch on them work unchanged: `npm_lifecycle_event`, `npm_lifecycle_script`,
+`npm_package_name`, `npm_package_version`, `npm_package_json`, `npm_execpath`,
+`npm_node_execpath`, `INIT_CWD`.
+
 ## Running JavaScript tasks
 
 You can write your tasks in JavaScript and run them with `xrun`.

package/dist/cli/env.d.ts

@@ -5,6 +5,7 @@ declare const lib: {
     xrunId: string;
     forceColor: string;
     xrunCwd: string;
+    xrunInitCwd: string;
     xrunVersion: string;
     xrunBinDir: string;
     xrunNodeBin: string;

package/dist/cli/env.js

@@ -7,6 +7,7 @@ const lib = {
     xrunId: "XRUN_ID",
     forceColor: "FORCE_COLOR",
     xrunCwd: "XRUN_CWD",
+    xrunInitCwd: "XRUN_INIT_CWD",
     xrunVersion: "XRUN_VERSION",
     xrunBinDir: "XRUN_BIN_DIR",
     xrunNodeBin: "XRUN_NODE_BIN",

package/dist/cli/npm-loader.js

@@ -2,6 +2,7 @@ import logger from "../lib/logger.js";
 import chalk from "../lib/chalk.js";
 import { readPackageUpSync } from "read-package-up";
 import myPkg from "../lib/my-pkg.js";
+import makeNpmScriptEnv from "../lib/util/npm-script-env.js";
 import config from "./config.js";
 import env from "./env.js";
 export default (xrun, options) => {
@@ -13,14 +14,25 @@ export default (xrun, options) => {
     const pkgName = chalk.magenta(readPkg.path.replace(process.cwd(), "."));
     if (Pkg.scripts && options.npm !== false) {
         const scripts = {};
+        const initCwd = env.get(env.xrunInitCwd) || process.cwd();
+        const npmExec = key => xrun.exec(Pkg.scripts[key], {
+            flags: "npm",
+            env: makeNpmScriptEnv({
+                pkgPath: readPkg.path,
+                pkgJson: Pkg,
+                scriptName: key,
+                scriptCmd: Pkg.scripts[key],
+                initCwd
+            })
+        });
         for (const k in Pkg.scripts) {
             if (!k.startsWith("pre") && !k.startsWith("post")) {
                 const pre = `pre${k}`;
                 const post = `post${k}`;
-                scripts[k] = xrun.serial(Pkg.scripts.hasOwnProperty(pre) && pre, xrun.exec(Pkg.scripts[k], "npm"), Pkg.scripts.hasOwnProperty(post) && post);
+                scripts[k] = xrun.serial(Pkg.scripts.hasOwnProperty(pre) && pre, npmExec(k), Pkg.scripts.hasOwnProperty(post) && post);
             }
             else {
-                scripts[k] = xrun.exec(Pkg.scripts[k], "npm");
+                scripts[k] = npmExec(k);
             }
         }
         xrun.load("npm", scripts);

package/dist/cli/parse-cmd-args.js

@@ -91,6 +91,11 @@ async function parseArgs(argv, start) {
     env.set(env.xrunNodeBin, process.execPath);
     // don't search if user has explicitly set CWD
     const search = !opts.cwd;
+    // capture the true invocation directory once, before any chdir below, so npm scripts get an
+    // INIT_CWD that matches npm's semantics even across nested xrun calls in the same process
+    if (!env.has(env.xrunInitCwd)) {
+        env.set(env.xrunInitCwd, WrapProcess.cwd());
+    }
     const saveCwd = env.get(env.xrunCwd);
     opts.cwd = updateCwd(opts.cwd);
     let searchResult = {};

package/dist/lib/util/npm-script-env.d.ts

@@ -0,0 +1,12 @@
+interface MakeNpmScriptEnvOptions {
+    pkgPath: string;
+    pkgJson: {
+        name?: string;
+        version?: string;
+    };
+    scriptName: string;
+    scriptCmd: string;
+    initCwd: string;
+}
+export default function makeNpmScriptEnv({ pkgPath, pkgJson, scriptName, scriptCmd, initCwd }: MakeNpmScriptEnvOptions): Record<string, string>;
+export {};

package/dist/lib/util/npm-script-env.js

@@ -0,0 +1,22 @@
+import Path from "path";
+import { myPkgDir } from "../my-pkg.js";
+export default function makeNpmScriptEnv({ pkgPath, pkgJson, scriptName, scriptCmd, initCwd }) {
+    const node = process.env.NODE || process.execPath;
+    const env = {
+        npm_lifecycle_event: scriptName,
+        npm_lifecycle_script: scriptCmd,
+        npm_execpath: Path.join(myPkgDir, "bin", "xrun.js"),
+        npm_node_execpath: node,
+        NODE: node,
+        npm_package_json: pkgPath,
+        INIT_CWD: initCwd,
+        PWD: Path.dirname(pkgPath)
+    };
+    if (pkgJson.name) {
+        env.npm_package_name = pkgJson.name;
+    }
+    if (pkgJson.version) {
+        env.npm_package_version = pkgJson.version;
+    }
+    return env;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fynjs/run",
-  "version": "1.1.6",
+  "version": "1.1.7",
   "description": "concurrent or serial run npm scripts, javascript tasks, and more",
   "main": "./dist/lib/index.js",
   "types": "./dist/lib/index.d.ts",
@@ -88,29 +88,29 @@
   "homepage": "https://github.com/jchip/fynjs/tree/main/packages/xarc-run",
   "dependencies": {
     "chalk": "^6.0.0",
-    "chalker": "^2.1.5",
+    "chalker": "^2.1.6",
     "insync": "^2.1.1",
     "jaro-winkler": "^0.2.8",
-    "@fynjs/cli-args": "^1.1.5",
+    "@fynjs/cli-args": "^1.1.6",
     "optional-require": "^2.1.0",
     "read-package-up": "^12.0.0",
-    "string-array": "^2.1.5",
-    "unwrap-npm-cmd": "^2.1.5",
-    "xsh": "^1.1.6"
+    "string-array": "^2.1.6",
+    "unwrap-npm-cmd": "^2.1.6",
+    "xsh": "^1.1.7"
   },
   "devDependencies": {
     "@fynjs/ts-resolve": "^1.0.3",
     "@types/node": "^26.4.1",
     "@vitest/coverage-v8": "^5.0.0",
-    "munchy": "^2.0.5",
+    "munchy": "^2.0.6",
     "prettier": "^3.5.3",
-    "publish-util": "^3.1.5",
-    "run-verify": "^2.1.6",
+    "publish-util": "^3.1.6",
+    "run-verify": "^2.1.7",
     "strip-ansi": "^7.2.0",
     "typescript": "^7.0.2",
     "vite": "^8.2.2",
     "vitest": "^5.0.0",
-    "xaa": "^3.1.5",
+    "xaa": "^3.1.6",
     "xstdout": "^0.1.1"
   },
   "type": "module"