@jdeighan/coffee-utils 8.0.16 → 9.0.0

package/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "@jdeighan/coffee-utils",
 	"type": "module",
-	"version": "8.0.16",
+	"version": "9.0.0",
 	"description": "A set of utility functions for CoffeeScript",
 	"main": "coffee_utils.js",
 	"exports": {
@@ -55,6 +55,6 @@
 		"svelte": "^3.49.0"
 	},
 	"devDependencies": {
-		"@jdeighan/unit-tester": "^2.0.16"
+		"@jdeighan/unit-tester": "^2.0.18"
 	}
 }

package/src/DataStores.coffee

@@ -4,9 +4,8 @@ import pathlib from 'path'
 import yaml from 'js-yaml'
 import {writable, readable, get} from 'svelte/store'
 
-import {
-	assert, undef, pass, error, isEmpty,
-	} from '@jdeighan/coffee-utils'
+import {assert, error} from '@jdeighan/unit-tester/utils'
+import {undef, pass, isEmpty} from '@jdeighan/coffee-utils'
 import {localStore} from '@jdeighan/coffee-utils/browser'
 import {
 	withExt, slurp, barf, newerDestFileExists,

package/src/DataStores.js

@@ -12,9 +12,12 @@ import {
 
 import {
   assert,
+  error
+} from '@jdeighan/unit-tester/utils';
+
+import {
   undef,
   pass,
-  error,
   isEmpty
 } from '@jdeighan/coffee-utils';
 

package/src/Section.coffee

@@ -1,7 +1,8 @@
 # Section.coffee
 
+import {assert, error, croak} from '@jdeighan/unit-tester/utils'
 import {
-	assert, pass, undef, defined, croak, isArray,
+	pass, undef, defined, isArray,
 	} from '@jdeighan/coffee-utils'
 import {arrayToBlock} from '@jdeighan/coffee-utils/block'
 import {indented} from '@jdeighan/coffee-utils/indent'

package/src/Section.js

@@ -2,10 +2,14 @@
   // Section.coffee
 import {
   assert,
+  error,
+  croak
+} from '@jdeighan/unit-tester/utils';
+
+import {
   pass,
   undef,
   defined,
-  croak,
   isArray
 } from '@jdeighan/coffee-utils';
 

package/src/SectionMap.coffee

@@ -1,7 +1,8 @@
 # SectionMap.coffee
 
+import {assert, error, croak} from '@jdeighan/unit-tester/utils'
 import {
-	assert, pass, undef, defined, croak, OL, isEmpty, nonEmpty,
+	pass, undef, defined, OL, isEmpty, nonEmpty,
 	isString, isHash, isArray, isUniqueTree, isNonEmptyString,
 	isNonEmptyArray,
 	} from '@jdeighan/coffee-utils'

package/src/SectionMap.js

@@ -4,10 +4,14 @@ var isSectionName, isSetName;
 
 import {
   assert,
+  error,
+  croak
+} from '@jdeighan/unit-tester/utils';
+
+import {
   pass,
   undef,
   defined,
-  croak,
   OL,
   isEmpty,
   nonEmpty,

package/src/arrow.coffee

@@ -1,6 +1,7 @@
 # arrow.coffee
 
-import {undef, assert, OL, setCharsAt} from '@jdeighan/coffee-utils'
+import {assert} from '@jdeighan/unit-tester/utils'
+import {undef, OL, setCharsAt} from '@jdeighan/coffee-utils'
 
 # --- We use spaces here because Windows Terminal handles TAB chars badly
 
@@ -9,10 +10,12 @@ export hbar = '─'       # unicode 2500
 export corner = '└'     # unicode 2514
 export arrowhead = '>'
 export space = ' '
+export dot = '.'
 
-export oneIndent = vbar + space + space + space
-export arrow = corner + hbar + arrowhead + space
-export clearIndent = space + space + space + space
+export oneIndent   = vbar   + space + space     + space
+export arrow       = corner + hbar  + arrowhead + space
+export clearIndent = space  + space + space     + space
+export dotIndent   = dot    + space + space     + space
 
 # ---------------------------------------------------------------------------
 
@@ -30,6 +33,12 @@ export prefix = (level, option='none') ->
 		when 'noLast2Vbars'
 			assert (level >= 2), "prefix(), noLast2Vbars but level=#{OL(level)}"
 			return oneIndent.repeat(level-2) + clearIndent + clearIndent
+		when 'dotLastVbar'
+			assert (level >= 1), "prefix(), dotLastVbar but level=#{OL(level)}"
+			return oneIndent.repeat(level-1) + dotIndent
+		when 'dotLast2Vbars'
+			assert (level >= 2), "prefix(), dotLast2Vbars but level=#{OL(level)}"
+			return oneIndent.repeat(level-2) + dotIndent + clearIndent
 		else
 			return oneIndent.repeat(level)
 

package/src/arrow.js

@@ -1,8 +1,11 @@
 // Generated by CoffeeScript 2.7.0
   // arrow.coffee
+import {
+  assert
+} from '@jdeighan/unit-tester/utils';
+
 import {
   undef,
-  assert,
   OL,
   setCharsAt
 } from '@jdeighan/coffee-utils';
@@ -18,12 +21,16 @@ export var arrowhead = '>';
 
 export var space = ' ';
 
+export var dot = '.';
+
 export var oneIndent = vbar + space + space + space;
 
 export var arrow = corner + hbar + arrowhead + space;
 
 export var clearIndent = space + space + space + space;
 
+export var dotIndent = dot + space + space + space;
+
 // ---------------------------------------------------------------------------
 export var prefix = function(level, option = 'none') {
   switch (option) {
@@ -40,6 +47,12 @@ export var prefix = function(level, option = 'none') {
     case 'noLast2Vbars':
       assert(level >= 2, `prefix(), noLast2Vbars but level=${OL(level)}`);
       return oneIndent.repeat(level - 2) + clearIndent + clearIndent;
+    case 'dotLastVbar':
+      assert(level >= 1, `prefix(), dotLastVbar but level=${OL(level)}`);
+      return oneIndent.repeat(level - 1) + dotIndent;
+    case 'dotLast2Vbars':
+      assert(level >= 2, `prefix(), dotLast2Vbars but level=${OL(level)}`);
+      return oneIndent.repeat(level - 2) + dotIndent + clearIndent;
     default:
       return oneIndent.repeat(level);
   }

package/src/block_utils.coffee

@@ -3,8 +3,9 @@
 import fs from 'fs'
 import readline from 'readline'
 
+import {assert, error} from '@jdeighan/unit-tester/utils'
 import {
-	undef, assert, defined, isEmpty, isString, isArray, nonEmpty, error, rtrim,
+	undef, defined, isEmpty, isString, isArray, nonEmpty, rtrim,
 	} from '@jdeighan/coffee-utils'
 
 # ---------------------------------------------------------------------------

package/src/block_utils.js

@@ -5,14 +5,17 @@ import fs from 'fs';
 import readline from 'readline';
 
 import {
-  undef,
   assert,
+  error
+} from '@jdeighan/unit-tester/utils';
+
+import {
+  undef,
   defined,
   isEmpty,
   isString,
   isArray,
   nonEmpty,
-  error,
   rtrim
 } from '@jdeighan/coffee-utils';
 

package/src/call_stack.coffee

@@ -1,7 +1,8 @@
 # call_stack.coffee
 
+import {assert, croak} from '@jdeighan/unit-tester/utils'
 import {
-	undef, defined, croak, assert, OL,  escapeStr, deepCopy,
+	undef, defined, OL,  escapeStr, deepCopy,
 	isArray, isBoolean,
 	} from '@jdeighan/coffee-utils'
 import {LOG} from '@jdeighan/coffee-utils/log'

package/src/call_stack.js

@@ -2,11 +2,14 @@
 // call_stack.coffee
 var doDebugStack;
 
+import {
+  assert,
+  croak
+} from '@jdeighan/unit-tester/utils';
+
 import {
   undef,
   defined,
-  croak,
-  assert,
   OL,
   escapeStr,
   deepCopy,

package/src/coffee_utils.coffee

@@ -1,12 +1,12 @@
 # coffee_utils.coffee
 
+import {assert, error, croak} from '@jdeighan/unit-tester/utils'
+
 export sep_dash = '-'.repeat(42)
 export sep_eq = '='.repeat(42)
 `export const undef = undefined`
 LOG = (lArgs...) -> console.log lArgs...   # synonym for console.log()
 
-export doHaltOnError = false
-
 # ---------------------------------------------------------------------------
 # TEMP!!!!!
 
@@ -26,89 +26,11 @@ export eval_expr = (str) ->
 	str = str.replace(/\bundef\b/g, 'undefined')
 	return Function('"use strict";return (' + str + ')')();
 
-# ---------------------------------------------------------------------------
-
-export haltOnError = () ->
-
-	doHaltOnError = true
-
 # ---------------------------------------------------------------------------
 #   pass - do nothing
 
 export pass = () ->
 
-# ---------------------------------------------------------------------------
-#   error - throw an error
-
-export error = (message) ->
-
-	if doHaltOnError
-		console.trace("ERROR: #{message}")
-		process.exit()
-	throw new Error(message)
-
-# ---------------------------------------------------------------------------
-
-getCallers = (stackTrace, lExclude=[]) ->
-
-	iter = stackTrace.matchAll(///
-			at
-			\s+
-			(?:
-				async
-				\s+
-				)?
-			([^\s(]+)
-			///g)
-	if !iter
-		return ["<unknown>"]
-
-	lCallers = []
-	for lMatches from iter
-		[_, caller] = lMatches
-		if (caller.indexOf('file://') == 0)
-			break
-		if caller not in lExclude
-			lCallers.push caller
-
-	return lCallers
-
-# ---------------------------------------------------------------------------
-#   assert - mimic nodejs's assert
-#   return true so we can use it in boolean expressions
-
-export assert = (cond, msg) ->
-
-	if ! cond
-		stackTrace = new Error().stack
-		lCallers = getCallers(stackTrace, ['assert'])
-
-		console.log '--------------------'
-		console.log 'JavaScript CALL STACK:'
-		for caller in lCallers
-			console.log "   #{caller}"
-		console.log '--------------------'
-		console.log "ERROR: #{msg} (in #{lCallers[0]}())"
-		if doHaltOnError
-			process.exit()
-		error msg
-	return true
-
-# ---------------------------------------------------------------------------
-#   croak - throws an error after possibly printing useful info
-
-export croak = (err, label, obj) ->
-
-	curmsg = if isString(err) then err else err.message
-	newmsg = """
-			ERROR (croak): #{curmsg}
-			#{label}:
-			#{JSON.stringify(obj)}
-			"""
-
-	# --- re-throw the error
-	throw new Error(newmsg)
-
 # ---------------------------------------------------------------------------
 
 export getClassName = (obj) ->
@@ -131,7 +53,7 @@ export patchStr = (bigstr, pos, str) ->
 
 export isString = (x) ->
 
-	return typeof x == 'string' || x instanceof String
+	return (typeof x == 'string') || (x instanceof String)
 
 # ---------------------------------------------------------------------------
 

package/src/coffee_utils.js

@@ -1,7 +1,12 @@
 // Generated by CoffeeScript 2.7.0
-  // coffee_utils.coffee
-var LOG, getCallers,
-  indexOf = [].indexOf;
+// coffee_utils.coffee
+var LOG;
+
+import {
+  assert,
+  error,
+  croak
+} from '@jdeighan/unit-tester/utils';
 
 export var sep_dash = '-'.repeat(42);
 
@@ -13,7 +18,6 @@ LOG = function(...lArgs) {
   return console.log(...lArgs); // synonym for console.log()
 };
 
-export var doHaltOnError = false;
 
 // ---------------------------------------------------------------------------
 // TEMP!!!!!
@@ -29,81 +33,10 @@ export var eval_expr = function(str) {
   return Function('"use strict";return (' + str + ')')();
 };
 
-// ---------------------------------------------------------------------------
-export var haltOnError = function() {
-  return doHaltOnError = true;
-};
-
 // ---------------------------------------------------------------------------
 //   pass - do nothing
 export var pass = function() {};
 
-// ---------------------------------------------------------------------------
-//   error - throw an error
-export var error = function(message) {
-  if (doHaltOnError) {
-    console.trace(`ERROR: ${message}`);
-    process.exit();
-  }
-  throw new Error(message);
-};
-
-// ---------------------------------------------------------------------------
-getCallers = function(stackTrace, lExclude = []) {
-  var _, caller, iter, lCallers, lMatches;
-  iter = stackTrace.matchAll(/at\s+(?:async\s+)?([^\s(]+)/g);
-  if (!iter) {
-    return ["<unknown>"];
-  }
-  lCallers = [];
-  for (lMatches of iter) {
-    [_, caller] = lMatches;
-    if (caller.indexOf('file://') === 0) {
-      break;
-    }
-    if (indexOf.call(lExclude, caller) < 0) {
-      lCallers.push(caller);
-    }
-  }
-  return lCallers;
-};
-
-// ---------------------------------------------------------------------------
-//   assert - mimic nodejs's assert
-//   return true so we can use it in boolean expressions
-export var assert = function(cond, msg) {
-  var caller, i, lCallers, len, stackTrace;
-  if (!cond) {
-    stackTrace = new Error().stack;
-    lCallers = getCallers(stackTrace, ['assert']);
-    console.log('--------------------');
-    console.log('JavaScript CALL STACK:');
-    for (i = 0, len = lCallers.length; i < len; i++) {
-      caller = lCallers[i];
-      console.log(`   ${caller}`);
-    }
-    console.log('--------------------');
-    console.log(`ERROR: ${msg} (in ${lCallers[0]}())`);
-    if (doHaltOnError) {
-      process.exit();
-    }
-    error(msg);
-  }
-  return true;
-};
-
-// ---------------------------------------------------------------------------
-//   croak - throws an error after possibly printing useful info
-export var croak = function(err, label, obj) {
-  var curmsg, newmsg;
-  curmsg = isString(err) ? err : err.message;
-  newmsg = `ERROR (croak): ${curmsg}
-${label}:
-${JSON.stringify(obj)}`;
-  // --- re-throw the error
-  throw new Error(newmsg);
-};
-
 // ---------------------------------------------------------------------------
 export var getClassName = function(obj) {
   if (typeof obj !== 'object') {
@@ -125,7 +58,7 @@ export var patchStr = function(bigstr, pos, str) {
 
 // ---------------------------------------------------------------------------
 export var isString = function(x) {
-  return typeof x === 'string' || x instanceof String;
+  return (typeof x === 'string') || (x instanceof String);
 };
 
 // ---------------------------------------------------------------------------

package/src/debug_utils.coffee

@@ -1,7 +1,8 @@
 # debug_utils.coffee
 
+import {assert, error, croak} from '@jdeighan/unit-tester/utils'
 import {
-	assert, undef, error, croak, warn, defined,
+	undef, warn, defined,
 	isString, isFunction, isBoolean, patchStr,
 	OL, escapeStr, isNumber, isArray, words, pass,
 	} from '@jdeighan/coffee-utils'
@@ -111,12 +112,8 @@ export doTheLogging = (type, label, lObjects) ->
 
 		when 'enter'
 			log label, prefix(level)
-			if label.match(///^ \s* call///)
-				pre = prefix(level+1, 'noLastVbar')
-				itemPre = prefix(level+2, 'noLast2Vbars')
-			else
-				pre = prefix(level+1)
-				itemPre = prefix(level+2, 'noLastVbar')
+			pre = prefix(level+1, 'dotLastVbar')
+			itemPre = prefix(level+2, 'dotLast2Vbars')
 			for obj,i in lObjects
 				logItem "arg[#{i}]", obj, pre, itemPre
 
@@ -126,6 +123,7 @@ export doTheLogging = (type, label, lObjects) ->
 			itemPre = prefix(level+1, 'noLast2Vbars')
 			for obj,i in lObjects
 				logItem "ret[#{i}]", obj, pre, itemPre
+
 		when 'string'
 			pre = prefix(level)
 			itemPre = prefix(level+1, 'noLastVbar')

package/src/debug_utils.js

@@ -5,9 +5,12 @@ var lFuncList, reMethod, strFuncList,
 
 import {
   assert,
-  undef,
   error,
-  croak,
+  croak
+} from '@jdeighan/unit-tester/utils';
+
+import {
+  undef,
   warn,
   defined,
   isString,
@@ -151,13 +154,8 @@ export var doTheLogging = function(type, label, lObjects) {
   switch (type) {
     case 'enter':
       log(label, prefix(level));
-      if (label.match(/^\s*call/)) {
-        pre = prefix(level + 1, 'noLastVbar');
-        itemPre = prefix(level + 2, 'noLast2Vbars');
-      } else {
-        pre = prefix(level + 1);
-        itemPre = prefix(level + 2, 'noLastVbar');
-      }
+      pre = prefix(level + 1, 'dotLastVbar');
+      itemPre = prefix(level + 2, 'dotLast2Vbars');
       for (i = j = 0, len = lObjects.length; j < len; i = ++j) {
         obj = lObjects[i];
         logItem(`arg[${i}]`, obj, pre, itemPre);

package/src/fs_utils.coffee

@@ -5,9 +5,10 @@ import urllib from 'url'
 import fs from 'fs'
 import NReadLines from 'n-readlines'
 
+import {assert, error, croak} from '@jdeighan/unit-tester/utils'
 import {
-	assert, undef, pass, defined, rtrim, error, isEmpty, nonEmpty,
-	isString, isArray, isHash, isRegExp, isFunction, croak, OL,
+	undef, pass, defined, rtrim, isEmpty, nonEmpty,
+	isString, isArray, isHash, isRegExp, isFunction, OL,
 	} from '@jdeighan/coffee-utils'
 import {log, LOG} from '@jdeighan/coffee-utils/log'
 import {debug} from '@jdeighan/coffee-utils/debug'

package/src/fs_utils.js

@@ -12,11 +12,15 @@ import NReadLines from 'n-readlines';
 
 import {
   assert,
+  error,
+  croak
+} from '@jdeighan/unit-tester/utils';
+
+import {
   undef,
   pass,
   defined,
   rtrim,
-  error,
   isEmpty,
   nonEmpty,
   isString,
@@ -24,7 +28,6 @@ import {
   isHash,
   isRegExp,
   isFunction,
-  croak,
   OL
 } from '@jdeighan/coffee-utils';
 

package/src/indent_utils.coffee

@@ -1,7 +1,8 @@
 # indent_utils.coffee
 
+import {assert, error} from '@jdeighan/unit-tester/utils'
 import {
-	assert, undef, error, escapeStr, defined,
+	undef, escapeStr, defined,
 	OL, isInteger, isString, isArray, isEmpty, rtrim,
 	} from '@jdeighan/coffee-utils'
 import {arrayToBlock, blockToArray} from '@jdeighan/coffee-utils/block'

package/src/indent_utils.js

@@ -2,8 +2,11 @@
   // indent_utils.coffee
 import {
   assert,
+  error
+} from '@jdeighan/unit-tester/utils';
+
+import {
   undef,
-  error,
   escapeStr,
   defined,
   OL,

package/src/log_utils.coffee

@@ -2,8 +2,9 @@
 
 import yaml from 'js-yaml'
 
+import {assert, error, croak} from '@jdeighan/unit-tester/utils'
 import {
-	assert, undef, isNumber, isInteger, isString, isHash, isFunction,
+	undef, isNumber, isInteger, isString, isHash, isFunction,
 	escapeStr, sep_eq, sep_dash, pass, OL,
 	} from '@jdeighan/coffee-utils'
 import {blockToArray} from '@jdeighan/coffee-utils/block'

package/src/log_utils.js

@@ -6,6 +6,11 @@ import yaml from 'js-yaml';
 
 import {
   assert,
+  error,
+  croak
+} from '@jdeighan/unit-tester/utils';
+
+import {
   undef,
   isNumber,
   isInteger,

package/src/placeholders.coffee

@@ -1,6 +1,7 @@
 # placeholders.coffee
 
-import {assert, undef, defined, croak} from '@jdeighan/coffee-utils'
+import {assert, error, croak} from '@jdeighan/unit-tester/utils'
+import {undef, defined} from '@jdeighan/coffee-utils'
 
 hDefOptions = {
 	pre:  '__'

package/src/placeholders.js

@@ -4,9 +4,13 @@ var hDefOptions;
 
 import {
   assert,
-  undef,
-  defined,
+  error,
   croak
+} from '@jdeighan/unit-tester/utils';
+
+import {
+  undef,
+  defined
 } from '@jdeighan/coffee-utils';
 
 hDefOptions = {

package/src/svelte_utils.coffee

@@ -1,6 +1,7 @@
 # svelte_utils.coffee
 
-import {assert, isFunction} from '@jdeighan/coffee-utils'
+import {assert, error, croak} from '@jdeighan/unit-tester/utils'
+import {isFunction} from '@jdeighan/coffee-utils'
 import {log} from '@jdeighan/coffee-utils/log'
 
 # ---------------------------------------------------------------------------

package/src/svelte_utils.js

@@ -2,6 +2,11 @@
   // svelte_utils.coffee
 import {
   assert,
+  error,
+  croak
+} from '@jdeighan/unit-tester/utils';
+
+import {
   isFunction
 } from '@jdeighan/coffee-utils';
 

package/src/taml.coffee

@@ -2,8 +2,9 @@
 
 import yaml from 'js-yaml'
 
+import {assert, error, croak} from '@jdeighan/unit-tester/utils'
 import {
-	assert, undef, oneline, isString,
+	undef, oneline, isString,
 	} from '@jdeighan/coffee-utils'
 import {untabify, tabify, splitLine} from '@jdeighan/coffee-utils/indent'
 import {slurp} from '@jdeighan/coffee-utils/fs'

package/src/taml.js

@@ -6,6 +6,11 @@ import yaml from 'js-yaml';
 
 import {
   assert,
+  error,
+  croak
+} from '@jdeighan/unit-tester/utils';
+
+import {
   undef,
   oneline,
   isString