@jdeighan/coffee-utils 11.0.2 → 11.0.3

package/src/{log_utils.js → log.js}

@@ -1,12 +1,12 @@
 // Generated by CoffeeScript 2.7.0
-// log_utils.coffee
+// log.coffee
 var doDebugLog, fixForTerminal, fourSpaces, loaded, maxOneLine, putBlock, putstr;
 
 import {
+  LOG,
   assert,
-  error,
   croak
-} from '@jdeighan/unit-tester/utils';
+} from '@jdeighan/exceptions';
 
 import {
   undef,
@@ -23,16 +23,9 @@ import {
 } from '@jdeighan/coffee-utils';
 
 import {
-  blockToArray
+  toArray
 } from '@jdeighan/coffee-utils/block';
 
-import {
-  tabify,
-  untabify,
-  indentation,
-  indented
-} from '@jdeighan/coffee-utils/indent';
-
 import {
   toTAML
 } from '@jdeighan/coffee-utils/taml';
@@ -54,48 +47,6 @@ export var debugLog = function(flag = true) {
   }
 };
 
-// ---------------------------------------------------------------------------
-// This is useful for debugging
-export var LOG = function(...lArgs) {
-  var item, label;
-  [label, item] = lArgs;
-  if (lArgs.length > 1) {
-    // --- There's both a label and an item
-    if (item === undef) {
-      console.log(`${label} = undef`);
-    } else if (item === null) {
-      console.log(`${label} = null`);
-    } else {
-      console.log(sep_dash);
-      console.log(`${label}:`);
-      if (isString(item)) {
-        console.log(untabify(item));
-      } else {
-        console.log(untabify(orderedStringify(item)));
-      }
-      console.log(sep_dash);
-    }
-  } else {
-    console.log(label);
-  }
-  return true; // to allow use in boolean expressions
-};
-
-
-// --- Use this instead to make it easier to remove all instances
-export var DEBUG = LOG; // synonym
-
-
-// ---------------------------------------------------------------------------
-export var LOGLINES = function(label, lLines) {
-  var i, len, line;
-  LOG(`${label}:`);
-  for (i = 0, len = lLines.length; i < len; i++) {
-    line = lLines[i];
-    LOG(`${OL(line)}`);
-  }
-};
-
 // ---------------------------------------------------------------------------
 export var setStringifier = function(func) {
   var orgStringifier;
@@ -210,7 +161,7 @@ export var logItem = function(label, item, pre = '', itemPre = undef) {
     if (label) {
       putstr(`${pre}${label}:`);
     }
-    ref = blockToArray(stringify(item, true));
+    ref = toArray(stringify(item, true));
     // --- escape special chars
     for (i = 0, len = ref.length; i < len; i++) {
       str = ref[i];
@@ -239,7 +190,7 @@ fixForTerminal = function(str) {
 putBlock = function(item, prefix = '') {
   var i, len, line, ref;
   putstr(`${prefix}${sep_eq}`);
-  ref = blockToArray(item);
+  ref = toArray(item);
   for (i = 0, len = ref.length; i < len; i++) {
     line = ref[i];
     putstr(`${prefix}${escapeStr(line)}`);

package/src/placeholders.coffee

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

package/src/placeholders.js

@@ -4,9 +4,8 @@ var hDefOptions;
 
 import {
   assert,
-  error,
   croak
-} from '@jdeighan/unit-tester/utils';
+} from '@jdeighan/exceptions';
 
 import {
   undef,

package/src/{server_utils.coffee → server.coffee}

@@ -1,4 +1,4 @@
-# server_utils.coffee
+# server.coffee
 
 import getline from 'readline-sync'
 import {execSync} from 'child_process'

package/src/{server_utils.js → server.js}

@@ -1,5 +1,5 @@
 // Generated by CoffeeScript 2.7.0
-// server_utils.coffee
+// server.coffee
 import getline from 'readline-sync';
 
 import {

package/src/{call_stack.coffee → stack.coffee}

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

package/src/{call_stack.js → stack.js}

@@ -1,11 +1,11 @@
 // Generated by CoffeeScript 2.7.0
-// call_stack.coffee
+// stack.coffee
 var doDebugStack;
 
 import {
   assert,
   croak
-} from '@jdeighan/unit-tester/utils';
+} from '@jdeighan/exceptions';
 
 import {
   undef,

package/src/{svelte_utils.coffee → svelte.coffee}

@@ -1,8 +1,7 @@
-# svelte_utils.coffee
+# svelte.coffee
 
-import {assert, error, croak} from '@jdeighan/unit-tester/utils'
+import {assert, croak, LOG} from '@jdeighan/exceptions'
 import {isFunction} from '@jdeighan/coffee-utils'
-import {log} from '@jdeighan/coffee-utils/log'
 
 # ---------------------------------------------------------------------------
 #   svelteSourceCodeEsc - to display source code for a *.starbucks page
@@ -33,10 +32,10 @@ export onInterval = (func, secs, doLog=false) ->
 	assert isFunction(func), "onInterval(): 1st arg not a function"
 	ms = Math.floor(1000 * secs)
 	if doLog
-		log "calling func every #{ms} ms."
+		LOG "calling func every #{ms} ms."
 	interval = setInterval(func, ms)
 
 	return () ->
 		if doLog
-			log "destroying interval timer"
+			LOG "destroying interval timer"
 		clearInterval interval

package/src/{svelte_utils.js → svelte.js}

@@ -1,19 +1,15 @@
 // Generated by CoffeeScript 2.7.0
-  // svelte_utils.coffee
+  // svelte.coffee
 import {
   assert,
-  error,
-  croak
-} from '@jdeighan/unit-tester/utils';
+  croak,
+  LOG
+} from '@jdeighan/exceptions';
 
 import {
   isFunction
 } from '@jdeighan/coffee-utils';
 
-import {
-  log
-} from '@jdeighan/coffee-utils/log';
-
 // ---------------------------------------------------------------------------
 //   svelteSourceCodeEsc - to display source code for a *.starbucks page
 export var svelteSourceCodeEsc = function(str) {
@@ -32,12 +28,12 @@ export var onInterval = function(func, secs, doLog = false) {
   assert(isFunction(func), "onInterval(): 1st arg not a function");
   ms = Math.floor(1000 * secs);
   if (doLog) {
-    log(`calling func every ${ms} ms.`);
+    LOG(`calling func every ${ms} ms.`);
   }
   interval = setInterval(func, ms);
   return function() {
     if (doLog) {
-      log("destroying interval timer");
+      LOG("destroying interval timer");
     }
     return clearInterval(interval);
   };

package/src/taml.coffee

@@ -2,16 +2,16 @@
 
 import yaml from 'js-yaml'
 
-import {assert, error, croak} from '@jdeighan/unit-tester/utils'
+import {assert, croak} from '@jdeighan/exceptions'
 import {
-	undef, defined, notdefined, oneline, isString, chomp, escapeStr,
+	undef, defined, notdefined, OL, chomp, escapeStr,
+	isString, isObject, isEmpty,
 	} from '@jdeighan/coffee-utils'
-import {untabify, tabify, splitLine} from '@jdeighan/coffee-utils/indent'
-import {slurp} from '@jdeighan/coffee-utils/fs'
-import {debug} from '@jdeighan/coffee-utils/debug'
+import {splitLine} from '@jdeighan/coffee-utils/indent'
 import {
-	firstLine, blockToArray, arrayToBlock,
+	firstLine, toArray, toBlock,
 	} from '@jdeighan/coffee-utils/block'
+import {slurp} from '@jdeighan/coffee-utils/fs'
 
 # ---------------------------------------------------------------------------
 #   isTAML - is the string valid TAML?
@@ -20,24 +20,16 @@ export isTAML = (text) ->
 
 	return isString(text) && (firstLine(text).indexOf('---') == 0)
 
-# ---------------------------------------------------------------------------
-
-squote = (text) ->
-
-	return "'" + text.replace(/'/g, "''") + "'"
-
 # ---------------------------------------------------------------------------
 #   taml - convert valid TAML string to a JavaScript value
 
-export taml = (text) ->
+export fromTAML = (text) ->
 
-	debug "enter taml(#{oneline(text)})"
-	if ! text?
-		debug "return undef from taml() - text is not defined"
+	if notdefined(text)
 		return undef
-	assert isTAML(text), "taml(): string #{oneline(text)} isn't TAML"
+	assert isTAML(text), "string #{OL(text)} isn't TAML"
 
-	lLines = for line in blockToArray(text)
+	lLines = for line in toArray(text)
 		[level, str] = splitLine(line)
 		prefix = ' '.repeat(level)
 		if lMatches = line.match(///^
@@ -55,12 +47,7 @@ export taml = (text) ->
 		else
 			prefix + str
 
-	debug "return from taml()"
-	return yaml.load(arrayToBlock(lLines), {skipInvalid: true})
-
-# ---------------------------------------------------------------------------
-
-export fromTAML = taml
+	return yaml.load(toBlock(lLines), {skipInvalid: true})
 
 # ---------------------------------------------------------------------------
 # --- a replacer is (key, value) -> newvalue
@@ -69,6 +56,8 @@ myReplacer = (name, value) ->
 
 	if isString(value)
 		return escapeStr(value)
+	else if isObject(value, ['tamlReplacer'])
+		return value.tamlReplacer()
 	else
 		return value
 
@@ -90,10 +79,16 @@ export toTAML = (obj, hOptions={}) ->
 		str = str.replace(/   /g, "\t")
 	return "---\n" + chomp(str)
 
+# ---------------------------------------------------------------------------
+
+squote = (text) ->
+
+	return "'" + text.replace(/'/g, "''") + "'"
+
 # ---------------------------------------------------------------------------
 #   slurpTAML - read TAML from a file
 
 export slurpTAML = (filepath) ->
 
 	contents = slurp(filepath)
-	return taml(contents)
+	return fromTAML(contents)

package/src/taml.js

@@ -6,64 +6,52 @@ import yaml from 'js-yaml';
 
 import {
   assert,
-  error,
   croak
-} from '@jdeighan/unit-tester/utils';
+} from '@jdeighan/exceptions';
 
 import {
   undef,
   defined,
   notdefined,
-  oneline,
-  isString,
+  OL,
   chomp,
-  escapeStr
+  escapeStr,
+  isString,
+  isObject,
+  isEmpty
 } from '@jdeighan/coffee-utils';
 
 import {
-  untabify,
-  tabify,
   splitLine
 } from '@jdeighan/coffee-utils/indent';
 
-import {
-  slurp
-} from '@jdeighan/coffee-utils/fs';
-
-import {
-  debug
-} from '@jdeighan/coffee-utils/debug';
-
 import {
   firstLine,
-  blockToArray,
-  arrayToBlock
+  toArray,
+  toBlock
 } from '@jdeighan/coffee-utils/block';
 
+import {
+  slurp
+} from '@jdeighan/coffee-utils/fs';
+
 // ---------------------------------------------------------------------------
 //   isTAML - is the string valid TAML?
 export var isTAML = function(text) {
   return isString(text) && (firstLine(text).indexOf('---') === 0);
 };
 
-// ---------------------------------------------------------------------------
-squote = function(text) {
-  return "'" + text.replace(/'/g, "''") + "'";
-};
-
 // ---------------------------------------------------------------------------
 //   taml - convert valid TAML string to a JavaScript value
-export var taml = function(text) {
+export var fromTAML = function(text) {
   var _, key, lLines, lMatches, level, line, prefix, str;
-  debug(`enter taml(${oneline(text)})`);
-  if (text == null) {
-    debug("return undef from taml() - text is not defined");
+  if (notdefined(text)) {
     return undef;
   }
-  assert(isTAML(text), `taml(): string ${oneline(text)} isn't TAML`);
+  assert(isTAML(text), `string ${OL(text)} isn't TAML`);
   lLines = (function() {
     var i, len, ref, results;
-    ref = blockToArray(text);
+    ref = toArray(text);
     results = [];
     for (i = 0, len = ref.length; i < len; i++) {
       line = ref[i];
@@ -82,20 +70,18 @@ export var taml = function(text) {
     }
     return results;
   })();
-  debug("return from taml()");
-  return yaml.load(arrayToBlock(lLines), {
+  return yaml.load(toBlock(lLines), {
     skipInvalid: true
   });
 };
 
-// ---------------------------------------------------------------------------
-export var fromTAML = taml;
-
 // ---------------------------------------------------------------------------
 // --- a replacer is (key, value) -> newvalue
 myReplacer = function(name, value) {
   if (isString(value)) {
     return escapeStr(value);
+  } else if (isObject(value, ['tamlReplacer'])) {
+    return value.tamlReplacer();
   } else {
     return value;
   }
@@ -121,10 +107,15 @@ export var toTAML = function(obj, hOptions = {}) {
   return "---\n" + chomp(str);
 };
 
+// ---------------------------------------------------------------------------
+squote = function(text) {
+  return "'" + text.replace(/'/g, "''") + "'";
+};
+
 // ---------------------------------------------------------------------------
 //   slurpTAML - read TAML from a file
 export var slurpTAML = function(filepath) {
   var contents;
   contents = slurp(filepath);
-  return taml(contents);
+  return fromTAML(contents);
 };

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

@@ -1,11 +1,10 @@
-# coffee_utils.coffee
+# utils.coffee
 
-import {assert, error, croak} from '@jdeighan/unit-tester/utils'
+import {LOG, assert, croak} from '@jdeighan/exceptions'
 
 export sep_dash = '-'.repeat(42)
 export sep_eq = '='.repeat(42)
 `export const undef = undefined`
-LOG = (lArgs...) -> console.log lArgs...   # synonym for console.log()
 
 # ---------------------------------------------------------------------------
 # TEMP!!!!!
@@ -258,7 +257,7 @@ export nonEmpty = (x) ->
 	if isHash(x)
 		return Object.keys(x).length > 0
 	else
-		error "isEmpty(): Invalid parameter"
+		croak "isEmpty(): Invalid parameter"
 
 # ---------------------------------------------------------------------------
 

package/src/{coffee_utils.js → utils.js}

@@ -1,12 +1,10 @@
 // Generated by CoffeeScript 2.7.0
-// coffee_utils.coffee
-var LOG;
-
+  // utils.coffee
 import {
+  LOG,
   assert,
-  error,
   croak
-} from '@jdeighan/unit-tester/utils';
+} from '@jdeighan/exceptions';
 
 export var sep_dash = '-'.repeat(42);
 
@@ -14,11 +12,6 @@ export var sep_eq = '='.repeat(42);
 
 export const undef = undefined;
 
-LOG = function(...lArgs) {
-  return console.log(...lArgs); // synonym for console.log()
-};
-
-
 // ---------------------------------------------------------------------------
 // TEMP!!!!!
 export var isComment = function(line) {
@@ -103,8 +96,8 @@ export var isConstructor = function(f) {
   var err;
   try {
     new f();
-  } catch (error1) {
-    err = error1;
+  } catch (error) {
+    err = error;
     if (err.message.indexOf('is not a constructor') >= 0) {
       return false;
     }
@@ -280,7 +273,7 @@ export var nonEmpty = function(x) {
   if (isHash(x)) {
     return Object.keys(x).length > 0;
   } else {
-    return error("isEmpty(): Invalid parameter");
+    return croak("isEmpty(): Invalid parameter");
   }
 };
 
@@ -516,8 +509,8 @@ export var deepCopy = function(obj) {
   objStr = JSON.stringify(obj);
   try {
     newObj = JSON.parse(objStr);
-  } catch (error1) {
-    err = error1;
+  } catch (error) {
+    err = error;
     croak("ERROR: err.message", objStr);
   }
   return newObj;