@jdeighan/coffee-utils 4.0.13 → 4.0.17

package/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "@jdeighan/coffee-utils",
 	"type": "module",
-	"version": "4.0.13",
+	"version": "4.0.17",
 	"description": "A set of utility functions for CoffeeScript",
 	"main": "coffee_utils.js",
 	"exports": {

package/src/UnitTester.coffee

@@ -1,10 +1,9 @@
 # UnitTester.coffee
 
-import assert from 'assert'
 import test from 'ava'
 
 import {
-	undef, pass, error, croak,
+	assert, undef, pass, error, croak,
 	isString, isFunction, isInteger, isArray,
 	} from '@jdeighan/coffee-utils'
 import {blockToArray} from '@jdeighan/coffee-utils/block'
@@ -103,7 +102,7 @@ export class UnitTester
 
 	fails: (lineNum, func, expected) ->
 
-		assert not expected?, "UnitTester: fails doesn't allow expected"
+		assert ! expected?, "UnitTester: fails doesn't allow expected"
 		assert isFunction(func), "UnitTester: fails requires a function"
 
 		# --- disable logging
@@ -123,7 +122,7 @@ export class UnitTester
 
 	succeeds: (lineNum, func, expected) ->
 
-		assert not expected?, "UnitTester: succeeds doesn't allow expected"
+		assert ! expected?, "UnitTester: succeeds doesn't allow expected"
 		assert isFunction(func), "UnitTester: succeeds requires a function"
 		try
 			func()
@@ -137,8 +136,8 @@ export class UnitTester
 	# ........................................................................
 
 	same_list: (lineNum, list, expected) ->
-		assert not list? || isArray(list), "UnitTester: not an array"
-		assert not expected? || isArray(expected),
+		assert ! list? || isArray(list), "UnitTester: not an array"
+		assert ! expected? || isArray(expected),
 			"UnitTester: expected is not an array"
 
 		@setWhichTest 'deepEqual'
@@ -148,8 +147,8 @@ export class UnitTester
 	# ........................................................................
 
 	not_same_list: (lineNum, list, expected) ->
-		assert not list? || isArray(list), "UnitTester: not an array"
-		assert not expected? || isArray(expected),
+		assert ! list? || isArray(list), "UnitTester: not an array"
+		assert ! expected? || isArray(expected),
 			"UnitTester: expected is not an array"
 
 		@setWhichTest 'notDeepEqual'
@@ -182,7 +181,7 @@ export class UnitTester
 		if (lineNum < 0) && process.env.FINALTEST
 			error "Negative line numbers not allowed in FINALTEST"
 
-		if not @testing || (@maxLineNum && (lineNum > @maxLineNum))
+		if ! @testing || (@maxLineNum && (lineNum > @maxLineNum))
 			return
 
 		if lineNum < -100000

package/src/UnitTester.js

@@ -1,10 +1,9 @@
 // Generated by CoffeeScript 2.6.1
 // UnitTester.coffee
-import assert from 'assert';
-
 import test from 'ava';
 
 import {
+  assert,
   undef,
   pass,
   error,

package/src/block_utils.coffee

@@ -1,11 +1,10 @@
 # block_utils.coffee
 
-import assert from 'assert'
 import fs from 'fs'
 import readline from 'readline'
 
 import {
-	isEmpty, isString, nonEmpty, error, isComment, rtrim,
+	assert, isEmpty, isString, nonEmpty, error, isComment, rtrim,
 	} from '@jdeighan/coffee-utils'
 import {log} from '@jdeighan/coffee-utils/log'
 
@@ -139,7 +138,7 @@ export forEachBlock = (filepath, func, regexp = /^-{16,}$/) ->
 		return
 
 	await forEachLine filepath, callback
-	if not earlyExit
+	if ! earlyExit
 		func(lLines.join('\n'), firstLineNum)
 	return
 
@@ -174,7 +173,7 @@ export forEachSetOfBlocks = (filepath, func,
 		return
 
 	await forEachLine filepath, callback
-	if not earlyExit
+	if ! earlyExit
 		lBlocks.push(lLines.join('\n'))
 		func(lBlocks, firstLineNum)
 	return

package/src/block_utils.js

@@ -1,12 +1,11 @@
 // Generated by CoffeeScript 2.6.1
 // block_utils.coffee
-import assert from 'assert';
-
 import fs from 'fs';
 
 import readline from 'readline';
 
 import {
+  assert,
   isEmpty,
   isString,
   nonEmpty,

package/src/coffee_utils.coffee

@@ -1,7 +1,5 @@
 # coffee_utils.coffee
 
-import assert from 'assert'
-
 import {log} from '@jdeighan/coffee-utils/log'
 
 export sep_dash = '-'.repeat(42)
@@ -20,6 +18,15 @@ export error = (message) ->
 
 	throw new Error(message)
 
+# ---------------------------------------------------------------------------
+#   assert - mimic nodejs's assert
+
+export assert = (cond, msg) ->
+
+	if ! cond
+		error(msg)
+	return
+
 # ---------------------------------------------------------------------------
 #   croak - throws an error after possibly printing useful info
 
@@ -75,10 +82,10 @@ export isNumber = (x) ->
 export isObject = (x) ->
 
 	return (typeof x == 'object') \
-			&& not isString(x) \
-			&& not isArray(x) \
-			&& not isHash(x) \
-			&& not isNumber(x)
+			&& ! isString(x) \
+			&& ! isArray(x) \
+			&& ! isHash(x) \
+			&& ! isNumber(x)
 
 # ---------------------------------------------------------------------------
 
@@ -98,7 +105,7 @@ export isHash = (x) ->
 
 export isEmpty = (x) ->
 
-	if not x?
+	if ! x?
 		return true
 	if isString(x)
 		return x.match(/^\s*$/)
@@ -115,10 +122,10 @@ export isEmpty = (x) ->
 
 export nonEmpty = (x) ->
 
-	if not x?
+	if ! x?
 		return false
 	if isString(x)
-		return not x.match(/^\s*$/)
+		return ! x.match(/^\s*$/)
 	if isArray(x)
 		return x.length > 0
 	if isHash(x)
@@ -153,10 +160,10 @@ export words = (str) ->
 
 export isArrayOfHashes = (lItems) ->
 
-	if not isArray(lItems)
+	if ! isArray(lItems)
 		return false
 	for item in lItems
-		if not isHash(item)
+		if ! isHash(item)
 			return false
 	return true
 
@@ -164,10 +171,10 @@ export isArrayOfHashes = (lItems) ->
 
 export isArrayOfStrings = (lItems) ->
 
-	if not isArray(lItems)
+	if ! isArray(lItems)
 		return false
 	for item in lItems
-		if not isString(item)
+		if ! isString(item)
 			return false
 	return true
 
@@ -223,7 +230,7 @@ export ask = (prompt) ->
 export titleLine = (title, char='=', padding=2, linelen=42) ->
 	# --- used in logger
 
-	if not title
+	if ! title
 		return char.repeat(linelen)
 
 	titleLen = title.length + 2 * padding
@@ -272,7 +279,7 @@ export deepCopy = (obj) ->
 
 export escapeStr = (str) ->
 
-	if not str?
+	if ! str?
 		return 'undef'
 	if typeof str != 'string'
 		croak "escapeStr(): not a string", str, 'STRING'

package/src/coffee_utils.js

@@ -2,8 +2,6 @@
 // coffee_utils.coffee
 var commentRegExp;
 
-import assert from 'assert';
-
 import {
   log
 } from '@jdeighan/coffee-utils/log';
@@ -24,6 +22,14 @@ export var error = function(message) {
   throw new Error(message);
 };
 
+// ---------------------------------------------------------------------------
+//   assert - mimic nodejs's assert
+export var assert = function(cond, msg) {
+  if (!cond) {
+    error(msg);
+  }
+};
+
 // ---------------------------------------------------------------------------
 //   croak - throws an error after possibly printing useful info
 export var croak = function(err, label, obj) {
@@ -225,7 +231,6 @@ export var ask = function(prompt) {
 // ---------------------------------------------------------------------------
 export var titleLine = function(title, char = '=', padding = 2, linelen = 42) {
   var nLeft, nRight, strLeft, strMiddle, strRight, titleLen;
-  // --- used in logger
   if (!title) {
     return char.repeat(linelen);
   }

package/src/debug_utils.coffee

@@ -1,9 +1,7 @@
 # debug_utils.coffee
 
-import assert from 'assert'
-
 import {
-	undef, error, croak, warn, words, isString, isFunction,
+	assert, undef, error, croak, warn, words, isString, isFunction,
 	oneline, escapeStr, isNumber, isArray,
 	} from '@jdeighan/coffee-utils'
 import {blockToArray} from '@jdeighan/coffee-utils/block'
@@ -148,7 +146,7 @@ export debug = (lArgs...) ->
 	if entering && lDebugFuncs && funcMatch(curFunc)
 		setDebugging true
 
-	if debugging && (not ifMatches? || str.match(ifMatches))
+	if debugging && (! ifMatches? || str.match(ifMatches))
 
 		# --- set the prefix, i.e. indentation to use
 		if returning
@@ -202,7 +200,7 @@ export funcMatch = (curFunc) ->
 # ---------------------------------------------------------------------------
 
 export checkTrace = (block) ->
-# --- export only to allow unit tests
+	# --- export only to allow unit tests
 
 	lStack = []
 

package/src/debug_utils.js

@@ -2,9 +2,8 @@
 // debug_utils.coffee
 var arrow, arrowhead, corner, debugLevel, getPrefix, hbar, ifMatches, indent, lDebugFuncs, lDebugStack, reMethod, restoreDebugEnv, saveDebugEnv, stripArrow, vbar;
 
-import assert from 'assert';
-
 import {
+  assert,
   undef,
   error,
   croak,

package/src/fs_utils.coffee

@@ -1,12 +1,11 @@
 # fs_utils.coffee
 
-import assert from 'assert'
 import pathlib from 'path'
 import urllib from 'url'
 import fs from 'fs'
 
 import {
-	undef, pass, rtrim, error, nonEmpty,
+	assert, undef, pass, rtrim, error, nonEmpty,
 	isRegExp, isFunction, croak,
 	} from '@jdeighan/coffee-utils'
 import {log} from '@jdeighan/coffee-utils/log'
@@ -14,47 +13,22 @@ import {debug} from '@jdeighan/coffee-utils/debug'
 
 # ---------------------------------------------------------------------------
 
-export parseSource = (source) ->
-	# --- returns {
-	#        dir
-	#        filename   # only this is guaranteed to be set
-	#        stub
-	#        ext
-	#        }
+export isFile = (fullpath) ->
 
-	debug "enter parseSource()"
-	if source == 'unit test'
-		debug "return 'unit test' from parseSource()"
-		return {
-			filename: 'unit test'
-			stub: 'unit test'
-			}
-	try
-		hInfo = pathlib.parse(source)
-		debug "return from parseSource()", hInfo
-		if hInfo.root
-			dir = mkpath(hInfo.dir)   # change \ to /
-			return {
-				dir: dir
-				fullpath: mkpath(dir, hInfo.base)
-				filename: hInfo.base
-				stub: hInfo.name
-				ext: hInfo.ext
-				}
-		else
-			return {
-				dir: mkpath(hInfo.dir)   # change \ to /
-				filename: hInfo.base
-				stub: hInfo.name
-				ext: hInfo.ext
-				}
-	catch err
-		debug "return '#{err.message} from parseSource()"
-		return {
-			filename: source
-			stub: source
-			error: err.message
-			}
+	return fs.lstatSync(fullpath).isFile()
+
+# ---------------------------------------------------------------------------
+
+export isDir = (fullpath) ->
+
+	return fs.lstatSync(fullpath).isDirectory()
+
+# ---------------------------------------------------------------------------
+
+export isSimpleFileName = (path) ->
+
+	h = pathlib.parse(path)
+	return ! h.root && ! h.dir && h.base
 
 # ---------------------------------------------------------------------------
 #    mydir() - pass argument `import.meta.url` and it will return
@@ -62,7 +36,6 @@ export parseSource = (source) ->
 
 export mydir = (url) ->
 
-#	dir = pathlib.dirname(urllib.fileURLToPath(url.replace(/\@/g, '%40')))
 	dir = pathlib.dirname(urllib.fileURLToPath(url))
 	return mkpath(dir)
 
@@ -121,10 +94,7 @@ export barf = (filepath, contents) ->
 
 	debug "enter barf('#{filepath}')", contents
 	contents = rtrim(contents) + "\n"
-	try
-		fs.writeFileSync(filepath, contents, {encoding: 'utf8'})
-	catch err
-		log "barf(): write failed: #{err.message}"
+	fs.writeFileSync(filepath, contents, {encoding: 'utf8'})
 	debug "return from barf()"
 	return
 
@@ -274,3 +244,46 @@ export shortenPath = (path) ->
 	else
 		return str
 
+# ---------------------------------------------------------------------------
+
+export parseSource = (source) ->
+	# --- returns {
+	#        dir
+	#        filename   # only this is guaranteed to be set
+	#        stub
+	#        ext
+	#        }
+
+	debug "enter parseSource()"
+	if source == 'unit test'
+		debug "return 'unit test' from parseSource()"
+		return {
+			filename: 'unit test'
+			stub: 'unit test'
+			}
+	try
+		hInfo = pathlib.parse(source)
+		debug "return from parseSource()", hInfo
+		if hInfo.root
+			dir = mkpath(hInfo.dir)   # change \ to /
+			return {
+				dir: dir
+				fullpath: mkpath(dir, hInfo.base)
+				filename: hInfo.base
+				stub: hInfo.name
+				ext: hInfo.ext
+				}
+		else
+			return {
+				dir: mkpath(hInfo.dir)   # change \ to /
+				filename: hInfo.base
+				stub: hInfo.name
+				ext: hInfo.ext
+				}
+	catch err
+		debug "return '#{err.message} from parseSource()"
+		return {
+			filename: source
+			stub: source
+			error: err.message
+			}

package/src/fs_utils.js

@@ -2,8 +2,6 @@
 // fs_utils.coffee
 var withUnderScore;
 
-import assert from 'assert';
-
 import pathlib from 'path';
 
 import urllib from 'url';
@@ -11,6 +9,7 @@ import urllib from 'url';
 import fs from 'fs';
 
 import {
+  assert,
   undef,
   pass,
   rtrim,
@@ -30,51 +29,20 @@ import {
 } from '@jdeighan/coffee-utils/debug';
 
 // ---------------------------------------------------------------------------
-export var parseSource = function(source) {
-  var dir, err, hInfo;
-  // --- returns {
-  //        dir
-  //        filename   # only this is guaranteed to be set
-  //        stub
-  //        ext
-  //        }
-  debug("enter parseSource()");
-  if (source === 'unit test') {
-    debug("return 'unit test' from parseSource()");
-    return {
-      filename: 'unit test',
-      stub: 'unit test'
-    };
-  }
-  try {
-    hInfo = pathlib.parse(source);
-    debug("return from parseSource()", hInfo);
-    if (hInfo.root) {
-      dir = mkpath(hInfo.dir); // change \ to /
-      return {
-        dir: dir,
-        fullpath: mkpath(dir, hInfo.base),
-        filename: hInfo.base,
-        stub: hInfo.name,
-        ext: hInfo.ext
-      };
-    } else {
-      return {
-        dir: mkpath(hInfo.dir), // change \ to /
-        filename: hInfo.base,
-        stub: hInfo.name,
-        ext: hInfo.ext
-      };
-    }
-  } catch (error1) {
-    err = error1;
-    debug(`return '${err.message} from parseSource()`);
-    return {
-      filename: source,
-      stub: source,
-      error: err.message
-    };
-  }
+export var isFile = function(fullpath) {
+  return fs.lstatSync(fullpath).isFile();
+};
+
+// ---------------------------------------------------------------------------
+export var isDir = function(fullpath) {
+  return fs.lstatSync(fullpath).isDirectory();
+};
+
+// ---------------------------------------------------------------------------
+export var isSimpleFileName = function(path) {
+  var h;
+  h = pathlib.parse(path);
+  return !h.root && !h.dir && h.base;
 };
 
 // ---------------------------------------------------------------------------
@@ -82,7 +50,6 @@ export var parseSource = function(source) {
 //              the directory your file is in
 export var mydir = function(url) {
   var dir;
-  //	dir = pathlib.dirname(urllib.fileURLToPath(url.replace(/\@/g, '%40')))
   dir = pathlib.dirname(urllib.fileURLToPath(url));
   return mkpath(dir);
 };
@@ -140,17 +107,11 @@ export var slurp = function(filepath) {
 // ---------------------------------------------------------------------------
 //   barf - write a string to a file
 export var barf = function(filepath, contents) {
-  var err;
   debug(`enter barf('${filepath}')`, contents);
   contents = rtrim(contents) + "\n";
-  try {
-    fs.writeFileSync(filepath, contents, {
-      encoding: 'utf8'
-    });
-  } catch (error1) {
-    err = error1;
-    log(`barf(): write failed: ${err.message}`);
-  }
+  fs.writeFileSync(filepath, contents, {
+    encoding: 'utf8'
+  });
   debug("return from barf()");
 };
 
@@ -325,3 +286,51 @@ export var shortenPath = function(path) {
     return str;
   }
 };
+
+// ---------------------------------------------------------------------------
+export var parseSource = function(source) {
+  var dir, err, hInfo;
+  // --- returns {
+  //        dir
+  //        filename   # only this is guaranteed to be set
+  //        stub
+  //        ext
+  //        }
+  debug("enter parseSource()");
+  if (source === 'unit test') {
+    debug("return 'unit test' from parseSource()");
+    return {
+      filename: 'unit test',
+      stub: 'unit test'
+    };
+  }
+  try {
+    hInfo = pathlib.parse(source);
+    debug("return from parseSource()", hInfo);
+    if (hInfo.root) {
+      dir = mkpath(hInfo.dir); // change \ to /
+      return {
+        dir: dir,
+        fullpath: mkpath(dir, hInfo.base),
+        filename: hInfo.base,
+        stub: hInfo.name,
+        ext: hInfo.ext
+      };
+    } else {
+      return {
+        dir: mkpath(hInfo.dir), // change \ to /
+        filename: hInfo.base,
+        stub: hInfo.name,
+        ext: hInfo.ext
+      };
+    }
+  } catch (error1) {
+    err = error1;
+    debug(`return '${err.message} from parseSource()`);
+    return {
+      filename: source,
+      stub: source,
+      error: err.message
+    };
+  }
+};

package/src/indent_utils.coffee

@@ -1,9 +1,7 @@
 # indent_utils.coffee
 
-import assert from 'assert'
-
 import {
-	undef, error, escapeStr,
+	assert, undef, error, escapeStr,
 	OL, isInteger, isString, isArray, isEmpty, rtrim,
 	} from '@jdeighan/coffee-utils'
 import {arrayToBlock, blockToArray} from '@jdeighan/coffee-utils/block'
@@ -124,7 +122,7 @@ export tabify = (str, numSpaces=undef) ->
 			n = prefix.length
 			if (prefix.indexOf('\t') != -1)
 				error "tabify(): leading TAB characters not allowed"
-			if not numSpaces?
+			if ! numSpaces?
 				numSpaces = n
 			if (n % numSpaces != 0)
 				error "tabify(): Invalid # of leading space chars"

package/src/indent_utils.js

@@ -1,8 +1,7 @@
 // Generated by CoffeeScript 2.6.1
-// indent_utils.coffee
-import assert from 'assert';
-
+  // indent_utils.coffee
 import {
+  assert,
   undef,
   error,
   escapeStr,

package/src/log_utils.coffee

@@ -1,10 +1,9 @@
 # log_utils.coffee
 
-import assert from 'assert'
 import yaml from 'js-yaml'
 
 import {
-	undef, isNumber, isString, isHash, isFunction, escapeStr,
+	assert, undef, isNumber, isString, isHash, isFunction, escapeStr,
 	} from '@jdeighan/coffee-utils'
 import {blockToArray} from '@jdeighan/coffee-utils/block'
 import {tabify} from '@jdeighan/coffee-utils/indent'
@@ -17,15 +16,13 @@ logger = console.log          # for strings
 export tamlStringify = (obj) ->
 
 	str = yaml.dump(obj, {
-			skipInvalid: true
-			indent: 1
-			sortKeys: false
-			lineWidth: -1
-			})
+		skipInvalid: true
+		indent: 1
+		sortKeys: false
+		lineWidth: -1
+		})
 	str = "---\n" + tabify(str)
-	str = str.replace(/\t/g, '   ')  # because fr***ing Windows Terminal
-	                                 # has no way of adjusting display
-	                                 # of TAB chars
+	str = str.replace(/\t/g, '   ')  # fr***ing Windows Terminal
 	return str
 
 # ---------------------------------------------------------------------------
@@ -108,9 +105,9 @@ export log = (lArgs...) ->
 	else
 		prefix = itemPrefix = ''
 
-	if (not logItem)
+	if (! logItem)
 		logger "#{prefix}#{str}"
-	else if not item?
+	else if ! item?
 		logger "#{prefix}#{str} = undef"
 	else if isNumber(item)
 		logger "#{prefix}#{str} = #{item}"

package/src/log_utils.js

@@ -2,11 +2,10 @@
 // log_utils.coffee
 var logger, maxOneLine;
 
-import assert from 'assert';
-
 import yaml from 'js-yaml';
 
 import {
+  assert,
   undef,
   isNumber,
   isString,
@@ -37,9 +36,7 @@ export var tamlStringify = function(obj) {
     lineWidth: -1
   });
   str = "---\n" + tabify(str);
-  str = str.replace(/\t/g, '   '); // because fr***ing Windows Terminal
-  // has no way of adjusting display
-  // of TAB chars
+  str = str.replace(/\t/g, '   '); // fr***ing Windows Terminal
   return str;
 };
 

package/src/private_env.coffee

@@ -1,6 +1,6 @@
 # private_env.coffee
 
-import assert from 'assert'
+import {assert} from '@jdeighan/coffee-utils'
 import {log} from '@jdeighan/coffee-utils/log'
 
 # --- Use by simply importing and using hEnvLib

package/src/private_env.js

@@ -1,6 +1,8 @@
 // Generated by CoffeeScript 2.6.1
-// private_env.coffee
-import assert from 'assert';
+  // private_env.coffee
+import {
+  assert
+} from '@jdeighan/coffee-utils';
 
 import {
   log