@jdeighan/coffee-utils 7.0.0 → 7.0.3

package/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "@jdeighan/coffee-utils",
 	"type": "module",
-	"version": "7.0.0",
+	"version": "7.0.3",
 	"description": "A set of utility functions for CoffeeScript",
 	"main": "coffee_utils.js",
 	"exports": {
@@ -49,7 +49,7 @@
 		"js-yaml": "^4.1.0",
 		"n-readlines": "^1.0.1",
 		"readline-sync": "^1.4.10",
-		"svelte": "^3.46.4"
+		"svelte": "^3.46.6"
 	},
 	"devDependencies": {
 		"@jdeighan/unit-tester": "^1.0.5"

package/src/call_stack.coffee

@@ -93,13 +93,13 @@ export class CallStack
 		auxPre = getPrefix(@level, 'returnVal')
 
 		if @lStack.length == 0
-			LOG "returnFrom('#{fName}') but stack is empty"
+			LOG "returnFrom('#{funcName}') but stack is empty"
 			return [mainPre, auxPre, undef]
 
 		hInfo = @removeCall(funcName)
 		if doDebugStack
 			prefix = '   '.repeat(@lStack.length)
-			LOG "#{prefix}[<-- BACK #{fName}]"
+			LOG "#{prefix}[<-- BACK #{funcName}]"
 
 		return [mainPre, auxPre, hInfo]
 

package/src/call_stack.js

@@ -99,13 +99,13 @@ export var CallStack = class CallStack {
     mainPre = getPrefix(this.level, 'withArrow');
     auxPre = getPrefix(this.level, 'returnVal');
     if (this.lStack.length === 0) {
-      LOG(`returnFrom('${fName}') but stack is empty`);
+      LOG(`returnFrom('${funcName}') but stack is empty`);
       return [mainPre, auxPre, undef];
     }
     hInfo = this.removeCall(funcName);
     if (doDebugStack) {
       prefix = '   '.repeat(this.lStack.length);
-      LOG(`${prefix}[<-- BACK ${fName}]`);
+      LOG(`${prefix}[<-- BACK ${funcName}]`);
     }
     return [mainPre, auxPre, hInfo];
   }

package/src/fs_utils.coffee

@@ -239,21 +239,26 @@ export pathTo = (fname, dir, direction="down") ->
 
 	debug "enter pathTo('#{fname}','#{dir}','#{direction}')"
 	assert fs.existsSync(dir), "Directory #{dir} does not exist"
-	if fs.existsSync("#{dir}/#{fname}")
-		debug "return from pathTo: #{dir}/#{fname} - file exists"
-		return mkpath("#{dir}/#{fname}")
+	filepath = mkpath(dir, fname)
+	if fs.existsSync(filepath)
+		debug "return from pathTo: #{filepath} - file exists"
+		return filepath
 	else if (direction == 'down')
 		# --- Search all directories in this directory
+		#     getSubDirs() returns dirs sorted alphabetically
 		for subdir in getSubDirs(dir)
-			if fpath = pathTo(fname, "#{dir}/#{subdir}")
+			dirpath = mkpath(dir, subdir)
+			debug "check #{dirpath}"
+			if fpath = pathTo(fname, dirpath)
 				debug "return from pathTo: #{fpath}"
 				return fpath
 	else if (direction == 'up')
-		while dir = getParentDir(dir)
-			debug "check #{dir}"
-			if fs.existsSync("#{dir}/#{fname}")
-				debug "return from pathTo(): #{dir}/#{fname}"
-				return "#{dir}/#{fname}"
+		while dirpath = getParentDir(dir)
+			debug "check #{dirpath}"
+			filepath = mkpath(dirpath, fname)
+			if fs.existsSync(filepath)
+				debug "return from pathTo(): #{filepath}"
+				return filepath
 	else
 		error "pathTo(): Invalid direction '#{direction}'"
 	debug "return undef from pathTo - file not found"

package/src/fs_utils.js

@@ -281,28 +281,33 @@ export var forEachFile = function(dir, cb, filt = undef, level = 0) {
 
 // ---------------------------------------------------------------------------
 export var pathTo = function(fname, dir, direction = "down") {
-  var fpath, i, len, ref, subdir;
+  var dirpath, filepath, fpath, i, len, ref, subdir;
   debug(`enter pathTo('${fname}','${dir}','${direction}')`);
   assert(fs.existsSync(dir), `Directory ${dir} does not exist`);
-  if (fs.existsSync(`${dir}/${fname}`)) {
-    debug(`return from pathTo: ${dir}/${fname} - file exists`);
-    return mkpath(`${dir}/${fname}`);
+  filepath = mkpath(dir, fname);
+  if (fs.existsSync(filepath)) {
+    debug(`return from pathTo: ${filepath} - file exists`);
+    return filepath;
   } else if (direction === 'down') {
     ref = getSubDirs(dir);
     // --- Search all directories in this directory
+    //     getSubDirs() returns dirs sorted alphabetically
     for (i = 0, len = ref.length; i < len; i++) {
       subdir = ref[i];
-      if (fpath = pathTo(fname, `${dir}/${subdir}`)) {
+      dirpath = mkpath(dir, subdir);
+      debug(`check ${dirpath}`);
+      if (fpath = pathTo(fname, dirpath)) {
         debug(`return from pathTo: ${fpath}`);
         return fpath;
       }
     }
   } else if (direction === 'up') {
-    while (dir = getParentDir(dir)) {
-      debug(`check ${dir}`);
-      if (fs.existsSync(`${dir}/${fname}`)) {
-        debug(`return from pathTo(): ${dir}/${fname}`);
-        return `${dir}/${fname}`;
+    while (dirpath = getParentDir(dir)) {
+      debug(`check ${dirpath}`);
+      filepath = mkpath(dirpath, fname);
+      if (fs.existsSync(filepath)) {
+        debug(`return from pathTo(): ${filepath}`);
+        return filepath;
       }
     }
   } else {

package/src/indent_utils.coffee

@@ -41,7 +41,7 @@ export indentLevel = (str) ->
 # ---------------------------------------------------------------------------
 #   indented - add indentation to each string in a block
 
-export indented = (input, level=0) ->
+export indented = (input, level=1) ->
 
 	assert (level >= 0), "indented(): negative level"
 	if level == 0

package/src/indent_utils.js

@@ -53,7 +53,7 @@ export var indentLevel = function(str) {
 
 // ---------------------------------------------------------------------------
 //   indented - add indentation to each string in a block
-export var indented = function(input, level = 0) {
+export var indented = function(input, level = 1) {
   var lInputLines, lLines, line, toAdd;
   assert(level >= 0, "indented(): negative level");
   if (level === 0) {