@jdeighan/coffee-utils 5.0.0 → 5.0.3

package/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "@jdeighan/coffee-utils",
 	"type": "module",
-	"version": "5.0.0",
+	"version": "5.0.3",
 	"description": "A set of utility functions for CoffeeScript",
 	"main": "coffee_utils.js",
 	"exports": {
@@ -17,7 +17,6 @@
 		"./svelte": "./src/svelte_utils.js",
 		"./store": "./src/DataStores.js",
 		"./taml": "./src/taml.js",
-		"./templib": "./src/templib.js",
 		"./package.json": "./package.json"
 	},
 	"engines": {
@@ -29,9 +28,7 @@
 	"scripts": {
 		"build": "cls && rm -f ./src/*.js && coffee -c ./src",
 		"pretest": "cls && cielo -qfc ./test && coffee -c .",
-		"test": "npx ava ./test/*.test.js",
-		"prefinaltest": "npm run pretest",
-		"finaltest": "cross-env FINALTEST=yes ava ./test/*.test.js"
+		"test": "npx ava ./test/*.test.js"
 	},
 	"repository": {
 		"type": "git",
@@ -53,6 +50,6 @@
 		"svelte": "^3.46.4"
 	},
 	"devDependencies": {
-		"@jdeighan/unit-tester": "^1.0.4"
+		"@jdeighan/unit-tester": "^1.0.5"
 	}
 }

package/src/DataStores.coffee

@@ -5,12 +5,14 @@ import yaml from 'js-yaml'
 import {writable, readable, get} from 'svelte/store'
 
 import {
-	assert, undef, pass, error, localStore, isEmpty,
+	assert, undef, pass, error, isEmpty,
 	} from '@jdeighan/coffee-utils'
+import {localStore} from '@jdeighan/coffee-utils/browser'
 import {log} from '@jdeighan/coffee-utils/log'
 import {
 	withExt, slurp, barf, newerDestFileExists,
 	} from '@jdeighan/coffee-utils/fs'
+import {untabify} from '@jdeighan/coffee-utils/indent'
 
 # ---------------------------------------------------------------------------
 

package/src/DataStores.js

@@ -15,10 +15,13 @@ import {
   undef,
   pass,
   error,
-  localStore,
   isEmpty
 } from '@jdeighan/coffee-utils';
 
+import {
+  localStore
+} from '@jdeighan/coffee-utils/browser';
+
 import {
   log
 } from '@jdeighan/coffee-utils/log';
@@ -30,6 +33,10 @@ import {
   newerDestFileExists
 } from '@jdeighan/coffee-utils/fs';
 
+import {
+  untabify
+} from '@jdeighan/coffee-utils/indent';
+
 // ---------------------------------------------------------------------------
 export var WritableDataStore = class WritableDataStore {
   constructor(value = undef) {

package/src/browser_utils.coffee

@@ -21,3 +21,21 @@ export beep = (volume=100, freq=520, duration=200) ->
 	v.start(audio.currentTime)
 	v.stop(audio.currentTime + duration * 0.001)
 	return
+
+# ---------------------------------------------------------------------------
+
+export localStore = (key, value=undef) ->
+	# --- if value is undef, returns the current value
+
+	if typeof localStorage == 'undefined'
+		return
+	if value?
+		localStorage.setItem key, JSON.stringify(value)
+		return
+	else
+		value = localStorage.getItem(key)
+		if value?
+			return JSON.parse(localStorage.getItem(key))
+		else
+			return undef
+

package/src/browser_utils.js

@@ -26,3 +26,21 @@ export var beep = function(volume = 100, freq = 520, duration = 200) {
   v.start(audio.currentTime);
   v.stop(audio.currentTime + duration * 0.001);
 };
+
+// ---------------------------------------------------------------------------
+export var localStore = function(key, value = undef) {
+  // --- if value is undef, returns the current value
+  if (typeof localStorage === 'undefined') {
+    return;
+  }
+  if (value != null) {
+    localStorage.setItem(key, JSON.stringify(value));
+  } else {
+    value = localStorage.getItem(key);
+    if (value != null) {
+      return JSON.parse(localStorage.getItem(key));
+    } else {
+      return undef;
+    }
+  }
+};

package/src/coffee_utils.coffee

@@ -30,32 +30,15 @@ export assert = (cond, msg) ->
 
 export croak = (err, label, obj) ->
 
-	message = if (typeof err == 'object') then err.message else err
-	console.log "ERROR (croak): #{message}"
-	console.log obj, label
+	curmsg = if isString(err) then err else err.message
+	newmsg = """
+			ERROR (croak): #{curmsg}
+			#{label}:
+			#{JSON.stringify(obj)}
+			"""
 
 	# --- re-throw the error
-	if (typeof err == 'object')
-		throw err
-	else
-		throw new Error(message)
-
-# ---------------------------------------------------------------------------
-
-export localStore = (key, value=undef) ->
-	# --- if value is undef, returns the current value
-
-	if typeof localStorage == 'undefined'
-		return
-	if value?
-		localStorage.setItem key, JSON.stringify(value)
-		return
-	else
-		value = localStorage.getItem(key)
-		if value?
-			return JSON.parse(localStorage.getItem(key))
-		else
-			return undef
+	throw new Error(newmsg)
 
 # ---------------------------------------------------------------------------
 

package/src/coffee_utils.js

@@ -29,34 +29,13 @@ export var assert = function(cond, msg) {
 // ---------------------------------------------------------------------------
 //   croak - throws an error after possibly printing useful info
 export var croak = function(err, label, obj) {
-  var message;
-  message = (typeof err === 'object') ? err.message : err;
-  console.log(`ERROR (croak): ${message}`);
-  console.log(obj, label);
+  var curmsg, newmsg;
+  curmsg = isString(err) ? err : err.message;
+  newmsg = `ERROR (croak): ${curmsg}
+${label}:
+${JSON.stringify(obj)}`;
   // --- re-throw the error
-  if (typeof err === 'object') {
-    throw err;
-  } else {
-    throw new Error(message);
-  }
-};
-
-// ---------------------------------------------------------------------------
-export var localStore = function(key, value = undef) {
-  // --- if value is undef, returns the current value
-  if (typeof localStorage === 'undefined') {
-    return;
-  }
-  if (value != null) {
-    localStorage.setItem(key, JSON.stringify(value));
-  } else {
-    value = localStorage.getItem(key);
-    if (value != null) {
-      return JSON.parse(localStorage.getItem(key));
-    } else {
-      return undef;
-    }
-  }
+  throw new Error(newmsg);
 };
 
 // ---------------------------------------------------------------------------

package/src/indent_utils.coffee

@@ -25,7 +25,7 @@ export splitLine = (line) ->
 
 export indentation = (level) ->
 
-	assert (level >= 0), "indented(): negative level"
+	assert (level >= 0), "indentation(): negative level"
 	return '\t'.repeat(level)
 
 # ---------------------------------------------------------------------------

package/src/indent_utils.js

@@ -35,7 +35,7 @@ export var splitLine = function(line) {
 //   indentation - return appropriate indentation string for given level
 //   export only to allow unit testing
 export var indentation = function(level) {
-  assert(level >= 0, "indented(): negative level");
+  assert(level >= 0, "indentation(): negative level");
   return '\t'.repeat(level);
 };