@jdeighan/coffee-utils 2.1.8 → 2.1.12

package/package.json

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

package/src/coffee_utils.coffee

@@ -351,6 +351,8 @@ export oneline = (obj) ->
 	else
 		return 'undef'
 
+export OL = oneline
+
 # ---------------------------------------------------------------------------
 # truncateBlock - limit block to a certain number of lines
 

package/src/coffee_utils.js

@@ -383,6 +383,8 @@ export var oneline = function(obj) {
   }
 };
 
+export var OL = oneline;
+
 // ---------------------------------------------------------------------------
 // truncateBlock - limit block to a certain number of lines
 export var truncateBlock = function(str, numLines) {

package/src/debug_utils.coffee

@@ -26,6 +26,12 @@ lDebugFuncs = undef
 
 # ---------------------------------------------------------------------------
 
+stripArrow = (prefix) ->
+
+	return prefix.replace(arrow, '    ')
+
+# ---------------------------------------------------------------------------
+
 export debugIfLineMatches = (regexp=undef) ->
 
 	ifMatches = regexp
@@ -92,20 +98,6 @@ export resetDebugging = () ->
 	lDebugStack = []
 	return
 
-# ---------------------------------------------------------------------------
-# --- export only to allow unit testing
-
-export patchDebugStr = (str) ->
-
-	# --- Match things like "$varname$" to "'#{escapeStr(varname)}'"
-	re = /\$([A-Za-z_][A-Za-z0-9_]*)\$/g
-
-	replacer = (match, ident) ->
-
-		return "'\#\{escapeStr(#{ident})\}'"
-
-	return str.replace(re, replacer)
-
 # ---------------------------------------------------------------------------
 
 export debug = (lArgs...) ->
@@ -128,13 +120,13 @@ export debug = (lArgs...) ->
 		item = lArgs[1]
 
 	# --- determine if we're entering or returning from a function
-	entering = exiting = false
+	entering = returning = false
 	curFunc = undef
 	if (lMatches = str.match(///^
 			\s*
 			enter
 			\s+
-			([A-Za-z_][A-Za-z0-9_]*)
+			([A-Za-z_][A-Za-z0-9_\.]*)
 			///))
 		entering = true
 		curFunc = lMatches[1]
@@ -144,9 +136,9 @@ export debug = (lArgs...) ->
 			.*
 			from
 			\s+
-			([A-Za-z_][A-Za-z0-9_]*)
+			([A-Za-z_][A-Za-z0-9_\.]*)
 			///))
-		exiting = true
+		returning = true
 		curFunc = lMatches[1]
 
 	if entering && lDebugFuncs && funcMatch(curFunc)
@@ -155,7 +147,7 @@ export debug = (lArgs...) ->
 	if debugging && (not ifMatches? || str.match(ifMatches))
 
 		# --- set the prefix, i.e. indentation to use
-		if exiting
+		if returning
 			if (debugLevel==0)
 				prefix = arrow
 			else
@@ -166,15 +158,19 @@ export debug = (lArgs...) ->
 		if (nArgs==1)
 			log str, item, {prefix}
 		else
-			log str, item, {prefix, logItem: true}
+			log str, item, {
+				prefix,
+				logItem: true,
+				itemPrefix: stripArrow(prefix),
+				}
 
-	if exiting && lDebugFuncs && funcMatch(curFunc)
+	if returning && lDebugFuncs && funcMatch(curFunc)
 		setDebugging false    # revert to previous setting - might still be on
 
 	if debugging
 		if entering
 			debugLevel += 1
-		if exiting && (debugLevel > 0)
+		if returning && (debugLevel > 0)
 			debugLevel -= 1
 	return
 

package/src/debug_utils.js

@@ -1,6 +1,6 @@
 // Generated by CoffeeScript 2.5.1
 // debug_utils.coffee
-var arrow, arrowhead, corner, debugLevel, getPrefix, hbar, ifMatches, indent, lDebugFuncs, lDebugStack, reMethod, restoreDebugEnv, saveDebugEnv, vbar;
+var arrow, arrowhead, corner, debugLevel, getPrefix, hbar, ifMatches, indent, lDebugFuncs, lDebugStack, reMethod, restoreDebugEnv, saveDebugEnv, stripArrow, vbar;
 
 import {
   strict as assert
@@ -48,6 +48,11 @@ ifMatches = undef;
 
 lDebugFuncs = undef;
 
+// ---------------------------------------------------------------------------
+stripArrow = function(prefix) {
+  return prefix.replace(arrow, '    ');
+};
+
 // ---------------------------------------------------------------------------
 export var debugIfLineMatches = function(regexp = undef) {
   ifMatches = regexp;
@@ -106,21 +111,9 @@ export var resetDebugging = function() {
   lDebugStack = [];
 };
 
-// ---------------------------------------------------------------------------
-// --- export only to allow unit testing
-export var patchDebugStr = function(str) {
-  var re, replacer;
-  // --- Match things like "$varname$" to "'#{escapeStr(varname)}'"
-  re = /\$([A-Za-z_][A-Za-z0-9_]*)\$/g;
-  replacer = function(match, ident) {
-    return `'\#\{escapeStr(${ident})\}'`;
-  };
-  return str.replace(re, replacer);
-};
-
 // ---------------------------------------------------------------------------
 export var debug = function(...lArgs) {
-  var curFunc, entering, exiting, item, lMatches, nArgs, prefix, str;
+  var curFunc, entering, item, lMatches, nArgs, prefix, returning, str;
   // --- either 1 or 2 args
   if (!debugging && (lDebugFuncs == null)) {
     return;
@@ -135,13 +128,13 @@ export var debug = function(...lArgs) {
     item = lArgs[1];
   }
   // --- determine if we're entering or returning from a function
-  entering = exiting = false;
+  entering = returning = false;
   curFunc = undef;
-  if ((lMatches = str.match(/^\s*enter\s+([A-Za-z_][A-Za-z0-9_]*)/))) {
+  if ((lMatches = str.match(/^\s*enter\s+([A-Za-z_][A-Za-z0-9_\.]*)/))) {
     entering = true;
     curFunc = lMatches[1];
-  } else if ((lMatches = str.match(/^\s*return.*from\s+([A-Za-z_][A-Za-z0-9_]*)/))) {
-    exiting = true;
+  } else if ((lMatches = str.match(/^\s*return.*from\s+([A-Za-z_][A-Za-z0-9_\.]*)/))) {
+    returning = true;
     curFunc = lMatches[1];
   }
   if (entering && lDebugFuncs && funcMatch(curFunc)) {
@@ -149,7 +142,7 @@ export var debug = function(...lArgs) {
   }
   if (debugging && ((ifMatches == null) || str.match(ifMatches))) {
     // --- set the prefix, i.e. indentation to use
-    if (exiting) {
+    if (returning) {
       if (debugLevel === 0) {
         prefix = arrow;
       } else {
@@ -163,18 +156,19 @@ export var debug = function(...lArgs) {
     } else {
       log(str, item, {
         prefix,
-        logItem: true
+        logItem: true,
+        itemPrefix: stripArrow(prefix)
       });
     }
   }
-  if (exiting && lDebugFuncs && funcMatch(curFunc)) {
+  if (returning && lDebugFuncs && funcMatch(curFunc)) {
     setDebugging(false); // revert to previous setting - might still be on
   }
   if (debugging) {
     if (entering) {
       debugLevel += 1;
     }
-    if (exiting && (debugLevel > 0)) {
+    if (returning && (debugLevel > 0)) {
       debugLevel -= 1;
     }
   }

package/src/log_utils.coffee

@@ -77,10 +77,10 @@ export log = (lArgs...) ->
 	#     valid options:
 	#        prefix
 	#        logItem
+	#        itemPrefix
 
 	if (lArgs.length==0)
 		return
-	prefix = ''
 	str = lArgs[0]
 	switch lArgs.length
 		when 1
@@ -92,11 +92,22 @@ export log = (lArgs...) ->
 			item = lArgs[1]      # might not be logged, though
 			hOptions = lArgs[2]
 			assert isHash(hOptions), "log(): 3rd arg must be a hash"
-			if hOptions.prefix?
-				prefix = hOptions.prefix
 			if hOptions.logItem?
 				logItem = hOptions.logItem
 
+	if hOptions?
+		if hOptions.prefix?
+			prefix = hOptions.prefix
+		else
+			prefix = ''
+
+		if hOptions.itemPrefix?
+			itemPrefix = hOptions.itemPrefix
+		else
+			itemPrefix = ''
+	else
+		prefix = itemPrefix = ''
+
 	if (not logItem)
 		logger "#{prefix}#{str}"
 	else if not item?
@@ -110,7 +121,7 @@ export log = (lArgs...) ->
 		else
 			logger "#{prefix}#{str}:"
 			for line in stringToArray(item)
-				logger "#{prefix}   #{escapeStr(line)}"
+				logger "#{itemPrefix}   #{escapeStr(line)}"
 	else
 		# --- It's some type of object
 		json = JSON.stringify(item)
@@ -119,7 +130,7 @@ export log = (lArgs...) ->
 		else
 			logger "#{prefix}#{str}:"
 			for str in stringToArray(stringify(item))
-				logger "#{prefix}   #{str}"
+				logger "#{itemPrefix}   #{str}"
 	return
 
 # ---------------------------------------------------------------------------

package/src/log_utils.js

@@ -81,15 +81,15 @@ maxOneLine = 32;
 
 // ---------------------------------------------------------------------------
 export var log = function(...lArgs) {
-  var esc, hOptions, i, item, j, json, len, len1, line, logItem, prefix, ref, ref1, str;
+  var esc, hOptions, i, item, itemPrefix, j, json, len, len1, line, logItem, prefix, ref, ref1, str;
   // --- (str, item, hOptions)
   //     valid options:
   //        prefix
   //        logItem
+  //        itemPrefix
   if (lArgs.length === 0) {
     return;
   }
-  prefix = '';
   str = lArgs[0];
   switch (lArgs.length) {
     case 1:
@@ -103,13 +103,24 @@ export var log = function(...lArgs) {
       item = lArgs[1];
       hOptions = lArgs[2];
       assert(isHash(hOptions), "log(): 3rd arg must be a hash");
-      if (hOptions.prefix != null) {
-        prefix = hOptions.prefix;
-      }
       if (hOptions.logItem != null) {
         logItem = hOptions.logItem;
       }
   }
+  if (hOptions != null) {
+    if (hOptions.prefix != null) {
+      prefix = hOptions.prefix;
+    } else {
+      prefix = '';
+    }
+    if (hOptions.itemPrefix != null) {
+      itemPrefix = hOptions.itemPrefix;
+    } else {
+      itemPrefix = '';
+    }
+  } else {
+    prefix = itemPrefix = '';
+  }
   if (!logItem) {
     logger(`${prefix}${str}`);
   } else if (item == null) {
@@ -125,7 +136,7 @@ export var log = function(...lArgs) {
       ref = stringToArray(item);
       for (i = 0, len = ref.length; i < len; i++) {
         line = ref[i];
-        logger(`${prefix}   ${escapeStr(line)}`);
+        logger(`${itemPrefix}   ${escapeStr(line)}`);
       }
     }
   } else {
@@ -138,7 +149,7 @@ export var log = function(...lArgs) {
       ref1 = stringToArray(stringify(item));
       for (j = 0, len1 = ref1.length; j < len1; j++) {
         str = ref1[j];
-        logger(`${prefix}   ${str}`);
+        logger(`${itemPrefix}   ${str}`);
       }
     }
   }