@jdeighan/coffee-utils 16.0.13 → 16.0.15

package/package.json

@@ -1,10 +1,11 @@
 {
 	"name": "@jdeighan/coffee-utils",
 	"type": "module",
-	"version": "16.0.13",
+	"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.0",
+		"@jdeighan/base-utils": "^8.0.16",
 		"cross-env": "^7.0.3",
 		"n-readlines": "^1.0.1",
 		"readline-sync": "^1.4.10",
-		"svelte": "^4.0.5"
+		"svelte": "^4.1.1"
 	},
 	"devDependencies": {
-		"@jdeighan/unit-tester": "^3.0.58",
-		"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

@@ -8,23 +8,26 @@ import {
 	readFile, writeFile, rm, rmdir,   #  rmSync, rmdirSync,
 	} from 'node:fs/promises'
 import {execSync} from 'node:child_process'
-import readline from 'readline'
-import NReadLines from 'n-readlines'
 
 import {
 	undef, pass, defined, notdefined, rtrim, isEmpty, nonEmpty,
 	isString, isArray, isHash, isRegExp, isFunction, isBoolean,
-	OL, toBlock, getOptions, isArrayOfStrings,
+	OL, toBlock, getOptions, isArrayOfStrings, deepCopy,
 	} from '@jdeighan/base-utils'
 import {
-	mkpath, isFile, isDir, rmFileSync, mkdirSync,
+	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}
+export {
+	mydir, mkpath, isFile, isDir, rmFileSync, mkdirSync,
+	forEachLineInFile, rmDir, rmDirSync, rmFile,
+	}
 
 fix = true
 
@@ -35,27 +38,6 @@ export doFixOutput = (flag=true) =>
 	fix = flag
 	return
 
-# ---------------------------------------------------------------------------
-
-export rmDir = (dirpath) =>
-
-	await rmdir dirpath, {recursive: true}
-	return
-
-# ---------------------------------------------------------------------------
-
-export rmDirSync = (dirpath) =>
-
-	fs.rmdirSync dirpath, {recursive: true}
-	return
-
-# ---------------------------------------------------------------------------
-
-export rmFile = (filepath) =>
-
-	await rm filepath
-	return
-
 # --------------------------------------------------------------------------
 
 export fixOutput = (contents) =>
@@ -126,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 = () =>
@@ -212,44 +183,6 @@ export getFullPath = (filepath) =>
 
 # ---------------------------------------------------------------------------
 
-export forEachLineInFile = (filepath, func) =>
-	# --- func gets (line, lineNum, filepath) - lineNum starts at 1
-
-	reader = new NReadLines(filepath)
-	nLines = 0
-
-	while (buffer = reader.next())
-		nLines += 1
-		# --- text is split on \n chars,
-		#     we also need to remove \r chars
-		line = buffer.toString().replace(/\r/g, '')
-		result = func(line, nLines, filepath)
-		assert isBoolean(result)
-		if result
-			reader.close()   # allow premature termination
-			return
-	return
-
-# ---------------------------------------------------------------------------
-
-export mapEachLineInFile = (filepath, func) =>
-
-	reader = new NReadLines(filepath)
-	nLines = 0
-
-	lLines = []
-	while (buffer = reader.next())
-		nLines += 1
-		# --- text is split on \n chars,
-		#     we also need to remove \r chars
-		line = buffer.toString().replace(/\r/g, '')
-		result = func(line, nLines)
-		if defined(result)
-			lLines.push result
-	return lLines
-
-# ---------------------------------------------------------------------------
-
 export forEachBlock = (filepath, func, regexp = /^-{16,}$/) =>
 
 	lLines = []
@@ -277,25 +210,28 @@ export forEachBlock = (filepath, func, regexp = /^-{16,}$/) =>
 
 # ---------------------------------------------------------------------------
 
-export forEachSetOfBlocks = (filepath, func,
-		block_regexp = /^-{16,}$/,
-		set_regexp   = /^={16,}$/) =>
+export forEachSetOfBlocks = (filepath, func, \
+		block_regexp = /^-{16,}$/, \
+		set_regexp   = /^={16,}$/) \
+		=>
 
+	dbgEnter 'forEachSetOfBlocks', filepath
 	lBlocks = []
 	lLines = []
 	firstLineNum = 1
 	earlyExit = false
 
-	callback = (line, lineNum) ->
+	callback = (line, hContext) ->
+		dbgEnter 'callback', line, hContext.lineNum
+		lineNum = hContext.lineNum
 		if (line.match(set_regexp))
 			lBlocks.push(lLines.join('\n'))
 			lLines = []
-			if result = func(lBlocks, firstLineNum, line)
-				if (result == true)
-					earlyExit = true
-					return true
-				else if defined(result)
-					croak "forEachSetOfBlocks() - callback returned '#{result}'"
+			result = func(deepCopy(lBlocks), firstLineNum, line)
+			if (result == true)
+				earlyExit = true
+				dbgReturn 'callback', true
+				return true
 			lBlocks = []
 			firstLineNum = lineNum+1
 		else if (line.match(block_regexp))
@@ -303,12 +239,14 @@ export forEachSetOfBlocks = (filepath, func,
 			lLines = []
 		else
 			lLines.push line
+		dbgReturn 'callback', false
 		return false
 
 	forEachLineInFile filepath, callback
 	if ! earlyExit
 		lBlocks.push(lLines.join('\n'))
 		func(lBlocks, firstLineNum)
+	dbgReturn 'forEachSetOfBlocks'
 	return
 
 # ---------------------------------------------------------------------------
@@ -414,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
@@ -427,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))
@@ -439,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}'"
@@ -544,3 +482,5 @@ export parseSource = (source) =>
 			hSourceInfo.purpose = lMatches[1]
 	dbgReturn "parseSource", hSourceInfo
 	return hSourceInfo
