@jdeighan/coffee-utils 7.0.53 → 7.0.54

package/package.json

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

package/src/call_stack.coffee

@@ -160,5 +160,5 @@ export class CallStack
 			LOG "   <EMPTY>"
 		else
 			for item, i in @lStack
-				LOG "   #{i}: #{JSON.stringify(item)}"
+				LOG "   #{i}: #{item.fullName} #{item.isLogged}"
 		return

package/src/call_stack.js

@@ -168,7 +168,7 @@ export var CallStack = class CallStack {
       ref = this.lStack;
       for (i = j = 0, len = ref.length; j < len; i = ++j) {
         item = ref[i];
-        LOG(`   ${i}: ${JSON.stringify(item)}`);
+        LOG(`   ${i}: ${item.fullName} ${item.isLogged}`);
       }
     }
   }

package/src/debug_utils.coffee

@@ -95,7 +95,7 @@ export debug = (label, lObjects...) ->
 					for obj in lObjects
 						logItem undef, obj, {prefix}
 
-	if (type == 'enter') && doLog
+	if (type == 'enter') && doLog && (label.indexOf('call') == -1)
 		callStack.logCurFunc()
 	else if (type == 'return')
 		callStack.returnFrom funcName
@@ -119,20 +119,25 @@ export stdShouldLog = (label, type, funcName, stack) ->
 	else
 		assert funcName == undef, "func name #{OL(funcName)} not undef"
 	assert stack instanceof CallStack, "not a call stack object"
+
 	if doDebugDebug
 		LOG "stdShouldLog(#{OL(label)}, #{OL(type)}, #{OL(funcName)}, stack)"
 		LOG "stack", stack
 		LOG "lFuncList", lFuncList
+
 	switch type
 		when 'enter'
 			if funcMatch(stack, lFuncList)
 				return label
 
-			# --- As a special case, if we enter a function where we will not
-			#     be logging, but we were logging in the calling function,
-			#     we'll log out the call itself
-			else if stack.isLoggingPrev()
-				return label.replace('enter', 'call')
+			else
+				# --- As a special case, if we enter a function where we will not
+				#     be logging, but we were logging in the calling function,
+				#     we'll log out the call itself
+
+				prevLogged = stack.isLoggingPrev()
+				if prevLogged
+					return label.replace('enter', 'call')
 		else
 			if funcMatch(stack, lFuncList)
 				return label

package/src/debug_utils.js

@@ -153,7 +153,7 @@ export var debug = function(label, ...lObjects) {
         }
     }
   }
-  if ((type === 'enter') && doLog) {
+  if ((type === 'enter') && doLog && (label.indexOf('call') === -1)) {
     callStack.logCurFunc();
   } else if (type === 'return') {
     callStack.returnFrom(funcName);
@@ -164,6 +164,7 @@ export var debug = function(label, ...lObjects) {
 
 // ---------------------------------------------------------------------------
 export var stdShouldLog = function(label, type, funcName, stack) {
+  var prevLogged;
   // --- if type is 'enter', then funcName won't be on the stack yet
   //     returns the (possibly modified) label to log
 
@@ -187,11 +188,14 @@ export var stdShouldLog = function(label, type, funcName, stack) {
     case 'enter':
       if (funcMatch(stack, lFuncList)) {
         return label;
-      // --- As a special case, if we enter a function where we will not
-      //     be logging, but we were logging in the calling function,
-      //     we'll log out the call itself
-      } else if (stack.isLoggingPrev()) {
-        return label.replace('enter', 'call');
+      } else {
+        // --- As a special case, if we enter a function where we will not
+        //     be logging, but we were logging in the calling function,
+        //     we'll log out the call itself
+        prevLogged = stack.isLoggingPrev();
+        if (prevLogged) {
+          return label.replace('enter', 'call');
+        }
       }
       break;
     default: