@naturalcycles/nodejs-lib 13.34.1 → 13.34.2

package/dist/util/exec2.d.ts

@@ -141,8 +141,8 @@ export interface SpawnOptions {
     cwd?: string;
     env?: AnyObject;
     /**
-     * Defaults to false for security reasons.
-     * Set to true to pass `process.env` to the spawned process.
+     * Defaults to true.
+     * Set to false to NOT pass `process.env` to the spawned process.
      */
     passProcessEnv?: boolean;
     /**

package/dist/util/exec2.js

@@ -50,7 +50,7 @@ class Exec2 {
     async spawnAsync(cmd, opt = {}) {
         const started = Date.now();
         this.logStart(cmd, opt);
-        const { shell = true, printWhileRunning = true, collectOutputWhileRunning = true, throwOnNonZeroCode = true, cwd, env, forceColor = colors_1.hasColors, } = opt;
+        const { shell = true, printWhileRunning = true, collectOutputWhileRunning = true, throwOnNonZeroCode = true, cwd, env, passProcessEnv = true, forceColor = colors_1.hasColors, } = opt;
         let stdout = '';
         let stderr = '';
         if (printWhileRunning)
@@ -60,9 +60,9 @@ class Exec2 {
                 shell,
                 cwd,
                 env: {
-                    ...env,
-                    ...(opt.passProcessEnv ? process.env : {}),
+                    ...(passProcessEnv ? process.env : {}),
                     ...(forceColor ? { FORCE_COLOR: '1' } : {}),
+                    ...env,
                 },
             });
             p.stdout.on('data', data => {
@@ -117,7 +117,7 @@ class Exec2 {
     spawn(cmd, opt = {}) {
         const started = Date.now();
         this.logStart(cmd, opt);
-        const { shell = true, cwd, env, forceColor = colors_1.hasColors } = opt;
+        const { shell = true, cwd, env, passProcessEnv = true, forceColor = colors_1.hasColors } = opt;
         console.log(''); // 1-line padding before the output
         const r = node_child_process_1.default.spawnSync(cmd, opt.args, {
             encoding: 'utf8',
@@ -125,9 +125,9 @@ class Exec2 {
             shell,
             cwd,
             env: {
-                ...env,
-                ...(opt.passProcessEnv ? process.env : {}),
+                ...(passProcessEnv ? process.env : {}),
                 ...(forceColor ? { FORCE_COLOR: '1' } : {}),
+                ...env,
             },
         });
         console.log(''); // 1-line padding after the output
@@ -157,7 +157,7 @@ class Exec2 {
     exec(cmd, opt = {}) {
         const started = Date.now();
         this.logStart(cmd, opt);
-        const { cwd, env, timeout } = opt;
+        const { cwd, env, passProcessEnv = true, timeout } = opt;
         try {
             const s = node_child_process_1.default
                 .execSync(cmd, {
@@ -168,8 +168,8 @@ class Exec2 {
                 cwd,
                 timeout,
                 env: {
+                    ...(passProcessEnv ? process.env : {}),
                     ...env,
-                    ...(opt.passProcessEnv ? process.env : {}),
                 },
             })
                 .trim();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@naturalcycles/nodejs-lib",
-  "version": "13.34.1",
+  "version": "13.34.2",
   "scripts": {
     "prepare": "husky",
     "build": "dev-lib build",

package/src/util/exec2.ts

@@ -60,6 +60,7 @@ class Exec2 {
       throwOnNonZeroCode = true,
       cwd,
       env,
+      passProcessEnv = true,
       forceColor = hasColors,
     } = opt
     let stdout = ''
@@ -72,9 +73,9 @@ class Exec2 {
         shell,
         cwd,
         env: {
-          ...env,
-          ...(opt.passProcessEnv ? process.env : {}),
+          ...(passProcessEnv ? process.env : {}),
           ...(forceColor ? { FORCE_COLOR: '1' } : {}),
+          ...env,
         },
       })
 
@@ -131,7 +132,7 @@ class Exec2 {
   spawn(cmd: string, opt: SpawnOptions = {}): void {
     const started = Date.now()
     this.logStart(cmd, opt)
-    const { shell = true, cwd, env, forceColor = hasColors } = opt
+    const { shell = true, cwd, env, passProcessEnv = true, forceColor = hasColors } = opt
     console.log('') // 1-line padding before the output
 
     const r = cp.spawnSync(cmd, opt.args, {
@@ -140,9 +141,9 @@ class Exec2 {
       shell,
       cwd,
       env: {
-        ...env,
-        ...(opt.passProcessEnv ? process.env : {}),
+        ...(passProcessEnv ? process.env : {}),
         ...(forceColor ? { FORCE_COLOR: '1' } : {}),
+        ...env,
       },
     })
 
@@ -175,7 +176,7 @@ class Exec2 {
   exec(cmd: string, opt: ExecOptions = {}): string {
     const started = Date.now()
     this.logStart(cmd, opt)
-    const { cwd, env, timeout } = opt
+    const { cwd, env, passProcessEnv = true, timeout } = opt
 
     try {
       const s = cp
@@ -187,8 +188,8 @@ class Exec2 {
           cwd,
           timeout,
           env: {
+            ...(passProcessEnv ? process.env : {}),
             ...env,
-            ...(opt.passProcessEnv ? process.env : {}),
           },
         })
         .trim()
@@ -326,8 +327,8 @@ export interface SpawnOptions {
 
   env?: AnyObject
   /**
-   * Defaults to false for security reasons.
-   * Set to true to pass `process.env` to the spawned process.
+   * Defaults to true.
+   * Set to false to NOT pass `process.env` to the spawned process.
    */
   passProcessEnv?: boolean
   /**