@jdeighan/coffee-utils 13.0.15 → 14.0.0

package/package.json

@@ -1,11 +1,11 @@
 {
 	"name": "@jdeighan/coffee-utils",
 	"type": "module",
-	"version": "13.0.15",
+	"version": "14.0.0",
 	"description": "A set of utility functions for CoffeeScript",
 	"main": "coffee_utils.js",
 	"exports": {
-		".": "./src/utils.js",
+		".": "./src/coffee-utils.js",
 		"./server": "./src/server.js",
 		"./browser": "./src/browser.js",
 		"./fs": "./src/fs.js",
@@ -50,13 +50,13 @@
 	},
 	"homepage": "https://github.com/johndeighan/coffee-utils#readme",
 	"dependencies": {
-		"@jdeighan/base-utils": "^2.0.10",
+		"@jdeighan/base-utils": "^3.0.2",
 		"cross-env": "^7.0.3",
 		"n-readlines": "^1.0.1",
 		"readline-sync": "^1.4.10",
 		"svelte": "^3.55.0"
 	},
 	"devDependencies": {
-		"@jdeighan/unit-tester": "^3.0.10"
+		"@jdeighan/unit-tester": "^3.0.15"
 	}
 }

package/src/DataStores.coffee

@@ -3,9 +3,9 @@
 import pathlib from 'path'
 import {writable, readable, get} from 'svelte/store'
 
-import {assert, croak} from '@jdeighan/base-utils'
+import {undef, pass, range} from '@jdeighan/base-utils'
+import {assert, croak} from '@jdeighan/base-utils/exceptions'
 import {fromTAML} from '@jdeighan/base-utils/taml'
-import {undef, pass, range} from '@jdeighan/coffee-utils'
 import {localStore} from '@jdeighan/coffee-utils/browser'
 import {
 	withExt, slurp, barf, newerDestFileExists,

package/src/DataStores.js

@@ -8,21 +8,21 @@ import {
   get
 } from 'svelte/store';
 
+import {
+  undef,
+  pass,
+  range
+} from '@jdeighan/base-utils';
+
 import {
   assert,
   croak
-} from '@jdeighan/base-utils';
+} from '@jdeighan/base-utils/exceptions';
 
 import {
   fromTAML
 } from '@jdeighan/base-utils/taml';
 
-import {
-  undef,
-  pass,
-  range
-} from '@jdeighan/coffee-utils';
-
 import {
   localStore
 } from '@jdeighan/coffee-utils/browser';

package/src/KeyedSet.coffee

@@ -1,14 +1,16 @@
 # KeyedSet.coffee
 
-import {assert, croak, LOG, LOGVALUE} from '@jdeighan/base-utils'
-import {
-	dbgEnter, dbgReturn, dbg,
-	} from '@jdeighan/base-utils/debug'
 import {
 	undef, defined, notdefined, OL, deepCopy,
-	isString, isNonEmptyString, isArray, isHash, isArrayOfStrings,
+	isString, isNonEmptyString, isArray, isHash,
 	isEmpty, nonEmpty,
-	} from '@jdeighan/coffee-utils'
+	} from '@jdeighan/base-utils'
+import {assert, croak} from '@jdeighan/base-utils/exceptions'
+import {LOG, LOGVALUE} from '@jdeighan/base-utils/log'
+import {
+	dbgEnter, dbgReturn, dbg,
+	} from '@jdeighan/base-utils/debug'
+import {isArrayOfStrings} from '@jdeighan/coffee-utils'
 
 # ---------------------------------------------------------------------------
 

package/src/KeyedSet.js

@@ -1,18 +1,5 @@
 // Generated by CoffeeScript 2.7.0
   // KeyedSet.coffee
