@jdeighan/coffee-utils 4.1.4 → 4.1.8

package/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "@jdeighan/coffee-utils",
 	"type": "module",
-	"version": "4.1.4",
+	"version": "4.1.8",
 	"description": "A set of utility functions for CoffeeScript",
 	"main": "coffee_utils.js",
 	"exports": {
@@ -13,7 +13,6 @@
 		"./debug": "./src/debug_utils.js",
 		"./svelte": "./src/svelte_utils.js",
 		"./test": "./src/UnitTester.js",
-		"./privenv": "./src/private_env.js",
 		"./package.json": "./package.json"
 	},
 	"engines": {

package/src/coffee_utils.coffee

@@ -202,6 +202,12 @@ export isInteger = (x) ->
 	else
 		return false
 
+# ---------------------------------------------------------------------------
+
+export uniq = (lItems) ->
+
+	return [...new Set(lItems)]
+
 # ---------------------------------------------------------------------------
 #   warn - issue a warning
 
@@ -209,13 +215,23 @@ export warn = (message) ->
 
 	log "WARNING: #{message}"
 
+# ---------------------------------------------------------------------------
+#   hashToStr - stringify a hash
+
+export hashToStr = (h) ->
+
+	return JSON.stringify(h, Object.keys(h).sort(), 3)
+
 # ---------------------------------------------------------------------------
 #   say - print to the console (for now)
 #         later, on a web page, call alert(str)
 
-export say = (str) ->
+export say = (x) ->
 
-	console.log str
+	if isHash(x)
+		console.log hashToStr(x)
+	else
+		console.log x
 	return
 
 # ---------------------------------------------------------------------------
@@ -341,3 +357,21 @@ export extractMatches = (line, regexp, convertFunc=undef) ->
 		return lStrings
 
 # ---------------------------------------------------------------------------
+
+export envVarsWithPrefix = (prefix, hOptions={}) ->
+	# --- valid options:
+	#        stripPrefix
+
+	assert prefix, "envVarsWithPrefix: empty prefix!"
+	plen = prefix.length
+	h = {}
+	for key in Object.keys(process.env)
+		if key.indexOf(prefix) == 0
+			if hOptions.stripPrefix
+				h[key.substr(plen)] = process.env[key]
+			else
+				h[key] = process.env[key]
+	return h
+
+# ---------------------------------------------------------------------------
+

package/src/coffee_utils.js

@@ -210,17 +210,32 @@ export var isInteger = function(x) {
   }
 };
 
+// ---------------------------------------------------------------------------
+export var uniq = function(lItems) {
+  return [...new Set(lItems)];
+};
+
 // ---------------------------------------------------------------------------
 //   warn - issue a warning
 export var warn = function(message) {
   return log(`WARNING: ${message}`);
 };
 
+// ---------------------------------------------------------------------------
+//   hashToStr - stringify a hash
+export var hashToStr = function(h) {
+  return JSON.stringify(h, Object.keys(h).sort(), 3);
+};
+
 // ---------------------------------------------------------------------------
 //   say - print to the console (for now)
 //         later, on a web page, call alert(str)
