@jdeighan/coffee-utils 7.0.11 → 7.0.14

package/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "@jdeighan/coffee-utils",
 	"type": "module",
-	"version": "7.0.11",
+	"version": "7.0.14",
 	"description": "A set of utility functions for CoffeeScript",
 	"main": "coffee_utils.js",
 	"exports": {
@@ -49,7 +49,7 @@
 		"js-yaml": "^4.1.0",
 		"n-readlines": "^1.0.1",
 		"readline-sync": "^1.4.10",
-		"svelte": "^3.46.6"
+		"svelte": "^3.47.0"
 	},
 	"devDependencies": {
 		"@jdeighan/unit-tester": "^1.0.5"

package/src/coffee_utils.coffee

@@ -379,3 +379,17 @@ export strcat = (lItems...) ->
 	for item in lItems
 		str += item.toString()
 	return str
+
+# ---------------------------------------------------------------------------
+
+export replaceVars = (line, hVars) ->
+
+	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)

package/src/coffee_utils.js

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

package/src/log_utils.coffee

@@ -15,23 +15,28 @@ putstr = undef
 export stringify = undef
 
 # ---------------------------------------------------------------------------
-# This is useful for debugging and easy to remove after debugging
+# This is useful for debugging
 
 export LOG = (lArgs...) ->
 
 	[label, item] = lArgs
 	if lArgs.length > 1
-		console.log sep_dash
-		if item?
-			console.log "#{label}:"
-			console.log untabify(orderedStringify(item))
+		# --- There's both a label and an item
+		if ! item?
+			console.log "#{label}: UNDEFINED"
 		else
-			console.log "[#{label}]: UNDEFINED"
-		console.log sep_dash
+			console.log sep_dash
+			console.log "#{label}:"
+			if isString(item)
+				console.log item
+			else
+				console.log untabify(orderedStringify(item))
+			console.log sep_dash
 	else
 		console.log label
 	return
 
+# --- Use this instead to make it easier to remove all instances
 export DEBUG = LOG   # synonym
 
 # ---------------------------------------------------------------------------
@@ -93,7 +98,7 @@ export orderedStringify = (obj, escape=false) ->
 		skipInvalid: true
 		indent: 1
 		sortKeys: true
-		lineWidth: -1
+		lineWidth: 40
 		replacer: if escape then escReplacer else (name,value) -> value
 		})
 

package/src/log_utils.js

@@ -34,24 +34,29 @@ putstr = undef;
 export var stringify = undef;
 
 // ---------------------------------------------------------------------------
-// This is useful for debugging and easy to remove after debugging
+// This is useful for debugging
 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)));
+    if (item == null) {
+      console.log(`${label}: UNDEFINED`);
     } else {
-      console.log(`[${label}]: UNDEFINED`);
+      console.log(sep_dash);
+      console.log(`${label}:`);
+      if (isString(item)) {
+        console.log(item);
+      } else {
+        console.log(untabify(orderedStringify(item)));
+      }
+      console.log(sep_dash);
     }
-    console.log(sep_dash);
   } else {
     console.log(label);
   }
 };
 
+// --- Use this instead to make it easier to remove all instances
 export var DEBUG = LOG; // synonym
 
 
@@ -113,7 +118,7 @@ export var orderedStringify = function(obj, escape = false) {
     skipInvalid: true,
     indent: 1,
     sortKeys: true,
-    lineWidth: -1,
+    lineWidth: 40,
     replacer: escape ? escReplacer : function(name, value) {
       return value;
     }