@naturalcycles/nodejs-lib 13.33.1 → 13.34.0

package/dist/util/exec2.d.ts

@@ -140,6 +140,11 @@ export interface SpawnOptions {
     name?: string;
     cwd?: string;
     env?: AnyObject;
+    /**
+     * Defaults to false for security reasons.
+     * Set to true to pass `process.env` to the spawned process.
+     */
+    passProcessEnv?: boolean;
 }
 export interface ExecOptions {
     /**
@@ -163,5 +168,10 @@ export interface ExecOptions {
     cwd?: string;
     timeout?: NumberOfMilliseconds;
     env?: AnyObject;
+    /**
+     * Defaults to false for security reasons.
+     * Set to true to pass `process.env` to the spawned process.
+     */
+    passProcessEnv?: boolean;
 }
 export {};

package/dist/util/exec2.js

@@ -57,8 +57,10 @@ class Exec2 {
             const p = node_child_process_1.default.spawn(cmd, opt.args || [], {
                 shell,
                 cwd,
-                env,
-                // ...process.env, // not passing by default for security reasons
+                env: {
+                    ...env,
+                    ...(opt.passProcessEnv ? process.env : {}),
+                },
             });
             p.stdout.on('data', data => {
                 if (collectOutputWhileRunning) {
@@ -115,8 +117,10 @@ class Exec2 {
             stdio: 'inherit',
             shell,
             cwd,
-            env,
-            // ...process.env, // not passing by default for security reasons
+            env: {
+                ...env,
+                ...(opt.passProcessEnv ? process.env : {}),
+            },
         });
         this.logFinish(cmd, opt, started);
         if (r.error) {
@@ -153,8 +157,10 @@ class Exec2 {
                 // shell: undefined,
                 cwd,
                 timeout,
-                env,
-                // ...process.env, // not passing by default for security reasons
+                env: {
+                    ...env,
+                    ...(opt.passProcessEnv ? process.env : {}),
+                },
             })
                 .trim();
         }
@@ -192,7 +198,13 @@ class Exec2 {
     logFinish(cmd, opt, started) {
         if (!opt.logFinish && !opt.log)
             return;
-        console.log([(0, colors_1.white)(opt.name || cmd), (0, colors_1.dimGrey)('took ' + (0, js_lib_1._since)(started))].join(' '));
+        console.log([
+            (0, colors_1.white)(opt.name || cmd),
+            ...((!opt.name && opt.args) || []),
+            (0, colors_1.dimGrey)('took ' + (0, js_lib_1._since)(started)),
+        ]
+            .filter(Boolean)
+            .join(' '));
     }
 }
 exports.exec2 = new Exec2();

package/package.json

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

package/src/util/exec2.ts

@@ -68,8 +68,10 @@ class Exec2 {
       const p = cp.spawn(cmd, opt.args || [], {
         shell,
         cwd,
-        env,
-        // ...process.env, // not passing by default for security reasons
+        env: {
+          ...env,
+          ...(opt.passProcessEnv ? process.env : {}),
+        },
       })
 
       p.stdout.on('data', data => {
@@ -130,8 +132,10 @@ class Exec2 {
       stdio: 'inherit',
       shell,
       cwd,
-      env,
-      // ...process.env, // not passing by default for security reasons
+      env: {
+        ...env,
+        ...(opt.passProcessEnv ? process.env : {}),
+      },
     })
 
     this.logFinish(cmd, opt, started)
@@ -172,8 +176,10 @@ class Exec2 {
           // shell: undefined,
           cwd,
           timeout,
-          env,
-          // ...process.env, // not passing by default for security reasons
+          env: {
+            ...env,
+            ...(opt.passProcessEnv ? process.env : {}),
+          },
         })
         .trim()
     } catch (err) {
@@ -218,7 +224,15 @@ class Exec2 {
   ): void {
     if (!opt.logFinish && !opt.log) return
 
-    console.log([white(opt.name || cmd), dimGrey('took ' + _since(started))].join(' '))
+    console.log(
+      [
+        white(opt.name || cmd),
+        ...((!opt.name && (opt as SpawnOptions).args) || []),
+        dimGrey('took ' + _since(started)),
+      ]
+        .filter(Boolean)
+        .join(' '),
+    )
   }
 }
 
@@ -297,6 +311,11 @@ export interface SpawnOptions {
   cwd?: string
 
   env?: AnyObject
+  /**
+   * Defaults to false for security reasons.
+   * Set to true to pass `process.env` to the spawned process.
+   */
+  passProcessEnv?: boolean
 }
 
 export interface ExecOptions {
@@ -323,4 +342,9 @@ export interface ExecOptions {
   timeout?: NumberOfMilliseconds
 
   env?: AnyObject
+  /**
+   * Defaults to false for security reasons.
+   * Set to true to pass `process.env` to the spawned process.
+   */
+  passProcessEnv?: boolean
 }