@naturalcycles/nodejs-lib 13.34.1 → 13.34.3

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

@@ -48,21 +48,21 @@ class Exec2 {
      * log: true
      */
     async spawnAsync(cmd, opt = {}) {
+        const { shell = true, printWhileRunning = true, collectOutputWhileRunning = true, throwOnNonZeroCode = true, cwd, env, passProcessEnv = true, forceColor = colors_1.hasColors, } = opt;
+        opt.log ??= printWhileRunning; // by default log should be true, as we are printing the output
         const started = Date.now();
         this.logStart(cmd, opt);
-        const { shell = true, printWhileRunning = true, collectOutputWhileRunning = true, throwOnNonZeroCode = true, cwd, env, forceColor = colors_1.hasColors, } = opt;
         let stdout = '';
         let stderr = '';
-        if (printWhileRunning)
-            console.log(''); // 1-line padding before the output
+        // if (printWhileRunning) console.log('') // 1-line padding before the output
         return await new Promise((resolve, reject) => {
             const p = node_child_process_1.default.spawn(cmd, opt.args || [], {
                 shell,
                 cwd,
                 env: {
-                    ...env,
-                    ...(opt.passProcessEnv ? process.env : {}),
+                    ...(passProcessEnv ? process.env : {}),
                     ...(forceColor ? { FORCE_COLOR: '1' } : {}),
+                    ...env,
                 },
             });
             p.stdout.on('data', data => {
@@ -84,8 +84,7 @@ class Exec2 {
                 }
             });
             p.on('close', code => {
-                if (printWhileRunning)
-                    console.log(''); // 1-line padding after the output
+                // if (printWhileRunning) console.log('') // 1-line padding after the output
                 const isSuccessful = !code;
                 this.logFinish(cmd, opt, started, isSuccessful);
                 const exitCode = code || 0;
@@ -115,22 +114,23 @@ class Exec2 {
      * log: true
      */
     spawn(cmd, opt = {}) {
+        const { shell = true, cwd, env, passProcessEnv = true, forceColor = colors_1.hasColors } = opt;
+        opt.log ??= true; // by default log should be true, as we are printing the output
         const started = Date.now();
         this.logStart(cmd, opt);
-        const { shell = true, cwd, env, forceColor = colors_1.hasColors } = opt;
-        console.log(''); // 1-line padding before the output
+        // console.log('') // 1-line padding before the output
         const r = node_child_process_1.default.spawnSync(cmd, opt.args, {
             encoding: 'utf8',
             stdio: 'inherit',
             shell,
             cwd,
             env: {
-                ...env,
-                ...(opt.passProcessEnv ? process.env : {}),
+                ...(passProcessEnv ? process.env : {}),
                 ...(forceColor ? { FORCE_COLOR: '1' } : {}),
+                ...env,
             },
         });
-        console.log(''); // 1-line padding after the output
+        // console.log('') // 1-line padding after the output
         const isSuccessful = !r.error && !r.status;
         this.logFinish(cmd, opt, started, isSuccessful);
         if (r.error) {
@@ -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.3",
   "scripts": {
     "prepare": "husky",
     "build": "dev-lib build",

package/src/util/exec2.ts

@@ -51,8 +51,6 @@ class Exec2 {
    * log: true
    */
   async spawnAsync(cmd: string, opt: SpawnAsyncOptions = {}): Promise<SpawnOutput> {
-    const started = Date.now()
-    this.logStart(cmd, opt)
     const {
       shell = true,
       printWhileRunning = true,
@@ -60,21 +58,25 @@ class Exec2 {
       throwOnNonZeroCode = true,
       cwd,
       env,
+      passProcessEnv = true,
       forceColor = hasColors,
     } = opt
+    opt.log ??= printWhileRunning // by default log should be true, as we are printing the output
+    const started = Date.now()
+    this.logStart(cmd, opt)
     let stdout = ''
     let stderr = ''
 
-    if (printWhileRunning) console.log('') // 1-line padding before the output
+    // if (printWhileRunning) console.log('') // 1-line padding before the output
 
     return await new Promise<SpawnOutput>((resolve, reject) => {
       const p = cp.spawn(cmd, opt.args || [], {
         shell,
         cwd,
         env: {
-          ...env,
-          ...(opt.passProcessEnv ? process.env : {}),
+          ...(passProcessEnv ? process.env : {}),
           ...(forceColor ? { FORCE_COLOR: '1' } : {}),
+          ...env,
         },
       })
 
@@ -98,7 +100,7 @@ class Exec2 {
       })
 
       p.on('close', code => {
-        if (printWhileRunning) console.log('') // 1-line padding after the output
+        // if (printWhileRunning) console.log('') // 1-line padding after the output
         const isSuccessful = !code
         this.logFinish(cmd, opt, started, isSuccessful)
         const exitCode = code || 0
@@ -129,10 +131,11 @@ class Exec2 {
    * log: true
    */
   spawn(cmd: string, opt: SpawnOptions = {}): void {
+    const { shell = true, cwd, env, passProcessEnv = true, forceColor = hasColors } = opt
+    opt.log ??= true // by default log should be true, as we are printing the output
     const started = Date.now()
     this.logStart(cmd, opt)
-    const { shell = true, cwd, env, forceColor = hasColors } = opt
-    console.log('') // 1-line padding before the output
+    // console.log('') // 1-line padding before the output
 
     const r = cp.spawnSync(cmd, opt.args, {
       encoding: 'utf8',
@@ -140,13 +143,13 @@ 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
+    // console.log('') // 1-line padding after the output
     const isSuccessful = !r.error && !r.status
     this.logFinish(cmd, opt, started, isSuccessful)
 
@@ -175,7 +178,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 +190,8 @@ class Exec2 {
           cwd,
           timeout,
           env: {
+            ...(passProcessEnv ? process.env : {}),
             ...env,
-            ...(opt.passProcessEnv ? process.env : {}),
           },
         })
         .trim()
@@ -326,8 +329,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
   /**