-import {
-  assert,
-  croak,
-  LOG,
-  LOGVALUE
-} from '@jdeighan/base-utils';
-
-import {
-  dbgEnter,
-  dbgReturn,
-  dbg
-} from '@jdeighan/base-utils/debug';
-
 import {
   undef,
   defined,
@@ -23,9 +10,28 @@ import {
   isNonEmptyString,
   isArray,
   isHash,
-  isArrayOfStrings,
   isEmpty,
   nonEmpty
+} from '@jdeighan/base-utils';
+
+import {
+  assert,
+  croak
+} from '@jdeighan/base-utils/exceptions';
+
+import {
+  LOG,
+  LOGVALUE
+} from '@jdeighan/base-utils/log';
+
+import {
+  dbgEnter,
+  dbgReturn,
+  dbg
+} from '@jdeighan/base-utils/debug';
+
+import {
+  isArrayOfStrings
 } from '@jdeighan/coffee-utils';
 
 // ---------------------------------------------------------------------------

package/src/Section.coffee

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

package/src/Section.js

@@ -3,7 +3,7 @@
 import {
   assert,
   croak
-} from '@jdeighan/base-utils';
+} from '@jdeighan/base-utils/exceptions';
 
 import {
   dbg,
@@ -17,12 +17,9 @@ import {
   defined,
   isArray,
   isEmpty,
-  isFunction
-} from '@jdeighan/coffee-utils';
-
-import {
+  isFunction,
   toBlock
-} from '@jdeighan/coffee-utils/block';
+} from '@jdeighan/base-utils';
 
 // ---------------------------------------------------------------------------
 export var Section = class Section {

package/src/SectionMap.coffee

@@ -1,17 +1,19 @@
 # SectionMap.coffee
 
-import {
-	assert, croak, LOG, LOGVALUE, LOGTAML, isTAML, fromTAML,
-	} from '@jdeighan/base-utils'
+import {assert, croak} from '@jdeighan/base-utils/exceptions'
+import {LOG, LOGVALUE, LOGTAML} from '@jdeighan/base-utils/log'
+import {isTAML, fromTAML} from '@jdeighan/base-utils/taml'
 import {
 	dbg, dbgEnter, dbgReturn, dbgYield, dbgResume,
 	} from '@jdeighan/base-utils/debug'
 import {
 	pass, undef, defined, notdefined, OL, isEmpty, nonEmpty,
-	isString, isHash, isArray, isUniqueTree, isNonEmptyString,
-	isNonEmptyArray, isFunction, jsType, isArrayOfStrings,
+	isString, isHash, isArray, isNonEmptyString,
+	isFunction, jsType, toBlock,
+	} from '@jdeighan/base-utils'
+import {
+	isArrayOfStrings, isNonEmptyArray, isUniqueTree,
 	} from '@jdeighan/coffee-utils'
-import {toBlock} from '@jdeighan/coffee-utils/block'
 import {Section} from '@jdeighan/coffee-utils/section'
 
 # ---------------------------------------------------------------------------

package/src/SectionMap.js

@@ -4,13 +4,19 @@ var isSectionName, isSetName;
 
 import {
   assert,
-  croak,
+  croak
+} from '@jdeighan/base-utils/exceptions';
+
+import {
   LOG,
   LOGVALUE,
-  LOGTAML,
+  LOGTAML
+} from '@jdeighan/base-utils/log';
+
+import {
   isTAML,
   fromTAML
-} from '@jdeighan/base-utils';
+} from '@jdeighan/base-utils/taml';
 
 import {
   dbg,
@@ -31,17 +37,17 @@ import {
   isString,
   isHash,
   isArray,
-  isUniqueTree,
   isNonEmptyString,
-  isNonEmptyArray,
   isFunction,
   jsType,
-  isArrayOfStrings
-} from '@jdeighan/coffee-utils';
+  toBlock
+} from '@jdeighan/base-utils';
 
 import {
-  toBlock
-} from '@jdeighan/coffee-utils/block';
+  isArrayOfStrings,
+  isNonEmptyArray,
+  isUniqueTree
+} from '@jdeighan/coffee-utils';
 
 import {
   Section

package/src/block.coffee

@@ -3,73 +3,12 @@
 import fs from 'fs'
 import readline from 'readline'
 
-import {assert, croak} from '@jdeighan/base-utils'
-import {blockToArray, arrayToBlock} from '@jdeighan/base-utils/utils'
+import {assert, croak} from '@jdeighan/base-utils/exceptions'
 import {
-	undef, pass, defined, notdefined,
-	isEmpty, isString, isArray, nonEmpty, isArrayOfStrings,
-	rtrim, OL,
-	} from '@jdeighan/coffee-utils'
-
-export {blockToArray, arrayToBlock}
-
-# ---------------------------------------------------------------------------
-#   toArray - split a block or array into lines w/o newlines
-
-export toArray = (item, option=undef) ->
-	# --- Valid options:
-	#     'noEmptyLines'
-	#     'noLeadingEmptyLines'
-
-	if isString(item)
-		lLines = item.split(/\r?\n/)
-	else if isArray(item)
-		lLines = item
-	else
-		croak "Not a string or array"
-
-	# --- We need to ensure that no strings contain newlines
-	#     and possibly remove empty lines
-	lNewLines = []
-	nonEmptyFound = false
-	for line in lLines
-		if isEmpty(line)
-			if (option == 'noEmptyLines') \
-					|| ((option == 'noLeadingEmptyLines') && ! nonEmptyFound)
-				pass
-			else
-				lNewLines.push ''
-		else if (line.indexOf("\n") > -1)
-			for substr in toArray(line)
-				if isEmpty(substr)
-					if (option == 'noEmptyLines') \
-							|| ((option == 'noLeadingEmptyLines') && ! nonEmptyFound)
-						pass
-					else
-						lNewLines.push ''
-				else
-					nonEmptyFound = true
-					lNewLines.push substr
-		else
-			nonEmptyFound = true
-			lNewLines.push line
-	return lNewLines
-
-# ---------------------------------------------------------------------------
-#   toBlock - block may have trailing whitespace
-#             but undef items are ignored
-
-export toBlock = (lLines) ->
-
-	if notdefined(lLines)
-		return undef
-	assert isArrayOfStrings(lLines),
-		"lLines is not an array of strings: #{OL(lLines)}"
-	lNewLines = []
-	for line in lLines
-		if defined(line)
-			lNewLines.push rtrim(line)
-	return lNewLines.join("\n")
+	undef, pass, defined, notdefined, rtrim, OL,
+	isEmpty, isString, isArray, nonEmpty, toArray, toBlock,
+	} from '@jdeighan/base-utils'
+import {isArrayOfStrings} from '@jdeighan/coffee-utils'
 
 # ---------------------------------------------------------------------------
 
