@jdeighan/coffee-utils 4.1.0 → 4.1.4

package/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "@jdeighan/coffee-utils",
 	"type": "module",
-	"version": "4.1.0",
+	"version": "4.1.4",
 	"description": "A set of utility functions for CoffeeScript",
 	"main": "coffee_utils.js",
 	"exports": {
@@ -42,6 +42,7 @@
 	"dependencies": {
 		"ava": "^3.15.0",
 		"cross-env": "^7.0.3",
-		"js-yaml": "^4.1.0"
+		"js-yaml": "^4.1.0",
+		"readline-sync": "^1.4.10"
 	}
 }

package/src/UnitTester.coffee

@@ -14,9 +14,9 @@ import {debug, debugging, setDebugging} from '@jdeighan/coffee-utils/debug'
 
 export class UnitTester
 
-	constructor: (whichTest='deepEqual', @fulltest=false) ->
+	constructor: (@file='unknown file') ->
 		@hFound = {}
-		@setWhichTest whichTest
+		@whichTest = 'deepEqual'
 		@justshow = false
 		@testing = true
 		@maxLineNum = undef
@@ -180,7 +180,7 @@ export class UnitTester
 		@lineNum = lineNum    # set an object property
 
 		if (lineNum < 0) && process.env.FINALTEST
-			error "Negative line numbers not allowed in FINALTEST"
+			error "Negative line numbers not allowed in FINALTEST in #{@file}"
 
 		if ! @testing || (@maxLineNum && (lineNum > @maxLineNum))
 			return
@@ -242,9 +242,6 @@ export class UnitTester
 
 	getLineNum: (lineNum) ->
 
-		if @fulltest && (lineNum < 0)
-			error "UnitTester(): negative line number during full test!!!"
-
 		# --- patch lineNum to avoid duplicates
 		while @hFound[lineNum]
 			if lineNum < 0

package/src/UnitTester.js

@@ -32,10 +32,10 @@ import {
 
 // ---------------------------------------------------------------------------
 export var UnitTester = class UnitTester {
-  constructor(whichTest = 'deepEqual', fulltest = false) {
-    this.fulltest = fulltest;
+  constructor(file = 'unknown file') {
+    this.file = file;
     this.hFound = {};
-    this.setWhichTest(whichTest);
+    this.whichTest = 'deepEqual';
     this.justshow = false;
     this.testing = true;
     this.maxLineNum = undef;
@@ -189,7 +189,7 @@ export var UnitTester = class UnitTester {
     this.initialize();
     this.lineNum = lineNum; // set an object property
     if ((lineNum < 0) && process.env.FINALTEST) {
-      error("Negative line numbers not allowed in FINALTEST");
+      error(`Negative line numbers not allowed in FINALTEST in ${this.file}`);
     }
     if (!this.testing || (this.maxLineNum && (lineNum > this.maxLineNum))) {
       return;
@@ -256,9 +256,6 @@ export var UnitTester = class UnitTester {
 
   // ........................................................................
   getLineNum(lineNum) {
-    if (this.fulltest && (lineNum < 0)) {
-      error("UnitTester(): negative line number during full test!!!");
-    }
     // --- patch lineNum to avoid duplicates
     while (this.hFound[lineNum]) {
       if (lineNum < 0) {

package/src/coffee_utils.coffee

@@ -1,5 +1,6 @@
 # coffee_utils.coffee
 
+import getline from 'readline-sync'
 import {log} from '@jdeighan/coffee-utils/log'
 
 export sep_dash = '-'.repeat(42)
@@ -212,9 +213,9 @@ export warn = (message) ->
 #   say - print to the console (for now)
 #         later, on a web page, call alert(str)
 
-export say = (str, obj=undef) ->
+export say = (str) ->
 
-	log str, obj
+	console.log str
 	return
 
 # ---------------------------------------------------------------------------
@@ -223,7 +224,8 @@ export say = (str, obj=undef) ->
 
 export ask = (prompt) ->
 
-	return 'yes'
+	answer = getline.question("{prompt}? ")
+	return answer
 
 # ---------------------------------------------------------------------------
 

package/src/coffee_utils.js

@@ -2,6 +2,8 @@
 // coffee_utils.coffee
 var commentRegExp;
 
+import getline from 'readline-sync';
+
 import {
   log
 } from '@jdeighan/coffee-utils/log';
@@ -217,15 +219,17 @@ export var warn = function(message) {
 // ---------------------------------------------------------------------------
 //   say - print to the console (for now)
 //         later, on a web page, call alert(str)
-export var say = function(str, obj = undef) {
-  log(str, obj);
+export var say = function(str) {
+  console.log(str);
 };
 
 // ---------------------------------------------------------------------------
 //   ask - ask a question
 //         later, on a web page, prompt the user for answer to question
 export var ask = function(prompt) {
-  return 'yes';
+  var answer;
+  answer = getline.question("{prompt}? ");
+  return answer;
 };
 
 // ---------------------------------------------------------------------------

package/src/debug_utils.coffee

@@ -23,7 +23,7 @@ lDebugStack = []
 # --- These are saved/restored in lDebugStack
 export debugging = false
 ifMatches = undef
-lDebugFuncs = undef
+lDebugFuncs = undef   # --- names of functions to debug
 
 stdLogger = false
 

package/src/debug_utils.js

@@ -51,7 +51,7 @@ export var debugging = false;
 
 ifMatches = undef;
 
-lDebugFuncs = undef;
+lDebugFuncs = undef; // --- names of functions to debug
 
 stdLogger = false;
 

package/src/log_utils.coffee

@@ -25,7 +25,6 @@ export setLogger = (func) ->
 	return orgLogger
 
 # ---------------------------------------------------------------------------
-# the default stringifier
 
 export tamlStringify = (obj) ->
 
@@ -39,9 +38,24 @@ export tamlStringify = (obj) ->
 	str = str.replace(/\t/g, '   ')  # fr***ing Windows Terminal
 	return str
 
+# ---------------------------------------------------------------------------
+# the default stringifier
+
+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 stringify = tamlStringify # for non-strings
+export stringify = orderedStringify # for non-strings
 
 # ---------------------------------------------------------------------------
 
@@ -51,7 +65,7 @@ export setStringifier = (func) ->
 		assert isFunction(func), "setStringifier() not a function"
 		stringify = func
 	else
-		stringify = tamlStringify
+		stringify = orderedStringify
 	return
 
 # ---------------------------------------------------------------------------
@@ -75,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

@@ -41,7 +41,6 @@ export var setLogger = function(func) {
 };
 
 // ---------------------------------------------------------------------------
-// the default stringifier
 export var tamlStringify = function(obj) {
   var str;
   str = yaml.dump(obj, {
@@ -56,7 +55,22 @@ 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 stringify = orderedStringify; // for non-strings
 
 
 // ---------------------------------------------------------------------------
@@ -65,7 +79,7 @@ export var setStringifier = function(func) {
     assert(isFunction(func), "setStringifier() not a function");
     stringify = func;
   } else {
-    stringify = tamlStringify;
+    stringify = orderedStringify;
   }
 };
 
@@ -87,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;