@jdeighan/coffee-utils 11.0.40 → 11.0.42

package/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "@jdeighan/coffee-utils",
 	"type": "module",
-	"version": "11.0.40",
+	"version": "11.0.42",
 	"description": "A set of utility functions for CoffeeScript",
 	"main": "coffee_utils.js",
 	"exports": {
@@ -48,7 +48,7 @@
 	},
 	"homepage": "https://github.com/johndeighan/coffee-utils#readme",
 	"dependencies": {
-		"@jdeighan/exceptions": "^2.0.5",
+		"@jdeighan/base-utils": "^1.0.3",
 		"cross-env": "^7.0.3",
 		"js-yaml": "^4.1.0",
 		"n-readlines": "^1.0.1",
@@ -56,6 +56,6 @@
 		"svelte": "^3.52.0"
 	},
 	"devDependencies": {
-		"@jdeighan/unit-tester": "^2.0.60"
+		"@jdeighan/unit-tester": "^2.0.62"
 	}
 }

package/src/DataStores.coffee

@@ -3,7 +3,7 @@
 import pathlib from 'path'
 import {writable, readable, get} from 'svelte/store'
 
-import {assert, croak} from '@jdeighan/exceptions'
+import {assert, croak} from '@jdeighan/base-utils'
 import {undef, pass} from '@jdeighan/coffee-utils'
 import {localStore} from '@jdeighan/coffee-utils/browser'
 import {

package/src/DataStores.js

@@ -11,7 +11,7 @@ import {
 import {
   assert,
   croak
-} from '@jdeighan/exceptions';
+} from '@jdeighan/base-utils';
 
 import {
   undef,

package/src/Section.coffee

@@ -1,7 +1,7 @@
 # Section.coffee
 
-import {assert, croak} from '@jdeighan/exceptions'
-import {dbg, dbgEnter, dbgReturn} from '@jdeighan/exceptions/debug'
+import {assert, croak} from '@jdeighan/base-utils'
+import {dbg, dbgEnter, dbgReturn} from '@jdeighan/base-utils/debug'
 import {
 	pass, undef, defined, isArray, isEmpty, isFunction,
 	} from '@jdeighan/coffee-utils'

package/src/Section.js

@@ -3,13 +3,13 @@
 import {
   assert,
   croak
-} from '@jdeighan/exceptions';
+} from '@jdeighan/base-utils';
 
 import {
   dbg,
   dbgEnter,
   dbgReturn
-} from '@jdeighan/exceptions/debug';
+} from '@jdeighan/base-utils/debug';
 
 import {
   pass,

package/src/SectionMap.coffee

@@ -2,10 +2,10 @@
 
 import {
 	assert, croak, LOG, LOGVALUE, LOGTAML, isTAML, fromTAML,
-	} from '@jdeighan/exceptions'
+	} from '@jdeighan/base-utils'
 import {
 	dbg, dbgEnter, dbgReturn, dbgYield, dbgResume,
-	} from '@jdeighan/exceptions/debug'
+	} from '@jdeighan/base-utils/debug'
 import {
 	pass, undef, defined, notdefined, OL, isEmpty, nonEmpty,
 	isString, isHash, isArray, isUniqueTree, isNonEmptyString,
@@ -107,9 +107,8 @@ export class SectionMap
 		#        an array of section or set names or literal strings
 		#     i.e. it should NOT contain sub-arrays
 
-		if isString(desc) || isArrayOfStrings(desc)
-			dbgEnter "SectionMap.getBlock", desc
-		else
+		dbgEnter "SectionMap.getBlock", desc
+		if ! isString(desc) && ! isArrayOfStrings(desc)
 			croak "Bad desc: #{OL(desc)}"
 
 		if isSectionName(desc)

package/src/SectionMap.js

@@ -10,7 +10,7 @@ import {
   LOGTAML,
   isTAML,
   fromTAML
-} from '@jdeighan/exceptions';
+} from '@jdeighan/base-utils';
 
 import {
   dbg,
@@ -18,7 +18,7 @@ import {
   dbgReturn,
   dbgYield,
   dbgResume
-} from '@jdeighan/exceptions/debug';
+} from '@jdeighan/base-utils/debug';
 
 import {
   pass,
@@ -131,9 +131,8 @@ export var SectionMap = class SectionMap {
     //        a set name
     //        an array of section or set names or literal strings
     //     i.e. it should NOT contain sub-arrays
-    if (isString(desc) || isArrayOfStrings(desc)) {
-      dbgEnter("SectionMap.getBlock", desc);
-    } else {
+    dbgEnter("SectionMap.getBlock", desc);
+    if (!isString(desc) && !isArrayOfStrings(desc)) {
       croak(`Bad desc: ${OL(desc)}`);
     }
     if (isSectionName(desc)) {

package/src/block.coffee

@@ -3,8 +3,8 @@
 import fs from 'fs'
 import readline from 'readline'
 
-import {assert, croak} from '@jdeighan/exceptions'
-import {blockToArray, arrayToBlock} from '@jdeighan/exceptions/utils'
+import {assert, croak} from '@jdeighan/base-utils'
+import {blockToArray, arrayToBlock} from '@jdeighan/base-utils/utils'
 import {
 	undef, pass, defined, notdefined,
 	isEmpty, isString, isArray, nonEmpty, isArrayOfStrings,

package/src/block.js

@@ -7,12 +7,12 @@ import readline from 'readline';
 import {
   assert,
   croak
-} from '@jdeighan/exceptions';
+} from '@jdeighan/base-utils';
 
 import {
   blockToArray,
   arrayToBlock
-} from '@jdeighan/exceptions/utils';
+} from '@jdeighan/base-utils/utils';
 
 import {
   undef,

package/src/fs.coffee

@@ -5,8 +5,8 @@ import urllib from 'url'
 import fs from 'fs'
 import NReadLines from 'n-readlines'
 
-import {assert, croak, LOG, fromTAML} from '@jdeighan/exceptions'
-import {dbg, dbgEnter, dbgReturn} from '@jdeighan/exceptions/debug'
+import {assert, croak, LOG, fromTAML} from '@jdeighan/base-utils'
+import {dbg, dbgEnter, dbgReturn} from '@jdeighan/base-utils/debug'
 import {
 	undef, pass, defined, rtrim, isEmpty, nonEmpty, getOptions,
 	isString, isArray, isHash, isRegExp, isFunction, OL,

package/src/fs.js

@@ -15,13 +15,13 @@ import {
   croak,
   LOG,
   fromTAML
-} from '@jdeighan/exceptions';
+} from '@jdeighan/base-utils';
 
 import {
   dbg,
   dbgEnter,
   dbgReturn
-} from '@jdeighan/exceptions/debug';
+} from '@jdeighan/base-utils/debug';
 
 import {
   undef,

package/src/fsa.coffee

@@ -1,8 +1,8 @@
 # fsa.coffee
 
-import {assert, croak} from '@jdeighan/exceptions'
-import {LOG} from '@jdeighan/exceptions/log'
-import {dbg, dbgEnter, dbgReturn} from '@jdeighan/exceptions/debug'
+import {assert, croak} from '@jdeighan/base-utils'
+import {LOG} from '@jdeighan/base-utils/log'
+import {dbg, dbgEnter, dbgReturn} from '@jdeighan/base-utils/debug'
 import {
 	undef, defined, notdefined, words, isEmpty, nonEmpty,
 	isString, OL,

package/src/fsa.js

@@ -3,17 +3,17 @@
 import {
   assert,
   croak
-} from '@jdeighan/exceptions';
+} from '@jdeighan/base-utils';
 
 import {
   LOG
-} from '@jdeighan/exceptions/log';
+} from '@jdeighan/base-utils/log';
 
 import {
   dbg,
   dbgEnter,
   dbgReturn
-} from '@jdeighan/exceptions/debug';
+} from '@jdeighan/base-utils/debug';
 
 import {
   undef,

package/src/html.coffee

@@ -1,6 +1,6 @@
 # html.coffee
 
-import {assert, croak} from '@jdeighan/exceptions'
+import {assert, croak} from '@jdeighan/base-utils'
 import {
 	undef, pass, words, isEmpty, nonEmpty,
 	} from '@jdeighan/coffee-utils'

package/src/html.js

@@ -5,7 +5,7 @@ var hNoEnd, i, len, ref, tagName;
 import {
   assert,
   croak
-} from '@jdeighan/exceptions';
+} from '@jdeighan/base-utils';
 
 import {
   undef,

package/src/indent.coffee

@@ -1,6 +1,6 @@
 # indent.coffee
 
-import {assert, croak} from '@jdeighan/exceptions'
+import {assert, croak} from '@jdeighan/base-utils'
 import {
 	undef, defined, notdefined,
 	OL, isInteger, isString, isArray, isEmpty, rtrim,

package/src/indent.js

@@ -3,7 +3,7 @@
 import {
   assert,
   croak
-} from '@jdeighan/exceptions';
+} from '@jdeighan/base-utils';
 
 import {
   undef,

package/src/svelte.coffee

@@ -1,7 +1,7 @@
 # svelte.coffee
 
-import {assert, croak} from '@jdeighan/exceptions'
-import {LOG} from '@jdeighan/exceptions/log'
+import {assert, croak} from '@jdeighan/base-utils'
+import {LOG} from '@jdeighan/base-utils/log'
 import {isFunction} from '@jdeighan/coffee-utils'
 
 # ---------------------------------------------------------------------------

package/src/svelte.js

@@ -3,11 +3,11 @@
 import {
   assert,
   croak
-} from '@jdeighan/exceptions';
+} from '@jdeighan/base-utils';
 
 import {
   LOG
-} from '@jdeighan/exceptions/log';
+} from '@jdeighan/base-utils/log';
 
 import {
   isFunction

package/src/taml.coffee

@@ -2,7 +2,7 @@
 
 import yaml from 'js-yaml'
 
-import {assert, croak, isTAML, fromTAML, toTAML} from '@jdeighan/exceptions'
+import {assert, croak, isTAML, fromTAML, toTAML} from '@jdeighan/base-utils'
 import {
 	undef, defined, notdefined, OL, chomp, escapeStr,
 	isString, isObject, isEmpty,

package/src/taml.js

@@ -8,7 +8,7 @@ import {
   isTAML,
   fromTAML,
   toTAML
-} from '@jdeighan/exceptions';
+} from '@jdeighan/base-utils';
 
 import {
   undef,

package/src/utils.coffee

@@ -1,7 +1,10 @@
 # utils.coffee
 
-import {assert, croak} from '@jdeighan/exceptions'
-import {LOG, sep_dash, sep_eq} from '@jdeighan/exceptions/log'
+import {assert, croak} from '@jdeighan/base-utils'
+import {LOG, LOGVALUE, sep_dash, sep_eq} from '@jdeighan/base-utils/log'
+import {
+	dbgEnter, dbgReturn, dbgYield, dbgResume, dbg, setDebugging,
+	} from '@jdeighan/base-utils/debug'
 import {
 	undef, pass, defined, notdefined,
 	deepCopy, escapeStr, unescapeStr, hasChar, quoted, OL,
@@ -9,10 +12,13 @@ import {
 	isConstructor, isFunction, isRegExp, isObject, getClassName,
 	jsType, oneof,
 	isEmpty, nonEmpty, chomp, rtrim, setCharsAt, words, getOptions,
-	} from '@jdeighan/exceptions/utils'
+	} from '@jdeighan/base-utils/utils'
 
 export {
-	undef, pass, defined, notdefined, LOG, sep_dash, sep_eq,
+	assert, croak,
+	LOG, LOGVALUE, sep_dash, sep_eq,
+	dbgEnter, dbgReturn, dbgYield, dbgResume, dbg, setDebugging,
+	undef, pass, defined, notdefined,
 	deepCopy, escapeStr, unescapeStr, hasChar, quoted, OL,
 	isString, isNumber, isInteger, isHash, isArray, isBoolean,
 	isConstructor, isFunction, isRegExp, isObject, getClassName,

package/src/utils.js

@@ -5,13 +5,23 @@ var hasProp = {}.hasOwnProperty;
 import {
   assert,
   croak
-} from '@jdeighan/exceptions';
+} from '@jdeighan/base-utils';
 
 import {
   LOG,
+  LOGVALUE,
   sep_dash,
   sep_eq
-} from '@jdeighan/exceptions/log';
+} from '@jdeighan/base-utils/log';
+
+import {
+  dbgEnter,
+  dbgReturn,
+  dbgYield,
+  dbgResume,
+  dbg,
+  setDebugging
+} from '@jdeighan/base-utils/debug';
 
 import {
   undef,
@@ -44,16 +54,25 @@ import {
   setCharsAt,
   words,
   getOptions
-} from '@jdeighan/exceptions/utils';
+} from '@jdeighan/base-utils/utils';
 
 export {
+  assert,
+  croak,
+  LOG,
+  LOGVALUE,
+  sep_dash,
+  sep_eq,
+  dbgEnter,
+  dbgReturn,
+  dbgYield,
+  dbgResume,
+  dbg,
+  setDebugging,
   undef,
   pass,
   defined,
   notdefined,
-  LOG,
-  sep_dash,
-  sep_eq,
   deepCopy,
   escapeStr,
   unescapeStr,