@@ -113,7 +52,7 @@ export normalizeBlock = (content) ->
 
 	if typeof content != 'string'
 		throw new Error("normalizeBlock(): not a string")
-	lLines = for line in blockToArray(content)
+	lLines = for line in toArray(content)
 		line = line.trim()
 		line.replace(/\s+/g, ' ')
 	lLines = lLines.filter (line) -> line != ''
@@ -124,9 +63,9 @@ export normalizeBlock = (content) ->
 
 export truncateBlock = (str, numLines) ->
 
-	lLines = blockToArray str
+	lLines = toArray str
 	lLines.length = numLines
-	return arrayToBlock lLines
+	return toBlock lLines
 
 # ---------------------------------------------------------------------------
 

package/src/block.js

@@ -7,99 +7,26 @@ import readline from 'readline';
 import {
   assert,
   croak
-} from '@jdeighan/base-utils';
-
-import {
-  blockToArray,
-  arrayToBlock
-} from '@jdeighan/base-utils/utils';
+} from '@jdeighan/base-utils/exceptions';
 
 import {
   undef,
   pass,
   defined,
   notdefined,
+  rtrim,
+  OL,
   isEmpty,
   isString,
   isArray,
   nonEmpty,
-  isArrayOfStrings,
-  rtrim,
-  OL
-} from '@jdeighan/coffee-utils';
-
-export {
-  blockToArray,
-  arrayToBlock
-};
-
-// ---------------------------------------------------------------------------
-//   toArray - split a block or array into lines w/o newlines
-export var toArray = function(item, option = undef) {
-  var i, j, lLines, lNewLines, len, len1, line, nonEmptyFound, ref, substr;
-  // --- Valid options:
-  //     'noEmptyLines'
-  //     'noLeadingEmptyLines'
-  if (isString(item)) {
-    lLines = item.split(/\r?\n/);
-  } else if (isArray(item)) {
-    lLines = item;
-  } else {
-    croak("Not a string or array");
-  }
-  // --- We need to ensure that no strings contain newlines
-  //     and possibly remove empty lines
-  lNewLines = [];
-  nonEmptyFound = false;
-  for (i = 0, len = lLines.length; i < len; i++) {
-    line = lLines[i];
-    if (isEmpty(line)) {
-      if ((option === 'noEmptyLines') || ((option === 'noLeadingEmptyLines') && !nonEmptyFound)) {
-        pass;
-      } else {
-        lNewLines.push('');
-      }
-    } else if (line.indexOf("\n") > -1) {
-      ref = toArray(line);
-      for (j = 0, len1 = ref.length; j < len1; j++) {
-        substr = ref[j];
-        if (isEmpty(substr)) {
-          if ((option === 'noEmptyLines') || ((option === 'noLeadingEmptyLines') && !nonEmptyFound)) {
-            pass;
-          } else {
-            lNewLines.push('');
-          }
-        } else {
-          nonEmptyFound = true;
-          lNewLines.push(substr);
-        }
-      }
-    } else {
-      nonEmptyFound = true;
-      lNewLines.push(line);
-    }
-  }
-  return lNewLines;
-};
+  toArray,
+  toBlock
+} from '@jdeighan/base-utils';
 
