@jdeighan/coffee-utils 11.0.2 → 11.0.3

package/src/{fs_utils.coffee → fs.coffee}

@@ -1,17 +1,15 @@
-# fs_utils.coffee
+# fs.coffee
 
 import pathlib from 'path'
 import urllib from 'url'
 import fs from 'fs'
 import NReadLines from 'n-readlines'
 
-import {assert, error, croak} from '@jdeighan/unit-tester/utils'
+import {LOG, assert, croak} from '@jdeighan/exceptions'
 import {
 	undef, pass, defined, rtrim, isEmpty, nonEmpty,
 	isString, isArray, isHash, isRegExp, isFunction, OL,
 	} from '@jdeighan/coffee-utils'
-import {log, LOG} from '@jdeighan/coffee-utils/log'
-import {debug} from '@jdeighan/coffee-utils/debug'
 import {arrayToBlock} from '@jdeighan/coffee-utils/block'
 
 # ---------------------------------------------------------------------------
@@ -20,13 +18,9 @@ import {arrayToBlock} from '@jdeighan/coffee-utils/block'
 
 export mydir = (url) ->
 
-	debug "url = #{url}"
 	path = urllib.fileURLToPath(url)
-	debug "path = #{path}"
 	dir = pathlib.dirname(path)
-	debug "dir = #{dir}"
 	final = mkpath(dir)
-	debug "final = #{final}"
 	return final
 
 # ---------------------------------------------------------------------------
@@ -35,11 +29,8 @@ export mydir = (url) ->
 
 export myfile = (url) ->
 
-	debug "url = #{url}"
 	path = urllib.fileURLToPath(url)
-	debug "path = #{path}"
 	filename = pathlib.parse(path).base
-	debug "filename = #{filename}"
 	return filename
 
 # ---------------------------------------------------------------------------
@@ -48,9 +39,7 @@ export myfile = (url) ->
 
 export myfullpath = (url) ->
 
-	debug "url = #{url}"
 	path = urllib.fileURLToPath(url)
-	debug "path = #{path}"
 	return mkpath(path)
 
 # ---------------------------------------------------------------------------
@@ -140,7 +129,6 @@ export forEachLineInFile = (filepath, func) ->
 
 export slurp = (filepath, maxLines=undef) ->
 
-	debug "enter slurp('#{filepath}')"
 	if maxLines?
 		lLines = []
 		forEachLineInFile filepath, (line, nLines) ->
