@jdeighan/coffee-utils 8.0.14 → 8.0.17

package/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "@jdeighan/coffee-utils",
 	"type": "module",
-	"version": "8.0.14",
+	"version": "8.0.17",
 	"description": "A set of utility functions for CoffeeScript",
 	"main": "coffee_utils.js",
 	"exports": {
@@ -55,6 +55,6 @@
 		"svelte": "^3.49.0"
 	},
 	"devDependencies": {
-		"@jdeighan/unit-tester": "^2.0.14"
+		"@jdeighan/unit-tester": "^2.0.16"
 	}
 }

package/src/arrow.coffee

@@ -9,10 +9,12 @@ export hbar = '─'       # unicode 2500
 export corner = '└'     # unicode 2514
 export arrowhead = '>'
 export space = ' '
+export dot = '.'
 
-export oneIndent = vbar + space + space + space
-export arrow = corner + hbar + arrowhead + space
-export clearIndent = space + space + space + space
+export oneIndent   = vbar   + space + space     + space
+export arrow       = corner + hbar  + arrowhead + space
+export clearIndent = space  + space + space     + space
+export dotIndent   = dot    + space + space     + space
 
 # ---------------------------------------------------------------------------
 
@@ -30,6 +32,12 @@ export prefix = (level, option='none') ->
 		when 'noLast2Vbars'
 			assert (level >= 2), "prefix(), noLast2Vbars but level=#{OL(level)}"
 			return oneIndent.repeat(level-2) + clearIndent + clearIndent
+		when 'dotLastVbar'
+			assert (level >= 1), "prefix(), dotLastVbar but level=#{OL(level)}"
+			return oneIndent.repeat(level-1) + dotIndent
+		when 'dotLast2Vbars'
+			assert (level >= 2), "prefix(), dotLast2Vbars but level=#{OL(level)}"
+			return oneIndent.repeat(level-2) + dotIndent + clearIndent
 		else
 			return oneIndent.repeat(level)
 

package/src/arrow.js

@@ -18,12 +18,16 @@ export var arrowhead = '>';
 
 export var space = ' ';
 
+export var dot = '.';
+
 export var oneIndent = vbar + space + space + space;
 
 export var arrow = corner + hbar + arrowhead + space;
 
 export var clearIndent = space + space + space + space;
 