-// ---------------------------------------------------------------------------
-//   toBlock - block may have trailing whitespace
-//             but undef items are ignored
-export var toBlock = function(lLines) {
-  var i, lNewLines, len, line;
-  if (notdefined(lLines)) {
-    return undef;
-  }
-  assert(isArrayOfStrings(lLines), `lLines is not an array of strings: ${OL(lLines)}`);
-  lNewLines = [];
-  for (i = 0, len = lLines.length; i < len; i++) {
-    line = lLines[i];
-    if (defined(line)) {
-      lNewLines.push(rtrim(line));
-    }
-  }
-  return lNewLines.join("\n");
-};
+import {
+  isArrayOfStrings
+} from '@jdeighan/coffee-utils';
 
 // ---------------------------------------------------------------------------
 export var splitBlock = function(block) {
@@ -147,7 +74,7 @@ export var normalizeBlock = function(content) {
   }
   lLines = (function() {
     var i, len, ref, results;
-    ref = blockToArray(content);
+    ref = toArray(content);
     results = [];
     for (i = 0, len = ref.length; i < len; i++) {
       line = ref[i];
@@ -166,9 +93,9 @@ export var normalizeBlock = function(content) {
 // truncateBlock - limit block to a certain number of lines
 export var truncateBlock = function(str, numLines) {
   var lLines;
-  lLines = blockToArray(str);
+  lLines = toArray(str);
   lLines.length = numLines;
-  return arrayToBlock(lLines);
+  return toBlock(lLines);
 };
 
 // ---------------------------------------------------------------------------

package/src/browser.coffee

@@ -1,6 +1,6 @@
 # browser.coffee
 
-import {undef} from '@jdeighan/coffee-utils'
+import {undef} from '@jdeighan/base-utils'
 
 audio = undef   # audio context - create only when needed, then keep
 

package/src/browser.js

@@ -4,7 +4,7 @@ var audio;
 
 import {
   undef
-} from '@jdeighan/coffee-utils';
+} from '@jdeighan/base-utils';
 
 audio = undef; // audio context - create only when needed, then keep
 

package/src/{utils.coffee → coffee-utils.coffee}

@@ -1,7 +1,9 @@
-# utils.coffee
+# coffee-utils.coffee
 
-import {assert, croak} from '@jdeighan/base-utils'
-import {LOG, LOGVALUE, sep_dash, sep_eq} from '@jdeighan/base-utils/log'
+import {assert, croak} from '@jdeighan/base-utils/exceptions'
+import {
+	LOG, LOGVALUE, sep_dash, sep_eq,
+	} from '@jdeighan/base-utils/log'
 import {
 	dbgEnter, dbgReturn, dbgYield, dbgResume, dbg, setDebugging,
 	} from '@jdeighan/base-utils/debug'
@@ -10,21 +12,9 @@ import {
 	deepCopy, escapeStr, unescapeStr, hasChar, quoted, OL,
 	isString, isNumber, isInteger, isHash, isArray, isBoolean,
 	isConstructor, isFunction, isRegExp, isObject, getClassName,
-	jsType, oneof,
-	isEmpty, nonEmpty, chomp, rtrim, setCharsAt, words, getOptions,
-	} from '@jdeighan/base-utils/utils'
-
-export {
-	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,
-	jsType, oneof,
+	jsType, oneof, isIterable,
 	isEmpty, nonEmpty, chomp, rtrim, setCharsAt, words, getOptions,
-	}
+	} from '@jdeighan/base-utils'
 
 # ---------------------------------------------------------------------------
 
@@ -347,14 +337,6 @@ export replaceVars = (line, hVars={}, rx=/__(env\.)?([A-Za-z_]\w*)__/g) ->
 
 # ---------------------------------------------------------------------------
 
-export isIterable = (obj) ->
-
-	if (obj == undef) || (obj == null)
-		return false
-	return typeof obj[Symbol.iterator] == 'function'
-
-# ---------------------------------------------------------------------------
-
 export className = (aClass) ->
 
 	if lMatches = aClass.toString().match(/class\s+(\w+)/)
@@ -364,12 +346,6 @@ export className = (aClass) ->
 
 # ---------------------------------------------------------------------------
 
-export range = (n) ->
-
-	return [0..n-1]
-
-# ---------------------------------------------------------------------------
-
 export timestamp = () ->
 
 	return new Date().toLocaleTimeString("en-US")

package/src/{utils.js → coffee-utils.js}

@@ -1,11 +1,11 @@
 // Generated by CoffeeScript 2.7.0
-// utils.coffee
+// coffee-utils.coffee
 var hasProp = {}.hasOwnProperty;
 
 import {
   assert,
   croak
-} from '@jdeighan/base-utils';
+} from '@jdeighan/base-utils/exceptions';
 
 import {
   LOG,
@@ -47,6 +47,7 @@ import {
   getClassName,
   jsType,
   oneof,
+  isIterable,
   isEmpty,
   nonEmpty,
   chomp,
@@ -54,52 +55,7 @@ import {
   setCharsAt,
   words,
   getOptions
-} from '@jdeighan/base-utils/utils';
-
-export {
-  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,
-  jsType,
-  oneof,
-  isEmpty,
-  nonEmpty,
-  chomp,
-  rtrim,
-  setCharsAt,
-  words,
-  getOptions
-};
+} from '@jdeighan/base-utils';
 
 // ---------------------------------------------------------------------------
 export var isHashComment = (line) => {
@@ -459,14 +415,6 @@ export var replaceVars = function(line, hVars = {}, rx = /__(env\.)?([A-Za-z_]\w
   return line.replace(rx, replacerFunc);
 };
 
-// ---------------------------------------------------------------------------
-export var isIterable = function(obj) {
-  if ((obj === undef) || (obj === null)) {
-    return false;
-  }
-  return typeof obj[Symbol.iterator] === 'function';
-};
-
 // ---------------------------------------------------------------------------
 export var className = function(aClass) {
   var lMatches;
@@ -477,16 +425,6 @@ export var className = function(aClass) {
   }
 };
 
-// ---------------------------------------------------------------------------
-export var range = function(n) {
-  var ref;
-  return (function() {
-    var results = [];
-    for (var i = 0, ref = n - 1; 0 <= ref ? i <= ref : i >= ref; 0 <= ref ? i++ : i--){ results.push(i); }
-    return results;
-  }).apply(this);
-};
-
 // ---------------------------------------------------------------------------
 export var timestamp = function() {
   return new Date().toLocaleTimeString("en-US");

package/src/fs.coffee

@@ -6,13 +6,14 @@ import fs from 'fs'
 import readline from 'readline'
 import NReadLines from 'n-readlines'
 
-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,
-	} from '@jdeighan/coffee-utils'
-import {arrayToBlock} from '@jdeighan/coffee-utils/block'
+	isString, isArray, isHash, isRegExp, isFunction, OL, toBlock,
+	} from '@jdeighan/base-utils'
+import {assert, croak} from '@jdeighan/base-utils/exceptions'
+import {LOG, LOGVALUE} from '@jdeighan/base-utils/log'
+import {dbg, dbgEnter, dbgReturn} from '@jdeighan/base-utils/debug'
+import {fromTAML} from '@jdeighan/base-utils/taml'
 
 # ---------------------------------------------------------------------------
 #    mydir() - pass argument import.meta.url and it will return
@@ -216,7 +217,7 @@ export slurp = (filepath, maxLines=undef) ->
 		forEachLine filepath, (line, nLines) ->
 			lLines.push line
 			return (nLines >= maxLines)
-		contents = arrayToBlock(lLines)
+		contents = toBlock(lLines)
 	else
 		filepath = filepath.replace(/\//g, "\\")
 		contents = fs.readFileSync(filepath, 'utf8').toString()
@@ -230,7 +231,7 @@ export barf = (filepath, contents) ->
 	if isEmpty(contents)
 		return
 	if isArray(contents)
-		contents = arrayToBlock(contents)
+		contents = toBlock(contents)
 	else if ! isString(contents)
 		croak "barf(): Invalid contents"
 	contents = rtrim(contents) + "\n"

package/src/fs.js

@@ -12,19 +12,6 @@ import readline from 'readline';
 
 import NReadLines from 'n-readlines';
 
-import {
-  assert,
-  croak,
-  LOG,
-  fromTAML
-} from '@jdeighan/base-utils';
-
-import {
-  dbg,
-  dbgEnter,
-  dbgReturn
-} from '@jdeighan/base-utils/debug';
-
 import {
   undef,
   pass,
@@ -38,12 +25,29 @@ import {
   isHash,
   isRegExp,
   isFunction,
-  OL
-} from '@jdeighan/coffee-utils';
+  OL,
+  toBlock
+} from '@jdeighan/base-utils';
 
 import {
-  arrayToBlock
-} from '@jdeighan/coffee-utils/block';
+  assert,
+  croak
+} from '@jdeighan/base-utils/exceptions';
+
+import {
+  LOG,
+  LOGVALUE
+} from '@jdeighan/base-utils/log';
+
+import {
+  dbg,
+  dbgEnter,
+  dbgReturn
+} from '@jdeighan/base-utils/debug';
+
+import {
+  fromTAML
+} from '@jdeighan/base-utils/taml';
 
 // ---------------------------------------------------------------------------
 //    mydir() - pass argument import.meta.url and it will return
@@ -252,7 +256,7 @@ export var slurp = function(filepath, maxLines = undef) {
       lLines.push(line);
       return nLines >= maxLines;
     });
-    contents = arrayToBlock(lLines);
+    contents = toBlock(lLines);
   } else {
     filepath = filepath.replace(/\//g, "\\");
     contents = fs.readFileSync(filepath, 'utf8').toString();
@@ -267,7 +271,7 @@ export var barf = function(filepath, contents) {
     return;
   }
   if (isArray(contents)) {
-    contents = arrayToBlock(contents);
+    contents = toBlock(contents);
   } else if (!isString(contents)) {
     croak("barf(): Invalid contents");
   }

package/src/fsa.coffee

@@ -1,13 +1,12 @@
 # fsa.coffee
 
-import {assert, croak} from '@jdeighan/base-utils'
+import {assert, croak} from '@jdeighan/base-utils/exceptions'
 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,
-	} from '@jdeighan/coffee-utils'
-import {toArray} from '@jdeighan/coffee-utils/block'
+	isString, OL, toArray,
+	} from '@jdeighan/base-utils'
 
 # ---------------------------------------------------------------------------
 

package/src/fsa.js

@@ -3,7 +3,7 @@
 import {
   assert,
   croak
-} from '@jdeighan/base-utils';
+} from '@jdeighan/base-utils/exceptions';
 
 import {
   LOG
@@ -23,12 +23,9 @@ import {
   isEmpty,
   nonEmpty,
   isString,
-  OL
-} from '@jdeighan/coffee-utils';
-
-import {
+  OL,
   toArray
-} from '@jdeighan/coffee-utils/block';
+} from '@jdeighan/base-utils';
 
 // ---------------------------------------------------------------------------
 export var FSA = class FSA {

package/src/html.coffee

@@ -1,11 +1,10 @@
 # html.coffee
 
-import {assert, croak} from '@jdeighan/base-utils'
+import {assert, croak} from '@jdeighan/base-utils/exceptions'
 import {
-	undef, pass, words, isEmpty, nonEmpty,
-	} from '@jdeighan/coffee-utils'
+	undef, pass, words, isEmpty, nonEmpty, toBlock,
+	} from '@jdeighan/base-utils'
 import {indented} from '@jdeighan/coffee-utils/indent'
-import {toBlock} from '@jdeighan/coffee-utils/block'
 
 hNoEnd = {}
 for tagName in words('area base br col command embed hr img input' \

package/src/html.js

@@ -5,24 +5,21 @@ var hNoEnd, i, len, ref, tagName;
 import {
   assert,
   croak
-} from '@jdeighan/base-utils';
+} from '@jdeighan/base-utils/exceptions';
 
 import {
   undef,
   pass,
   words,
   isEmpty,
-  nonEmpty
-} from '@jdeighan/coffee-utils';
+  nonEmpty,
+  toBlock
+} from '@jdeighan/base-utils';
 
 import {
   indented
 } from '@jdeighan/coffee-utils/indent';
 
