@jdeighan/coffee-utils 7.0.36 → 7.0.39

package/package.json

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

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]];

package/src/log_utils.coffee

@@ -22,8 +22,10 @@ export LOG = (lArgs...) ->
 	[label, item] = lArgs
 	if lArgs.length > 1
 		# --- There's both a label and an item
-		if ! item?
+		if (item == undef)
 			console.log "#{label}: UNDEFINED"
+		else if (item == null)
+			console.log "#{label}: NULL"
 		else
 			console.log sep_dash
 			console.log "#{label}:"
@@ -152,6 +154,8 @@ export logItem = (label, item, hOptions={}) ->
 
 	if (item == undef)
 		putstr "#{prefix}#{labelStr}undef"
+	else if (item == null)
+		putstr "#{prefix}#{labelStr}null"
 	else if isString(item)
 		if (item.length <= maxOneLine)
 			putstr "#{prefix}#{labelStr}'#{escapeStr(item)}'"

package/src/log_utils.js

@@ -39,8 +39,11 @@ export var LOG = function(...lArgs) {
   var item, label;
   [label, item] = lArgs;
   if (lArgs.length > 1) {
-    if (item == null) {
+    // --- There's both a label and an item
+    if (item === undef) {
       console.log(`${label}: UNDEFINED`);
+    } else if (item === null) {
+      console.log(`${label}: NULL`);
     } else {
       console.log(sep_dash);
       console.log(`${label}:`);
@@ -168,6 +171,8 @@ export var logItem = function(label, item, hOptions = {}) {
   labelStr = label ? `${label} = ` : "";
   if (item === undef) {
     putstr(`${prefix}${labelStr}undef`);
+  } else if (item === null) {
+    putstr(`${prefix}${labelStr}null`);
   } else if (isString(item)) {
     if (item.length <= maxOneLine) {
       putstr(`${prefix}${labelStr}'${escapeStr(item)}'`);