dollar-shell 1.0.3 → 1.0.5

package/README.md

@@ -204,7 +204,9 @@ BSD-3-Clause
 
 ## Release History
 
-- 1.0.3 *Added TSDoc comments, improved docs, fixed typos, added the missing copying of properties.*
-- 1.0.2 *Technical release: fixed references in the package file.*
-- 1.0.1 *Technical release: more tests, better documentation.*
-- 1.0.0 *The initial release.*
+* 1.0.5 *Updated dev dependencies.*
+* 1.0.4 *Fixed `raw()` for spawn commands.*
+* 1.0.3 *Added TSDoc comments, improved docs, fixed typos, added the missing copying of properties.*
+* 1.0.2 *Technical release: fixed references in the package file.*
+* 1.0.1 *Technical release: more tests, better documentation.*
+* 1.0.0 *The initial release.*

package/package.json

@@ -1,17 +1,23 @@
 {
   "name": "dollar-shell",
   "description": "Run shell commands and use them in streams with ease in Node, Deno, Bun. Tiny, simple, no dependency package.",
-  "version": "1.0.3",
+  "version": "1.0.5",
   "type": "module",
   "main": "./src/index.js",
   "types": "./src/index.d.ts",
   "exports": {
-    ".": "./src/index.js",
+    ".": {
+      "types": "./src/index.d.ts",
+      "default": "./src/index.js"
+    },
     "./*": "./src/*"
   },
   "scripts": {
     "test": "tape6 --flags FO",
-    "ts-test": "tsc --noEmit"
+    "test:bun": "tape6-bun --flags FO",
+    "test:deno": "deno run -A `tape6-runner main` --flags FO",
+    "test:deno-original": "tape6-deno --flags FO",
+    "ts-check": "tsc --noEmit"
   },
   "files": [
     "/src",
@@ -34,11 +40,14 @@
     "stream"
   ],
   "author": "Eugene Lazutkin <eugene.lazutkin@gmail.com> (http://www.lazutkin.com/)",
-  "funding": "https://github.com/sponsors/uhop",
+  "funding": {
+    "type": "github",
+    "url": "https://github.com/sponsors/uhop"
+  },
   "license": "BSD-3-Clause",
   "devDependencies": {
-    "tape-six": "^0.9.6",
-    "typescript": "^5.5.4"
+    "tape-six": "^0.12.1",
+    "typescript": "^5.6.2"
   },
   "tape6": {
     "tests": [

package/src/bq-spawn.js

@@ -2,6 +2,32 @@
 
 import {verifyStrings, isRawValue, getRawValue} from './utils.js';
 
+const appendString = (s, previousSpace, result) => {
+  previousSpace ||= /^\s/.test(s);
+  if (previousSpace) s = s.trimStart();
+
+  const lastSpace = /\s$/.test(s);
+  if (lastSpace) s = s.trimEnd();
+
+  let parts = s.split(/\s+/g).filter(part => part);
+  if (parts.length) {
+    if (!previousSpace) {
+      if (result.length) {
+        result[result.length - 1] += parts[0];
+      } else {
+        result.push(parts[0]);
+      }
+      parts = parts.slice(1);
+    }
+    result.push(...parts);
+    previousSpace = lastSpace;
+  } else {
+    previousSpace ||= lastSpace;
+  }
+
+  return previousSpace;
+};
+
 const impl =
   (spawn, options) =>
   (strings, ...args) => {
@@ -11,45 +37,30 @@ const impl =
     for (let i = 0; i < strings.length; i++) {
       // process a string
 
-      let string = strings[i];
-      previousSpace ||= /^\s/.test(string);
-      if (previousSpace) string = string.trimStart();
-      const lastSpace = /\s$/.test(string);
-      if (lastSpace) string = string.trimEnd();
-
-      let parts = string.split(/\s+/g).filter(part => part);
-      if (parts.length) {
-        if (!previousSpace) {
-          if (result.length) {
-            result[result.length - 1] += parts[0];
-          } else {
-            result.push(parts[0]);
-          }
-          parts = parts.slice(1);
-        }
-        result.push(...parts);
-        previousSpace = lastSpace;
-      } else {
-        previousSpace ||= lastSpace;
-      }
+      previousSpace = appendString(strings[i], previousSpace, result);
 
       // process an argument
 
       if (i >= args.length) continue;
 
-      const arg = String(isRawValue(args[i]) ? getRawValue(args[i]) : args[i]);
-      if (!arg) continue;
-
-      if (previousSpace) {
-        result.push(arg);
+      if (isRawValue(args[i])) {
+        const arg = String(getRawValue(args[i]));
+        if (!arg) continue;
+        previousSpace = appendString(arg, previousSpace, result);
       } else {
-        if (result.length) {
-          result[result.length - 1] += arg;
-        } else {
+        const arg = String(args[i]);
+        if (!arg) continue;
+        if (previousSpace) {
           result.push(arg);
+        } else {
+          if (result.length) {
+            result[result.length - 1] += arg;
+          } else {
+            result.push(arg);
+          }
         }
+        previousSpace = false;
       }
-      previousSpace = false;
     }
 
     return spawn(result, options);