@jdeighan/coffee-utils 10.0.8 → 10.0.11

package/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "@jdeighan/coffee-utils",
 	"type": "module",
-	"version": "10.0.8",
+	"version": "10.0.11",
 	"description": "A set of utility functions for CoffeeScript",
 	"main": "coffee_utils.js",
 	"exports": {
@@ -56,6 +56,6 @@
 		"svelte": "^3.49.0"
 	},
 	"devDependencies": {
-		"@jdeighan/unit-tester": "^2.0.21"
+		"@jdeighan/unit-tester": "^2.0.23"
 	}
 }

package/src/block_utils.coffee

@@ -10,6 +10,7 @@ import {
 
 # ---------------------------------------------------------------------------
 #   blockToArray - split a block into lines
+#   DEPRECATED - use toArray()
 
 export blockToArray = (block) ->
 
@@ -68,7 +69,8 @@ export toArray = (item, option=undef) ->
 	return lNewLines
 
 # ---------------------------------------------------------------------------
-#   arrayToBlock - block will have no trailing whitespace
+#   arrayToBlock - block and lines in block will have no trailing whitespace
+#   DEPRECATED - use toBlock()
 
 export arrayToBlock = (lLines) ->
 
@@ -90,11 +92,11 @@ export toBlock = (lLines) ->
 	if (lLines == undef)
 		return undef
 	assert isArray(lLines), "lLines is not an array"
-	lLines = lLines.filter((line) => defined(line));
-	if lLines.length == 0
-		return undef
-	else
-		return lLines.join('\n')
+	lNewLines = []
+	for line in lLines
+		if defined(line)
+			lNewLines.push rtrim(line)
+	return lNewLines.join("\n")
 
 # ---------------------------------------------------------------------------
 

package/src/block_utils.js

@@ -23,6 +23,7 @@ import {
 
 // ---------------------------------------------------------------------------
 //   blockToArray - split a block into lines
+//   DEPRECATED - use toArray()
 export var blockToArray = function(block) {
   var lLines, len;
   if (isEmpty(block)) {
@@ -89,7 +90,8 @@ export var toArray = function(item, option = undef) {
 };
 
 // ---------------------------------------------------------------------------
-//   arrayToBlock - block will have no trailing whitespace
+//   arrayToBlock - block and lines in block will have no trailing whitespace
+//   DEPRECATED - use toBlock()
 export var arrayToBlock = function(lLines) {
   if (lLines === undef) {
     return undef;
@@ -109,18 +111,19 @@ export var arrayToBlock = function(lLines) {
 //   toBlock - block may have trailing whitespace
 //             but undef items are ignored
 export var toBlock = function(lLines) {
+  var i, lNewLines, len1, line;
   if (lLines === undef) {
     return undef;
   }
   assert(isArray(lLines), "lLines is not an array");
-  lLines = lLines.filter((line) => {
-    return defined(line);
-  });
-  if (lLines.length === 0) {
-    return undef;
-  } else {
-    return lLines.join('\n');
+  lNewLines = [];
+  for (i = 0, len1 = lLines.length; i < len1; i++) {
+    line = lLines[i];
+    if (defined(line)) {
+      lNewLines.push(rtrim(line));
+    }
   }
+  return lNewLines.join("\n");
 };
 
 // ---------------------------------------------------------------------------

package/src/coffee_utils.coffee

@@ -223,6 +223,22 @@ export nonEmpty = (x) ->
 
 # ---------------------------------------------------------------------------
 
+export notInArray = (lItems, item) ->
+
+	return (lItems.indexOf(item) == -1)
+
+# ---------------------------------------------------------------------------
+
+export pushCond = (lItems, item, doPush=notInArray) ->
+
+	if doPush(lItems, item)
+		lItems.push item
+		return true
+	else
+		return false
+
+# ---------------------------------------------------------------------------
+
 export words = (str) ->
 
 	return str.trim().split(/\s+/)

package/src/coffee_utils.js

@@ -236,6 +236,21 @@ export var nonEmpty = function(x) {
   }
 };
 
+// ---------------------------------------------------------------------------
+export var notInArray = function(lItems, item) {
+  return lItems.indexOf(item) === -1;
+};
+
+// ---------------------------------------------------------------------------
+export var pushCond = function(lItems, item, doPush = notInArray) {
+  if (doPush(lItems, item)) {
+    lItems.push(item);
+    return true;
+  } else {
+    return false;
+  }
+};
+
 // ---------------------------------------------------------------------------
 export var words = function(str) {
   return str.trim().split(/\s+/);