@jdeighan/coffee-utils 7.0.55 → 7.0.56

package/package.json

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

package/src/debug_utils.coffee

@@ -38,6 +38,9 @@ export debug = (label, lObjects...) ->
 		LOG "debug(): type = #{OL(type)}"
 		LOG "debug(): funcName = #{OL(funcName)}"
 
+	# --- function shouldLog() returns the (possibly modified) label
+	#     if we should log this, else it returns undef
+
 	switch type
 		when 'enter'
 			callStack.enter funcName
@@ -64,27 +67,27 @@ export debug = (label, lObjects...) ->
 	if doLog
 		level = callStack.getLevel()
 		prefix = getPrefix(level)
+		itemPrefix = removeLastVbar(prefix)
 
 		if doDebugDebug
 			LOG "callStack", callStack
 			LOG "level = #{OL(level)}"
 			LOG "prefix = #{OL(prefix)}"
+			LOG "itemPrefix = #{OL(itemPrefix)}"
 
 		switch type
 			when 'enter'
 				log label, {prefix}
-				prefix = removeLastVbar(prefix)
 				for obj,i in lObjects
 					if (i > 0)
-						log dashes(prefix)
-					logItem undef, obj, {prefix}
+						log dashes(itemPrefix, 40)
+					logItem undef, obj, {itemPrefix}
 			when 'return'
 				log label, {prefix: addArrow(prefix)}
-				prefix = removeLastVbar(prefix)
 				for obj,i in lObjects
 					if (i > 0)
-						log dashes(prefix)
-					logItem undef, obj, {prefix}
+						log dashes(itemPrefix, 40)
+					logItem undef, obj, {itemPrefix}
 			when 'string'
 				log label, {prefix}
 			when 'objects'

package/src/debug_utils.js

@@ -60,7 +60,7 @@ export var lFuncList = [];
 
 // ---------------------------------------------------------------------------
 export var debug = function(label, ...lObjects) {
-  var doLog, funcName, i, j, k, l, len1, len2, len3, level, nObjects, obj, prefix, type;
+  var doLog, funcName, i, itemPrefix, j, k, l, len1, len2, len3, level, nObjects, obj, prefix, type;
   assert(isString(label), `1st arg ${OL(label)} should be a string`);
   // --- We want to allow objects to be undef. Therefore, we need to
   //     distinguish between 1 arg sent vs. 2 or more args sent
@@ -71,6 +71,8 @@ export var debug = function(label, ...lObjects) {
     LOG(`debug(): type = ${OL(type)}`);
     LOG(`debug(): funcName = ${OL(funcName)}`);
   }
+  // --- function shouldLog() returns the (possibly modified) label
+  //     if we should log this, else it returns undef
   switch (type) {
     case 'enter':
       callStack.enter(funcName);
@@ -99,34 +101,34 @@ export var debug = function(label, ...lObjects) {
   if (doLog) {
     level = callStack.getLevel();
     prefix = getPrefix(level);
+    itemPrefix = removeLastVbar(prefix);
     if (doDebugDebug) {
       LOG("callStack", callStack);
       LOG(`level = ${OL(level)}`);
       LOG(`prefix = ${OL(prefix)}`);
+      LOG(`itemPrefix = ${OL(itemPrefix)}`);
     }
     switch (type) {
       case 'enter':
         log(label, {prefix});
-        prefix = removeLastVbar(prefix);
         for (i = j = 0, len1 = lObjects.length; j < len1; i = ++j) {
           obj = lObjects[i];
           if (i > 0) {
-            log(dashes(prefix));
+            log(dashes(itemPrefix, 40));
           }
-          logItem(undef, obj, {prefix});
+          logItem(undef, obj, {itemPrefix});
         }
         break;
       case 'return':
         log(label, {
           prefix: addArrow(prefix)
         });
-        prefix = removeLastVbar(prefix);
         for (i = k = 0, len2 = lObjects.length; k < len2; i = ++k) {
           obj = lObjects[i];
           if (i > 0) {
-            log(dashes(prefix));
+            log(dashes(itemPrefix, 40));
           }
-          logItem(undef, obj, {prefix});
+          logItem(undef, obj, {itemPrefix});
         }
         break;
       case 'string':