@jdeighan/coffee-utils 8.0.14 → 8.0.15

package/package.json

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

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;
 };
 
 // ---------------------------------------------------------------------------