@jdeighan/coffee-utils 7.0.59 → 7.0.60

package/package.json

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

package/src/call_stack.coffee

@@ -1,7 +1,7 @@
 # call_stack.coffee
 
 import {
-	undef, defined, croak, assert, OL, isBoolean, escapeStr,
+	undef, defined, croak, assert, OL, isBoolean, escapeStr, deepCopy,
 	} from '@jdeighan/coffee-utils'
 import {log, LOG} from '@jdeighan/coffee-utils/log'
 import {getPrefix} from '@jdeighan/coffee-utils/arrow'
@@ -36,7 +36,7 @@ export class CallStack
 
 	# ........................................................................
 
-	enter: (funcName) ->
+	enter: (funcName, lArgs=[]) ->
 		# --- funcName might be <object>.<method>
 
 		if doDebugStack
@@ -56,12 +56,14 @@ export class CallStack
 				fullName: funcName     #    "#{ident1}.#{ident2}"
 				funcName: ident2
 				isLogged: false
+				lArgs: deepCopy(lArgs)
 				})
 		else
 			@lStack.push({
 				fullName: funcName
 				funcName: ident1
 				isLogged: false
+				lArgs: deepCopy(lArgs)
 				})
 		return
 
@@ -156,15 +158,25 @@ export class CallStack
 
 	# ........................................................................
 
-	dump: (prefix='', label='CALL STACK') ->
+	dump: () ->
 
-		lLines = ["#{label}:"]
+		lLines = ["CALL STACK:"]
 		if @lStack.length == 0
 			lLines.push "   <EMPTY>"
 		else
 			for item, i in @lStack
-				lLines.push "   #{i}: #{item.fullName} #{item.isLogged}"
-		return lLines.join("\n") + "\n"
+				lLines.push "   " + @callStr(i, item)
+		return lLines.join("\n")
+
+	# ........................................................................
+
+	callStr: (i, item) ->
+
+		sym = if item.isLogged then '*' else ''
+		str = "#{i}#{sym}: #{item.fullName}"
+		for arg in item.lArgs
+			str += " #{OL(arg)}"
+		return str
 
 	# ........................................................................
 

package/src/call_stack.js

