@jdeighan/coffee-utils 7.0.57 → 7.0.58

package/package.json

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

package/src/debug_utils.coffee

@@ -50,21 +50,25 @@ logif = (label, lObjects...) ->
 	assert isString(label), "1st arg #{OL(label)} should be a string"
 	nObjects = lObjects.length
 	[type, funcName] = getType(label, nObjects)
-	switch type
-		when 'enter'
-			if defined(lFunctions) && (funcName not in lFunctions)
-				return
-			callStack.enter funcName
-			log label, lObjects...
-		when 'return'
-			if defined(lFunctions) && (funcName not in lFunctions)
-				return
-			log label, lObjects...
-			callStack.returnFrom funcName
-		when 'string'
-			log label, lObjects...
-		when 'objects'
-			log label, lObjects...
+
+	level = callStack.getLevel()
+	prefix = getPrefix(level)
+	itemPrefix = removeLastVbar(prefix)
+	sep = dashes(itemPrefix, 40)
+
+	if (type == 'enter')
+		if defined(lFunctions) && (funcName not in lFunctions)
+			return
+		callStack.enter funcName
+	else if (type == 'return')
+		if defined(lFunctions) && (funcName not in lFunctions)
+			return
+
+	doTheLogging type, label, lObjects
+
+	if (type == 'return')
+		callStack.returnFrom funcName
+
 	return
 
 # ---------------------------------------------------------------------------
@@ -109,42 +113,7 @@ export debug = (label, lObjects...) ->
 	logif "#{nObjects} objects"
 
 	if doLog
-		level = callStack.getLevel()
-		prefix = getPrefix(level)
-		itemPrefix = removeLastVbar(prefix)
-		sep = dashes(itemPrefix, 40)
-		assert isString(sep), "sep is not a string"
-
-		logif "callStack", callStack
-		logif "level = #{OL(level)}"
-		logif "prefix = #{OL(prefix)}"
-		logif "itemPrefix = #{OL(itemPrefix)}"
-		logif "sep = #{OL(sep)}"
-
-		switch type
-			when 'enter'
-				log label, {prefix}
-				for obj,i in lObjects
-					if (i > 0)
-						log sep
-					logItem undef, obj, {itemPrefix}
-			when 'return'
-				log label, {prefix: addArrow(prefix)}
-				for obj,i in lObjects
-					if (i > 0)
-						log sep
-					logItem undef, obj, {itemPrefix}
-			when 'string'
-				log label, {prefix}
-			when 'objects'
-				if (nObjects==1) && shortEnough(label, lObjects[0])
-					logItem label, lObjects[0], {prefix}
-				else
-					if (label.indexOf(':') != label.length - 1)
-						label += ':'
-					log label, {prefix}
-					for obj in lObjects
-						logItem undef, obj, {prefix}
+		doTheLogging type, label, lObjects
 
 	if (type == 'enter') && doLog && (label.indexOf('call') == -1)
 		callStack.logCurFunc()
@@ -156,6 +125,48 @@ export debug = (label, lObjects...) ->
 
 # ---------------------------------------------------------------------------
 
+export doTheLogging = (type, label, lObjects) ->
+
+	level = callStack.getLevel()
+	prefix = getPrefix(level)
+	itemPrefix = removeLastVbar(prefix)
+	sep = dashes(itemPrefix, 40)
+	assert isString(sep), "sep is not a string"
+
+	logif "callStack", callStack
+	logif "level = #{OL(level)}"
+	logif "prefix = #{OL(prefix)}"
+	logif "itemPrefix = #{OL(itemPrefix)}"
+	logif "sep = #{OL(sep)}"
+
+	switch type
+		when 'enter'
+			log label, {prefix}
+			for obj,i in lObjects
+				if (i > 0)
+					log sep
+				logItem undef, obj, {itemPrefix}
+		when 'return'
+			log label, {prefix: addArrow(prefix)}
+			for obj,i in lObjects
+				if (i > 0)
+					log sep
+				logItem undef, obj, {itemPrefix}
+		when 'string'
+			log label, {prefix}
+		when 'objects'
+			if (lObjects.length==1) && shortEnough(label, lObjects[0])
+				logItem label, lObjects[0], {prefix}
+			else
+				if (label.indexOf(':') != label.length - 1)
+					label += ':'
+				log label, {prefix}
+				for obj in lObjects
+					logItem undef, obj, {prefix}
+	return
+
+# ---------------------------------------------------------------------------
+
 export stdShouldLog = (label, type, funcName, stack) ->
 	# --- if type is 'enter', then funcName won't be on the stack yet
 	#     returns the (possibly modified) label to log

package/src/debug_utils.js

