@jdeighan/coffee-utils 7.0.45 → 7.0.48

package/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "@jdeighan/coffee-utils",
 	"type": "module",
-	"version": "7.0.45",
+	"version": "7.0.48",
 	"description": "A set of utility functions for CoffeeScript",
 	"main": "coffee_utils.js",
 	"exports": {
@@ -52,6 +52,6 @@
 		"svelte": "^3.48.0"
 	},
 	"devDependencies": {
-		"@jdeighan/unit-tester": "^2.0.2"
+		"@jdeighan/unit-tester": "^2.0.3"
 	}
 }

package/src/DataStores.js

@@ -1,4 +1,4 @@
-// Generated by CoffeeScript 2.6.1
+// Generated by CoffeeScript 2.7.0
 // DataStores.coffee
 import pathlib from 'path';
 

package/src/arrow.js

@@ -1,4 +1,4 @@
-// Generated by CoffeeScript 2.6.1
+// Generated by CoffeeScript 2.7.0
 // arrow.coffee
 export var vbar = '│'; // unicode 2502
 

package/src/block_utils.js

@@ -1,4 +1,4 @@
-// Generated by CoffeeScript 2.6.1
+// Generated by CoffeeScript 2.7.0
 // block_utils.coffee
 import fs from 'fs';
 

package/src/browser_utils.js

@@ -1,4 +1,4 @@
-// Generated by CoffeeScript 2.6.1
+// Generated by CoffeeScript 2.7.0
 // browser_utils.coffee
 var audio;
 

package/src/call_stack.js

@@ -1,4 +1,4 @@
-// Generated by CoffeeScript 2.6.1
+// Generated by CoffeeScript 2.7.0
 // call_stack.coffee
 var doDebugStack;
 

package/src/coffee_utils.js

@@ -1,4 +1,4 @@
-// Generated by CoffeeScript 2.6.1
+// Generated by CoffeeScript 2.7.0
   // coffee_utils.coffee
 var LOG, getCallers,
   indexOf = [].indexOf;

package/src/debug_utils.coffee

@@ -143,7 +143,6 @@ adjustStack = (str) ->
 			undef
 			if shouldLogString(str) then 'string' else undef
 			]
-	return
 
 # ---------------------------------------------------------------------------
 
@@ -159,15 +158,21 @@ export debug = (lArgs...) ->
 
 	if doDebugDebug
 		if nArgs==1
-			LOG "debug('#{escapeStr(label)}')"
+			LOG "debug('#{escapeStr(label)}') - 1 arg"
 		else
-			LOG "debug('#{escapeStr(label)}', #{typeof item})"
+			LOG "debug('#{escapeStr(label)}', #{typeof item}) - 2 args"
 
 	# --- We always need to manipulate the stack when we encounter
 	#     either "enter X" or "return from X", so we can't short-circuit
 	#     when debugging is off
 