+export var dotIndent = dot + space + space + space;
+
 // ---------------------------------------------------------------------------
 export var prefix = function(level, option = 'none') {
   switch (option) {
@@ -40,6 +44,12 @@ export var prefix = function(level, option = 'none') {
     case 'noLast2Vbars':
       assert(level >= 2, `prefix(), noLast2Vbars but level=${OL(level)}`);
       return oneIndent.repeat(level - 2) + clearIndent + clearIndent;
+    case 'dotLastVbar':
+      assert(level >= 1, `prefix(), dotLastVbar but level=${OL(level)}`);
+      return oneIndent.repeat(level - 1) + dotIndent;
+    case 'dotLast2Vbars':
+      assert(level >= 2, `prefix(), dotLast2Vbars but level=${OL(level)}`);
+      return oneIndent.repeat(level - 2) + dotIndent + clearIndent;
     default:
       return oneIndent.repeat(level);
   }

package/src/coffee_utils.coffee

@@ -151,12 +151,6 @@ export isBoolean = (x) ->
 
 # ---------------------------------------------------------------------------
 
-export isNumber = (x) ->
-
-	return typeof x == 'number' || x instanceof Number
-
-# ---------------------------------------------------------------------------
-
 export isObject = (x) ->
 
 	return (typeof x == 'object') \
@@ -280,14 +274,33 @@ export isRegExp = (x) ->
 
 # ---------------------------------------------------------------------------
 
-export isInteger = (x) ->
+export isNumber = (x, hOptions={}) ->
+
+	result = (typeof x == 'number') || (x instanceof Number)
+	if result
+		if defined(hOptions.min) && (x < hOptions.min)
+			result = false
+		if defined(hOptions.max) && (x > hOptions.max)
+			result = false
+	return result
+
+# ---------------------------------------------------------------------------
+
+export isInteger = (x, hOptions={}) ->
 
 	if (typeof x == 'number')
-		return Number.isInteger(x)
-	else if (getClassName(x) == 'Number')
-		return Number.isInteger(x.valueOf())
+		result = Number.isInteger(x)
+	else if (x instanceof Number)
+		result = Number.isInteger(x.valueOf())
 	else
-		return false
+		result = false
+
+	if result
+		if defined(hOptions.min) && (x < hOptions.min)
+			result = false
+		if defined(hOptions.max) && (x > hOptions.max)
+			result = false
+	return result
 
 # ---------------------------------------------------------------------------
 

package/src/coffee_utils.js

@@ -144,11 +144,6 @@ export var isBoolean = function(x) {
   return typeof x === 'boolean';
 };
 
-// ---------------------------------------------------------------------------
-export var isNumber = function(x) {
-  return typeof x === 'number' || x instanceof Number;
-};
-
 // ---------------------------------------------------------------------------
 export var isObject = function(x) {
   return (typeof x === 'object') && !isString(x) && !isArray(x) && !isHash(x) && !isNumber(x);
@@ -280,14 +275,39 @@ export var isRegExp = function(x) {
 };
 
 // ---------------------------------------------------------------------------
-export var isInteger = function(x) {
+export var isNumber = function(x, hOptions = {}) {
+  var result;
+  result = (typeof x === 'number') || (x instanceof Number);
+  if (result) {
+    if (defined(hOptions.min) && (x < hOptions.min)) {
+      result = false;
+    }
+    if (defined(hOptions.max) && (x > hOptions.max)) {
+      result = false;
+    }
+  }
+  return result;
+};
+
+// ---------------------------------------------------------------------------
+export var isInteger = function(x, hOptions = {}) {
+  var result;
   if (typeof x === 'number') {
-    return Number.isInteger(x);
-  } else if (getClassName(x) === 'Number') {
-    return Number.isInteger(x.valueOf());
+    result = Number.isInteger(x);
+  } else if (x instanceof Number) {
+    result = Number.isInteger(x.valueOf());
   } else {
-    return false;
+    result = false;
+  }
+  if (result) {
+    if (defined(hOptions.min) && (x < hOptions.min)) {
+      result = false;
+    }
+    if (defined(hOptions.max) && (x > hOptions.max)) {
+      result = false;
+    }
   }
+  return result;
 };
 
 // ---------------------------------------------------------------------------

package/src/debug_utils.coffee

@@ -111,12 +111,8 @@ export doTheLogging = (type, label, lObjects) ->
 
 		when 'enter'
 			log label, prefix(level)
-			if label.match(///^ \s* call///)
-				pre = prefix(level+1, 'noLastVbar')
-				itemPre = prefix(level+2, 'noLast2Vbars')
-			else
-				pre = prefix(level+1)
-				itemPre = prefix(level+2, 'noLastVbar')
+			pre = prefix(level+1, 'dotLastVbar')
+			itemPre = prefix(level+2, 'dotLast2Vbars')
 			for obj,i in lObjects
 				logItem "arg[#{i}]", obj, pre, itemPre
 
@@ -126,6 +122,7 @@ export doTheLogging = (type, label, lObjects) ->
 			itemPre = prefix(level+1, 'noLast2Vbars')
 			for obj,i in lObjects
 				logItem "ret[#{i}]", obj, pre, itemPre
+
 		when 'string'
 			pre = prefix(level)
 			itemPre = prefix(level+1, 'noLastVbar')

package/src/debug_utils.js

@@ -151,13 +151,8 @@ export var doTheLogging = function(type, label, lObjects) {
   switch (type) {
     case 'enter':
       log(label, prefix(level));
-      if (label.match(/^\s*call/)) {
-        pre = prefix(level + 1, 'noLastVbar');
-        itemPre = prefix(level + 2, 'noLast2Vbars');
-      } else {
-        pre = prefix(level + 1);
-        itemPre = prefix(level + 2, 'noLastVbar');
-      }
+      pre = prefix(level + 1, 'dotLastVbar');
+      itemPre = prefix(level + 2, 'dotLast2Vbars');
       for (i = j = 0, len = lObjects.length; j < len; i = ++j) {
         obj = lObjects[i];
         logItem(`arg[${i}]`, obj, pre, itemPre);