@jdeighan/coffee-utils 7.0.19 → 7.0.20

package/package.json

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

package/src/fs_utils.coffee

@@ -342,46 +342,37 @@ export shortenPath = (path) ->
 export parseSource = (source) ->
 	# --- returns {
 	#        dir
-	#        filename   # only this is guaranteed to be set
+	#        filename
 	#        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"
 	if source == 'unit test'
+		croak "A source of 'unit test' is deprecated"
+	if source.match(/^file\:\/\//)
+		source = urllib.fileURLToPath(source)
+
+	hInfo = pathlib.parse(source)
+	if hInfo.dir
+		dir = mkpath(hInfo.dir)   # change \ to /
 		hSourceInfo = {
-			filename: 'unit test'
-			stub: 'unit test'
+			dir
+			fullpath: mkpath(dir, hInfo.base)
+			filename: hInfo.base
+			stub: hInfo.name
+			ext: hInfo.ext
 			}
-		debug "return from parseSource()", hSourceInfo
-		return hSourceInfo
-	try
-		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
-	catch err
+	else
 		hSourceInfo = {
-			filename: source
-			stub: source
-			error: err.message
+			filename: hInfo.base
+			stub: hInfo.name
+			ext: hInfo.ext
 			}
-		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

@@ -401,52 +401,41 @@ 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
   //        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");
   if (source === 'unit test') {
+    croak("A source of 'unit test' is deprecated");
+  }
+  if (source.match(/^file\:\/\//)) {
+    source = urllib.fileURLToPath(source);
+  }
+  hInfo = pathlib.parse(source);
+  if (hInfo.dir) {
+    dir = mkpath(hInfo.dir); // change \ to /
     hSourceInfo = {
-      filename: 'unit test',
-      stub: 'unit test'
+      dir,
+      fullpath: mkpath(dir, hInfo.base),
+      filename: hInfo.base,
+      stub: hInfo.name,
+      ext: hInfo.ext
     };
-    debug("return from parseSource()", hSourceInfo);
-    return hSourceInfo;
-  }
-  try {
-    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;
-  } catch (error1) {
-    err = error1;
+  } else {
     hSourceInfo = {
-      filename: source,
-      stub: source,
-      error: err.message
+      filename: hInfo.base,
+      stub: hInfo.name,
+      ext: hInfo.ext
     };
-    debug(`return '${err.message} from parseSource()`, hSourceInfo);
-    return hSourceInfo;
   }
+  debug("return from parseSource()", hSourceInfo);
+  return hSourceInfo;
 };
 
 // ---------------------------------------------------------------------------