@naturalcycles/nodejs-lib 13.34.2 → 13.34.4

package/dist/util/exec2.d.ts

@@ -68,7 +68,7 @@ declare class Exec2 {
      * Defaults:
      *
      * shell: true
-     * log: true
+     * log: false
      */
     exec(cmd: string, opt?: ExecOptions): string;
     throwOnNonZeroExitCode(o: SpawnOutput): void;

package/dist/util/exec2.js

@@ -48,13 +48,15 @@ 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
+        opt.logStart ??= opt.log;
+        opt.logFinish ??= opt.log;
         const started = Date.now();
         this.logStart(cmd, 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)
-            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,
@@ -84,8 +86,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,10 +116,13 @@ 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
+        opt.logStart ??= opt.log;
+        opt.logFinish ??= opt.log;
         const started = Date.now();
         this.logStart(cmd, opt);
-        const { shell = true, cwd, env, passProcessEnv = true, 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',
@@ -130,7 +134,7 @@ class Exec2 {
                 ...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) {
@@ -152,12 +156,14 @@ class Exec2 {
      * Defaults:
      *
      * shell: true
-     * log: true
+     * log: false
      */
     exec(cmd, opt = {}) {
+        const { cwd, env, passProcessEnv = true, timeout } = opt;
+        opt.logStart ??= opt.log ?? false;
+        opt.logFinish ??= opt.log ?? false;
         const started = Date.now();
         this.logStart(cmd, opt);
-        const { cwd, env, passProcessEnv = true, timeout } = opt;
         try {
             const s = node_child_process_1.default
                 .execSync(cmd, {
@@ -195,7 +201,7 @@ class Exec2 {
         }
     }
     logStart(cmd, opt) {
-        if (!opt.logStart && !opt.log)
+        if (!opt.logStart)
             return;
         console.log([
             (0, colors_1.dimGrey)(...Object.entries(opt.env || {}).map(([k, v]) => [k, v].join('='))),
@@ -206,7 +212,7 @@ class Exec2 {
             .join(' '));
     }
     logFinish(cmd, opt, started, isSuccessful) {
-        if (isSuccessful && !opt.logFinish && !opt.log)
+        if (isSuccessful && !opt.logFinish)
             return;
         console.log([
             (0, colors_1.white)(opt.name || cmd),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@naturalcycles/nodejs-lib",
-  "version": "13.34.2",
+  "version": "13.34.4",
   "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,
@@ -63,10 +61,15 @@ class Exec2 {
       passProcessEnv = true,
       forceColor = hasColors,
     } = opt
+    opt.log ??= printWhileRunning // by default log should be true, as we are printing the output
+    opt.logStart ??= opt.log
+    opt.logFinish ??= opt.log
+    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 || [], {
@@ -99,7 +102,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
@@ -130,10 +133,13 @@ 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
+    opt.logStart ??= opt.log
+    opt.logFinish ??= opt.log
     const started = Date.now()
     this.logStart(cmd, opt)
-    const { shell = true, cwd, env, passProcessEnv = true, 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',
@@ -147,7 +153,7 @@ class Exec2 {
       },
     })
 
-    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)
 
@@ -171,12 +177,14 @@ class Exec2 {
    * Defaults:
    *
    * shell: true
-   * log: true
+   * log: false
    */
   exec(cmd: string, opt: ExecOptions = {}): string {
+    const { cwd, env, passProcessEnv = true, timeout } = opt
+    opt.logStart ??= opt.log ?? false
+    opt.logFinish ??= opt.log ?? false
     const started = Date.now()
     this.logStart(cmd, opt)
-    const { cwd, env, passProcessEnv = true, timeout } = opt
 
     try {
       const s = cp
@@ -217,7 +225,7 @@ class Exec2 {
   }
 
   private logStart(cmd: string, opt: SpawnOptions | ExecOptions): void {
-    if (!opt.logStart && !opt.log) return
+    if (!opt.logStart) return
 
     console.log(
       [
@@ -236,7 +244,7 @@ class Exec2 {
     started: UnixTimestampMillisNumber,
     isSuccessful: boolean,
   ): void {
-    if (isSuccessful && !opt.logFinish && !opt.log) return
+    if (isSuccessful && !opt.logFinish) return
 
     console.log(
       [