@jdeighan/coffee-utils 16.0.19 → 16.0.21

package/package.json

@@ -1,14 +1,13 @@
 {
 	"name": "@jdeighan/coffee-utils",
 	"type": "module",
-	"version": "16.0.19",
+	"version": "16.0.21",
 	"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",
@@ -47,14 +46,14 @@
 	},
 	"homepage": "https://github.com/johndeighan/coffee-utils#readme",
 	"dependencies": {
-		"@jdeighan/base-utils": "^8.0.21",
+		"@jdeighan/base-utils": "^8.0.22",
 		"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.69",
+		"@jdeighan/unit-tester": "^3.0.70",
 		"ava": "^6.0.1"
 	}
 }

package/src/lib/browser.coffee

@@ -1,6 +1,7 @@
 # browser.coffee
 
 import {undef, defined, notdefined} from '@jdeighan/base-utils'
+import {assert, croak} from '@jdeighan/base-utils/exceptions'
 
 audio = undef   # audio context - create only when needed, then keep
 
@@ -24,15 +25,27 @@ export beep = (volume=100, freq=520, duration=200) =>
 
 # ---------------------------------------------------------------------------
 
-export getLocalStore = (key, defValue={}) =>
+export localStorageAvailable = () ->
+
+	storage = window.localStorage
+	if notdefined(storage)
+		return false
+	try
+		x = '__storage_test__'
+		storage.setItem x, x
+		got = storage.getItem x
+		storage.removeItem x
+		return (got == x)
+	catch e
+		return false
+
+# ---------------------------------------------------------------------------
 
-	if (typeof localStorage == 'undefined')
-		console.log "localStorage not available!"
-		return undef
+export getLocalStore = (key, defValue={}) =>
 
-	value = localStorage.getItem(key)
-	if defined(value)
-		return JSON.parse(value)
+	assert localStorageAvailable(), "no localStorage"
+	if localStorage.hasOwnProperty(key)
+		return JSON.parse(localStorage.getItem(key))
 	else
 		localStorage.setItem key, JSON.stringify(defValue)
 		return defValue
@@ -41,20 +54,6 @@ export getLocalStore = (key, defValue={}) =>
 
 export setLocalStore = (key, value) =>
 
-	if (typeof localStorage == 'undefined')
-		console.log "localStorage not available!"
-		return undef
-
+	assert localStorageAvailable(), "no localStorage"
 	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

@@ -8,6 +8,11 @@ import {
   notdefined
 } from '@jdeighan/base-utils';
 
+import {
+  assert,
+  croak
+} from '@jdeighan/base-utils/exceptions';
+
 audio = undef; // audio context - create only when needed, then keep
 
 
@@ -30,15 +35,29 @@ export var beep = (volume = 100, freq = 520, duration = 200) => {
 };
 
 // ---------------------------------------------------------------------------
-export var getLocalStore = (key, defValue = {}) => {
-  var value;
-  if (typeof localStorage === 'undefined') {
-    console.log("localStorage not available!");
-    return undef;
+export var localStorageAvailable = function() {
+  var e, got, storage, x;
+  storage = window.localStorage;
+  if (notdefined(storage)) {
+    return false;
+  }
+  try {
+    x = '__storage_test__';
+    storage.setItem(x, x);
+    got = storage.getItem(x);
+    storage.removeItem(x);
+    return got === x;
+  } catch (error) {
+    e = error;
+    return false;
   }
-  value = localStorage.getItem(key);
-  if (defined(value)) {
-    return JSON.parse(value);
+};
+
+// ---------------------------------------------------------------------------
+export var getLocalStore = (key, defValue = {}) => {
+  assert(localStorageAvailable(), "no localStorage");
+  if (localStorage.hasOwnProperty(key)) {
+    return JSON.parse(localStorage.getItem(key));
   } else {
     localStorage.setItem(key, JSON.stringify(defValue));
     return defValue;
@@ -47,19 +66,6 @@ export var getLocalStore = (key, defValue = {}) => {
 
 // ---------------------------------------------------------------------------
 export var setLocalStore = (key, value) => {
-  if (typeof localStorage === 'undefined') {
-    console.log("localStorage not available!");
-    return undef;
-  }
+  assert(localStorageAvailable(), "no localStorage");
   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/prefs.coffee

@@ -1,12 +0,0 @@
-# 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

@@ -1,13 +0,0 @@
-// 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);
-};