@jdeighan/coffee-utils 7.0.21 → 7.0.24

package/package.json

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

package/src/coffee_utils.coffee

@@ -202,6 +202,19 @@ export isInteger = (x) ->
 
 # ---------------------------------------------------------------------------
 
+export isUniqueList = (lItems) ->
+
+	if ! lItems?
+		return true     # empty list is unique
+	h = {}
+	for item in lItems
+		if h[item]
+			return false
+		h[item] = 1
+	return true
+
+# ---------------------------------------------------------------------------
+
 export uniq = (lItems) ->
 
 	return [...new Set(lItems)]
@@ -384,6 +397,17 @@ 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)

package/src/coffee_utils.js

@@ -202,6 +202,23 @@ export var isInteger = function(x) {
   }
 };
 
+// ---------------------------------------------------------------------------
+export var isUniqueList = function(lItems) {
+  var h, i, item, len;
+  if (lItems == null) {
+    return true; // empty list is unique
+  }
+  h = {};
+  for (i = 0, len = lItems.length; i < len; i++) {
+    item = lItems[i];
+    if (h[item]) {
+      return false;
+    }
+    h[item] = 1;
+  }
+  return true;
+};
+
 // ---------------------------------------------------------------------------
 export var uniq = function(lItems) {
   return [...new Set(lItems)];
@@ -412,12 +429,20 @@ 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);
 };

package/src/fs_utils.coffee

@@ -62,7 +62,12 @@ export isFile = (fullpath) ->
 
 export isDir = (fullpath) ->
 
-	return fs.lstatSync(fullpath).isDirectory()
+	try
+		obj = fs.lstatSync(fullpath)
+		if !obj? then return false
+		return obj.isDirectory()
+	catch
+		return false
 
 # ---------------------------------------------------------------------------
 
@@ -73,6 +78,16 @@ export isSimpleFileName = (path) ->
 
 # ---------------------------------------------------------------------------
 
+export fileStub = (path) ->
+
+	assert isString(path), "fileExt(): path not a string"
+	if lMatches = path.match(/^(.*)\.[A-Za-z0-9_]+$/)
+		return lMatches[1]
+	else
+		return ''
+
+# ---------------------------------------------------------------------------
+
 export fileExt = (path) ->
 
 	assert isString(path), "fileExt(): path not a string"
@@ -343,6 +358,7 @@ export parseSource = (source) ->
 	# --- returns {
 	#        dir
 	#        filename
+	#        fullpath
 	#        stub
 	#        ext
 	#        }
@@ -356,22 +372,28 @@ export parseSource = (source) ->
 	if source.match(/^file\:\/\//)
 		source = urllib.fileURLToPath(source)
 
-	hInfo = pathlib.parse(source)
-	if hInfo.dir
-		dir = mkpath(hInfo.dir)   # change \ to /
+	if isDir(source)
 		hSourceInfo = {
-			dir
-			fullpath: mkpath(dir, hInfo.base)
-			filename: hInfo.base
-			stub: hInfo.name
-			ext: hInfo.ext
+			dir: source
+			fullpath: source
 			}
 	else
-		hSourceInfo = {
-			filename: hInfo.base
-			stub: hInfo.name
-			ext: hInfo.ext
-			}
+		hInfo = pathlib.parse(source)
+		if hInfo.dir
+			dir = mkpath(hInfo.dir)   # change \ to /
+			hSourceInfo = {
+				dir
+				fullpath: mkpath(dir, hInfo.base)
+				filename: hInfo.base
+				stub: hInfo.name
+				ext: hInfo.ext
+				}
+		else
+			hSourceInfo = {
+				filename: hInfo.base
+				stub: hInfo.name
+				ext: hInfo.ext
+				}
 	debug "return from parseSource()", hSourceInfo
 	return hSourceInfo
 

package/src/fs_utils.js

@@ -85,7 +85,16 @@ export var isFile = function(fullpath) {
 
 // ---------------------------------------------------------------------------
 export var isDir = function(fullpath) {
-  return fs.lstatSync(fullpath).isDirectory();
+  var obj;
+  try {
+    obj = fs.lstatSync(fullpath);
+    if (obj == null) {
+      return false;
+    }
+    return obj.isDirectory();
+  } catch (error1) {
+    return false;
+  }
 };
 
 // ---------------------------------------------------------------------------
@@ -95,6 +104,17 @@ export var isSimpleFileName = function(path) {
   return !h.root && !h.dir && h.base;
 };
 
+// ---------------------------------------------------------------------------
+export var fileStub = function(path) {
+  var lMatches;
+  assert(isString(path), "fileExt(): path not a string");
+  if (lMatches = path.match(/^(.*)\.[A-Za-z0-9_]+$/)) {
+    return lMatches[1];
+  } else {
+    return '';
+  }
+};
+
 // ---------------------------------------------------------------------------
 export var fileExt = function(path) {
   var lMatches;
@@ -406,6 +426,7 @@ export var parseSource = function(source) {
   // --- returns {
   //        dir
   //        filename
+  //        fullpath
   //        stub
   //        ext
   //        }
@@ -418,22 +439,29 @@ export var parseSource = function(source) {
   if (source.match(/^file\:\/\//)) {
     source = urllib.fileURLToPath(source);
   }
-  hInfo = pathlib.parse(source);
-  if (hInfo.dir) {
-    dir = mkpath(hInfo.dir); // change \ to /
+  if (isDir(source)) {
     hSourceInfo = {
-      dir,
-      fullpath: mkpath(dir, hInfo.base),
-      filename: hInfo.base,
-      stub: hInfo.name,
-      ext: hInfo.ext
+      dir: source,
+      fullpath: source
     };
   } else {
-    hSourceInfo = {
-      filename: hInfo.base,
-      stub: hInfo.name,
-      ext: hInfo.ext
-    };
+    hInfo = pathlib.parse(source);
+    if (hInfo.dir) {
+      dir = mkpath(hInfo.dir); // change \ to /
+      hSourceInfo = {
+        dir,
+        fullpath: mkpath(dir, hInfo.base),
+        filename: hInfo.base,
+        stub: hInfo.name,
+        ext: hInfo.ext
+      };
+    } else {
+      hSourceInfo = {
+        filename: hInfo.base,
+        stub: hInfo.name,
+        ext: hInfo.ext
+      };
+    }
   }
   debug("return from parseSource()", hSourceInfo);
   return hSourceInfo;