@jdeighan/coffee-utils 7.0.32 → 7.0.33

package/package.json

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

package/src/coffee_utils.coffee

@@ -391,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

@@ -428,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);
 };