+
+# ---------------------------------------------------------------------------

package/src/lib/fs.js

@@ -21,10 +21,6 @@ import {
   execSync
 } from 'node:child_process';
 
-import readline from 'readline';
-
-import NReadLines from 'n-readlines';
-
 import {
   undef,
   pass,
@@ -42,15 +38,22 @@ import {
   OL,
   toBlock,
   getOptions,
-  isArrayOfStrings
+  isArrayOfStrings,
+  deepCopy
 } from '@jdeighan/base-utils';
 
 import {
+  mydir,
   mkpath,
   isFile,
   isDir,
   rmFileSync,
-  mkdirSync
+  mkdirSync,
+  forEachLineInFile,
+  fixPath,
+  rmFile,
+  rmDir,
+  rmDirSync
 } from '@jdeighan/base-utils/fs';
 
 import {
@@ -71,14 +74,19 @@ import {
 
 import {
   fromTAML
-} from '@jdeighan/base-utils/taml';
+} from '@jdeighan/base-utils/ll-taml';
 
 export {
+  mydir,
   mkpath,
   isFile,
   isDir,
   rmFileSync,
-  mkdirSync
+  mkdirSync,
+  forEachLineInFile,
+  rmDir,
+  rmDirSync,
+  rmFile
 };
 
 fix = true;
@@ -88,25 +96,6 @@ export var doFixOutput = (flag = true) => {
   fix = flag;
 };
 
-// ---------------------------------------------------------------------------
-export var rmDir = async(dirpath) => {
-  await rmdir(dirpath, {
-    recursive: true
-  });
-};
-
-// ---------------------------------------------------------------------------
-export var rmDirSync = (dirpath) => {
-  fs.rmdirSync(dirpath, {
-    recursive: true
-  });
-};
-
-// ---------------------------------------------------------------------------
-export var rmFile = async(filepath) => {
-  await rm(filepath);
-};
-
 // --------------------------------------------------------------------------
 export var fixOutput = (contents) => {
   if (fix && isString(contents)) {
@@ -190,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());
@@ -273,45 +251,6 @@ export var getFullPath = (filepath) => {
   return mkpath(pathlib.resolve(filepath));
 };
 
-// ---------------------------------------------------------------------------
-export var forEachLineInFile = (filepath, func) => {
-  var buffer, line, nLines, reader, result;
-  // --- func gets (line, lineNum, filepath) - lineNum starts at 1
-  reader = new NReadLines(filepath);
-  nLines = 0;
-  while ((buffer = reader.next())) {
-    nLines += 1;
-    // --- text is split on \n chars,
-    //     we also need to remove \r chars
-    line = buffer.toString().replace(/\r/g, '');
-    result = func(line, nLines, filepath);
-    assert(isBoolean(result));
-    if (result) {
-      reader.close(); // allow premature termination
-      return;
-    }
-  }
-};
-
-// ---------------------------------------------------------------------------
-export var mapEachLineInFile = (filepath, func) => {
-  var buffer, lLines, line, nLines, reader, result;
-  reader = new NReadLines(filepath);
-  nLines = 0;
-  lLines = [];
-  while ((buffer = reader.next())) {
-    nLines += 1;
-    // --- text is split on \n chars,
-    //     we also need to remove \r chars
-    line = buffer.toString().replace(/\r/g, '');
-    result = func(line, nLines);
-    if (defined(result)) {
-      lLines.push(result);
-    }
-  }
-  return lLines;
-};
-
 // ---------------------------------------------------------------------------
 export var forEachBlock = (filepath, func, regexp = /^-{16,}$/) => {
   var callback, earlyExit, firstLineNum, lLines;
@@ -345,22 +284,23 @@ export var forEachBlock = (filepath, func, regexp = /^-{16,}$/) => {
 // ---------------------------------------------------------------------------
 export var forEachSetOfBlocks = (filepath, func, block_regexp = /^-{16,}$/, set_regexp = /^={16,}$/) => {
   var callback, earlyExit, firstLineNum, lBlocks, lLines;
+  dbgEnter('forEachSetOfBlocks', filepath);
   lBlocks = [];
   lLines = [];
   firstLineNum = 1;
   earlyExit = false;
-  callback = function(line, lineNum) {
-    var result;
+  callback = function(line, hContext) {
+    var lineNum, result;
+    dbgEnter('callback', line, hContext.lineNum);
+    lineNum = hContext.lineNum;
     if (line.match(set_regexp)) {
       lBlocks.push(lLines.join('\n'));
       lLines = [];
-      if (result = func(lBlocks, firstLineNum, line)) {
-        if (result === true) {
-          earlyExit = true;
-          return true;
-        } else if (defined(result)) {
-          croak(`forEachSetOfBlocks() - callback returned '${result}'`);
-        }
+      result = func(deepCopy(lBlocks), firstLineNum, line);
+      if (result === true) {
+        earlyExit = true;
+        dbgReturn('callback', true);
+        return true;
       }
       lBlocks = [];
       firstLineNum = lineNum + 1;
@@ -370,6 +310,7 @@ export var forEachSetOfBlocks = (filepath, func, block_regexp = /^-{16,}$/, set_
     } else {
       lLines.push(line);
     }
+    dbgReturn('callback', false);
     return false;
   };
   forEachLineInFile(filepath, callback);
@@ -377,6 +318,7 @@ export var forEachSetOfBlocks = (filepath, func, block_regexp = /^-{16,}$/, set_
     lBlocks.push(lLines.join('\n'));
     func(lBlocks, firstLineNum);
   }
+  dbgReturn('forEachSetOfBlocks');
 };
 
 // ---------------------------------------------------------------------------
@@ -498,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') {
@@ -514,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);
         }
       }
     }
@@ -529,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;
@@ -644,3 +586,5 @@ export var parseSource = (source) => {
   dbgReturn("parseSource", hSourceInfo);
   return hSourceInfo;
 };
+
+// ---------------------------------------------------------------------------