-import {
-  toBlock
-} from '@jdeighan/coffee-utils/block';
-
 hNoEnd = {};
 
 ref = words('area base br col command embed hr img input' + ' keygen link meta param source track wbr');

package/src/indent.coffee

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

package/src/indent.js

@@ -3,24 +3,21 @@
 import {
   assert,
   croak
-} from '@jdeighan/base-utils';
+} from '@jdeighan/base-utils/exceptions';
 
 import {
   undef,
   defined,
   notdefined,
+  toArray,
+  toBlock,
   OL,
   isInteger,
   isString,
   isArray,
   isEmpty,
   rtrim
-} from '@jdeighan/coffee-utils';
-
-import {
-  toArray,
-  toBlock
-} from '@jdeighan/coffee-utils/block';
+} from '@jdeighan/base-utils';
 
 // ---------------------------------------------------------------------------
 export var getOneIndent = function(str) {

package/src/svelte.coffee

@@ -1,8 +1,8 @@
 # svelte.coffee
 
-import {assert, croak} from '@jdeighan/base-utils'
+import {assert, croak} from '@jdeighan/base-utils/exceptions'
 import {LOG} from '@jdeighan/base-utils/log'
-import {isFunction} from '@jdeighan/coffee-utils'
+import {isFunction} from '@jdeighan/base-utils'
 
 # ---------------------------------------------------------------------------
 #   svelteSourceCodeEsc - to display source code for a *.starbucks page

package/src/svelte.js

@@ -3,7 +3,7 @@
 import {
   assert,
   croak
-} from '@jdeighan/base-utils';
+} from '@jdeighan/base-utils/exceptions';
 
 import {
   LOG
@@ -11,7 +11,7 @@ import {
 
 import {
   isFunction
-} from '@jdeighan/coffee-utils';
+} from '@jdeighan/base-utils';
 
 // ---------------------------------------------------------------------------
 //   svelteSourceCodeEsc - to display source code for a *.starbucks page