@jdeighan/coffee-utils 11.0.2 → 11.0.3

package/package.json

@@ -1,22 +1,22 @@
 {
 	"name": "@jdeighan/coffee-utils",
 	"type": "module",
-	"version": "11.0.2",
+	"version": "11.0.3",
 	"description": "A set of utility functions for CoffeeScript",
 	"main": "coffee_utils.js",
 	"exports": {
-		".": "./src/coffee_utils.js",
-		"./server": "./src/server_utils.js",
-		"./browser": "./src/browser_utils.js",
-		"./fs": "./src/fs_utils.js",
-		"./log": "./src/log_utils.js",
-		"./block": "./src/block_utils.js",
-		"./indent": "./src/indent_utils.js",
-		"./html": "./src/html_utils.js",
-		"./stack": "./src/call_stack.js",
-		"./debug": "./src/debug_utils.js",
+		".": "./src/utils.js",
+		"./server": "./src/server.js",
+		"./browser": "./src/browser.js",
+		"./fs": "./src/fs.js",
+		"./log": "./src/log.js",
+		"./block": "./src/block.js",
+		"./indent": "./src/indent.js",
+		"./html": "./src/html.js",
+		"./stack": "./src/stack.js",
+		"./debug": "./src/debug.js",
 		"./arrow": "./src/arrow.js",
-		"./svelte": "./src/svelte_utils.js",
+		"./svelte": "./src/svelte.js",
 		"./store": "./src/DataStores.js",
 		"./taml": "./src/taml.js",
 		"./placeholders": "./src/placeholders.js",
@@ -50,6 +50,7 @@
 	},
 	"homepage": "https://github.com/johndeighan/coffee-utils#readme",
 	"dependencies": {
+		"@jdeighan/exceptions": "^1.0.3",
 		"cross-env": "^7.0.3",
 		"js-yaml": "^4.1.0",
 		"n-readlines": "^1.0.1",
@@ -57,6 +58,6 @@
 		"svelte": "^3.50.1"
 	},
 	"devDependencies": {
-		"@jdeighan/unit-tester": "^2.0.24"
+		"@jdeighan/unit-tester": "^2.0.27"
 	}
 }

package/src/DataStores.coffee

@@ -1,16 +1,15 @@
 # DataStores.coffee
 
 import pathlib from 'path'
-import yaml from 'js-yaml'
 import {writable, readable, get} from 'svelte/store'
 
-import {assert, error} from '@jdeighan/unit-tester/utils'
-import {undef, pass, isEmpty} from '@jdeighan/coffee-utils'
+import {assert, croak} from '@jdeighan/exceptions'
+import {undef, pass} from '@jdeighan/coffee-utils'
 import {localStore} from '@jdeighan/coffee-utils/browser'
 import {
 	withExt, slurp, barf, newerDestFileExists,
 	} from '@jdeighan/coffee-utils/fs'
-import {untabify} from '@jdeighan/coffee-utils/indent'
+import {fromTAML} from '@jdeighan/coffee-utils/taml'
 
 # ---------------------------------------------------------------------------
 
@@ -46,7 +45,7 @@ export class LocalStorageDataStore extends WritableDataStore
 
 	set: (value) ->
 		if ! value?
-			error "LocalStorageStore.set(): cannont set to undef"
+			croak "LocalStorageStore.set(): cannont set to undef"
 		super value
 		localStore @masterKey, value
 
@@ -63,7 +62,7 @@ export class PropsDataStore extends LocalStorageDataStore
 
 	setProp: (name, value) ->
 		if ! name?
-			error "PropStore.setProp(): empty key"
+			croak "PropStore.setProp(): empty key"
 		@update (hPrefs) ->
 			hPrefs[name] = value
 			return hPrefs
@@ -122,20 +121,12 @@ export class TAMLDataStore extends WritableDataStore
 
 	constructor: (str) ->
 
-		super taml(str)
+		super fromTAML(str)
 
 # ---------------------------------------------------------------------------
 #         UTILITIES
 # ---------------------------------------------------------------------------
 
