cross-spawn-cb 0.5.15 → 0.6.3

package/lib/spawnCallback.js

@@ -13,41 +13,44 @@ module.exports = function spawnCallback(command, args, options, callback) {
   callback = once(callback);
 
   var cp = spawn(command, args, options);
+
+  // collect output
   var stdout, stderr;
-  if (cp.stdout) {
-    stdout = [];
-    cp.stdout.on('data', stdout.push.bind(stdout));
-  }
-  if (cp.stderr) {
-    stderr = [];
-    cp.stderr.on('data', stderr.push.bind(stderr));
+  if (options.encoding) {
+    if (cp.stdout) {
+      stdout = [];
+      cp.stdout.on('data', stdout.push.bind(stdout));
+    }
+    if (cp.stderr) {
+      stderr = [];
+      cp.stderr.on('data', stderr.push.bind(stderr));
+    }
   }
+
+  // some versions of node emit both an error and close
   cp.on('error', function error(err) {
-    // some versions of node emit both an error and close
     err.code === 'OK' || callback(err);
   });
+
+  // done
   cp.on('close', function (status, signal) {
     nextTick(function closeNextTick() {
-      // format results - buffer
-      if (stdout) stdout = Buffer.concat(stdout);
-      if (stderr) stderr = Buffer.concat(stderr);
+      // process output
+      if (options.encoding) {
+        if (stdout) stdout = Buffer.concat(stdout);
+        if (stderr) stderr = Buffer.concat(stderr);
 
-      // format results - string
-      var encoding = options.encoding === 'buffer' ? 'utf8' : options.encoding || 'utf8';
-      if ((options.encoding && options.encoding !== 'buffer') || options.stdio === 'string') {
-        stdout = stdout.toString(encoding);
-        stderr = stderr.toString(encoding);
-      } else if (options.stdout === 'string') {
-        stdout = stdout.toString(encoding);
-      } else if (options.stderr === 'string') {
-        stderr = stderr.toString(encoding);
+        if (options.encoding !== 'buffer') {
+          if (stdout) stdout = stdout.toString(options.encoding);
+          if (stderr) stderr = stderr.toString(options.encoding);
+        }
       }
 
       // process errors
       var err = status !== 0 ? new Error('Non-zero exit code: ' + status) : null;
       if (stderr && stderr.length) {
         err = err || new Error('stderr has content');
-        err.stderr = stderr;
+        err.stderr = Buffer.isBuffer(stderr) ? stderr.toString('utf8') : stderr;
       }
       if (err) return callback(err);
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cross-spawn-cb",
-  "version": "0.5.15",
+  "version": "0.6.3",
   "description": "Cross spawn with a completion callback",
   "keywords": [
     "cross-spawn",
@@ -16,7 +16,7 @@
   "scripts": {
     "format": "prettier --write .",
     "lint": "eslint .",
-    "prepublishOnly": "dtd \"npm run lint\" \"depcheck\"",
+    "prepublishOnly": "npm run lint && depcheck",
     "test": "mocha-compat test/spec/**/*.test.js",
     "build": "rollup -c config/rollup.cs.config.js"
   },
@@ -37,7 +37,6 @@
     "@rollup/plugin-node-resolve": "^13.3.0",
     "@typescript-eslint/parser": "^5.30.6",
     "depcheck": "^1.4.3",
-    "dis-dat": "^0.1.7",
     "eslint": "^8.19.0",
     "eslint-config-prettier": "^8.5.0",
     "eslint-config-standard": "^17.0.0",