@jdeighan/coffee-utils 7.0.14 → 7.0.17

package/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "@jdeighan/coffee-utils",
 	"type": "module",
-	"version": "7.0.14",
+	"version": "7.0.17",
 	"description": "A set of utility functions for CoffeeScript",
 	"main": "coffee_utils.js",
 	"exports": {
@@ -52,6 +52,6 @@
 		"svelte": "^3.47.0"
 	},
 	"devDependencies": {
-		"@jdeighan/unit-tester": "^1.0.5"
+		"@jdeighan/unit-tester": "^2.0.0"
 	}
 }

package/src/coffee_utils.coffee

@@ -382,14 +382,8 @@ export strcat = (lItems...) ->
 
 # ---------------------------------------------------------------------------
 
-export replaceVars = (line, hVars) ->
+export replaceVars = (line, hVars={}, rx=/__(env\.)?([A-Za-z_]\w*)__/g) ->
 
 	replacerFunc = (match, prefix, name) =>
 		return if prefix then process.env[name] else hVars[name].toString()
-
-	return line.replace(///
-			__
-			(env\.)?
-			([A-Za-z_]\w*)
-			__
-			///g, replacerFunc)
+	return line.replace(rx, replacerFunc)

package/src/coffee_utils.js

@@ -410,7 +410,7 @@ export var strcat = function(...lItems) {
 };
 
 // ---------------------------------------------------------------------------
-export var replaceVars = function(line, hVars) {
+export var replaceVars = function(line, hVars = {}, rx = /__(env\.)?([A-Za-z_]\w*)__/g) {
   var replacerFunc;
   replacerFunc = (match, prefix, name) => {
     if (prefix) {
@@ -419,5 +419,5 @@ export var replaceVars = function(line, hVars) {
       return hVars[name].toString();
     }
   };
-  return line.replace(/__(env\.)?([A-Za-z_]\w*)__/g, replacerFunc);
+  return line.replace(rx, replacerFunc);
 };

package/src/log_utils.coffee

@@ -28,7 +28,7 @@ export LOG = (lArgs...) ->
 			console.log sep_dash
 			console.log "#{label}:"
 			if isString(item)
-				console.log item
+				console.log untabify(item)
 			else
 				console.log untabify(orderedStringify(item))
 			console.log sep_dash

package/src/log_utils.js

@@ -45,7 +45,7 @@ export var LOG = function(...lArgs) {
       console.log(sep_dash);
       console.log(`${label}:`);
       if (isString(item)) {
-        console.log(item);
+        console.log(untabify(item));
       } else {
         console.log(untabify(orderedStringify(item)));
       }