-	[mainPre, auxPre, hEnv, type] = adjustStack(label)
+	lResult = adjustStack(label)
+	if doDebugDebug
+		LOG 'lResult', lResult
+	[mainPre, auxPre, hEnv, type] = lResult
+	if doDebugDebug && (type == undef)
+		LOG "type is undef - NOT LOGGING"
+
 	hOptions = {
 		prefix: mainPre
 		itemPrefix: auxPre
@@ -196,7 +201,7 @@ export debug = (lArgs...) ->
 		if doDebugDebug
 			trans = "#{orgDebugging} => #{debugging}"
 			LOG "   Restore hEnv: debugging: #{trans}"
-	return
+	return true   # allow use in boolean expressions
 
 # ---------------------------------------------------------------------------
 

package/src/debug_utils.js

@@ -1,4 +1,4 @@
-// Generated by CoffeeScript 2.6.1
+// Generated by CoffeeScript 2.7.0
 // debug_utils.coffee
 var adjustStack, doDebugDebug, reMethod, resetDebugging, shouldLogFunc, shouldLogString, stack;
 
@@ -161,7 +161,7 @@ adjustStack = function(str) {
 
 // ---------------------------------------------------------------------------
 export var debug = function(...lArgs) {
-  var auxPre, hEnv, hOptions, item, label, mainPre, nArgs, orgDebugging, trans, type;
+  var auxPre, hEnv, hOptions, item, lResult, label, mainPre, nArgs, orgDebugging, trans, type;
   // --- We want to allow item to be undef. Therefore, we need to
   //     distinguish between 1 arg sent vs. 2 args sent
   nArgs = lArgs.length;
@@ -170,15 +170,22 @@ export var debug = function(...lArgs) {
   assert(isString(label), `debug(): 1st arg ${OL(label)} should be a string`);
   if (doDebugDebug) {
     if (nArgs === 1) {
-      LOG(`debug('${escapeStr(label)}')`);
+      LOG(`debug('${escapeStr(label)}') - 1 arg`);
     } else {
-      LOG(`debug('${escapeStr(label)}', ${typeof item})`);
+      LOG(`debug('${escapeStr(label)}', ${typeof item}) - 2 args`);
     }
   }
   // --- We always need to manipulate the stack when we encounter
   //     either "enter X" or "return from X", so we can't short-circuit
   //     when debugging is off
-  [mainPre, auxPre, hEnv, type] = adjustStack(label);
+  lResult = adjustStack(label);
+  if (doDebugDebug) {
+    LOG('lResult', lResult);
+  }
+  [mainPre, auxPre, hEnv, type] = lResult;
+  if (doDebugDebug && (type === undef)) {
+    LOG("type is undef - NOT LOGGING");
+  }
   hOptions = {
     prefix: mainPre,
     itemPrefix: auxPre
@@ -213,8 +220,10 @@ export var debug = function(...lArgs) {
       LOG(`   Restore hEnv: debugging: ${trans}`);
     }
   }
+  return true; // allow use in boolean expressions
 };
 
+
 // ---------------------------------------------------------------------------
 reMethod = /^([A-Za-z_][A-Za-z0-9_]*)\.([A-Za-z_][A-Za-z0-9_]*)$/;
 

package/src/fs_utils.js

@@ -1,4 +1,4 @@
-// Generated by CoffeeScript 2.6.1
+// Generated by CoffeeScript 2.7.0
 // fs_utils.coffee
 var isSystemDir;
 

package/src/indent_utils.coffee

@@ -38,6 +38,15 @@ export indentLevel = (line) ->
 	lMatches = line.match(/^\t*/)
 	return lMatches[0].length
 
+# ---------------------------------------------------------------------------
+#   isUndented - true iff indentLevel(line) == 0
+
+export isUndented = (line) ->
+
+	assert isString(line), "non-string #{OL(line)}"
+	lMatches = line.match(/^\t*/)
+	return (lMatches[0].length == 0)
+
 # ---------------------------------------------------------------------------
 #   indented - add indentation to each string in a block
 

package/src/indent_utils.js

@@ -1,4 +1,4 @@
-// Generated by CoffeeScript 2.6.1
+// Generated by CoffeeScript 2.7.0
   // indent_utils.coffee
 import {
   assert,
@@ -50,6 +50,15 @@ export var indentLevel = function(line) {
   return lMatches[0].length;
 };
 
+// ---------------------------------------------------------------------------
+//   isUndented - true iff indentLevel(line) == 0
+export var isUndented = function(line) {
+  var lMatches;
+  assert(isString(line), `non-string ${OL(line)}`);
+  lMatches = line.match(/^\t*/);
+  return lMatches[0].length === 0;
+};
+
 // ---------------------------------------------------------------------------
 //   indented - add indentation to each string in a block
 export var indented = function(input, level = 1) {

package/src/log_utils.coffee

@@ -36,7 +36,7 @@ export LOG = (lArgs...) ->
 			console.log sep_dash
 	else
 		console.log label
-	return
+	return true   # to allow use in boolean expressions
 
 # --- Use this instead to make it easier to remove all instances
 export DEBUG = LOG   # synonym
@@ -135,7 +135,7 @@ export log = (str, hOptions={}) ->
 
 	prefix = fixStr(hOptions.prefix)
 	putstr "#{prefix}#{str}"
-	return
+	return true   # to allow use in boolean expressions
 
 # ---------------------------------------------------------------------------
 
@@ -173,7 +173,7 @@ export logItem = (label, item, hOptions={}) ->
 			putstr "#{prefix}#{indentation(1)}#{fixStr(str)}"
 		putstr "#{prefix}#{sep_dash}"
 
-	return
+	return true
 
 # ---------------------------------------------------------------------------
 

package/src/log_utils.js

@@ -1,4 +1,4 @@
-// Generated by CoffeeScript 2.6.1
+// Generated by CoffeeScript 2.7.0
 // log_utils.coffee
 var escReplacer, fixStr, loaded, maxOneLine, putBlock, putstr;
 
@@ -57,8 +57,10 @@ export var LOG = function(...lArgs) {
   } else {
     console.log(label);
   }
+  return true; // to allow use in boolean expressions
 };
 
+
 // --- Use this instead to make it easier to remove all instances
 export var DEBUG = LOG; // synonym
 
@@ -155,8 +157,10 @@ export var log = function(str, hOptions = {}) {
   assert(isHash(hOptions), "log(): arg 2 not a hash");
   prefix = fixStr(hOptions.prefix);
   putstr(`${prefix}${str}`);
+  return true; // to allow use in boolean expressions
 };
 
+
 // ---------------------------------------------------------------------------
 export var logItem = function(label, item, hOptions = {}) {
   var i, labelStr, len, prefix, ref, str;
@@ -197,6 +201,7 @@ export var logItem = function(label, item, hOptions = {}) {
     }
     putstr(`${prefix}${sep_dash}`);
   }
+  return true;
 };
 
 // ---------------------------------------------------------------------------

package/src/server_utils.js

@@ -1,4 +1,4 @@
-// Generated by CoffeeScript 2.6.1
+// Generated by CoffeeScript 2.7.0
 // server_utils.coffee
 import getline from 'readline-sync';
 

package/src/svelte_utils.js

@@ -1,4 +1,4 @@
-// Generated by CoffeeScript 2.6.1
+// Generated by CoffeeScript 2.7.0
   // svelte_utils.coffee
 import {
   assert,

package/src/taml.js

@@ -1,4 +1,4 @@
-// Generated by CoffeeScript 2.6.1
+// Generated by CoffeeScript 2.7.0
 // taml.coffee
 var squote;