-export taml = (text) ->
-
-	if ! text?
-		return undef
-	return yaml.load(untabify(text, 1), {skipInvalid: true})
-
-# ---------------------------------------------------------------------------
-
 export brewTamlStr = (code, stub) ->
 
 	return """

package/src/DataStores.js

@@ -2,8 +2,6 @@
 // DataStores.coffee
 import pathlib from 'path';
 
-import yaml from 'js-yaml';
-
 import {
   writable,
   readable,
@@ -12,13 +10,12 @@ import {
 
 import {
   assert,
-  error
-} from '@jdeighan/unit-tester/utils';
+  croak
+} from '@jdeighan/exceptions';
 
 import {
   undef,
-  pass,
-  isEmpty
+  pass
 } from '@jdeighan/coffee-utils';
 
 import {
@@ -33,8 +30,8 @@ import {
 } from '@jdeighan/coffee-utils/fs';
 
 import {
-  untabify
-} from '@jdeighan/coffee-utils/indent';
+  fromTAML
+} from '@jdeighan/coffee-utils/taml';
 
 // ---------------------------------------------------------------------------
 export var WritableDataStore = class WritableDataStore {
@@ -72,7 +69,7 @@ export var LocalStorageDataStore = class LocalStorageDataStore extends WritableD
   //     set() will also be called
   set(value) {
     if (value == null) {
-      error("LocalStorageStore.set(): cannont set to undef");
+      croak("LocalStorageStore.set(): cannont set to undef");
     }
     super.set(value);
     return localStore(this.masterKey, value);
@@ -93,7 +90,7 @@ export var PropsDataStore = class PropsDataStore extends LocalStorageDataStore {
 
   setProp(name, value) {
     if (name == null) {
-      error("PropStore.setProp(): empty key");
+      croak("PropStore.setProp(): empty key");
     }
     return this.update(function(hPrefs) {
       hPrefs[name] = value;
@@ -166,23 +163,13 @@ export var MousePosDataStore = class MousePosDataStore extends ReadableDataStore
 // ---------------------------------------------------------------------------
 export var TAMLDataStore = class TAMLDataStore extends WritableDataStore {
   constructor(str) {
-    super(taml(str));
+    super(fromTAML(str));
   }
 
 };
 
 // ---------------------------------------------------------------------------
 //         UTILITIES
-// ---------------------------------------------------------------------------
-export var taml = function(text) {
-  if (text == null) {
-    return undef;
-  }
-  return yaml.load(untabify(text, 1), {
-    skipInvalid: true
-  });
-};
-
 // ---------------------------------------------------------------------------
 export var brewTamlStr = function(code, stub) {
   return `import {TAMLDataStore} from '@jdeighan/starbucks/stores';

package/src/Section.coffee

@@ -1,6 +1,6 @@
 # Section.coffee
 
-import {assert, error, croak} from '@jdeighan/unit-tester/utils'
+import {assert, croak} from '@jdeighan/exceptions'
 import {
 	pass, undef, defined, isArray, isEmpty,
 	} from '@jdeighan/coffee-utils'

package/src/Section.js

@@ -2,9 +2,8 @@
   // Section.coffee
 import {
   assert,
-  error,
   croak
-} from '@jdeighan/unit-tester/utils';
+} from '@jdeighan/exceptions';
 
 import {
   pass,

package/src/SectionMap.coffee

@@ -1,16 +1,14 @@
 # SectionMap.coffee
 
-import {assert, error, croak} from '@jdeighan/unit-tester/utils'
+import {LOG, assert, croak} from '@jdeighan/exceptions'
 import {
 	pass, undef, defined, notdefined, OL, isEmpty, nonEmpty,
 	isString, isHash, isArray, isUniqueTree, isNonEmptyString,
 	isNonEmptyArray,
 	} from '@jdeighan/coffee-utils'
-import {arrayToBlock} from '@jdeighan/coffee-utils/block'
-import {indented} from '@jdeighan/coffee-utils/indent'
-import {LOG} from '@jdeighan/coffee-utils/log'
+import {toBlock} from '@jdeighan/coffee-utils/block'
 import {debug} from '@jdeighan/coffee-utils/debug'
-import {isTAML, taml} from '@jdeighan/coffee-utils/taml'
+import {isTAML, fromTAML} from '@jdeighan/coffee-utils/taml'
 import {Section} from '@jdeighan/coffee-utils/section'
 
 # ---------------------------------------------------------------------------
@@ -35,7 +33,7 @@ export class SectionMap
 		debug "enter SectionMap()", @lSectionTree
 
 		if isTAML(@lSectionTree)
-			@SectionTree = taml(@lSectionTree)
+			@SectionTree = fromTAML(@lSectionTree)
 
 		assert isArray(@lSectionTree), "not an array"
 
@@ -127,7 +125,7 @@ export class SectionMap
 				else
 					croak "Bad item: #{OL(item)}"
 
-			block = arrayToBlock(lBlocks)
+			block = toBlock(lBlocks)
 			debug "block is", block
 			if defined(setName)
 				if defined(proc = hReplacers[setName])

package/src/SectionMap.js

@@ -3,10 +3,10 @@
 var isSectionName, isSetName;
 
 import {
+  LOG,
   assert,
-  error,
   croak
-} from '@jdeighan/unit-tester/utils';
+} from '@jdeighan/exceptions';
 
 import {
   pass,
@@ -25,24 +25,16 @@ import {
 } from '@jdeighan/coffee-utils';
 
 import {
-  arrayToBlock
+  toBlock
 } from '@jdeighan/coffee-utils/block';
 
-import {
-  indented
-} from '@jdeighan/coffee-utils/indent';
-
-import {
-  LOG
-} from '@jdeighan/coffee-utils/log';
-
 import {
   debug
 } from '@jdeighan/coffee-utils/debug';
 
 import {
   isTAML,
-  taml
+  fromTAML
 } from '@jdeighan/coffee-utils/taml';
 
 import {
@@ -66,7 +58,7 @@ export var SectionMap = class SectionMap {
     // --- lSectionTree is a tree of section/set names
     debug("enter SectionMap()", this.lSectionTree);
     if (isTAML(this.lSectionTree)) {
-      this.SectionTree = taml(this.lSectionTree);
+      this.SectionTree = fromTAML(this.lSectionTree);
     }
     assert(isArray(this.lSectionTree), "not an array");
     // --- keys are section names, values are Section objects
@@ -162,7 +154,7 @@ export var SectionMap = class SectionMap {
           croak(`Bad item: ${OL(item)}`);
         }
       }
-      block = arrayToBlock(lBlocks);
+      block = toBlock(lBlocks);
       debug("block is", block);
       if (defined(setName)) {
         if (defined(proc = hReplacers[setName])) {

package/src/arrow.coffee

@@ -1,6 +1,6 @@
 # arrow.coffee
 
-import {assert} from '@jdeighan/unit-tester/utils'
+import {assert} from '@jdeighan/exceptions'
 import {undef, OL, setCharsAt} from '@jdeighan/coffee-utils'
 
 # --- We use spaces here because Windows Terminal handles TAB chars badly

package/src/arrow.js

@@ -2,7 +2,7 @@
   // arrow.coffee
 import {
   assert
-} from '@jdeighan/unit-tester/utils';
+} from '@jdeighan/exceptions';
 
 import {
   undef,

package/src/{block_utils.coffee → block.coffee}

@@ -1,13 +1,13 @@
-# block_utils.coffee
+# block.coffee
 
 import fs from 'fs'
 import readline from 'readline'
 
-import {assert, error, croak} from '@jdeighan/unit-tester/utils'
+import {assert, croak} from '@jdeighan/exceptions'
 import {
 	undef, pass, defined, notdefined,
 	isEmpty, isString, isArray, nonEmpty, isArrayOfStrings,
-	escapeStr, rtrim, OL,
+	rtrim, OL,
 	} from '@jdeighan/coffee-utils'
 
 # ---------------------------------------------------------------------------
@@ -208,7 +208,7 @@ export forEachBlock = (filepath, func, regexp = /^-{16,}$/) ->
 					earlyExit = true
 					return true
 				else if result?
-					error "forEachBlock() - callback returned '#{result}'"
+					croak "forEachBlock() - callback returned '#{result}'"
 			lLines = []
 			firstLineNum = lineNum+1
 		else
@@ -240,7 +240,7 @@ export forEachSetOfBlocks = (filepath, func,
 					earlyExit = true
 					return true
 				else if result?
-					error "forEachSetOfBlocks() - callback returned '#{result}'"
+					croak "forEachSetOfBlocks() - callback returned '#{result}'"
 			lBlocks = []
 			firstLineNum = lineNum+1
 		else if (line.match(block_regexp))

package/src/{block_utils.js → block.js}

@@ -1,14 +1,13 @@
 // Generated by CoffeeScript 2.7.0
-// block_utils.coffee
+// block.coffee
 import fs from 'fs';
 
 import readline from 'readline';
 
 import {
   assert,
-  error,
   croak
-} from '@jdeighan/unit-tester/utils';
+} from '@jdeighan/exceptions';
 
 import {
   undef,
@@ -20,7 +19,6 @@ import {
   isArray,
   nonEmpty,
   isArrayOfStrings,
-  escapeStr,
   rtrim,
   OL
 } from '@jdeighan/coffee-utils';
@@ -254,7 +252,7 @@ export var forEachBlock = async function(filepath, func, regexp = /^-{16,}$/) {
           earlyExit = true;
           return true;
         } else if (result != null) {
-          error(`forEachBlock() - callback returned '${result}'`);
+          croak(`forEachBlock() - callback returned '${result}'`);
         }
       }
       lLines = [];
@@ -286,7 +284,7 @@ export var forEachSetOfBlocks = async function(filepath, func, block_regexp = /^
           earlyExit = true;
           return true;
         } else if (result != null) {
-          error(`forEachSetOfBlocks() - callback returned '${result}'`);
+          croak(`forEachSetOfBlocks() - callback returned '${result}'`);
         }
       }
       lBlocks = [];

package/src/{browser_utils.coffee → browser.coffee}

@@ -1,4 +1,4 @@
-# browser_utils.coffee
+# browser.coffee
 
 import {undef} from '@jdeighan/coffee-utils'
 

package/src/{browser_utils.js → browser.js}

@@ -1,5 +1,5 @@
 // Generated by CoffeeScript 2.7.0
-// browser_utils.coffee
+// browser.coffee
 var audio;
 
 import {

package/src/{debug_utils.coffee → debug.coffee}

@@ -1,20 +1,15 @@
-# debug_utils.coffee
+# debug.coffee
 
-import {assert, error, croak} from '@jdeighan/unit-tester/utils'
+import {LOG, assert, croak} from '@jdeighan/exceptions'
 import {
-	undef, warn, defined,
-	isString, isFunction, isBoolean, patchStr,
-	OL, escapeStr, isNumber, isArray, words, pass,
+	undef, defined, notdefined,
+	isString, isFunction, isBoolean, isArray,
+	OL, words, pass,
 	} from '@jdeighan/coffee-utils'
-import {blockToArray} from '@jdeighan/coffee-utils/block'
-import {untabify} from '@jdeighan/coffee-utils/indent'
-import {slurp} from '@jdeighan/coffee-utils/fs'
 import {CallStack} from '@jdeighan/coffee-utils/stack'
+import {prefix} from '@jdeighan/coffee-utils/arrow'
 import {
-	prefix, addArrow, removeLastVbar, vbar,
-	} from '@jdeighan/coffee-utils/arrow'
-import {
-	log, logItem, logBareItem, LOG, shortEnough,
+	log, logItem, logBareItem, shortEnough,
 	} from '@jdeighan/coffee-utils/log'
 
 # --- set in resetDebugging() and setDebugging()

package/src/{debug_utils.js → debug.js}

@@ -1,58 +1,39 @@
 // Generated by CoffeeScript 2.7.0
-  // debug_utils.coffee
+  // debug.coffee
 var lFuncList, reMethod, strFuncList,
   indexOf = [].indexOf;
 
 import {
+  LOG,
   assert,
-  error,
   croak
-} from '@jdeighan/unit-tester/utils';
+} from '@jdeighan/exceptions';
 
 import {
   undef,
-  warn,
   defined,
+  notdefined,
   isString,
   isFunction,
   isBoolean,
-  patchStr,
-  OL,
-  escapeStr,
-  isNumber,
   isArray,
+  OL,
   words,
   pass
 } from '@jdeighan/coffee-utils';
 
-import {
-  blockToArray
-} from '@jdeighan/coffee-utils/block';
-
-import {
-  untabify
-} from '@jdeighan/coffee-utils/indent';
-
-import {
-  slurp
-} from '@jdeighan/coffee-utils/fs';
-
 import {
   CallStack
 } from '@jdeighan/coffee-utils/stack';
 
 import {
-  prefix,
-  addArrow,
-  removeLastVbar,
-  vbar
+  prefix
 } from '@jdeighan/coffee-utils/arrow';
 
 import {
   log,
   logItem,
   logBareItem,
-  LOG,
   shortEnough
 } from '@jdeighan/coffee-utils/log';