@jdeighan/coffee-utils 7.0.15 → 7.0.18

package/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "@jdeighan/coffee-utils",
 	"type": "module",
-	"version": "7.0.15",
+	"version": "7.0.18",
 	"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,8 +382,8 @@ export strcat = (lItems...) ->
 
 # ---------------------------------------------------------------------------
 
-export replaceVars = (line, hVars={}, regexp=/__(env\.)?([A-Za-z_]\w*)__/) ->
+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(regexp, 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 = {}, regexp = /__(env\.)?([A-Za-z_]\w*)__/) {
+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 = {}, regexp = /__(env\.)?([A-Za-z
       return hVars[name].toString();
     }
   };
-  return line.replace(regexp, replacerFunc);
+  return line.replace(rx, replacerFunc);
 };

package/src/debug_utils.coffee

@@ -150,7 +150,7 @@ adjustStack = (str) ->
 export debug = (lArgs...) ->
 
 	# --- We want to allow item to be undef. Therefore, we need to
-	#     distinguish between 1 arg sent vs. 2+ args sent
+	#     distinguish between 1 arg sent vs. 2 args sent
 	nArgs = lArgs.length
 	assert (nArgs==1) || (nArgs==2), "debug(): #{nArgs} args"
 	[label, item] = lArgs
@@ -172,6 +172,7 @@ export debug = (lArgs...) ->
 		prefix: mainPre
 		itemPrefix: auxPre
 		}
+
 	switch type
 		when 'enter'
 			log label, hOptions
@@ -184,7 +185,7 @@ export debug = (lArgs...) ->
 				# --- don't repeat the label
 				logItem undef, item, hOptions
 		when 'string'
-			if item
+			if (nArgs==2)
 				logItem label, item, hOptions
 			else
 				log label, hOptions

package/src/debug_utils.js

@@ -163,7 +163,7 @@ adjustStack = function(str) {
 export var debug = function(...lArgs) {
   var auxPre, hEnv, hOptions, item, label, mainPre, nArgs, orgDebugging, trans, type;
   // --- We want to allow item to be undef. Therefore, we need to
-  //     distinguish between 1 arg sent vs. 2+ args sent
+  //     distinguish between 1 arg sent vs. 2 args sent
   nArgs = lArgs.length;
   assert((nArgs === 1) || (nArgs === 2), `debug(): ${nArgs} args`);
   [label, item] = lArgs;
@@ -199,7 +199,7 @@ export var debug = function(...lArgs) {
       }
       break;
     case 'string':
-      if (item) {
+      if (nArgs === 2) {
         logItem(label, item, hOptions);
       } else {
         log(label, hOptions);