@jdeighan/coffee-utils 7.0.23 → 7.0.26

package/package.json

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

package/src/block_utils.coffee

@@ -4,7 +4,7 @@ import fs from 'fs'
 import readline from 'readline'
 
 import {
-	assert, isEmpty, isString, nonEmpty, error, isComment, rtrim,
+	assert, isEmpty, isString, nonEmpty, error, rtrim,
 	} from '@jdeighan/coffee-utils'
 
 # ---------------------------------------------------------------------------
@@ -84,7 +84,7 @@ export truncateBlock = (str, numLines) ->
 export joinBlocks = (lBlocks...) ->
 
 	lNonEmptyBlocks = []
-	for block in lBlocks
+	for block in lBlocks.flat(999)
 		assert isString(block), "joinBlocks(): #{block} is not a string"
 		if nonEmpty(block)
 			lNonEmptyBlocks.push block
@@ -108,7 +108,7 @@ var lineNum = 0
 for await (const line of rl) {
 	lineNum += 1
 	// Each line will be successively available here as 'line'
-	if (! isComment(line) && func(line, lineNum)) {
+	if (func(line, lineNum)) {
 		rl.close();      // close if true return value
 		return;
 		}

package/src/block_utils.js

@@ -10,7 +10,6 @@ import {
   isString,
   nonEmpty,
   error,
-  isComment,
   rtrim
 } from '@jdeighan/coffee-utils';
 
@@ -102,10 +101,11 @@ export var truncateBlock = function(str, numLines) {
 
 // ---------------------------------------------------------------------------
 export var joinBlocks = function(...lBlocks) {
-  var block, i, lNonEmptyBlocks, len1;
+  var block, i, lNonEmptyBlocks, len1, ref;
   lNonEmptyBlocks = [];
-  for (i = 0, len1 = lBlocks.length; i < len1; i++) {
-    block = lBlocks[i];
+  ref = lBlocks.flat(999);
+  for (i = 0, len1 = ref.length; i < len1; i++) {
+    block = ref[i];
     assert(isString(block), `joinBlocks(): ${block} is not a string`);
     if (nonEmpty(block)) {
       lNonEmptyBlocks.push(block);
@@ -130,7 +130,7 @@ var lineNum = 0
 for await (const line of rl) {
 	lineNum += 1
 	// Each line will be successively available here as 'line'
-	if (! isComment(line) && func(line, lineNum)) {
+	if (func(line, lineNum)) {
 		rl.close();      // close if true return value
 		return;
 		}

package/src/coffee_utils.coffee

@@ -133,24 +133,6 @@ export nonEmpty = (x) ->
 
 # ---------------------------------------------------------------------------
 
-commentRegExp = /^\s*\#+(?:\s|$)/
-
-# ---------------------------------------------------------------------------
-
-export setCommentRegexp = (regexp) ->
-
-	commentRegExp = regexp
-	return
-
-# ---------------------------------------------------------------------------
-
-export isComment = (str) ->
-
-	assert isString(str), "isComment(): not a string"
-	return if str.match(commentRegExp) then true else false
-
-# ---------------------------------------------------------------------------
-
 export words = (str) ->
 
 	return str.trim().split(/\s+/)
@@ -397,6 +379,25 @@ export strcat = (lItems...) ->
 
 export replaceVars = (line, hVars={}, rx=/__(env\.)?([A-Za-z_]\w*)__/g) ->
 
+	assert isHash(hVars), "replaceVars() hVars is not a hash"
+
 	replacerFunc = (match, prefix, name) =>
-		return if prefix then process.env[name] else hVars[name].toString()
+		if prefix
+			result = process.env[name]
+		else if ! hVars[name]?
+			result = 'undef'
+		else
+			result = hVars[name]
+			if ! isString(result)
+				result = JSON.stringify(result)
+		return result
+
 	return line.replace(rx, replacerFunc)
+
+# ---------------------------------------------------------------------------
+
+export isIterable = (object) ->
+
+	if (object == undef) || (object == null)
+		return false
+	return typeof object[Symbol.iterator] == 'function'

package/src/coffee_utils.js

@@ -1,6 +1,6 @@
 // Generated by CoffeeScript 2.6.1
 // coffee_utils.coffee
-var LOG, commentRegExp;
+var LOG;
 
 export var sep_dash = '-'.repeat(42);
 
@@ -128,24 +128,6 @@ export var nonEmpty = function(x) {
   }
 };
 
-// ---------------------------------------------------------------------------
-commentRegExp = /^\s*\#+(?:\s|$)/;
-
-// ---------------------------------------------------------------------------
-export var setCommentRegexp = function(regexp) {
-  commentRegExp = regexp;
-};
-
-// ---------------------------------------------------------------------------
-export var isComment = function(str) {
-  assert(isString(str), "isComment(): not a string");
-  if (str.match(commentRegExp)) {
-    return true;
-  } else {
-    return false;
-  }
-};
-
 // ---------------------------------------------------------------------------
 export var words = function(str) {
   return str.trim().split(/\s+/);
@@ -429,12 +411,28 @@ export var strcat = function(...lItems) {
 // ---------------------------------------------------------------------------
 export var replaceVars = function(line, hVars = {}, rx = /__(env\.)?([A-Za-z_]\w*)__/g) {
   var replacerFunc;
+  assert(isHash(hVars), "replaceVars() hVars is not a hash");
   replacerFunc = (match, prefix, name) => {
+    var result;
     if (prefix) {
-      return process.env[name];
+      result = process.env[name];
+    } else if (hVars[name] == null) {
+      result = 'undef';
     } else {
-      return hVars[name].toString();
+      result = hVars[name];
+      if (!isString(result)) {
+        result = JSON.stringify(result);
+      }
     }
+    return result;
   };
   return line.replace(rx, replacerFunc);
 };
+
+// ---------------------------------------------------------------------------
+export var isIterable = function(object) {
+  if ((object === undef) || (object === null)) {
+    return false;
+  }
+  return typeof object[Symbol.iterator] === 'function';
+};