@@ -150,7 +138,6 @@ export slurp = (filepath, maxLines=undef) ->
 	else
 		filepath = filepath.replace(/\//g, "\\")
 		contents = fs.readFileSync(filepath, 'utf8').toString()
-	debug "return from slurp()", contents
 	return contents
 
 # ---------------------------------------------------------------------------
@@ -158,9 +145,7 @@ export slurp = (filepath, maxLines=undef) ->
 
 export barf = (filepath, contents) ->
 
-	debug "enter barf('#{filepath}')", contents
 	if isEmpty(contents)
-		debug "return from barf(): empty contents"
 		return
 	if isArray(contents)
 		contents = arrayToBlock(contents)
@@ -168,7 +153,6 @@ export barf = (filepath, contents) ->
 		croak "barf(): Invalid contents"
 	contents = rtrim(contents) + "\n"
 	fs.writeFileSync(filepath, contents, {encoding: 'utf8'})
-	debug "return from barf()"
 	return
 
 # ---------------------------------------------------------------------------
@@ -199,10 +183,10 @@ export removeFileWithExt = (path, newExt, hOptions={}) ->
 	try
 		fs.unlinkSync fullpath
 		if hOptions.doLog
-			log "   unlink #{filename}"
+			LOG "   unlink #{filename}"
 		success = true
 	catch err
-		log "   UNLINK FAILED: #{err.message}"
+		LOG "   UNLINK FAILED: #{err.message}"
 		success = false
 	return success
 
@@ -277,7 +261,6 @@ export pathTo = (fname, searchDir, hOptions={}) ->
 	if isEmpty(relative)
 		relative = false
 
-	debug "enter pathTo()", fname, searchDir, direction
 	if ! searchDir
 		searchDir = process.cwd()
 	assert fs.existsSync(searchDir), "Dir #{searchDir} does not exist"
@@ -285,7 +268,6 @@ export pathTo = (fname, searchDir, hOptions={}) ->
 	if fs.existsSync(filepath)
 		if relative
 			filepath = "./#{fname}"
-		debug "return from pathTo() - file exists", filepath
 		return filepath
 
 	if (direction == 'down')
@@ -293,31 +275,24 @@ export pathTo = (fname, searchDir, hOptions={}) ->
 		#     getSubDirs() returns dirs sorted alphabetically
 		for subdir in getSubDirs(searchDir)
 			dirpath = mkpath(searchDir, subdir)
-			debug "check #{subdir}"
 			if defined(fpath = pathTo(fname, dirpath, hOptions))
 				if relative
 					fpath = fpath.replace('./', "./#{subdir}/")
-				debug "return from pathTo()", fpath
 				return fpath
 	else if (direction == 'up')
 		nLevels = 0
 		while defined(dirPath = getParentDir(searchDir))
 			nLevels += 1
-			debug "check #{dirPath}"
 			fpath = mkpath(dirPath, fname)
-			debug "check for #{fpath}"
 			if fs.existsSync(fpath)
 				if relative
 					fpath = "../".repeat(nLevels) + fname
-					debug "return from pathTo()", fpath
 					return fpath
 				else
-					debug "return from pathTo()", fpath
 					return fpath
 			searchDir = dirPath
 	else
-		error "pathTo(): Invalid direction '#{direction}'"
-	debug "return undef from pathTo - file not found"
+		croak "pathTo(): Invalid direction '#{direction}'"
 	return undef
 
 # ---------------------------------------------------------------------------
@@ -342,21 +317,13 @@ export allPathsTo = (fname, searchDir) ->
 
 export newerDestFileExists = (srcPath, destPath) ->
 
-	debug "enter newerDestFileExists()"
 	if ! fs.existsSync(destPath)
-		debug "return false from newerDestFileExists() - no file"
 		return false
 	srcModTime = fs.statSync(srcPath).mtimeMs
 	destModTime = fs.statSync(destPath).mtimeMs
-	debug "srcModTime = #{srcModTime}"
-	debug "destModTime = #{destModTime}"
 	if destModTime >= srcModTime
-		debug "#{destPath} is up to date"
-		debug "return true from newerDestFileExists()"
 		return true
 	else
-		debug "#{destPath} is old"
-		debug "return false from newerDestFileExists()"
 		return false
 
 # ---------------------------------------------------------------------------
@@ -386,7 +353,6 @@ export parseSource = (source) ->
 	#        }
 	# --- NOTE: source may be a file URL, e.g. import.meta.url
 
-	debug "enter parseSource()"
 	assert isString(source),\
 			"parseSource(): source not a string: #{OL(source)}"
 	if source == 'unit test'
@@ -423,7 +389,6 @@ export parseSource = (source) ->
 				([A-Za-z_]+)
 				$///)
 			hSourceInfo.purpose = lMatches[1]
-	debug "return from parseSource()", hSourceInfo
 	return hSourceInfo
 
 # ---------------------------------------------------------------------------

package/src/{fs_utils.js → fs.js}

@@ -1,5 +1,5 @@
 // Generated by CoffeeScript 2.7.0
-// fs_utils.coffee
+// fs.coffee
 var isSystemDir;
 
 import pathlib from 'path';
@@ -11,10 +11,10 @@ import fs from 'fs';
 import NReadLines from 'n-readlines';
 
 import {
+  LOG,
   assert,
-  error,
   croak
-} from '@jdeighan/unit-tester/utils';
+} from '@jdeighan/exceptions';
 
 import {
   undef,
@@ -31,15 +31,6 @@ import {
   OL
 } from '@jdeighan/coffee-utils';
 
-import {
-  log,
-  LOG
-} from '@jdeighan/coffee-utils/log';
-
-import {
-  debug
-} from '@jdeighan/coffee-utils/debug';
-
 import {
   arrayToBlock
 } from '@jdeighan/coffee-utils/block';
@@ -49,13 +40,9 @@ import {
 //              the directory your file is in
 export var mydir = function(url) {
   var dir, final, path;
-  debug(`url = ${url}`);
   path = urllib.fileURLToPath(url);
-  debug(`path = ${path}`);
   dir = pathlib.dirname(path);
-  debug(`dir = ${dir}`);
   final = mkpath(dir);
-  debug(`final = ${final}`);
   return final;
 };
 
@@ -64,11 +51,8 @@ export var mydir = function(url) {
 //               the name of your file
 export var myfile = function(url) {
   var filename, path;
-  debug(`url = ${url}`);
   path = urllib.fileURLToPath(url);
-  debug(`path = ${path}`);
   filename = pathlib.parse(path).base;
-  debug(`filename = ${filename}`);
   return filename;
 };
 
@@ -77,9 +61,7 @@ export var myfile = function(url) {
 //                   the full path to your file
 export var myfullpath = function(url) {
   var path;
-  debug(`url = ${url}`);
   path = urllib.fileURLToPath(url);
-  debug(`path = ${path}`);
   return mkpath(path);
 };
 
@@ -97,7 +79,7 @@ export var isDir = function(fullpath) {
       return false;
     }
     return obj.isDirectory();
-  } catch (error1) {
+  } catch (error) {
     return false;
   }
 };
@@ -175,7 +157,6 @@ export var forEachLineInFile = function(filepath, func) {
 //   slurp - read an entire file into a string
 export var slurp = function(filepath, maxLines = undef) {
   var contents, lLines;
-  debug(`enter slurp('${filepath}')`);
   if (maxLines != null) {
     lLines = [];
     forEachLineInFile(filepath, function(line, nLines) {
@@ -191,16 +172,13 @@ export var slurp = function(filepath, maxLines = undef) {
     filepath = filepath.replace(/\//g, "\\");
     contents = fs.readFileSync(filepath, 'utf8').toString();
   }
-  debug("return from slurp()", contents);
   return contents;
 };
 
 // ---------------------------------------------------------------------------
 //   barf - write a string to a file
 export var barf = function(filepath, contents) {
-  debug(`enter barf('${filepath}')`, contents);
   if (isEmpty(contents)) {
-    debug("return from barf(): empty contents");
     return;
   }
   if (isArray(contents)) {
@@ -212,7 +190,6 @@ export var barf = function(filepath, contents) {
   fs.writeFileSync(filepath, contents, {
     encoding: 'utf8'
   });
-  debug("return from barf()");
 };
 
 // ---------------------------------------------------------------------------
@@ -243,12 +220,12 @@ export var removeFileWithExt = function(path, newExt, hOptions = {}) {
   try {
     fs.unlinkSync(fullpath);
     if (hOptions.doLog) {
-      log(`   unlink ${filename}`);
+      LOG(`   unlink ${filename}`);
     }
     success = true;
-  } catch (error1) {
-    err = error1;
-    log(`   UNLINK FAILED: ${err.message}`);
+  } catch (error) {
+    err = error;
+    LOG(`   UNLINK FAILED: ${err.message}`);
     success = false;
   }
   return success;
@@ -339,7 +316,6 @@ export var pathTo = function(fname, searchDir, hOptions = {}) {
   if (isEmpty(relative)) {
     relative = false;
   }
-  debug("enter pathTo()", fname, searchDir, direction);
   if (!searchDir) {
     searchDir = process.cwd();
   }
@@ -349,7 +325,6 @@ export var pathTo = function(fname, searchDir, hOptions = {}) {
     if (relative) {
       filepath = `./${fname}`;
     }
-    debug("return from pathTo() - file exists", filepath);
     return filepath;
   }
   if (direction === 'down') {
@@ -359,12 +334,10 @@ export var pathTo = function(fname, searchDir, hOptions = {}) {
     for (i = 0, len = ref.length; i < len; i++) {
       subdir = ref[i];
       dirpath = mkpath(searchDir, subdir);
-      debug(`check ${subdir}`);
       if (defined(fpath = pathTo(fname, dirpath, hOptions))) {
         if (relative) {
           fpath = fpath.replace('./', `./${subdir}/`);
         }
-        debug("return from pathTo()", fpath);
         return fpath;
       }
     }
@@ -372,25 +345,20 @@ export var pathTo = function(fname, searchDir, hOptions = {}) {
     nLevels = 0;
     while (defined(dirPath = getParentDir(searchDir))) {
       nLevels += 1;
-      debug(`check ${dirPath}`);
       fpath = mkpath(dirPath, fname);
-      debug(`check for ${fpath}`);
       if (fs.existsSync(fpath)) {
         if (relative) {
           fpath = "../".repeat(nLevels) + fname;
-          debug("return from pathTo()", fpath);
           return fpath;
         } else {
-          debug("return from pathTo()", fpath);
           return fpath;
         }
       }
       searchDir = dirPath;
     }
   } else {
-    error(`pathTo(): Invalid direction '${direction}'`);
+    croak(`pathTo(): Invalid direction '${direction}'`);
   }
-  debug("return undef from pathTo - file not found");
   return undef;
 };
 
@@ -420,22 +388,14 @@ export var allPathsTo = function(fname, searchDir) {
 // ---------------------------------------------------------------------------
 export var newerDestFileExists = function(srcPath, destPath) {
   var destModTime, srcModTime;
-  debug("enter newerDestFileExists()");
   if (!fs.existsSync(destPath)) {
-    debug("return false from newerDestFileExists() - no file");
     return false;
   }
   srcModTime = fs.statSync(srcPath).mtimeMs;
   destModTime = fs.statSync(destPath).mtimeMs;
-  debug(`srcModTime = ${srcModTime}`);
-  debug(`destModTime = ${destModTime}`);
   if (destModTime >= srcModTime) {
-    debug(`${destPath} is up to date`);
-    debug("return true from newerDestFileExists()");
     return true;
   } else {
-    debug(`${destPath} is old`);
-    debug("return false from newerDestFileExists()");
     return false;
   }
 };
@@ -465,7 +425,6 @@ export var parseSource = function(source) {
   //        purpose
   //        }
   // --- NOTE: source may be a file URL, e.g. import.meta.url
-  debug("enter parseSource()");
   assert(isString(source), `parseSource(): source not a string: ${OL(source)}`);
   if (source === 'unit test') {
     croak("A source of 'unit test' is deprecated");
@@ -501,7 +460,6 @@ export var parseSource = function(source) {
       hSourceInfo.purpose = lMatches[1];
     }
   }
-  debug("return from parseSource()", hSourceInfo);
   return hSourceInfo;
 };
 

package/src/fsa.coffee

@@ -1,12 +1,11 @@
 # fsa.coffee
 
-import {assert, croak} from '@jdeighan/unit-tester/utils'
+import {LOG, assert, croak} from '@jdeighan/exceptions'
 import {
 	undef, defined, notdefined, words, isEmpty, nonEmpty,
 	isString, OL,
 	} from '@jdeighan/coffee-utils'
 import {toArray} from '@jdeighan/coffee-utils/block'
-import {LOG} from '@jdeighan/coffee-utils/log'
 import {debug} from '@jdeighan/coffee-utils/debug'
 
 # ---------------------------------------------------------------------------

package/src/fsa.js

@@ -1,9 +1,10 @@
 // Generated by CoffeeScript 2.7.0
   // fsa.coffee
 import {
+  LOG,
   assert,
   croak
-} from '@jdeighan/unit-tester/utils';
+} from '@jdeighan/exceptions';
 
 import {
   undef,
@@ -20,10 +21,6 @@ import {
   toArray
 } from '@jdeighan/coffee-utils/block';
 
-import {
-  LOG
-} from '@jdeighan/coffee-utils/log';
-
 import {
   debug
 } from '@jdeighan/coffee-utils/debug';

package/src/{html_utils.coffee → html.coffee}

@@ -1,12 +1,11 @@
-# html_utils.coffee
+# html.coffee
 
-import {assert, croak} from '@jdeighan/unit-tester/utils'
+import {assert, croak} from '@jdeighan/exceptions'
 import {
 	undef, pass, words, isEmpty, nonEmpty,
 	} from '@jdeighan/coffee-utils'
-import {indented, enclose} from '@jdeighan/coffee-utils/indent'
-import {arrayToBlock} from '@jdeighan/coffee-utils/block'
-import {debug} from '@jdeighan/coffee-utils/debug'
+import {indented} from '@jdeighan/coffee-utils/indent'
+import {toBlock} from '@jdeighan/coffee-utils/block'
 
 hNoEnd = {}
 for tagName in words('area base br col command embed hr img input' \
@@ -210,7 +209,7 @@ export elem = (tagName, hAttr=undef, text=undef, oneIndent="\t") ->
 		hAttr
 		text
 		}
-	return arrayToBlock([
+	return toBlock([
 		tag2str(hToken, 'begin')
 		indented(text, 1, oneIndent)
 		tag2str(hToken, 'end')

package/src/{html_utils.js → html.js}

@@ -1,11 +1,11 @@
 // Generated by CoffeeScript 2.7.0
-// html_utils.coffee
+// html.coffee
 var hNoEnd, i, len, ref, tagName;
 
 import {
   assert,
   croak
-} from '@jdeighan/unit-tester/utils';
+} from '@jdeighan/exceptions';
 
 import {
   undef,
@@ -16,18 +16,13 @@ import {
 } from '@jdeighan/coffee-utils';
 
 import {
-  indented,
-  enclose
+  indented
 } from '@jdeighan/coffee-utils/indent';
 
 import {
-  arrayToBlock
+  toBlock
 } from '@jdeighan/coffee-utils/block';
 
-import {
-  debug
-} from '@jdeighan/coffee-utils/debug';
-
 hNoEnd = {};
 
 ref = words('area base br col command embed hr img input' + ' keygen link meta param source track wbr');
@@ -218,5 +213,5 @@ export var elem = function(tagName, hAttr = undef, text = undef, oneIndent = "\t
     return undef;
   }
   hToken = {tagName, hAttr, text};
-  return arrayToBlock([tag2str(hToken, 'begin'), indented(text, 1, oneIndent), tag2str(hToken, 'end')]);
+  return toBlock([tag2str(hToken, 'begin'), indented(text, 1, oneIndent), tag2str(hToken, 'end')]);
 };

package/src/{indent_utils.coffee → indent.coffee}

@@ -1,13 +1,11 @@
-# indent_utils.coffee
+# indent.coffee
 
-import {assert, error} from '@jdeighan/unit-tester/utils'
+import {assert, croak} from '@jdeighan/exceptions'
 import {
-	undef, escapeStr, defined,
+	undef, defined, notdefined,
 	OL, isInteger, isString, isArray, isEmpty, rtrim,
 	} from '@jdeighan/coffee-utils'
-import {
-	arrayToBlock, blockToArray, toArray, toBlock,
-	} from '@jdeighan/coffee-utils/block'
+import {toArray, toBlock} from '@jdeighan/coffee-utils/block'
 
 # ---------------------------------------------------------------------------
 
@@ -143,7 +141,7 @@ export undented = (input, level=undef, oneIndent="\t") ->
 export tabify = (str, numSpaces=undef) ->
 
 	lLines = []
-	for str in blockToArray(str)
+	for str in toArray(str)
 		[_, prefix, theRest] = str.match(/^(\s*)(.*)$/)
 		prefixLen = prefix.length
 		if prefixLen == 0
@@ -155,7 +153,7 @@ export tabify = (str, numSpaces=undef) ->
 			assert (prefixLen % numSpaces == 0), "Bad prefix"
 			level = prefixLen / numSpaces
 			lLines.push '\t'.repeat(level) + theRest
-	result = arrayToBlock(lLines)
+	result = toBlock(lLines)
 	return result
 
 # ---------------------------------------------------------------------------
@@ -170,7 +168,7 @@ export untabify = (str, numSpaces=3) ->
 
 export enclose = (text, pre, post, oneIndent="\t") ->
 
-	return arrayToBlock([
+	return toBlock([
 		pre
 		indented(text, 1, oneIndent)
 		post

package/src/{indent_utils.js → indent.js}

@@ -1,14 +1,14 @@
 // Generated by CoffeeScript 2.7.0
-  // indent_utils.coffee
+  // indent.coffee
 import {
   assert,
-  error
-} from '@jdeighan/unit-tester/utils';
+  croak
+} from '@jdeighan/exceptions';
 
 import {
   undef,
-  escapeStr,
   defined,
+  notdefined,
   OL,
   isInteger,
   isString,
@@ -18,8 +18,6 @@ import {
 } from '@jdeighan/coffee-utils';
 
 import {
-  arrayToBlock,
-  blockToArray,
   toArray,
   toBlock
 } from '@jdeighan/coffee-utils/block';
@@ -169,7 +167,7 @@ export var undented = function(input, level = undef, oneIndent = "\t") {
 export var tabify = function(str, numSpaces = undef) {
   var _, i, lLines, len1, level, prefix, prefixLen, ref, result, theRest;
   lLines = [];
-  ref = blockToArray(str);
+  ref = toArray(str);
   for (i = 0, len1 = ref.length; i < len1; i++) {
     str = ref[i];
     [_, prefix, theRest] = str.match(/^(\s*)(.*)$/);
@@ -186,7 +184,7 @@ export var tabify = function(str, numSpaces = undef) {
       lLines.push('\t'.repeat(level) + theRest);
     }
   }
-  result = arrayToBlock(lLines);
+  result = toBlock(lLines);
   return result;
 };
 
@@ -199,5 +197,5 @@ export var untabify = function(str, numSpaces = 3) {
 // ---------------------------------------------------------------------------
 //    enclose - indent text, surround with pre and post
 export var enclose = function(text, pre, post, oneIndent = "\t") {
-  return arrayToBlock([pre, indented(text, 1, oneIndent), post]);
+  return toBlock([pre, indented(text, 1, oneIndent), post]);
 };

package/src/{log_utils.coffee → log.coffee}

@@ -1,14 +1,11 @@
-# log_utils.coffee
+# log.coffee
 
-import {assert, error, croak} from '@jdeighan/unit-tester/utils'
+import {LOG, assert, croak} from '@jdeighan/exceptions'
 import {
 	undef, isNumber, isInteger, isString, isHash, isFunction,
 	escapeStr, sep_eq, sep_dash, pass, OL,
 	} from '@jdeighan/coffee-utils'
-import {blockToArray} from '@jdeighan/coffee-utils/block'
-import {
-	tabify, untabify, indentation, indented,
-	} from '@jdeighan/coffee-utils/indent'
+import {toArray} from '@jdeighan/coffee-utils/block'
 import {toTAML} from '@jdeighan/coffee-utils/taml'
 
 # --- This logger only ever gets passed a single string argument
@@ -27,42 +24,6 @@ export debugLog = (flag=true) ->
 		LOG "doDebugLog = #{flag}"
 	return
 
-# ---------------------------------------------------------------------------
-# This is useful for debugging
-
-export LOG = (lArgs...) ->
-
-	[label, item] = lArgs
-	if lArgs.length > 1
-		# --- There's both a label and an item
-		if (item == undef)
-			console.log "#{label} = undef"
-		else if (item == null)
-			console.log "#{label} = null"
-		else
-			console.log sep_dash
-			console.log "#{label}:"
-			if isString(item)
-				console.log untabify(item)
-			else
-				console.log untabify(orderedStringify(item))
-			console.log sep_dash
-	else
-		console.log label
-	return true   # to allow use in boolean expressions
-
-# --- Use this instead to make it easier to remove all instances
-export DEBUG = LOG   # synonym
-
-# ---------------------------------------------------------------------------
-
-export LOGLINES = (label, lLines) ->
-
-	LOG "#{label}:"
-	for line in lLines
-		LOG "#{OL(line)}"
-	return
-
 # ---------------------------------------------------------------------------
 
 export setStringifier = (func) ->
@@ -185,7 +146,7 @@ export logItem = (label, item, pre='', itemPre=undef) ->
 			putstr "#{pre}#{label}:"
 
 		# --- escape special chars
-		for str in blockToArray(stringify(item, true))
+		for str in toArray(stringify(item, true))
 			putstr "#{itemPre}#{str}"
 
 	return true
@@ -212,7 +173,7 @@ fixForTerminal = (str) ->
 putBlock = (item, prefix='') ->
 
 	putstr "#{prefix}#{sep_eq}"
-	for line in blockToArray(item)
+	for line in toArray(item)
 		putstr "#{prefix}#{escapeStr(line)}"
 	putstr "#{prefix}#{sep_eq}"
 	return