@jdeighan/coffee-utils 11.0.41 → 11.0.43

package/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "@jdeighan/coffee-utils",
 	"type": "module",
-	"version": "11.0.41",
+	"version": "11.0.43",
 	"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/base-utils": "^1.0.0",
+		"@jdeighan/base-utils": "^1.0.5",
 		"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.61"
+		"@jdeighan/unit-tester": "^2.0.63"
 	}
 }

package/src/SectionMap.coffee

@@ -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

@@ -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/utils.coffee

@@ -1,7 +1,10 @@
 # utils.coffee
 
 import {assert, croak} from '@jdeighan/base-utils'
-import {LOG, sep_dash, sep_eq} from '@jdeighan/base-utils/log'
+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,
@@ -12,7 +15,10 @@ import {
 	} 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

@@ -9,10 +9,20 @@ import {
 
 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,
@@ -47,13 +57,22 @@ import {
 } 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,