@jdeighan/coffee-utils 7.0.64 → 7.0.65

package/package.json

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

package/src/debug_utils.coffee

@@ -25,12 +25,22 @@ strFuncList = undef     # original string
 
 # ---------------------------------------------------------------------------
 
+export interp = (label) ->
+
+	return label.replace(/// \$ ([A-Za-z_][A-Za-z0-9_]*) ///g,
+			(match, varName) -> return "\#{OL(#{varName})\}"
+			)
+
+# ---------------------------------------------------------------------------
+
 export debug = (orgLabel, lObjects...) ->
 
 	assert isString(orgLabel), "1st arg #{OL(orgLabel)} should be a string"
 
 	[type, funcName] = getType(orgLabel, lObjects)
 	label = shouldLog(orgLabel, type, funcName, callStack)
+	if defined(label)
+		label = interp(label)
 
 	switch type
 
@@ -243,22 +253,25 @@ export getType = (str, lObjects) ->
 
 	if lMatches = str.match(///^
 			\s*
-			enter
+			( enter | (?: return .+ from ) )
 			\s+
-			([A-Za-z_][A-Za-z0-9_\.]*)
+			([A-Za-z_][A-Za-z0-9_]*)
+			(?:
+				\.
+				([A-Za-z_][A-Za-z0-9_]*)
+				)?
 			///)
+		[_, type, ident1, ident2] = lMatches
 
-		# --- We are entering function curFunc
-		return ['enter', lMatches[1]]
-	else if lMatches = str.match(///^
-			\s*
-			return
-			.+
-			from
-			\s+
-			([A-Za-z_][A-Za-z0-9_\.]*)
-			///)
-		return ['return', lMatches[1]]
+		if ident2
+			funcName = ident2
+		else
+			funcName = ident1
+
+		if (type == 'enter')
+			return ['enter', funcName]
+		else
+			return ['return', funcName]
 	else
 		return ['string', undef]
 

package/src/debug_utils.js

@@ -65,12 +65,22 @@ lFuncList = []; // names of functions being debugged
 strFuncList = undef; // original string
 
 
+// ---------------------------------------------------------------------------
+export var interp = function(label) {
+  return label.replace(/\$([A-Za-z_][A-Za-z0-9_]*)/g, function(match, varName) {
+    return `\#{OL(${varName})\}`;
+  });
+};
+
 // ---------------------------------------------------------------------------
 export var debug = function(orgLabel, ...lObjects) {
   var funcName, label, type;
   assert(isString(orgLabel), `1st arg ${OL(orgLabel)} should be a string`);
   [type, funcName] = getType(orgLabel, lObjects);
   label = shouldLog(orgLabel, type, funcName, callStack);
+  if (defined(label)) {
+    label = interp(label);
+  }
   switch (type) {
     case 'enter':
       if (defined(label)) {
@@ -292,12 +302,19 @@ export var funcMatch = function(funcName) {
 // ---------------------------------------------------------------------------
 // --- type is one of: 'enter', 'return', 'string'
 export var getType = function(str, lObjects) {
-  var lMatches;
-  if (lMatches = str.match(/^\s*enter\s+([A-Za-z_][A-Za-z0-9_\.]*)/)) {
-    // --- We are entering function curFunc
-    return ['enter', lMatches[1]];
-  } else if (lMatches = str.match(/^\s*return.+from\s+([A-Za-z_][A-Za-z0-9_\.]*)/)) {
-    return ['return', lMatches[1]];
+  var _, funcName, ident1, ident2, lMatches, type;
+  if (lMatches = str.match(/^\s*(enter|(?:return.+from))\s+([A-Za-z_][A-Za-z0-9_]*)(?:\.([A-Za-z_][A-Za-z0-9_]*))?/)) {
+    [_, type, ident1, ident2] = lMatches;
+    if (ident2) {
+      funcName = ident2;
+    } else {
+      funcName = ident1;
+    }
+    if (type === 'enter') {
+      return ['enter', funcName];
+    } else {
+      return ['return', funcName];
+    }
   } else {
     return ['string', undef];
   }