@jdeighan/coffee-utils 4.1.3 → 4.1.7

package/package.json

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

@@ -14,9 +14,9 @@ import {debug, debugging, setDebugging} from '@jdeighan/coffee-utils/debug'
 
 export class UnitTester
 
-	constructor: (whichTest='deepEqual', @fulltest=false) ->
+	constructor: (@file='unknown file') ->
 		@hFound = {}
-		@setWhichTest whichTest
+		@whichTest = 'deepEqual'
 		@justshow = false
 		@testing = true
 		@maxLineNum = undef
@@ -180,7 +180,7 @@ export class UnitTester
 		@lineNum = lineNum    # set an object property
 
 		if (lineNum < 0) && process.env.FINALTEST
-			error "Negative line numbers not allowed in FINALTEST"
+			error "Negative line numbers not allowed in FINALTEST in #{@file}"
 
 		if ! @testing || (@maxLineNum && (lineNum > @maxLineNum))
 			return
@@ -242,9 +242,6 @@ export class UnitTester
 
 	getLineNum: (lineNum) ->
 
-		if @fulltest && (lineNum < 0)
-			error "UnitTester(): negative line number during full test!!!"
-
 		# --- patch lineNum to avoid duplicates
 		while @hFound[lineNum]
 			if lineNum < 0

package/src/UnitTester.js

@@ -32,10 +32,10 @@ import {
 
 // ---------------------------------------------------------------------------
 export var UnitTester = class UnitTester {
-  constructor(whichTest = 'deepEqual', fulltest = false) {
-    this.fulltest = fulltest;
+  constructor(file = 'unknown file') {
+    this.file = file;
     this.hFound = {};
-    this.setWhichTest(whichTest);
+    this.whichTest = 'deepEqual';
     this.justshow = false;
     this.testing = true;
     this.maxLineNum = undef;
@@ -189,7 +189,7 @@ export var UnitTester = class UnitTester {
     this.initialize();
     this.lineNum = lineNum; // set an object property
     if ((lineNum < 0) && process.env.FINALTEST) {
-      error("Negative line numbers not allowed in FINALTEST");
+      error(`Negative line numbers not allowed in FINALTEST in ${this.file}`);
     }
     if (!this.testing || (this.maxLineNum && (lineNum > this.maxLineNum))) {
       return;
@@ -256,9 +256,6 @@ export var UnitTester = class UnitTester {
 
   // ........................................................................
   getLineNum(lineNum) {
-    if (this.fulltest && (lineNum < 0)) {
-      error("UnitTester(): negative line number during full test!!!");
-    }
     // --- patch lineNum to avoid duplicates
     while (this.hFound[lineNum]) {
       if (lineNum < 0) {

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
 
 # ---------------------------------------------------------------------------

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);
+  }
 };
 
 // ---------------------------------------------------------------------------

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/src/private_env.coffee

@@ -1,52 +0,0 @@
-# private_env.coffee
-
-import {assert} from '@jdeighan/coffee-utils'
-import {log} from '@jdeighan/coffee-utils/log'
-
-# --- Use by simply importing and using hEnvLib
-#     This module does no loading - it merely holds hEnvLib
-export hPrivEnv = {}
-
-# --- None of these callbacks should replace variable hEnvLib
-
-export hPrivEnvCallbacks = {
-	getVar: (name) ->
-		return hPrivEnv[name]
-	setVar: (name, value) ->
-		hPrivEnv[name] = value
-		return
-	clearVar: (name) ->
-		delete hPrivEnv[name]
-		return
-	clearAll: () ->
-		for name in Object.keys(hPrivEnv)
-			delete hPrivEnv[name]
-		return
-	names: () ->
-		return Object.keys(hPrivEnv)
-	}
-
-# ---------------------------------------------------------------------------
-
-export setPrivEnvVar = (name, value) ->
-
-	hPrivEnv[name] = value
-	return
-
-# ---------------------------------------------------------------------------
-
-export resetPrivEnv = () ->
-
-	for name in Object.keys(hPrivEnv)
-		delete hPrivEnv[name]
-	return
-
-# ---------------------------------------------------------------------------
-
-export logPrivEnv = () ->
-
-	log "PRIVATE ENVIRONMENT:"
-	for key,value of hPrivEnv
-		log "   #{key} = '#{value}'"
-	log '-'.repeat(40)
-	return

package/src/private_env.js

@@ -1,63 +0,0 @@
-// Generated by CoffeeScript 2.6.1
-  // private_env.coffee
-import {
-  assert
-} from '@jdeighan/coffee-utils';
-
-import {
-  log
-} from '@jdeighan/coffee-utils/log';
-
-// --- Use by simply importing and using hEnvLib
-//     This module does no loading - it merely holds hEnvLib
-export var hPrivEnv = {};
-
-// --- None of these callbacks should replace variable hEnvLib
-export var hPrivEnvCallbacks = {
-  getVar: function(name) {
-    return hPrivEnv[name];
-  },
-  setVar: function(name, value) {
-    hPrivEnv[name] = value;
-  },
-  clearVar: function(name) {
-    delete hPrivEnv[name];
-  },
-  clearAll: function() {
-    var i, len, name, ref;
-    ref = Object.keys(hPrivEnv);
-    for (i = 0, len = ref.length; i < len; i++) {
-      name = ref[i];
-      delete hPrivEnv[name];
-    }
-  },
-  names: function() {
-    return Object.keys(hPrivEnv);
-  }
-};
-
-// ---------------------------------------------------------------------------
-export var setPrivEnvVar = function(name, value) {
-  hPrivEnv[name] = value;
-};
-
-// ---------------------------------------------------------------------------
-export var resetPrivEnv = function() {
-  var i, len, name, ref;
-  ref = Object.keys(hPrivEnv);
-  for (i = 0, len = ref.length; i < len; i++) {
-    name = ref[i];
-    delete hPrivEnv[name];
-  }
-};
-
-// ---------------------------------------------------------------------------
-export var logPrivEnv = function() {
-  var key, value;
-  log("PRIVATE ENVIRONMENT:");
-  for (key in hPrivEnv) {
-    value = hPrivEnv[key];
-    log(`   ${key} = '${value}'`);
-  }
-  log('-'.repeat(40));
-};