@jdeighan/coffee-utils 6.0.1 → 6.0.2

package/package.json

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

package/src/debug_utils.coffee

@@ -28,6 +28,15 @@ export debugging = false
 shouldDebug = shouldLog = undef
 
 stack = new CallStack()
+DEBUGDEBUG = false
+
+# ---------------------------------------------------------------------------
+
+export setDEBUGDEBUG = (flag=true) ->
+
+	DEBUGDEBUG = flag
+	console.log "DEBUGDEBUG = #{flag}"
+	return
 
 # ---------------------------------------------------------------------------
 
@@ -36,8 +45,8 @@ export resetDebugging = (funcDoDebug=undef, funcDoLog=undef) ->
 	debugging = false
 	debugLevel = 0
 	stack.reset()
-	shouldDebug = (funcName, curDebugging) -> curDebugging
-	shouldLog   = (str) -> debugging || process.env.DEBUG
+	shouldDebug = (funcName) -> debugging
+	shouldLog   = (str) -> debugging
 	if funcDoDebug
 		setDebugging funcDoDebug, funcDoLog
 	return
@@ -47,15 +56,21 @@ export resetDebugging = (funcDoDebug=undef, funcDoLog=undef) ->
 export setDebugging = (funcDoDebug=undef, funcDoLog=undef) ->
 
 	if isBoolean(funcDoDebug)
+		if DEBUGDEBUG
+			console.log "setDebugging #{funcDoDebug}"
 		debugging = funcDoDebug
 	else if isString(funcDoDebug)
 		debugging = false
 		lFuncNames = words(funcDoDebug)
 		assert isArray(lFuncNames), "words('#{funcDoDebug}') returned non-array"
-		shouldDebug = (funcName, curDebugging) ->
-			curDebugging || funcMatch(funcName, lFuncNames)
+		shouldDebug = (funcName) ->
+			funcMatch(funcName, lFuncNames)
+		if DEBUGDEBUG
+			console.log "setDebugging FUNCS: #{lFuncNames.join(',')}"
 	else if isFunction(funcDoDebug)
 		shouldDebug = funcDoDebug
+		if DEBUGDEBUG
+			console.log "setDebugging to custom func"
 	else
 		croak "setDebugging(): bad parameter #{oneline(funcDoDebug)}"
 
@@ -114,17 +129,6 @@ getPrefix = (level) ->
 
 # ---------------------------------------------------------------------------
 
-envSaysDebug = (curFunc) ->
-
-	if process.env.DEBUG_FUNC?
-		return curFunc == process.env.DEBUG_FUNC
-	else if process.env.DEBUG_FUNCS?
-		return process.env.DEBUG_FUNCS.split(',').indexOf(curFunc) > -1
-	else
-		return false
-
-# ---------------------------------------------------------------------------
-
 export debug = (lArgs...) ->
 	# --- either 1 or 2 args
 
@@ -157,7 +161,7 @@ export debug = (lArgs...) ->
 		entering = true
 		curFunc = lMatches[1]
 		stack.call(curFunc, curEnv())
-		debugging = envSaysDebug(curFunc) || shouldDebug(curFunc, debugging)
+		debugging = shouldDebug(curFunc)
 	else if (lMatches = str.match(///^
 			\s*
 			return

package/src/debug_utils.js

@@ -1,6 +1,6 @@
 // Generated by CoffeeScript 2.6.1
 // debug_utils.coffee
-var arrow, arrowhead, corner, curEnv, debugLevel, envSaysDebug, getPrefix, hbar, indent, logger, reMethod, setEnv, shouldDebug, shouldLog, stack, undef, vbar;
+var DEBUGDEBUG, arrow, arrowhead, corner, curEnv, debugLevel, getPrefix, hbar, indent, logger, reMethod, setEnv, shouldDebug, shouldLog, stack, undef, vbar;
 
 import {
   assert,
@@ -63,16 +63,24 @@ shouldDebug = shouldLog = undef;
 
 stack = new CallStack();
 
+DEBUGDEBUG = false;
+
+// ---------------------------------------------------------------------------
+export var setDEBUGDEBUG = function(flag = true) {
+  DEBUGDEBUG = flag;
+  console.log(`DEBUGDEBUG = ${flag}`);
+};
+
 // ---------------------------------------------------------------------------
 export var resetDebugging = function(funcDoDebug = undef, funcDoLog = undef) {
   debugging = false;
   debugLevel = 0;
   stack.reset();
-  shouldDebug = function(funcName, curDebugging) {
-    return curDebugging;
+  shouldDebug = function(funcName) {
+    return debugging;
   };
   shouldLog = function(str) {
-    return debugging || process.env.DEBUG;
+    return debugging;
   };
   if (funcDoDebug) {
     setDebugging(funcDoDebug, funcDoLog);
@@ -83,16 +91,25 @@ export var resetDebugging = function(funcDoDebug = undef, funcDoLog = undef) {
 export var setDebugging = function(funcDoDebug = undef, funcDoLog = undef) {
   var lFuncNames;
   if (isBoolean(funcDoDebug)) {
+    if (DEBUGDEBUG) {
+      console.log(`setDebugging ${funcDoDebug}`);
+    }
     debugging = funcDoDebug;
   } else if (isString(funcDoDebug)) {
     debugging = false;
     lFuncNames = words(funcDoDebug);
     assert(isArray(lFuncNames), `words('${funcDoDebug}') returned non-array`);
-    shouldDebug = function(funcName, curDebugging) {
-      return curDebugging || funcMatch(funcName, lFuncNames);
+    shouldDebug = function(funcName) {
+      return funcMatch(funcName, lFuncNames);
     };
+    if (DEBUGDEBUG) {
+      console.log(`setDebugging FUNCS: ${lFuncNames.join(',')}`);
+    }
   } else if (isFunction(funcDoDebug)) {
     shouldDebug = funcDoDebug;
+    if (DEBUGDEBUG) {
+      console.log("setDebugging to custom func");
+    }
   } else {
     croak(`setDebugging(): bad parameter ${oneline(funcDoDebug)}`);
   }
@@ -144,17 +161,6 @@ getPrefix = function(level) {
   return '   '.repeat(level);
 };
 
-// ---------------------------------------------------------------------------
-envSaysDebug = function(curFunc) {
-  if (process.env.DEBUG_FUNC != null) {
-    return curFunc === process.env.DEBUG_FUNC;
-  } else if (process.env.DEBUG_FUNCS != null) {
-    return process.env.DEBUG_FUNCS.split(',').indexOf(curFunc) > -1;
-  } else {
-    return false;
-  }
-};
-
 // ---------------------------------------------------------------------------
 export var debug = function(...lArgs) {
   var curFunc, entering, hInfo, item, itemPrefix, lMatches, nArgs, prefix, returning, str;
@@ -179,7 +185,7 @@ export var debug = function(...lArgs) {
     entering = true;
     curFunc = lMatches[1];
     stack.call(curFunc, curEnv());
-    debugging = envSaysDebug(curFunc) || shouldDebug(curFunc, debugging);
+    debugging = shouldDebug(curFunc);
   } else if ((lMatches = str.match(/^\s*return.+from\s+([A-Za-z_][A-Za-z0-9_\.]*)/))) {
     returning = true;
     curFunc = lMatches[1];