@jdeighan/coffee-utils 16.0.15 → 16.0.17

package/package.json

@@ -1,13 +1,14 @@
 {
 	"name": "@jdeighan/coffee-utils",
 	"type": "module",
-	"version": "16.0.15",
+	"version": "16.0.17",
 	"description": "A set of utility functions for CoffeeScript",
 	"main": "coffee_utils.js",
 	"exports": {
 		".": "./src/lib/browser.js",
 		"./server": "./src/lib/server.js",
 		"./browser": "./src/lib/browser.js",
+		"./prefs": "./src/lib/prefs.js",
 		"./fs": "./src/lib/fs.js",
 		"./log": "./src/lib/log.js",
 		"./block": "./src/lib/block.js",
@@ -46,14 +47,14 @@
 	},
 	"homepage": "https://github.com/johndeighan/coffee-utils#readme",
 	"dependencies": {
-		"@jdeighan/base-utils": "^8.0.16",
+		"@jdeighan/base-utils": "^8.0.18",
 		"cross-env": "^7.0.3",
 		"n-readlines": "^1.0.1",
 		"readline-sync": "^1.4.10",
 		"svelte": "^4.1.1"
 	},
 	"devDependencies": {
-		"@jdeighan/unit-tester": "^3.0.65",
+		"@jdeighan/unit-tester": "^3.0.67",
 		"ava": "^6.0.1"
 	}
 }

package/src/lib/SectionMap.coffee

@@ -10,7 +10,7 @@ import {LOG, LOGVALUE, LOGTAML} from '@jdeighan/base-utils/log'
 import {
 	dbg, dbgEnter, dbgReturn, dbgYield, dbgResume,
 	} from '@jdeighan/base-utils/debug'
-import {isTAML, fromTAML} from '@jdeighan/base-utils/ll-taml'
+import {isTAML, fromTAML} from '@jdeighan/base-utils/taml'
 
 import {Section} from '@jdeighan/coffee-utils/section'
 

package/src/lib/SectionMap.js

@@ -43,7 +43,7 @@ import {
 import {
   isTAML,
   fromTAML
-} from '@jdeighan/base-utils/ll-taml';
+} from '@jdeighan/base-utils/taml';
 
 import {
   Section

package/src/lib/browser.coffee

@@ -24,28 +24,37 @@ export beep = (volume=100, freq=520, duration=200) =>
 
 # ---------------------------------------------------------------------------
 
-export localStore = (key, value=undef) =>
-	# --- if value is undef, returns the current value
-
-	if (typeof localStorage != 'undefined')
-		if defined(value)
-			localStorage.setItem key, JSON.stringify(value)
-		else
-			value = localStorage.getItem(key)
-			if defined(value)
-				return JSON.parse(localStorage.getItem(key))
-	return undef
+export getLocalStore = (key, defValue={}) =>
 
-# ---------------------------------------------------------------------------
+	if (typeof localStorage == 'undefined')
+		console.log "localStorage not available!"
+		return undef
 
-storeKey = 'hPrefs'
-export hPrefs = localStore(storeKey) || {}
+	value = localStorage.getItem(key)
+	if defined(value)
+		return JSON.parse(value)
+	else
+		localStorage.setItem key, JSON.stringify(defValue)
+		return defValue
 
 # ---------------------------------------------------------------------------
 
-export setPref = (key, value) =>
+export setLocalStore = (key, value) =>
+
+	if (typeof localStorage == 'undefined')
+		console.log "localStorage not available!"
+		return undef
 
-	hPrefs[key] = value
-	localStore storeKey, hPrefs
+	localStorage.setItem key, JSON.stringify(value)
+	return
 
 # ---------------------------------------------------------------------------
+# --- only here for backward compatibility
+
+export localStore = (key, value) =>
+
+	if defined(value)
+		setLocalStore key, value
+	else
+		getLocalStore key, undef
+	return

package/src/lib/browser.js

@@ -1,6 +1,6 @@
 // Generated by CoffeeScript 2.7.0
 // browser.coffee
-var audio, storeKey;
+var audio;
 
 import {
   undef,
@@ -30,30 +30,36 @@ export var beep = (volume = 100, freq = 520, duration = 200) => {
 };
 
 // ---------------------------------------------------------------------------
-export var localStore = (key, value = undef) => {
-  // --- if value is undef, returns the current value
-  if (typeof localStorage !== 'undefined') {
-    if (defined(value)) {
-      localStorage.setItem(key, JSON.stringify(value));
-    } else {
-      value = localStorage.getItem(key);
-      if (defined(value)) {
-        return JSON.parse(localStorage.getItem(key));
-      }
-    }
+export var getLocalStore = (key, defValue = {}) => {
+  var value;
+  if (typeof localStorage === 'undefined') {
+    console.log("localStorage not available!");
+    return undef;
+  }
+  value = localStorage.getItem(key);
+  if (defined(value)) {
+    return JSON.parse(value);
+  } else {
+    localStorage.setItem(key, JSON.stringify(defValue));
+    return defValue;
   }
-  return undef;
 };
 
 // ---------------------------------------------------------------------------
-storeKey = 'hPrefs';
-
-export var hPrefs = localStore(storeKey) || {};
-
-// ---------------------------------------------------------------------------
-export var setPref = (key, value) => {
-  hPrefs[key] = value;
-  return localStore(storeKey, hPrefs);
+export var setLocalStore = (key, value) => {
+  if (typeof localStorage === 'undefined') {
+    console.log("localStorage not available!");
+    return undef;
+  }
+  localStorage.setItem(key, JSON.stringify(value));
 };
 
 // ---------------------------------------------------------------------------
+// --- only here for backward compatibility
+export var localStore = (key, value) => {
+  if (defined(value)) {
+    setLocalStore(key, value);
+  } else {
+    getLocalStore(key, undef);
+  }
+};

package/src/lib/fs.coffee

@@ -22,7 +22,7 @@ import {
 import {assert, croak} from '@jdeighan/base-utils/exceptions'
 import {LOG, LOGVALUE} from '@jdeighan/base-utils/log'
 import {dbg, dbgEnter, dbgReturn} from '@jdeighan/base-utils/debug'
-import {fromTAML} from '@jdeighan/base-utils/ll-taml'
+import {fromTAML} from '@jdeighan/base-utils/taml'
 
 export {
 	mydir, mkpath, isFile, isDir, rmFileSync, mkdirSync,

package/src/lib/fs.js

@@ -74,7 +74,7 @@ import {
 
 import {
   fromTAML
-} from '@jdeighan/base-utils/ll-taml';
+} from '@jdeighan/base-utils/taml';
 
 export {
   mydir,

package/src/lib/prefs.coffee

@@ -0,0 +1,12 @@
+# prefs.coffee
+
+import {getLocalStore} from '@jdeighan/coffee-utils/browser'
+
+export hPrefs = getLocalStore 'hPrefs', {}
+
+# ---------------------------------------------------------------------------
+
+export setPref = (key, value) =>
+
+	hPrefs[key] = value
+	setLocalStore 'hPrefs', hPrefs

package/src/lib/prefs.js

@@ -0,0 +1,13 @@
+// Generated by CoffeeScript 2.7.0
+  // prefs.coffee
+import {
+  getLocalStore
+} from '@jdeighan/coffee-utils/browser';
+
+export var hPrefs = getLocalStore('hPrefs', {});
+
+// ---------------------------------------------------------------------------
+export var setPref = (key, value) => {
+  hPrefs[key] = value;
+  return setLocalStore('hPrefs', hPrefs);
+};