@@ -9,7 +9,8 @@ import {
   assert,
   OL,
   isBoolean,
-  escapeStr
+  escapeStr,
+  deepCopy
 } from '@jdeighan/coffee-utils';
 
 import {
@@ -45,7 +46,7 @@ export var CallStack = class CallStack {
   }
 
   // ........................................................................
-  enter(funcName) {
+  enter(funcName, lArgs = []) {
     var _, ident1, ident2, lMatches;
     // --- funcName might be <object>.<method>
     if (doDebugStack) {
@@ -58,13 +59,15 @@ export var CallStack = class CallStack {
       this.lStack.push({
         fullName: funcName, //    "#{ident1}.#{ident2}"
         funcName: ident2,
-        isLogged: false
+        isLogged: false,
+        lArgs: deepCopy(lArgs)
       });
     } else {
       this.lStack.push({
         fullName: funcName,
         funcName: ident1,
-        isLogged: false
+        isLogged: false,
+        lArgs: deepCopy(lArgs)
       });
     }
   }
@@ -162,19 +165,32 @@ export var CallStack = class CallStack {
   }
 
   // ........................................................................
-  dump(prefix = '', label = 'CALL STACK') {
+  dump() {
     var i, item, j, lLines, len, ref;
-    lLines = [`${label}:`];
+    lLines = ["CALL STACK:"];
     if (this.lStack.length === 0) {
       lLines.push("   <EMPTY>");
     } else {
       ref = this.lStack;
       for (i = j = 0, len = ref.length; j < len; i = ++j) {
         item = ref[i];
-        lLines.push(`   ${i}: ${item.fullName} ${item.isLogged}`);
+        lLines.push("   " + this.callStr(i, item));
       }
     }
-    return lLines.join("\n") + "\n";
+    return lLines.join("\n");
+  }
+
+  // ........................................................................
+  callStr(i, item) {
+    var arg, j, len, ref, str, sym;
+    sym = item.isLogged ? '*' : '';
+    str = `${i}${sym}: ${item.fullName}`;
+    ref = item.lArgs;
+    for (j = 0, len = ref.length; j < len; j++) {
+      arg = ref[j];
+      str += ` ${OL(arg)}`;
+    }
+    return str;
   }
 
   // ........................................................................

package/src/coffee_utils.coffee

@@ -349,7 +349,15 @@ export ltrunc = (str, nChars) ->
 
 export deepCopy = (obj) ->
 
-	return JSON.parse(JSON.stringify(obj))
+	if (obj == undef)
+		return undef
+	objStr = JSON.stringify(obj)
+	try
+		newObj = JSON.parse(objStr)
+	catch err
+		croak "ERROR: err.message", objStr
+
+	return newObj
 
 # ---------------------------------------------------------------------------
 #   escapeStr - escape newlines, TAB chars, etc.

package/src/coffee_utils.js

@@ -347,7 +347,18 @@ export var ltrunc = function(str, nChars) {
 // ---------------------------------------------------------------------------
 //   deepCopy - deep copy an array or object
 export var deepCopy = function(obj) {
-  return JSON.parse(JSON.stringify(obj));
+  var err, newObj, objStr;
+  if (obj === undef) {
+    return undef;
+  }
+  objStr = JSON.stringify(obj);
+  try {
+    newObj = JSON.parse(objStr);
+  } catch (error1) {
+    err = error1;
+    croak("ERROR: err.message", objStr);
+  }
+  return newObj;
 };
 
 // ---------------------------------------------------------------------------

package/src/debug_utils.coffee

@@ -29,9 +29,9 @@ lFunctions = undef     # --- only used when doDebugDebug is true
 
 # ---------------------------------------------------------------------------
 
-export dumpCallStack = (label) ->
+export dumpCallStack = () ->
 
-	LOG callStack.dump('', label)
+	LOG callStack.dump()
 	return
 
 # ---------------------------------------------------------------------------
@@ -66,7 +66,7 @@ debugDebug = (label, lObjects...) ->
 	switch type
 		when 'enter'
 			assert defined(funcName), "type enter, funcName = undef"
-			callStack.enter funcName
+			callStack.enter funcName, lObjects
 			doLog = (lFunctions == undef) || (funcName in lFunctions)
 
 		when 'return'
@@ -105,7 +105,7 @@ export debug = (label, lObjects...) ->
 	nObjects = lObjects.length
 	[type, funcName] = getType(label, nObjects)
 	if (type == 'enter')
-		callStack.enter funcName
+		callStack.enter funcName, lObjects
 
 	debugDebug "enter debug(#{OL(label)})", lObjects...
 	debugDebug "type = #{OL(type)}"

package/src/debug_utils.js

@@ -70,8 +70,8 @@ lFunctions = undef; // --- only used when doDebugDebug is true
 
 
 // ---------------------------------------------------------------------------
-export var dumpCallStack = function(label) {
-  LOG(callStack.dump('', label));
+export var dumpCallStack = function() {
+  LOG(callStack.dump());
 };
 
 // ---------------------------------------------------------------------------
@@ -101,7 +101,7 @@ debugDebug = function(label, ...lObjects) {
   switch (type) {
     case 'enter':
       assert(defined(funcName), "type enter, funcName = undef");
-      callStack.enter(funcName);
+      callStack.enter(funcName, lObjects);
       doLog = (lFunctions === undef) || (indexOf.call(lFunctions, funcName) >= 0);
       break;
     case 'return':
@@ -138,7 +138,7 @@ export var debug = function(label, ...lObjects) {
   nObjects = lObjects.length;
   [type, funcName] = getType(label, nObjects);
   if (type === 'enter') {
-    callStack.enter(funcName);
+    callStack.enter(funcName, lObjects);
   }
   debugDebug(`enter debug(${OL(label)})`, ...lObjects);
   debugDebug(`type = ${OL(type)}`);