web-manager 3.2.47 → 3.2.49

package/lib/storage.js

@@ -1,38 +1,73 @@
 /*
 */
 var utilities = require('./utilities.js');
-var support;
 var pseudoStorage = {};
 
 function Storage(storageObj) {
   this.storage = storageObj;
 }
 
-Storage.get = function(path, def, options) {
+Storage.get = function (path, def) {
+  // Setup the usable storage object
+  var usableStorage;
+
+  // Setup the path and default value
   path = path || '';
+  // def = typeof def === 'undefined' ? {} : def;
+  // Important that defaults to undefined
+  // Because if default is empty obj, then a path to an undefined value like 'a.b.c' (assuming c is undefined) will return empty obj instead of undefined
+  def = typeof def === 'undefined' ? undefined : def;
 
+  // Try to parse the localStorage object
   try {
-    return utilities.get(JSON.parse(window.localStorage.getItem('_manager')) || {}, path, def);
+    usableStorage = JSON.parse(window.localStorage.getItem('_manager') || '{}');
   } catch (e) {
-    return utilities.get(pseudoStorage, path, def)
+    usableStorage = pseudoStorage;
+  }
+
+  // If there's no path, return the entire storage object
+  if (!path) {
+    return usableStorage || def;
   }
+
+  // Return the value at the path
+  return utilities.get(usableStorage, path, def);
 }
 
-Storage.set = function(path, value, options) {
-  var existing;
+Storage.set = function (path, value) {
+  // Setup the usable storage object
+  var usableStorage;
+
+  // Setup the path and default value
+  path = path || '';
+  value = typeof value === 'undefined' ? undefined : value;
+
+  // Try to parse the localStorage object
+  try {
+    usableStorage = Storage.get();
+  } catch (e) {
+    usableStorage = pseudoStorage;
+  }
+
+  // If there's no path, return the entire storage object
+  if (!path) {
+    usableStorage = value || {};
+  } else {
+    // Set the value at the path
+    utilities.set(usableStorage, path, value);
+  }
 
+  // Try to set the localStorage object
   try {
-    existing = Storage.get('', {});
-    utilities.set(existing, path, value);
-    window.localStorage.setItem('_manager', JSON.stringify(existing));
+    window.localStorage.setItem('_manager', JSON.stringify(usableStorage));
   } catch (e) {
-    utilities.set(pseudoStorage, path, value)
+    pseudoStorage = usableStorage;
   }
 
-  return existing;
+  return usableStorage;
 }
 
-Storage.clear = function(options) {
+Storage.clear = function () {
   try {
     window.localStorage.setItem('_manager', '{}');
   } catch (e) {

package/lib/utilities.js

@@ -19,7 +19,7 @@ Utilities.get = function (object, path, defaultValue) {
   // For each item in the path, dig into the object
   let currentObject = object;
   for (const key of pathArray) {
-    if (!currentObject || !currentObject.hasOwnProperty(key)) {
+    if (!currentObject || currentObject[key] === undefined) {
       return defaultValue;
     }
     currentObject = currentObject[key];
@@ -52,26 +52,26 @@ Utilities.set = function (obj, path, value) {
 }
 
 /* https://gist.github.com/jeneg/9767afdcca45601ea44930ea03e0febf */
-Utilities.getLegacy = function (obj, path, def) {
-  if (!path) {
-    return def;
-  }
-  var fullPath = (path || '')
-    .replace(/\[/g, '.')
-    .replace(/]/g, '')
-    .split('.')
-    .filter(Boolean);
-
-  return fullPath.every(everyFunc) ? obj : def;
-
-  function everyFunc(step) {
-    // return !(step && (obj = obj[step]) === undefined);
-    // console.log(' CHECK > ', !(step && (obj = obj[step]) === undefined));
-    // console.log('step', step, 'obj', obj, 'objstep', obj[step]);
-    // return !(step && (obj = obj[step]) === undefined);
-    return !(step && (obj = obj[step]) === undefined);
-  }
-}
+// Utilities.getLegacy = function (obj, path, def) {
+//   if (!path) {
+//     return def;
+//   }
+//   var fullPath = (path || '')
+//     .replace(/\[/g, '.')
+//     .replace(/]/g, '')
+//     .split('.')
+//     .filter(Boolean);
+
+//   return fullPath.every(everyFunc) ? obj : def;
+
+//   function everyFunc(step) {
+//     // return !(step && (obj = obj[step]) === undefined);
+//     // console.log(' CHECK > ', !(step && (obj = obj[step]) === undefined));
+//     // console.log('step', step, 'obj', obj, 'objstep', obj[step]);
+//     // return !(step && (obj = obj[step]) === undefined);
+//     return !(step && (obj = obj[step]) === undefined);
+//   }
+// }
 
 // https://dzone.com/articles/cross-browser-javascript-copy-and-paste
 // https://hackernoon.com/copying-text-to-clipboard-with-javascript-df4d4988697f

package/package.json

@@ -1,11 +1,10 @@
 {
   "name": "web-manager",
-  "version": "3.2.47",
+  "version": "3.2.49",
   "description": "Easily access important variables such as the query string, current domain, and current page in a single object.",
   "main": "index.js",
   "scripts": {
     "test": "./node_modules/mocha/bin/mocha test/ --recursive --timeout=10000",
-
     "test_": "npm run prepare && ./node_modules/mocha/bin/mocha test/ --recursive --timeout=10000",
     "prepare_": "node -e 'require(`prepare-package`)()'"
   },
@@ -34,7 +33,7 @@
     }
   },
   "dependencies": {
-    "@sentry/browser": "^7.108.0",
+    "@sentry/browser": "^7.112.2",
     "cookieconsent": "^3.1.1",
     "firebase": "^9.23.0",
     "lazysizes": "^5.3.2"