@jdeighan/coffee-utils 7.0.60 → 7.0.63

package/src/log_utils.js

@@ -39,11 +39,6 @@ export var stringify = undef;
 
 fourSpaces = '    ';
 
-// ---------------------------------------------------------------------------
-export var dashes = function(prefix, totalLen = 64, ch = '-') {
-  return prefix + ch.repeat(totalLen - prefix.length);
-};
-
 // ---------------------------------------------------------------------------
 export var debugLog = function(flag = true) {
   doDebugLog = flag;
@@ -84,6 +79,16 @@ export var LOG = function(...lArgs) {
 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;
@@ -132,7 +137,7 @@ export var tamlStringify = function(obj, escape = false) {
       return value;
     }
   });
-  return "---\n" + tabify(str, 1);
+  return "---\n" + str;
 };
 
 // ---------------------------------------------------------------------------
@@ -147,21 +152,18 @@ export var orderedStringify = function(obj, escape = false) {
       return value;
     }
   });
-  return "---\n" + tabify(str, 1);
+  return "---\n" + str;
 };
 
 // ---------------------------------------------------------------------------
 maxOneLine = 32;
 
 // ---------------------------------------------------------------------------
-export var log = function(str, hOptions = {}) {
-  var prefix;
-  // --- valid options:
-  //   prefix
+export var log = function(str, prefix = '') {
+  assert(isString(prefix), `not a string: ${OL(prefix)}`);
   assert(isString(str), `log(): not a string: ${OL(str)}`);
   assert(isFunction(putstr), "putstr not properly set");
-  assert(isHash(hOptions), `log(): arg 2 not a hash: ${OL(hOptions)}`);
-  prefix = fixForTerminal(hOptions.prefix);
+  prefix = fixForTerminal(prefix);
   if (doDebugLog) {
     LOG(`CALL log(${OL(str)}), prefix = ${OL(prefix)}`);
   }
@@ -171,45 +173,51 @@ export var log = function(str, hOptions = {}) {
 
 
 // ---------------------------------------------------------------------------
-export var logItem = function(label, item, hOptions = {}) {
-  var i, labelStr, len, prefix, ref, str;
-  // --- valid options:
-  //   prefix
+export var logBareItem = function(item, pre = '') {
+  logItem(undef, item, pre);
+};
+
+// ---------------------------------------------------------------------------
+export var logItem = function(label, item, pre = '', itemPre = undef) {
+  var i, labelStr, len, ref, str;
+  assert(isString(pre), `not a string: ${OL(pre)}`);
   assert(isFunction(putstr), "putstr not properly set");
   assert(!label || isString(label), "label a non-string");
-  assert(isHash(hOptions), "arg 3 not a hash");
-  label = fixForTerminal(label);
-  prefix = fixForTerminal(hOptions.prefix);
-  assert(prefix.indexOf("\t") === -1, "prefix has TAB");
+  if (itemPre === undef) {
+    itemPre = pre;
+  }
+  assert(pre.indexOf("\t") === -1, "pre has TAB");
+  assert(itemPre.indexOf("\t") === -1, "itemPre has TAB");
   if (doDebugLog) {
     LOG(`CALL logItem(${OL(label)}, ${OL(item)})`);
-    LOG(`prefix = ${OL(prefix)}`);
+    LOG(`pre = ${OL(pre)}`);
+    LOG(`itemPre = ${OL(itemPre)}`);
   }
   labelStr = label ? `${label} = ` : "";
   if (item === undef) {
-    putstr(`${prefix}${labelStr}undef`);
+    putstr(`${pre}${labelStr}undef`);
   } else if (item === null) {
-    putstr(`${prefix}${labelStr}null`);
+    putstr(`${pre}${labelStr}null`);
+  } else if (isNumber(item)) {
+    putstr(`${pre}${labelStr}${item}`);
   } else if (isString(item)) {
     if (item.length <= maxOneLine) {
-      putstr(`${prefix}${labelStr}'${escapeStr(item)}'`);
+      putstr(`${pre}${labelStr}'${escapeStr(item)}'`);
     } else {
       if (label) {
-        putstr(`${prefix}${label}:`);
+        putstr(`${pre}${label}:`);
       }
-      putBlock(item, prefix + fourSpaces);
+      putBlock(item, itemPre);
     }
-  } else if (isNumber(item)) {
-    putstr(`${prefix}${labelStr}${item}`);
   } else {
     if (label) {
-      putstr(`${prefix}${label}:`);
+      putstr(`${pre}${label}:`);
     }
     ref = blockToArray(stringify(item, true));
-    // escape special chars
+    // --- escape special chars
     for (i = 0, len = ref.length; i < len; i++) {
       str = ref[i];
-      putstr(`${prefix + fourSpaces}${fixForTerminal(str)}`);
+      putstr(`${itemPre}${str}`);
     }
   }
   return true;