@jdeighan/coffee-utils 16.0.14 → 16.0.15

package/package.json

@@ -1,10 +1,11 @@
 {
 	"name": "@jdeighan/coffee-utils",
 	"type": "module",
-	"version": "16.0.14",
+	"version": "16.0.15",
 	"description": "A set of utility functions for CoffeeScript",
 	"main": "coffee_utils.js",
 	"exports": {
+		".": "./src/lib/browser.js",
 		"./server": "./src/lib/server.js",
 		"./browser": "./src/lib/browser.js",
 		"./fs": "./src/lib/fs.js",
@@ -45,14 +46,14 @@
 	},
 	"homepage": "https://github.com/johndeighan/coffee-utils#readme",
 	"dependencies": {
-		"@jdeighan/base-utils": "^8.0.7",
+		"@jdeighan/base-utils": "^8.0.16",
 		"cross-env": "^7.0.3",
 		"n-readlines": "^1.0.1",
 		"readline-sync": "^1.4.10",
 		"svelte": "^4.1.1"
 	},
 	"devDependencies": {
-		"@jdeighan/unit-tester": "^3.0.61",
-		"ava": "^5.3.1"
+		"@jdeighan/unit-tester": "^3.0.65",
+		"ava": "^6.0.1"
 	}
 }

package/src/lib/SectionMap.coffee

@@ -10,7 +10,7 @@ import {LOG, LOGVALUE, LOGTAML} from '@jdeighan/base-utils/log'
 import {
 	dbg, dbgEnter, dbgReturn, dbgYield, dbgResume,
 	} from '@jdeighan/base-utils/debug'
-import {isTAML, fromTAML} from '@jdeighan/base-utils/taml'
+import {isTAML, fromTAML} from '@jdeighan/base-utils/ll-taml'
 
 import {Section} from '@jdeighan/coffee-utils/section'
 

package/src/lib/SectionMap.js

@@ -43,7 +43,7 @@ import {
 import {
   isTAML,
   fromTAML
-} from '@jdeighan/base-utils/taml';
+} from '@jdeighan/base-utils/ll-taml';
 
 import {
   Section

package/src/lib/fs.coffee

@@ -15,16 +15,17 @@ import {
 	OL, toBlock, getOptions, isArrayOfStrings, deepCopy,
 	} from '@jdeighan/base-utils'
 import {
-	mkpath, isFile, isDir, rmFileSync, mkdirSync, forEachLineInFile,
+	mydir, mkpath, isFile, isDir, rmFileSync, mkdirSync,
+	forEachLineInFile, fixPath,
 	rmFile, rmDir, rmDirSync,
 	} from '@jdeighan/base-utils/fs'
 import {assert, croak} from '@jdeighan/base-utils/exceptions'
 import {LOG, LOGVALUE} from '@jdeighan/base-utils/log'
 import {dbg, dbgEnter, dbgReturn} from '@jdeighan/base-utils/debug'
-import {fromTAML} from '@jdeighan/base-utils/taml'
+import {fromTAML} from '@jdeighan/base-utils/ll-taml'
 
 export {
-	mkpath, isFile, isDir, rmFileSync, mkdirSync,
+	mydir, mkpath, isFile, isDir, rmFileSync, mkdirSync,
 	forEachLineInFile, rmDir, rmDirSync, rmFile,
 	}
 
@@ -107,17 +108,6 @@ export cloneRepo = (user, repo, dir) =>
 	git_repo = "https://github.com/#{user}/#{repo}.git"
 	return execCmd "git clone #{git_repo} #{dir}"
 
-# ---------------------------------------------------------------------------
-#    mydir() - pass argument import.meta.url and it will return
-#              the directory your file is in
-
-export mydir = (url) =>
-
-	path = urllib.fileURLToPath(url)
-	dir = pathlib.dirname(path)
-	final = mkpath(dir)
-	return final
-
 # ---------------------------------------------------------------------------
 
 export homeDir = () =>
@@ -362,9 +352,9 @@ export pathTo = (fname, searchDir, options=undef) =>
 		if relative
 			return "./#{fname}"
 		else if directory
-			return searchDir
+			return fixPath(searchDir)
 		else
-			return filepath
+			return fixPath(filepath)
 
 	if (direction == 'down')
 		# --- Search all directories in this directory
@@ -375,9 +365,9 @@ export pathTo = (fname, searchDir, options=undef) =>
 				if relative
 					return fpath.replace('./', "./#{subdir}/")
 				else if directory
-					return dirPath
+					return fixPath(dirPath)
 				else
-					return fpath
+					return fixPath(fpath)
 	else if (direction == 'up')
 		nLevels = 0
 		while defined(dirPath = getParentDir(searchDir))
@@ -387,9 +377,9 @@ export pathTo = (fname, searchDir, options=undef) =>
 				if relative
 					return "../".repeat(nLevels) + fname
 				else if directory
-					return dirPath
+					return fixPath(dirPath)
 				else
-					return fpath
+					return fixPath(fpath)
 			searchDir = dirPath
 	else
 		croak "pathTo(): Invalid direction '#{direction}'"

package/src/lib/fs.js

@@ -43,12 +43,14 @@ import {
 } from '@jdeighan/base-utils';
 
 import {
+  mydir,
   mkpath,
   isFile,
   isDir,
   rmFileSync,
   mkdirSync,
   forEachLineInFile,
+  fixPath,
   rmFile,
   rmDir,
   rmDirSync
@@ -72,9 +74,10 @@ import {
 
 import {
   fromTAML
-} from '@jdeighan/base-utils/taml';
+} from '@jdeighan/base-utils/ll-taml';
 
 export {
+  mydir,
   mkpath,
   isFile,
   isDir,
@@ -176,17 +179,6 @@ export var cloneRepo = (user, repo, dir) => {
   return execCmd(`git clone ${git_repo} ${dir}`);
 };
 
-// ---------------------------------------------------------------------------
-//    mydir() - pass argument import.meta.url and it will return
-//              the directory your file is in
-export var mydir = (url) => {
-  var dir, final, path;
-  path = urllib.fileURLToPath(url);
-  dir = pathlib.dirname(path);
-  final = mkpath(dir);
-  return final;
-};
-
 // ---------------------------------------------------------------------------
 export var homeDir = () => {
   return mkpath(os.homedir());
@@ -448,9 +440,9 @@ export var pathTo = (fname, searchDir, options = undef) => {
     if (relative) {
       return `./${fname}`;
     } else if (directory) {
-      return searchDir;
+      return fixPath(searchDir);
     } else {
-      return filepath;
+      return fixPath(filepath);
     }
   }
   if (direction === 'down') {
@@ -464,9 +456,9 @@ export var pathTo = (fname, searchDir, options = undef) => {
         if (relative) {
           return fpath.replace('./', `./${subdir}/`);
         } else if (directory) {
-          return dirPath;
+          return fixPath(dirPath);
         } else {
-          return fpath;
+          return fixPath(fpath);
         }
       }
     }
@@ -479,9 +471,9 @@ export var pathTo = (fname, searchDir, options = undef) => {
         if (relative) {
           return "../".repeat(nLevels) + fname;
         } else if (directory) {
-          return dirPath;
+          return fixPath(dirPath);
         } else {
-          return fpath;
+          return fixPath(fpath);
         }
       }
       searchDir = dirPath;