@jdeighan/coffee-utils 11.0.22 → 11.0.24

package/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "@jdeighan/coffee-utils",
 	"type": "module",
-	"version": "11.0.22",
+	"version": "11.0.24",
 	"description": "A set of utility functions for CoffeeScript",
 	"main": "coffee_utils.js",
 	"exports": {
@@ -50,7 +50,7 @@
 	},
 	"homepage": "https://github.com/johndeighan/coffee-utils#readme",
 	"dependencies": {
-		"@jdeighan/exceptions": "^1.0.19",
+		"@jdeighan/exceptions": "^1.0.20",
 		"cross-env": "^7.0.3",
 		"js-yaml": "^4.1.0",
 		"n-readlines": "^1.0.1",
@@ -58,6 +58,6 @@
 		"svelte": "^3.52.0"
 	},
 	"devDependencies": {
-		"@jdeighan/unit-tester": "^2.0.43"
+		"@jdeighan/unit-tester": "^2.0.44"
 	}
 }

package/src/fs.coffee

@@ -28,7 +28,9 @@ export mydir = (url) ->
 export projRoot = (url) ->
 
 	dir = mydir(url)
-	pathToPkg = pathTo('package.json', dir, {direction: 'up'})
+	rootDir = pathTo('package.json', dir, 'direction=up directory')
+	assert defined(rootDir), "No project root directory found"
+	return rootDir
 
 # ---------------------------------------------------------------------------
 #    myfile() - pass argument import.meta.url and it will return
@@ -269,11 +271,13 @@ export forEachFile = (dir, cb, filt=undef, level=0) ->
 
 export pathTo = (fname, searchDir, options=undef) ->
 
-	{direction, relative} = getOptions(options, {
+	{direction, relative, directory} = getOptions(options, {
 		direction: 'down'
 		relative: false
+		directory: false    # return only the directory the file is in
 		})
 
+	assert !(relative && directory), "relative & directory are incompatible"
 	if ! searchDir
 		searchDir = process.cwd()
 	assert isDir(searchDir), "Not a directory: #{OL(searchDir)}"
@@ -281,6 +285,8 @@ export pathTo = (fname, searchDir, options=undef) ->
 	if isFile(filepath)
 		if relative
 			return "./#{fname}"
+		else if directory
+			return searchDir
 		else
 			return filepath
 
@@ -288,10 +294,12 @@ export pathTo = (fname, searchDir, options=undef) ->
 		# --- Search all directories in this directory
 		#     getSubDirs() returns dirs sorted alphabetically
 		for subdir in getSubDirs(searchDir)
-			dirpath = mkpath(searchDir, subdir)
-			if defined(fpath = pathTo(fname, dirpath, options))
+			dirPath = mkpath(searchDir, subdir)
+			if defined(fpath = pathTo(fname, dirPath, options))
 				if relative
 					return fpath.replace('./', "./#{subdir}/")
+				else if directory
+					return dirPath
 				else
 					return fpath
 	else if (direction == 'up')
@@ -302,6 +310,8 @@ export pathTo = (fname, searchDir, options=undef) ->
 			if isFile(fpath)
 				if relative
 					return "../".repeat(nLevels) + fname
+				else if directory
+					return dirPath
 				else
 					return fpath
 			searchDir = dirPath

package/src/fs.js

@@ -50,11 +50,11 @@ export var mydir = function(url) {
 
 // ---------------------------------------------------------------------------
 export var projRoot = function(url) {
-  var dir, pathToPkg;
+  var dir, rootDir;
   dir = mydir(url);
-  return pathToPkg = pathTo('package.json', dir, {
-    direction: 'up'
-  });
+  rootDir = pathTo('package.json', dir, 'direction=up directory');
+  assert(defined(rootDir), "No project root directory found");
+  return rootDir;
 };
 
 // ---------------------------------------------------------------------------
@@ -323,11 +323,13 @@ export var forEachFile = function(dir, cb, filt = undef, level = 0) {
 
 // ---------------------------------------------------------------------------
 export var pathTo = function(fname, searchDir, options = undef) {
-  var dirPath, direction, dirpath, filepath, fpath, i, len, nLevels, ref, relative, subdir;
-  ({direction, relative} = getOptions(options, {
+  var dirPath, direction, directory, filepath, fpath, i, len, nLevels, ref, relative, subdir;
+  ({direction, relative, directory} = getOptions(options, {
     direction: 'down',
-    relative: false
+    relative: false,
+    directory: false // return only the directory the file is in
   }));
+  assert(!(relative && directory), "relative & directory are incompatible");
   if (!searchDir) {
     searchDir = process.cwd();
   }
@@ -336,6 +338,8 @@ export var pathTo = function(fname, searchDir, options = undef) {
   if (isFile(filepath)) {
     if (relative) {
       return `./${fname}`;
+    } else if (directory) {
+      return searchDir;
     } else {
       return filepath;
     }
@@ -346,10 +350,12 @@ export var pathTo = function(fname, searchDir, options = undef) {
     //     getSubDirs() returns dirs sorted alphabetically
     for (i = 0, len = ref.length; i < len; i++) {
       subdir = ref[i];
-      dirpath = mkpath(searchDir, subdir);
-      if (defined(fpath = pathTo(fname, dirpath, options))) {
+      dirPath = mkpath(searchDir, subdir);
+      if (defined(fpath = pathTo(fname, dirPath, options))) {
         if (relative) {
           return fpath.replace('./', `./${subdir}/`);
+        } else if (directory) {
+          return dirPath;
         } else {
           return fpath;
         }
@@ -363,6 +369,8 @@ export var pathTo = function(fname, searchDir, options = undef) {
       if (isFile(fpath)) {
         if (relative) {
           return "../".repeat(nLevels) + fname;
+        } else if (directory) {
+          return dirPath;
         } else {
           return fpath;
         }