-export var say = function(str) {
-  console.log(str);
+export var say = function(x) {
+  if (isHash(x)) {
+    console.log(hashToStr(x));
+  } else {
+    console.log(x);
+  }
 };
 
 // ---------------------------------------------------------------------------
@@ -377,3 +392,25 @@ export var extractMatches = function(line, regexp, convertFunc = undef) {
 };
 
 // ---------------------------------------------------------------------------
+export var envVarsWithPrefix = function(prefix, hOptions = {}) {
+  var h, i, key, len, plen, ref;
+  // --- valid options:
+  //        stripPrefix
+  assert(prefix, "envVarsWithPrefix: empty prefix!");
+  plen = prefix.length;
+  h = {};
+  ref = Object.keys(process.env);
+  for (i = 0, len = ref.length; i < len; i++) {
+    key = ref[i];
+    if (key.indexOf(prefix) === 0) {
+      if (hOptions.stripPrefix) {
+        h[key.substr(plen)] = process.env[key];
+      } else {
+        h[key] = process.env[key];
+      }
+    }
+  }
+  return h;
+};
+
+// ---------------------------------------------------------------------------

package/src/fs_utils.coffee

@@ -45,8 +45,14 @@ export fileExt = (path) ->
 
 export mydir = (url) ->
 
-	dir = pathlib.dirname(urllib.fileURLToPath(url))
-	return mkpath(dir)
+	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
 
 # ---------------------------------------------------------------------------
 

package/src/fs_utils.js

@@ -57,9 +57,15 @@ export var fileExt = function(path) {
 //    mydir() - pass argument `import.meta.url` and it will return
 //              the directory your file is in
 export var mydir = function(url) {
-  var dir;
-  dir = pathlib.dirname(urllib.fileURLToPath(url));
-  return mkpath(dir);
+  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;
 };
 
 // ---------------------------------------------------------------------------

package/temp.js

@@ -0,0 +1,26 @@
+// Generated by CoffeeScript 2.6.1
+// temp.coffee
+var dir;
+
+import {
+  say
+} from '@jdeighan/coffee-utils';
+
+import {
+  log
+} from '@jdeighan/coffee-utils/log';
+
+import {
+  setDebugging
+} from '@jdeighan/coffee-utils/debug';
+
+import {
+  mydir,
+  mkpath
+} from '@jdeighan/coffee-utils/fs';
+
+setDebugging(true);
+
+dir = mydir(import.meta.url);
+
+say(`dir = ${dir}`);

package/.save/block.test.coffee

@@ -1,185 +0,0 @@
-# block.test.coffee
-
-import assert from 'assert'
-
-import {UnitTester} from '@jdeighan/coffee-utils/test'
-import {
-	blockToArray, arrayToBlock, firstLine, remainingLines,
-	normalizeBlock, truncateBlock,
-	joinBlocks, forEachLine, forEachBlock, forEachSetOfBlocks,
-	} from '@jdeighan/coffee-utils/block'
-
-simple = new UnitTester()
-
-# ---------------------------------------------------------------------------
-
-simple.equal 108, blockToArray("abc\nxyz\n"), [
-	'abc'
-	'xyz'
-	]
-
-simple.equal 113, blockToArray("abc\nxyz\n\n\n\n"), [
-	'abc'
-	'xyz'
-	]
-
-simple.equal 118, blockToArray("abc\n\nxyz\n"), [
-	'abc'
-	''
-	'xyz'
-	]
-
-# ---------------------------------------------------------------------------
-
-simple.equal 126, arrayToBlock(['a','b','c']), "a\nb\nc\n"
-
-# ---------------------------------------------------------------------------
-
-simple.equal 225, firstLine("""
-		#starbucks
-		do this
-		do that
-		"""), '#starbucks'
-
-# ---------------------------------------------------------------------------
-
-simple.equal 225, remainingLines("""
-		#starbucks
-		do this
-		do that
-		"""), """
-		do this
-		do that
-		"""
-
-# ---------------------------------------------------------------------------
-
-(() ->
-	str = joinBlocks('import me', '', 'do this\ndo that')
-	simple.equal 17, str, """
-			import me
-			do this
-			do that
-			"""
-	)()
-
-# ---------------------------------------------------------------------------
-
-simple.equal 49, normalizeBlock("""
-			line 1
-			line 2
-			"""), """
-			line 1
-			line 2
-			""" + '\n'
-
-simple.equal 57, normalizeBlock("""
-			line 1
-
-			line 2
-			"""), """
-			line 1
-			line 2
-			""" + '\n'
-
-simple.equal 66, normalizeBlock("""
-
-			line 1
-
-			line 2
-
-
-			"""), """
-			line 1
-			line 2
-			""" + '\n'
-
-# ---------------------------------------------------------------------------
-
-simple.equal 96, truncateBlock("""
-			line 1
-			line 2
-			line 3
-			line 4
-			""", 2), """
-			line 1
-			line 2
-			""" + '\n'
-
-# ---------------------------------------------------------------------------
-
-(() ->
-	lBlocks = [
-		"import {say} from '@jdeighan/coffee-utils'",
-		"",
-		"<script>\n\tx = 42\n</script>",
-		"",
-		]
-	str = joinBlocks(lBlocks...)
-	simple.equal 34, str, """
-			import {say} from '@jdeighan/coffee-utils'
-			<script>
-				x = 42
-			</script>
-			"""
-	)()
-
-# ---------------------------------------------------------------------------
-
-(() ->
-	lImports = [
-		"import {say} from '@jdeighan/coffee-utils'",
-		]
-	code = """
-		if (x==42)
-			log "line 2 in unit test"
-		"""
-	str = joinBlocks(lImports..., code)
-	simple.equal 34, str, """
-
-			import {say} from '@jdeighan/coffee-utils'
-			if (x==42)
-				log "line 2 in unit test"
-			"""
-	)()
-
-# ---------------------------------------------------------------------------
-# test forEachLine()
-
-(() ->
-	lLines = []
-
-	callback = (line) ->
-		lLines.push line
-		return
-
-	filepath = "c:/Users/johnd/coffee-utils/test/data/file2.txt"
-	await forEachLine filepath, callback
-
-	simple.equal 55, lLines, [
-			"abc",
-			"def",
-			"ghi",
-			"jkl",
-			]
-	)()
-
-# ---------------------------------------------------------------------------
-# test forEachBlock()
-
-(() ->
-	lBlocks = []
-
-	callback = (block) ->
-		lBlocks.push block
-		return
-
-	filepath = "c:/Users/johnd/coffee-utils/test/data/file3.txt"
-	await forEachBlock filepath, callback
-
-	simple.equal 76, lBlocks, [
-			"abc\ndef",
-			"abc\ndef\nghi",
-			"abc\ndef\nghi\njkl",
-			]
-	)()

package/.save/block.test.js

@@ -1,129 +0,0 @@
-// Generated by CoffeeScript 2.6.1
-// block.test.coffee
-var simple;
-
-import assert from 'assert';
-
-import {
-  UnitTester
-} from '@jdeighan/coffee-utils/test';
-
-import {
-  blockToArray,
-  arrayToBlock,
-  firstLine,
-  remainingLines,
-  normalizeBlock,
-  truncateBlock,
-  joinBlocks,
-  forEachLine,
-  forEachBlock,
-  forEachSetOfBlocks
-} from '@jdeighan/coffee-utils/block';
-
-simple = new UnitTester();
-
-// ---------------------------------------------------------------------------
-simple.equal(108, blockToArray("abc\nxyz\n"), ['abc', 'xyz']);
-
-simple.equal(113, blockToArray("abc\nxyz\n\n\n\n"), ['abc', 'xyz']);
-
-simple.equal(118, blockToArray("abc\n\nxyz\n"), ['abc', '', 'xyz']);
-
-// ---------------------------------------------------------------------------
-simple.equal(126, arrayToBlock(['a', 'b', 'c']), "a\nb\nc\n");
-
-// ---------------------------------------------------------------------------
-simple.equal(225, firstLine(`#starbucks
-do this
-do that`), '#starbucks');
-
-// ---------------------------------------------------------------------------
-simple.equal(225, remainingLines(`#starbucks
-do this
-do that`), `do this
-do that`);
-
-// ---------------------------------------------------------------------------
-(function() {
-  var str;
-  str = joinBlocks('import me', '', 'do this\ndo that');
-  return simple.equal(17, str, `import me
-do this
-do that`);
-})();
-
-// ---------------------------------------------------------------------------
-simple.equal(49, normalizeBlock(`line 1
-line 2`), `line 1
-line 2` + '\n');
-
-simple.equal(57, normalizeBlock(`line 1
-
-line 2`), `line 1
-line 2` + '\n');
-
-simple.equal(66, normalizeBlock(`
-line 1
-
-line 2
-
-`), `line 1
-line 2` + '\n');
-
-// ---------------------------------------------------------------------------
-simple.equal(96, truncateBlock(`line 1
-line 2
-line 3
-line 4`, 2), `line 1
-line 2` + '\n');
-
-// ---------------------------------------------------------------------------
-(function() {
-  var lBlocks, str;
-  lBlocks = ["import {say} from '@jdeighan/coffee-utils'", "", "<script>\n\tx = 42\n</script>", ""];
-  str = joinBlocks(...lBlocks);
-  return simple.equal(34, str, `import {say} from '@jdeighan/coffee-utils'
-<script>
-	x = 42
-</script>`);
-})();
-
-// ---------------------------------------------------------------------------
-(function() {
-  var code, lImports, str;
-  lImports = ["import {say} from '@jdeighan/coffee-utils'"];
-  code = `if (x==42)
-	log "line 2 in unit test"`;
-  str = joinBlocks(...lImports, code);
-  return simple.equal(34, str, `
-import {say} from '@jdeighan/coffee-utils'
-if (x==42)
-	log "line 2 in unit test"`);
-})();
-
-// ---------------------------------------------------------------------------
-// test forEachLine()
-(async function() {
-  var callback, filepath, lLines;
-  lLines = [];
-  callback = function(line) {
-    lLines.push(line);
-  };
-  filepath = "c:/Users/johnd/coffee-utils/test/data/file2.txt";
-  await forEachLine(filepath, callback);
-  return simple.equal(55, lLines, ["abc", "def", "ghi", "jkl"]);
-})();
-
-// ---------------------------------------------------------------------------
-// test forEachBlock()
-(async function() {
-  var callback, filepath, lBlocks;
-  lBlocks = [];
-  callback = function(block) {
-    lBlocks.push(block);
-  };
-  filepath = "c:/Users/johnd/coffee-utils/test/data/file3.txt";
-  await forEachBlock(filepath, callback);
-  return simple.equal(76, lBlocks, ["abc\ndef", "abc\ndef\nghi", "abc\ndef\nghi\njkl"]);
-})();

package/.save/block2.test.coffee

@@ -1,47 +0,0 @@
-# block2.test.coffee
-
-import assert from 'assert'
-import test from 'ava'
-
-import {
-	undef, say, isString, isHash, isEmpty, nonEmpty,
-	} from '@jdeighan/coffee-utils'
-import {mydir, mkpath} from '@jdeighan/coffee-utils/fs'
-import {UnitTester} from '@jdeighan/coffee-utils/test'
-import {
-	forEachLine, forEachBlock, forEachSetOfBlocks,
-	} from '@jdeighan/coffee-utils/block'
-
-testDir = mydir(`import.meta.url`)
-simple = new UnitTester()
-
-filepath = mkpath(testDir, 'code2.test.txt')
-
-# ----------------------------------------------------------------------------
-
-(() ->
-	lFirstBlocks = undef
-	callback = (lBlocks) ->
-		lFirstBlocks = lBlocks
-		return true   # we're only interested in the first set
-
-	test "line 29", (t) ->
-		await forEachSetOfBlocks filepath, callback
-		t.deepEqual lFirstBlocks, ["f()", "f"]
-	)()
-
-# ----------------------------------------------------------------------------
-
-(() ->
-	lAllBlockSets = []
-	callback = (lBlocks) ->
-		lAllBlockSets.push(lBlocks)
-		return
-
-	test "line 44", (t) ->
-		await forEachSetOfBlocks filepath, callback
-		t.deepEqual lAllBlockSets, [
-				["f()", "f"],
-				["f = (key=undef) ->\n\tswitch key\n\t\twhen 'ok'\n\t\t\tsay 'all is OK'", "f,say,mkpath"],
-				]
-	)()

package/.save/block2.test.js

@@ -1,64 +0,0 @@
-// Generated by CoffeeScript 2.6.1
-// block2.test.coffee
-var filepath, simple, testDir;
-
-import assert from 'assert';
-
-import test from 'ava';
-
-import {
-  undef,
-  say,
-  isString,
-  isHash,
-  isEmpty,
-  nonEmpty
-} from '@jdeighan/coffee-utils';
-
-import {
-  mydir,
-  mkpath
-} from '@jdeighan/coffee-utils/fs';
-
-import {
-  UnitTester
-} from '@jdeighan/coffee-utils/test';
-
-import {
-  forEachLine,
-  forEachBlock,
-  forEachSetOfBlocks
-} from '@jdeighan/coffee-utils/block';
-
-testDir = mydir(import.meta.url);
-
-simple = new UnitTester();
-
-filepath = mkpath(testDir, 'code2.test.txt');
-
-// ----------------------------------------------------------------------------
-(function() {
-  var callback, lFirstBlocks;
-  lFirstBlocks = undef;
-  callback = function(lBlocks) {
-    lFirstBlocks = lBlocks;
-    return true; // we're only interested in the first set
-  };
-  return test("line 29", async function(t) {
-    await forEachSetOfBlocks(filepath, callback);
-    return t.deepEqual(lFirstBlocks, ["f()", "f"]);
-  });
-})();
-
-// ----------------------------------------------------------------------------
-(function() {
-  var callback, lAllBlockSets;
-  lAllBlockSets = [];
-  callback = function(lBlocks) {
-    lAllBlockSets.push(lBlocks);
-  };
-  return test("line 44", async function(t) {
-    await forEachSetOfBlocks(filepath, callback);
-    return t.deepEqual(lAllBlockSets, [["f()", "f"], ["f = (key=undef) ->\n\tswitch key\n\t\twhen 'ok'\n\t\t\tsay 'all is OK'", "f,say,mkpath"]]);
-  });
-})();