@@ -81,39 +81,36 @@ export var setDebugDebugging = function(value = true) {
 
 // ---------------------------------------------------------------------------
 logif = function(label, ...lObjects) {
-  var funcName, nObjects, type;
+  var funcName, itemPrefix, level, nObjects, prefix, sep, type;
   if (!doDebugDebug) {
     return;
   }
   assert(isString(label), `1st arg ${OL(label)} should be a string`);
   nObjects = lObjects.length;
   [type, funcName] = getType(label, nObjects);
-  switch (type) {
-    case 'enter':
-      if (defined(lFunctions) && (indexOf.call(lFunctions, funcName) < 0)) {
-        return;
-      }
-      callStack.enter(funcName);
-      log(label, ...lObjects);
-      break;
-    case 'return':
-      if (defined(lFunctions) && (indexOf.call(lFunctions, funcName) < 0)) {
-        return;
-      }
-      log(label, ...lObjects);
-      callStack.returnFrom(funcName);
-      break;
-    case 'string':
-      log(label, ...lObjects);
-      break;
-    case 'objects':
-      log(label, ...lObjects);
+  level = callStack.getLevel();
+  prefix = getPrefix(level);
+  itemPrefix = removeLastVbar(prefix);
+  sep = dashes(itemPrefix, 40);
+  if (type === 'enter') {
+    if (defined(lFunctions) && (indexOf.call(lFunctions, funcName) < 0)) {
+      return;
+    }
+    callStack.enter(funcName);
+  } else if (type === 'return') {
+    if (defined(lFunctions) && (indexOf.call(lFunctions, funcName) < 0)) {
+      return;
+    }
+  }
+  doTheLogging(type, label, lObjects);
+  if (type === 'return') {
+    callStack.returnFrom(funcName);
   }
 };
 
 // ---------------------------------------------------------------------------
 export var debug = function(label, ...lObjects) {
-  var doLog, funcName, i, itemPrefix, j, k, l, len, len1, len2, level, nObjects, obj, prefix, sep, type;
+  var doLog, funcName, nObjects, type;
   logif(`enter debug(${OL(label)})`, ...lObjects);
   assert(isString(label), `1st arg ${OL(label)} should be a string`);
   // --- We want to allow objects to be undef. Therefore, we need to
@@ -146,56 +143,7 @@ export var debug = function(label, ...lObjects) {
   logif(`doLog = ${OL(doLog)}`);
   logif(`${nObjects} objects`);
   if (doLog) {
-    level = callStack.getLevel();
-    prefix = getPrefix(level);
-    itemPrefix = removeLastVbar(prefix);
-    sep = dashes(itemPrefix, 40);
-    assert(isString(sep), "sep is not a string");
-    logif("callStack", callStack);
-    logif(`level = ${OL(level)}`);
-    logif(`prefix = ${OL(prefix)}`);
-    logif(`itemPrefix = ${OL(itemPrefix)}`);
-    logif(`sep = ${OL(sep)}`);
-    switch (type) {
-      case 'enter':
-        log(label, {prefix});
-        for (i = j = 0, len = lObjects.length; j < len; i = ++j) {
-          obj = lObjects[i];
-          if (i > 0) {
-            log(sep);
-          }
-          logItem(undef, obj, {itemPrefix});
-        }
-        break;
-      case 'return':
-        log(label, {
-          prefix: addArrow(prefix)
-        });
-        for (i = k = 0, len1 = lObjects.length; k < len1; i = ++k) {
-          obj = lObjects[i];
-          if (i > 0) {
-            log(sep);
-          }
-          logItem(undef, obj, {itemPrefix});
-        }
-        break;
-      case 'string':
-        log(label, {prefix});
-        break;
-      case 'objects':
-        if ((nObjects === 1) && shortEnough(label, lObjects[0])) {
-          logItem(label, lObjects[0], {prefix});
-        } else {
-          if (label.indexOf(':') !== label.length - 1) {
-            label += ':';
-          }
-          log(label, {prefix});
-          for (l = 0, len2 = lObjects.length; l < len2; l++) {
-            obj = lObjects[l];
-            logItem(undef, obj, {prefix});
-          }
-        }
-    }
+    doTheLogging(type, label, lObjects);
   }
   if ((type === 'enter') && doLog && (label.indexOf('call') === -1)) {
     callStack.logCurFunc();
@@ -207,6 +155,61 @@ export var debug = function(label, ...lObjects) {
 };
 
 
+// ---------------------------------------------------------------------------
+export var doTheLogging = function(type, label, lObjects) {
+  var i, itemPrefix, j, k, l, len, len1, len2, level, obj, prefix, sep;
+  level = callStack.getLevel();
+  prefix = getPrefix(level);
+  itemPrefix = removeLastVbar(prefix);
+  sep = dashes(itemPrefix, 40);
+  assert(isString(sep), "sep is not a string");
+  logif("callStack", callStack);
+  logif(`level = ${OL(level)}`);
+  logif(`prefix = ${OL(prefix)}`);
+  logif(`itemPrefix = ${OL(itemPrefix)}`);
+  logif(`sep = ${OL(sep)}`);
+  switch (type) {
+    case 'enter':
+      log(label, {prefix});
+      for (i = j = 0, len = lObjects.length; j < len; i = ++j) {
+        obj = lObjects[i];
+        if (i > 0) {
+          log(sep);
+        }
+        logItem(undef, obj, {itemPrefix});
+      }
+      break;
+    case 'return':
+      log(label, {
+        prefix: addArrow(prefix)
+      });
+      for (i = k = 0, len1 = lObjects.length; k < len1; i = ++k) {
+        obj = lObjects[i];
+        if (i > 0) {
+          log(sep);
+        }
+        logItem(undef, obj, {itemPrefix});
+      }
+      break;
+    case 'string':
+      log(label, {prefix});
+      break;
+    case 'objects':
+      if ((lObjects.length === 1) && shortEnough(label, lObjects[0])) {
+        logItem(label, lObjects[0], {prefix});
+      } else {
+        if (label.indexOf(':') !== label.length - 1) {
+          label += ':';
+        }
+        log(label, {prefix});
+        for (l = 0, len2 = lObjects.length; l < len2; l++) {
+          obj = lObjects[l];
+          logItem(undef, obj, {prefix});
+        }
+      }
+  }
+};
+
 // ---------------------------------------------------------------------------
 export var stdShouldLog = function(label, type, funcName, stack) {
   var prevLogged;