@jdeighan/coffee-utils 8.0.0 → 8.0.3

package/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "@jdeighan/coffee-utils",
 	"type": "module",
-	"version": "8.0.0",
+	"version": "8.0.3",
 	"description": "A set of utility functions for CoffeeScript",
 	"main": "coffee_utils.js",
 	"exports": {
@@ -53,6 +53,6 @@
 		"svelte": "^3.48.0"
 	},
 	"devDependencies": {
-		"@jdeighan/unit-tester": "^2.0.8"
+		"@jdeighan/unit-tester": "^2.0.9"
 	}
 }

package/src/coffee_utils.coffee

@@ -135,6 +135,16 @@ export isString = (x) ->
 
 # ---------------------------------------------------------------------------
 
+export isNonEmptyString = (x) ->
+
+	if typeof x != 'string' && x ! instanceof String
+		return false
+	if x.match(/^\s*$/)
+		return false
+	return true
+
+# ---------------------------------------------------------------------------
+
 export isBoolean = (x) ->
 
 	return typeof x == 'boolean'
@@ -269,19 +279,43 @@ export isInteger = (x) ->
 
 # ---------------------------------------------------------------------------
 
-export isUniqueList = (lItems) ->
+export isUniqueList = (lItems, func=undef) ->
 
 	if ! lItems?
 		return true     # empty list is unique
+	if defined(func)
+		assert isFunction(func), "Not a function: #{OL(func)}"
 	h = {}
 	for item in lItems
-		if h[item]
+		if defined(func) && !func(item)
+			return false
+		if defined(h[item])
 			return false
 		h[item] = 1
 	return true
 
 # ---------------------------------------------------------------------------
 
+export isUniqueTree = (lItems, func=undef, hFound={}) ->
+
+	if isEmpty(lItems)
+		return true     # empty list is unique
+	if defined(func)
+		assert isFunction(func), "Not a function: #{OL(func)}"
+	for item in lItems
+		if isArray(item)
+			if ! isUniqueTree(item, func, hFound)
+				return false
+		else
+			if defined(func) && !func(item)
+				return false
+			if defined(hFound[item])
+				return false
+			hFound[item] = 1
+	return true
+
+# ---------------------------------------------------------------------------
+
 export uniq = (lItems) ->
 
 	return [...new Set(lItems)]

package/src/coffee_utils.js

@@ -128,6 +128,17 @@ export var isString = function(x) {
   return typeof x === 'string' || x instanceof String;
 };
 
+// ---------------------------------------------------------------------------
+export var isNonEmptyString = function(x) {
+  if (typeof x !== 'string' && !(x instanceof String)) {
+    return false;
+  }
+  if (x.match(/^\s*$/)) {
+    return false;
+  }
+  return true;
+};
+
 // ---------------------------------------------------------------------------
 export var isBoolean = function(x) {
   return typeof x === 'boolean';
@@ -270,15 +281,21 @@ export var isInteger = function(x) {
 };
 
 // ---------------------------------------------------------------------------
-export var isUniqueList = function(lItems) {
+export var isUniqueList = function(lItems, func = undef) {
   var h, i, item, len;
   if (lItems == null) {
     return true; // empty list is unique
   }
+  if (defined(func)) {
+    assert(isFunction(func), `Not a function: ${OL(func)}`);
+  }
   h = {};
   for (i = 0, len = lItems.length; i < len; i++) {
     item = lItems[i];
-    if (h[item]) {
+    if (defined(func) && !func(item)) {
+      return false;
+    }
+    if (defined(h[item])) {
       return false;
     }
     h[item] = 1;
@@ -286,6 +303,34 @@ export var isUniqueList = function(lItems) {
   return true;
 };
 
+// ---------------------------------------------------------------------------
+export var isUniqueTree = function(lItems, func = undef, hFound = {}) {
+  var i, item, len;
+  if (isEmpty(lItems)) {
+    return true; // empty list is unique
+  }
+  if (defined(func)) {
+    assert(isFunction(func), `Not a function: ${OL(func)}`);
+  }
+  for (i = 0, len = lItems.length; i < len; i++) {
+    item = lItems[i];
+    if (isArray(item)) {
+      if (!isUniqueTree(item, func, hFound)) {
+        return false;
+      }
+    } else {
+      if (defined(func) && !func(item)) {
+        return false;
+      }
+      if (defined(hFound[item])) {
+        return false;
+      }
+      hFound[item] = 1;
+    }
+  }
+  return true;
+};
+
 // ---------------------------------------------------------------------------
 export var uniq = function(lItems) {
   return [...new Set(lItems)];