@jdeighan/coffee-utils 7.0.19 → 7.0.22

package/package.json

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

package/src/fs_utils.coffee

@@ -7,7 +7,7 @@ import NReadLines from 'n-readlines'
 
 import {
 	assert, undef, pass, rtrim, error, isEmpty, nonEmpty,
-	isString, isArray, isRegExp, isFunction, croak,
+	isString, isArray, isRegExp, isFunction, croak, OL,
 	} from '@jdeighan/coffee-utils'
 import {log, LOG} from '@jdeighan/coffee-utils/log'
 import {debug} from '@jdeighan/coffee-utils/debug'
@@ -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"
@@ -342,20 +357,27 @@ export shortenPath = (path) ->
 export parseSource = (source) ->
 	# --- returns {
 	#        dir
-	#        filename   # only this is guaranteed to be set
+	#        filename
+	#        fullpath
 	#        stub
 	#        ext
 	#        }
+	# --- NOTE: source may be a file URL, e.g. import.meta.url
 
 	debug "enter parseSource()"
+	assert isString(source),\
+			"parseSource(): source not a string: #{OL(source)}"
 	if source == 'unit test'
+		croak "A source of 'unit test' is deprecated"
+	if source.match(/^file\:\/\//)
+		source = urllib.fileURLToPath(source)
+
+	if isDir(source)
 		hSourceInfo = {
-			filename: 'unit test'
-			stub: 'unit test'
+			dir: source
+			fullpath: source
 			}
-		debug "return from parseSource()", hSourceInfo
-		return hSourceInfo
-	try
+	else
 		hInfo = pathlib.parse(source)
 		if hInfo.dir
 			dir = mkpath(hInfo.dir)   # change \ to /
@@ -372,16 +394,8 @@ export parseSource = (source) ->
 				stub: hInfo.name
 				ext: hInfo.ext
 				}
-		debug "return from parseSource()", hSourceInfo
-		return hSourceInfo
-	catch err
-		hSourceInfo = {
-			filename: source
-			stub: source
-			error: err.message
-			}
-		debug "return '#{err.message} from parseSource()", hSourceInfo
-		return hSourceInfo
+	debug "return from parseSource()", hSourceInfo
+	return hSourceInfo
 
 # ---------------------------------------------------------------------------
 #   backup - back up a file

package/src/fs_utils.js

@@ -22,7 +22,8 @@ import {
   isArray,
   isRegExp,
   isFunction,
-  croak
+  croak,
+  OL
 } from '@jdeighan/coffee-utils';
 
 import {
@@ -84,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;
+  }
 };
 
 // ---------------------------------------------------------------------------
@@ -94,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;
@@ -401,23 +422,29 @@ export var shortenPath = function(path) {
 
 // ---------------------------------------------------------------------------
 export var parseSource = function(source) {
-  var dir, err, hInfo, hSourceInfo;
+  var dir, hInfo, hSourceInfo;
   // --- returns {
   //        dir
-  //        filename   # only this is guaranteed to be set
+  //        filename
+  //        fullpath
   //        stub
   //        ext
   //        }
+  // --- NOTE: source may be a file URL, e.g. import.meta.url
   debug("enter parseSource()");
+  assert(isString(source), `parseSource(): source not a string: ${OL(source)}`);
   if (source === 'unit test') {
+    croak("A source of 'unit test' is deprecated");
+  }
+  if (source.match(/^file\:\/\//)) {
+    source = urllib.fileURLToPath(source);
+  }
+  if (isDir(source)) {
     hSourceInfo = {
-      filename: 'unit test',
-      stub: 'unit test'
+      dir: source,
+      fullpath: source
     };
-    debug("return from parseSource()", hSourceInfo);
-    return hSourceInfo;
-  }
-  try {
+  } else {
     hInfo = pathlib.parse(source);
     if (hInfo.dir) {
       dir = mkpath(hInfo.dir); // change \ to /
@@ -435,18 +462,9 @@ export var parseSource = function(source) {
         ext: hInfo.ext
       };
     }
-    debug("return from parseSource()", hSourceInfo);
-    return hSourceInfo;
-  } catch (error1) {
-    err = error1;
-    hSourceInfo = {
-      filename: source,
-      stub: source,
-      error: err.message
-    };
-    debug(`return '${err.message} from parseSource()`, hSourceInfo);
-    return hSourceInfo;
   }
+  debug("return from parseSource()", hSourceInfo);
+  return hSourceInfo;
 };
 
 // ---------------------------------------------------------------------------