@jdeighan/coffee-utils 7.0.2 → 7.0.5

package/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "@jdeighan/coffee-utils",
 	"type": "module",
-	"version": "7.0.2",
+	"version": "7.0.5",
 	"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/debug_utils.coffee

@@ -168,7 +168,10 @@ export debug = (lArgs...) ->
 	#     when debugging is off
 
 	[mainPre, auxPre, hEnv, type] = adjustStack(label)
-	hOptions = {prefix: mainPre, itemPrefix: auxPre}
+	hOptions = {
+		prefix: mainPre
+		itemPrefix: auxPre
+		}
 	switch type
 		when 'enter'
 			log label, hOptions

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"
@@ -322,34 +327,36 @@ export parseSource = (source) ->
 
 	debug "enter parseSource()"
 	if source == 'unit test'
-		debug "return 'unit test' from parseSource()"
-		return {
+		hSourceInfo = {
 			filename: 'unit test'
 			stub: 'unit test'
 			}
+		debug "return from parseSource()", hSourceInfo
+		return hSourceInfo
 	try
 		hInfo = pathlib.parse(source)
-		debug "return from parseSource()", hInfo
-		if hInfo.root
+		if hInfo.dir
 			dir = mkpath(hInfo.dir)   # change \ to /
-			return {
-				dir: dir
+			hSourceInfo = {
+				dir
 				fullpath: mkpath(dir, hInfo.base)
 				filename: hInfo.base
 				stub: hInfo.name
 				ext: hInfo.ext
 				}
 		else
-			return {
-				dir: mkpath(hInfo.dir)   # change \ to /
+			hSourceInfo = {
 				filename: hInfo.base
 				stub: hInfo.name
 				ext: hInfo.ext
 				}
+		debug "return from parseSource()", hSourceInfo
+		return hSourceInfo
 	catch err
-		debug "return '#{err.message} from parseSource()"
-		return {
+		hSourceInfo = {
 			filename: source
 			stub: source
 			error: err.message
 			}
+		debug "return '#{err.message} from parseSource()", hSourceInfo
+		return hSourceInfo

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 {
@@ -367,7 +372,7 @@ export var shortenPath = function(path) {
 
 // ---------------------------------------------------------------------------
 export var parseSource = function(source) {
-  var dir, err, hInfo;
+  var dir, err, hInfo, hSourceInfo;
   // --- returns {
   //        dir
   //        filename   # only this is guaranteed to be set
@@ -376,39 +381,41 @@ export var parseSource = function(source) {
   //        }
   debug("enter parseSource()");
   if (source === 'unit test') {
-    debug("return 'unit test' from parseSource()");
-    return {
+    hSourceInfo = {
       filename: 'unit test',
       stub: 'unit test'
     };
+    debug("return from parseSource()", hSourceInfo);
+    return hSourceInfo;
   }
   try {
     hInfo = pathlib.parse(source);
-    debug("return from parseSource()", hInfo);
-    if (hInfo.root) {
+    if (hInfo.dir) {
       dir = mkpath(hInfo.dir); // change \ to /
-      return {
-        dir: dir,
+      hSourceInfo = {
+        dir,
         fullpath: mkpath(dir, hInfo.base),
         filename: hInfo.base,
         stub: hInfo.name,
         ext: hInfo.ext
       };
     } else {
-      return {
-        dir: mkpath(hInfo.dir), // change \ to /
+      hSourceInfo = {
         filename: hInfo.base,
         stub: hInfo.name,
         ext: hInfo.ext
       };
     }
+    debug("return from parseSource()", hSourceInfo);
+    return hSourceInfo;
   } catch (error1) {
     err = error1;
-    debug(`return '${err.message} from parseSource()`);
-    return {
+    hSourceInfo = {
       filename: source,
       stub: source,
       error: err.message
     };
+    debug(`return '${err.message} from parseSource()`, hSourceInfo);
+    return hSourceInfo;
   }
 };

package/src/indent_utils.coffee

@@ -130,22 +130,6 @@ export tabify = (str, numSpaces=undef) ->
 			lLines.push '\t'.repeat(prefixLen) + theRest
 	return arrayToBlock(lLines)
 
-# ---------------------------------------------------------------------------
-#    untabify - convert leading TABs to spaces
-
-untabify_old = (str, numSpaces=3) ->
-
-	oneIndent = ' '.repeat(numSpaces)
-	lLines = []
-	for str in blockToArray(str)
-		lMatches = str.match(/^(\t*)(.*)$/)
-		[_, prefix, theRest] = lMatches
-		if prefix == ''
-			lLines.push theRest
-		else
-			lLines.push oneIndent.repeat(prefix.length) + theRest
-	return arrayToBlock(lLines)
-
 # ---------------------------------------------------------------------------
 #    untabify - convert ALL TABs to spaces
 

package/src/indent_utils.js

@@ -1,7 +1,5 @@
 // Generated by CoffeeScript 2.6.1
-// indent_utils.coffee
-var untabify_old;
-
+  // indent_utils.coffee
 import {
   assert,
   undef,
@@ -162,26 +160,6 @@ export var tabify = function(str, numSpaces = undef) {
   return arrayToBlock(lLines);
 };
 
-// ---------------------------------------------------------------------------
-//    untabify - convert leading TABs to spaces
-untabify_old = function(str, numSpaces = 3) {
-  var _, i, lLines, lMatches, len, oneIndent, prefix, ref, theRest;
-  oneIndent = ' '.repeat(numSpaces);
-  lLines = [];
-  ref = blockToArray(str);
-  for (i = 0, len = ref.length; i < len; i++) {
-    str = ref[i];
-    lMatches = str.match(/^(\t*)(.*)$/);
-    [_, prefix, theRest] = lMatches;
-    if (prefix === '') {
-      lLines.push(theRest);
-    } else {
-      lLines.push(oneIndent.repeat(prefix.length) + theRest);
-    }
-  }
-  return arrayToBlock(lLines);
-};
-
 // ---------------------------------------------------------------------------
 //    untabify - convert ALL TABs to spaces
 export var untabify = function(str, numSpaces = 3) {

package/src/log_utils.coffee

@@ -134,17 +134,15 @@ export log = (str, hOptions={}) ->
 
 export logItem = (label, item, hOptions={}) ->
 	# --- valid options:
-	#   prefix
-	#   itemPrefix
+	#   prefix     - not used
+	#   itemPrefix - always used
 
 	assert isFunction(putstr), "putstr not properly set"
 	assert !label || isString(label), "label a non-string"
 	assert isHash(hOptions), "arg 3 not a hash"
 
 	label = fixStr(label)
-	prefix = fixStr(hOptions.prefix)
-	itemPrefix = fixStr(hOptions.itemPrefix || prefix)
-
+	prefix = fixStr(hOptions.itemPrefix || hOptions.prefix)
 	labelStr = if label then "#{label} = " else ""
 
 	if (item == undef)
@@ -155,16 +153,16 @@ export logItem = (label, item, hOptions={}) ->
 		else
 			if label
 				putstr "#{prefix}#{label}:"
-			putBlock item, itemPrefix
+			putBlock item, prefix
 	else if isNumber(item)
 		putstr "#{prefix}#{labelStr}#{item}"
 	else
-		putstr "#{itemPrefix}#{sep_dash}"
+		putstr "#{prefix}#{sep_dash}"
 		if label
 			putstr "#{prefix}#{label}:"
 		for str in blockToArray(stringify(item, true))  # escape special chars
-			putstr "#{itemPrefix}#{indentation(1)}#{fixStr(str)}"
-		putstr "#{itemPrefix}#{sep_dash}"
+			putstr "#{prefix}#{indentation(1)}#{fixStr(str)}"
+		putstr "#{prefix}#{sep_dash}"
 
 	return
 

package/src/log_utils.js

@@ -151,16 +151,15 @@ export var log = function(str, hOptions = {}) {
 
 // ---------------------------------------------------------------------------
 export var logItem = function(label, item, hOptions = {}) {
-  var i, itemPrefix, labelStr, len, prefix, ref, str;
+  var i, labelStr, len, prefix, ref, str;
   // --- valid options:
-  //   prefix
-  //   itemPrefix
+  //   prefix     - not used
+  //   itemPrefix - always used
   assert(isFunction(putstr), "putstr not properly set");
   assert(!label || isString(label), "label a non-string");
   assert(isHash(hOptions), "arg 3 not a hash");
   label = fixStr(label);
-  prefix = fixStr(hOptions.prefix);
-  itemPrefix = fixStr(hOptions.itemPrefix || prefix);
+  prefix = fixStr(hOptions.itemPrefix || hOptions.prefix);
   labelStr = label ? `${label} = ` : "";
   if (item === undef) {
     putstr(`${prefix}${labelStr}undef`);
@@ -171,12 +170,12 @@ export var logItem = function(label, item, hOptions = {}) {
       if (label) {
         putstr(`${prefix}${label}:`);
       }
-      putBlock(item, itemPrefix);
+      putBlock(item, prefix);
     }
   } else if (isNumber(item)) {
     putstr(`${prefix}${labelStr}${item}`);
   } else {
-    putstr(`${itemPrefix}${sep_dash}`);
+    putstr(`${prefix}${sep_dash}`);
     if (label) {
       putstr(`${prefix}${label}:`);
     }
@@ -184,9 +183,9 @@ export var logItem = function(label, item, hOptions = {}) {
     // escape special chars
     for (i = 0, len = ref.length; i < len; i++) {
       str = ref[i];
-      putstr(`${itemPrefix}${indentation(1)}${fixStr(str)}`);
+      putstr(`${prefix}${indentation(1)}${fixStr(str)}`);
     }
-    putstr(`${itemPrefix}${sep_dash}`);
+    putstr(`${prefix}${sep_dash}`);
   }
 };