@jdeighan/coffee-utils 7.0.34 → 7.0.37

package/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "@jdeighan/coffee-utils",
 	"type": "module",
-	"version": "7.0.34",
+	"version": "7.0.37",
 	"description": "A set of utility functions for CoffeeScript",
 	"main": "coffee_utils.js",
 	"exports": {

package/src/coffee_utils.coffee

@@ -61,10 +61,11 @@ getCallers = (stackTrace, lExclude=[]) ->
 export assert = (cond, msg) ->
 
 	if ! cond
-		try
-			throw new Error()
-		catch e
-			stackTrace = e.stack
+#		try
+#			throw new Error()
+#		catch e
+#			stackTrace = e.stack
+		stackTrace = new Error().stack
 		lCallers = getCallers(stackTrace, ['assert'])
 
 #		console.log 'STACK'

package/src/coffee_utils.js

@@ -58,14 +58,13 @@ getCallers = function(stackTrace, lExclude = []) {
 //   assert - mimic nodejs's assert
 //   return true so we can use it in boolean expressions
 export var assert = function(cond, msg) {
-  var caller, e, i, lCallers, len, stackTrace;
+  var caller, i, lCallers, len, stackTrace;
   if (!cond) {
-    try {
-      throw new Error();
-    } catch (error1) {
-      e = error1;
-      stackTrace = e.stack;
-    }
+    //		try
+    //			throw new Error()
+    //		catch e
+    //			stackTrace = e.stack
+    stackTrace = new Error().stack;
     lCallers = getCallers(stackTrace, ['assert']);
     //		console.log 'STACK'
     //		console.log stackTrace

package/src/debug_utils.coffee

@@ -176,12 +176,12 @@ export debug = (lArgs...) ->
 	switch type
 		when 'enter'
 			log label, hOptions
-			if item
+			if (nArgs==2)
 				# --- don't repeat the label
 				logItem undef, item, hOptions
 		when 'return'
 			log label, hOptions
-			if item?
+			if (nArgs==2)
 				# --- don't repeat the label
 				logItem undef, item, hOptions
 		when 'string'

package/src/debug_utils.js

@@ -186,14 +186,14 @@ export var debug = function(...lArgs) {
   switch (type) {
     case 'enter':
       log(label, hOptions);
-      if (item) {
+      if (nArgs === 2) {
         // --- don't repeat the label
         logItem(undef, item, hOptions);
       }
       break;
     case 'return':
       log(label, hOptions);
-      if (item != null) {
+      if (nArgs === 2) {
         // --- don't repeat the label
         logItem(undef, item, hOptions);
       }

package/src/indent_utils.coffee

@@ -13,8 +13,8 @@ import {arrayToBlock, blockToArray} from '@jdeighan/coffee-utils/block'
 
 export splitLine = (line) ->
 
-	assert line?, "splitLine(): line is undef"
-	assert isString(line), "splitLine(): line is not a string"
+	assert defined(line), "splitLine(): line is undef"
+	assert isString(line), "splitLine(): non-string #{OL(line)}"
 	line = rtrim(line)
 	lMatches = line.match(/^(\s*)(.*)$/)
 	return [lMatches[1].length, lMatches[2]]

package/src/indent_utils.js

@@ -25,8 +25,8 @@ import {
 //   splitLine - separate a line into [level, line]
 export var splitLine = function(line) {
   var lMatches;
-  assert(line != null, "splitLine(): line is undef");
-  assert(isString(line), "splitLine(): line is not a string");
+  assert(defined(line), "splitLine(): line is undef");
+  assert(isString(line), `splitLine(): non-string ${OL(line)}`);
   line = rtrim(line);
   lMatches = line.match(/^(\s*)(.*)$/);
   return [lMatches[1].length, lMatches[2]];