@jdeighan/coffee-utils 7.0.30 → 7.0.33

package/package.json

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

package/src/coffee_utils.coffee

@@ -19,12 +19,13 @@ export error = (message) ->
 
 # ---------------------------------------------------------------------------
 #   assert - mimic nodejs's assert
+#   return true so we can use it in boolean expressions
 
 export assert = (cond, msg) ->
 
 	if ! cond
 		error(msg)
-	return
+	return true
 
 # ---------------------------------------------------------------------------
 #   croak - throws an error after possibly printing useful info
@@ -85,9 +86,16 @@ export isArray = (x) ->
 
 # ---------------------------------------------------------------------------
 
-export isHash = (x) ->
+export isHash = (x, lKeys) ->
 
-	return (getClassName(x) == 'Object')
+	if ! x || (getClassName(x) != 'Object')
+		return false
+	if defined(lKeys)
+		assert isArray(lKeys), "isHash(): lKeys not an array"
+		for key in lKeys
+			if ! x.hasOwnProperty(key)
+				return false
+	return true
 
 # ---------------------------------------------------------------------------
 
@@ -103,7 +111,7 @@ export hashHasKey = (x, key) ->
 
 export isEmpty = (x) ->
 
-	if ! x?
+	if (x == undef) || (x == null)
 		return true
 	if isString(x)
 		return x.match(/^\s*$/)
@@ -112,7 +120,7 @@ export isEmpty = (x) ->
 	if isHash(x)
 		return Object.keys(x).length == 0
 	else
-		error "isEmpty(): Invalid parameter"
+		return false
 
 # ---------------------------------------------------------------------------
 #   nonEmpty
@@ -383,15 +391,16 @@ export replaceVars = (line, hVars={}, rx=/__(env\.)?([A-Za-z_]\w*)__/g) ->
 
 	replacerFunc = (match, prefix, name) =>
 		if prefix
-			result = process.env[name]
-		else if ! hVars[name]?
-			result = 'undef'
+			return process.env[name]
 		else
-			result = hVars[name]
-			if ! isString(result)
-				result = JSON.stringify(result)
-		return result
-
+			value = hVars[name]
+			if defined(value)
+				if isString(value)
+					return value
+				else
+					return JSON.stringify(value)
+			else
+				return "__#{name}__"
 	return line.replace(rx, replacerFunc)
 
 # ---------------------------------------------------------------------------

package/src/coffee_utils.js

@@ -25,10 +25,12 @@ export var error = function(message) {
 
 // ---------------------------------------------------------------------------
 //   assert - mimic nodejs's assert
+//   return true so we can use it in boolean expressions
 export var assert = function(cond, msg) {
   if (!cond) {
     error(msg);
   }
+  return true;
 };
 
 // ---------------------------------------------------------------------------
@@ -77,8 +79,21 @@ export var isArray = function(x) {
 };
 
 // ---------------------------------------------------------------------------
-export var isHash = function(x) {
-  return getClassName(x) === 'Object';
+export var isHash = function(x, lKeys) {
+  var i, key, len;
+  if (!x || (getClassName(x) !== 'Object')) {
+    return false;
+  }
+  if (defined(lKeys)) {
+    assert(isArray(lKeys), "isHash(): lKeys not an array");
+    for (i = 0, len = lKeys.length; i < len; i++) {
+      key = lKeys[i];
+      if (!x.hasOwnProperty(key)) {
+        return false;
+      }
+    }
+  }
+  return true;
 };
 
 // ---------------------------------------------------------------------------
@@ -92,7 +107,7 @@ export var hashHasKey = function(x, key) {
 //   isEmpty
 //      - string is whitespace, array has no elements, hash has no keys
 export var isEmpty = function(x) {
-  if (x == null) {
+  if ((x === undef) || (x === null)) {
     return true;
   }
   if (isString(x)) {
@@ -104,7 +119,7 @@ export var isEmpty = function(x) {
   if (isHash(x)) {
     return Object.keys(x).length === 0;
   } else {
-    return error("isEmpty(): Invalid parameter");
+    return false;
   }
 };
 
@@ -413,18 +428,21 @@ export var replaceVars = function(line, hVars = {}, rx = /__(env\.)?([A-Za-z_]\w
   var replacerFunc;
   assert(isHash(hVars), "replaceVars() hVars is not a hash");
   replacerFunc = (match, prefix, name) => {
-    var result;
+    var value;
     if (prefix) {
-      result = process.env[name];
-    } else if (hVars[name] == null) {
-      result = 'undef';
+      return process.env[name];
     } else {
-      result = hVars[name];
-      if (!isString(result)) {
-        result = JSON.stringify(result);
+      value = hVars[name];
+      if (defined(value)) {
+        if (isString(value)) {
+          return value;
+        } else {
+          return JSON.stringify(value);
+        }
+      } else {
+        return `__${name}__`;
       }
     }
-    return result;
   };
   return line.replace(rx, replacerFunc);
 };

package/src/fs_utils.coffee

@@ -361,6 +361,7 @@ export parseSource = (source) ->
 	#        fullpath
 	#        stub
 	#        ext
+	#        purpose
 	#        }
 	# --- NOTE: source may be a file URL, e.g. import.meta.url
 
@@ -394,6 +395,13 @@ export parseSource = (source) ->
 				stub: hInfo.name
 				ext: hInfo.ext
 				}
+
+		# --- check for a 'purpose'
+		if lMatches = hSourceInfo.stub.match(///
+				\.
+				([A-Za-z_]+)
+				$///)
+			hSourceInfo.purpose = lMatches[1]
 	debug "return from parseSource()", hSourceInfo
 	return hSourceInfo
 

package/src/fs_utils.js

@@ -422,13 +422,14 @@ export var shortenPath = function(path) {
 
 // ---------------------------------------------------------------------------
 export var parseSource = function(source) {
-  var dir, hInfo, hSourceInfo;
+  var dir, hInfo, hSourceInfo, lMatches;
   // --- returns {
   //        dir
   //        filename
   //        fullpath
   //        stub
   //        ext
+  //        purpose
   //        }
   // --- NOTE: source may be a file URL, e.g. import.meta.url
   debug("enter parseSource()");
@@ -462,6 +463,10 @@ export var parseSource = function(source) {
         ext: hInfo.ext
       };
     }
+    // --- check for a 'purpose'
+    if (lMatches = hSourceInfo.stub.match(/\.([A-Za-z_]+)$/)) {
+      hSourceInfo.purpose = lMatches[1];
+    }
   }
   debug("return from parseSource()", hSourceInfo);
   return hSourceInfo;

package/src/indent_utils.coffee

@@ -9,7 +9,7 @@ import {arrayToBlock, blockToArray} from '@jdeighan/coffee-utils/block'
 # ---------------------------------------------------------------------------
 #        NOTE: Currently, only TAB indentation is supported
 # ---------------------------------------------------------------------------
-#   splitLine - separate a line into {level, line}
+#   splitLine - separate a line into [level, line]
 
 export splitLine = (line) ->
 

package/src/indent_utils.js

@@ -21,7 +21,7 @@ import {
 // ---------------------------------------------------------------------------
 //        NOTE: Currently, only TAB indentation is supported
 // ---------------------------------------------------------------------------
-//   splitLine - separate a line into {level, line}
+//   splitLine - separate a line into [level, line]
 export var splitLine = function(line) {
   var lMatches;
   assert(line != null, "splitLine(): line is undef");