@jdeighan/coffee-utils 7.0.12 → 7.0.15

package/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "@jdeighan/coffee-utils",
 	"type": "module",
-	"version": "7.0.12",
+	"version": "7.0.15",
 	"description": "A set of utility functions for CoffeeScript",
 	"main": "coffee_utils.js",
 	"exports": {

package/src/coffee_utils.coffee

@@ -379,3 +379,11 @@ export strcat = (lItems...) ->
 	for item in lItems
 		str += item.toString()
 	return str
+
+# ---------------------------------------------------------------------------
+
+export replaceVars = (line, hVars={}, regexp=/__(env\.)?([A-Za-z_]\w*)__/) ->
+
+	replacerFunc = (match, prefix, name) =>
+		return if prefix then process.env[name] else hVars[name].toString()
+	return line.replace(regexp, replacerFunc)

package/src/coffee_utils.js

@@ -408,3 +408,16 @@ export var strcat = function(...lItems) {
   }
   return str;
 };
+
+// ---------------------------------------------------------------------------
+export var replaceVars = function(line, hVars = {}, regexp = /__(env\.)?([A-Za-z_]\w*)__/) {
+  var replacerFunc;
+  replacerFunc = (match, prefix, name) => {
+    if (prefix) {
+      return process.env[name];
+    } else {
+      return hVars[name].toString();
+    }
+  };
+  return line.replace(regexp, replacerFunc);
+};

package/src/log_utils.coffee

@@ -21,13 +21,17 @@ export LOG = (lArgs...) ->
 
 	[label, item] = lArgs
 	if lArgs.length > 1
-		console.log sep_dash
-		if item?
-			console.log "#{label}:"
-			console.log untabify(orderedStringify(item))
-		else
+		# --- There's both a label and an item
+		if ! item?
 			console.log "#{label}: UNDEFINED"
-		console.log sep_dash
+		else
+			console.log sep_dash
+			console.log "#{label}:"
+			if isString(item)
+				console.log untabify(item)
+			else
+				console.log untabify(orderedStringify(item))
+			console.log sep_dash
 	else
 		console.log label
 	return

package/src/log_utils.js

@@ -39,14 +39,18 @@ export var LOG = function(...lArgs) {
   var item, label;
   [label, item] = lArgs;
   if (lArgs.length > 1) {
-    console.log(sep_dash);
-    if (item != null) {
-      console.log(`${label}:`);
-      console.log(untabify(orderedStringify(item)));
-    } else {
+    if (item == null) {
       console.log(`${label}: UNDEFINED`);
+    } else {
+      console.log(sep_dash);
+      console.log(`${label}:`);
+      if (isString(item)) {
+        console.log(untabify(item));
+      } else {
+        console.log(untabify(orderedStringify(item)));
+      }
+      console.log(sep_dash);
     }
-    console.log(sep_dash);
   } else {
     console.log(label);
   }