@jdeighan/coffee-utils 4.0.23 → 4.1.3

package/src/log_utils.coffee

@@ -9,10 +9,22 @@ import {
 import {blockToArray} from '@jdeighan/coffee-utils/block'
 import {tabify} from '@jdeighan/coffee-utils/indent'
 
+# --- This logger only ever gets passed a single string argument
 logger = console.log          # for strings
 
 # ---------------------------------------------------------------------------
-# the default stringifier
+
+export setLogger = (func) ->
+
+	orgLogger = logger
+	if func?
+		assert isFunction(func), "setLogger() not a function"
+		logger = func
+	else
+		logger = console.log
+	return orgLogger
+
+# ---------------------------------------------------------------------------
 
 export tamlStringify = (obj) ->
 
@@ -27,19 +39,23 @@ export tamlStringify = (obj) ->
 	return str
 
 # ---------------------------------------------------------------------------
+# the default stringifier
 
-export stringify = tamlStringify # for non-strings
+export orderedStringify = (obj) ->
 
-# ---------------------------------------------------------------------------
+	str = yaml.dump(obj, {
+		skipInvalid: true
+		indent: 1
+		sortKeys: true
+		lineWidth: -1
+		})
+	str = "---\n" + tabify(str)
+	str = str.replace(/\t/g, '   ')  # fr***ing Windows Terminal
+	return str
 
-export setLogger = (func) ->
+# ---------------------------------------------------------------------------
 
-	if func?
-		assert isFunction(func), "setLogger() not a function"
-		logger = func
-	else
-		logger = console.log
-	return
+export stringify = orderedStringify # for non-strings
 
 # ---------------------------------------------------------------------------
 
@@ -49,7 +65,7 @@ export setStringifier = (func) ->
 		assert isFunction(func), "setStringifier() not a function"
 		stringify = func
 	else
-		stringify = tamlStringify
+		stringify = orderedStringify
 	return
 
 # ---------------------------------------------------------------------------
@@ -73,8 +89,8 @@ maxOneLine = 32
 export log = (lArgs...) ->
 	# --- (str, item, hOptions)
 	#     valid options:
-	#        prefix
 	#        logItem
+	#        prefix
 	#        itemPrefix
 
 	if (lArgs.length==0)

package/src/log_utils.js

@@ -23,11 +23,24 @@ import {
   tabify
 } from '@jdeighan/coffee-utils/indent';
 
+// --- This logger only ever gets passed a single string argument
 logger = console.log; // for strings
 
 
 // ---------------------------------------------------------------------------
-// the default stringifier
+export var setLogger = function(func) {
+  var orgLogger;
+  orgLogger = logger;
+  if (func != null) {
+    assert(isFunction(func), "setLogger() not a function");
+    logger = func;
+  } else {
+    logger = console.log;
+  }
+  return orgLogger;
+};
+
+// ---------------------------------------------------------------------------
 export var tamlStringify = function(obj) {
   var str;
   str = yaml.dump(obj, {
@@ -42,18 +55,23 @@ export var tamlStringify = function(obj) {
 };
 
 // ---------------------------------------------------------------------------
-export var stringify = tamlStringify; // for non-strings
-
+// the default stringifier
+export var orderedStringify = function(obj) {
+  var str;
+  str = yaml.dump(obj, {
+    skipInvalid: true,
+    indent: 1,
+    sortKeys: true,
+    lineWidth: -1
+  });
+  str = "---\n" + tabify(str);
+  str = str.replace(/\t/g, '   '); // fr***ing Windows Terminal
+  return str;
+};
 
 // ---------------------------------------------------------------------------
-export var setLogger = function(func) {
-  if (func != null) {
-    assert(isFunction(func), "setLogger() not a function");
-    logger = func;
-  } else {
-    logger = console.log;
-  }
-};
+export var stringify = orderedStringify; // for non-strings
+
 
 // ---------------------------------------------------------------------------
 export var setStringifier = function(func) {
@@ -61,7 +79,7 @@ export var setStringifier = function(func) {
     assert(isFunction(func), "setStringifier() not a function");
     stringify = func;
   } else {
-    stringify = tamlStringify;
+    stringify = orderedStringify;
   }
 };
 
@@ -83,8 +101,8 @@ export var log = function(...lArgs) {
   var esc, hOptions, i, item, itemPrefix, j, json, len, len1, line, logItem, prefix, ref, ref1, str;
   // --- (str, item, hOptions)
   //     valid options:
-  //        prefix
   //        logItem
+  //        prefix
   //        itemPrefix
   if (lArgs.length === 0) {
     return;

package/.save/bs.test.cielo

@@ -1,6 +0,0 @@
-import {UnitTester} from '@jdeighan/coffee-utils/test'
-
-simple = new UnitTester()
-simple.equal 39, pathTo('test.txt', dir), \
-		"#{dir}/subdirectory/test.txt"
-