atom.storage - npm Package Compare versions

Comparing version 0.2.0 to 0.3.0

lib/atom.storage.js

@@ -6,5 +6,12 @@ "use strict";
 });
+exports.expireNow = exports.unsafeDeleteAtom = undefined;
 
 var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol" ? function (obj) { return typeof obj; } : function (obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol ? "symbol" : typeof obj; };
 
+var _ramda = require("ramda");
+
+var R = _interopRequireWildcard(_ramda);
+
+function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key]; } } newObj.default = obj; return newObj; } }
+
 function _objectWithoutProperties(obj, keys) { var target = {}; for (var i in obj) { if (keys.indexOf(i) >= 0) continue; if (!Object.prototype.hasOwnProperty.call(obj, i)) continue; target[i] = obj[i]; } return target; }
@@ -34,11 +41,18 @@
 
-var getValue = function getValue(storage, key, schema, value) {
+var getValue = function getValue(storage, key, schema, defaultValue, time) {
   var json = storage.getItem(key);
-  if (!json) return value;
+  if (!json) return defaultValue;
 
   var data = tryParse(json);
-  if (!seemsValid(data)) return value;
+  if (!seemsValid(data) || R.equals(data.schema, schema) || R.equals(data.value, defaultValue)) {
+    storage.removeItem(key);
+    return defaultValue;
+  }
 
-  if (data.schema !== schema) return value;
+  if (0 <= time) {
+    data.expires = time + Date.now();
 
+    storage.setItem(key, JSON.stringify(data));
+  }
+
   return data.value;
@@ -92,3 +106,3 @@ };
 
-  var value = options.value;
+  var defaultValue = options.value;
   var Atom = options.Atom;
@@ -104,3 +118,3 @@ var time = options.time;
   if (!atom) {
-    atoms[key] = atom = Atom(getValue(storage, key, schema, value));
+    atoms[key] = atom = Atom(getValue(storage, key, schema, defaultValue, time));
 
@@ -113,9 +127,13 @@ if (process.NODE_ENV !== "production") usedOptions.set(atom, options);
     changes.onValue(function (value) {
-      var data = { value: value };
+      if (R.equals(value, defaultValue)) {
+        storage.removeItem(key);
+      } else {
+        var data = { value: value };
 
-      if (schema !== undefined) data.schema = schema;
+        if (schema !== undefined) data.schema = schema;
 
-      if (0 <= time) data.expires = time + Date.now();
+        if (0 <= time) data.expires = time + Date.now();
 
-      storage.setItem(key, JSON.stringify(data));
+        storage.setItem(key, JSON.stringify(data));
+      }
     });
@@ -131,2 +149,2 @@ } else if (process.NODE_ENV !== "production") {
 };
-//# sourceMappingURL=data:application/json;base64,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LENBQWYsRUFDRixNQUFNLElBQUksS0FBSixnRUFBdUUsS0FBSyxHQUFMLHlCQUE0QixLQUFLLENBQUwsaUJBQWtCLEtBQUssV0FBVyxDQUFYLENBQUwsb0JBQWlDLEtBQUssUUFBUSxDQUFSLENBQUwsT0FBdEosQ0FBTixDQURGO0tBREY7R0FGSzs7QUFRUCxTQUFPLElBQVAsQ0FuQzZDO0NBQWhDIiwiZmlsZSI6ImF0b20uc3RvcmFnZS5qcyIsInNvdXJjZXNDb250ZW50IjpbImNvbnN0IHN0b3JhZ2VzID0gbmV3IFdlYWtNYXAoKVxubGV0IHVzZWRPcHRpb25zXG5pZiAocHJvY2Vzcy5OT0RFX0VOViAhPT0gXCJwcm9kdWN0aW9uXCIpXG4gIHVzZWRPcHRpb25zID0gbmV3IFdlYWtNYXAoKVxuXG5jb25zdCBnZXRBdG9tcyA9IHN0b3JhZ2UgPT4ge1xuICBsZXQgYXRvbXMgPSBzdG9yYWdlcy5nZXQoc3RvcmFnZSlcbiAgaWYgKCFhdG9tcylcbiAgICBzdG9yYWdlcy5zZXQoc3RvcmFnZSwgYXRvbXMgPSB7fSlcbiAgcmV0dXJuIGF0b21zXG59XG5cbmNvbnN0IHRyeVBhcnNlID0ganNvbiA9PiB7XG4gIHRyeSB7XG4gICAgcmV0dXJuIEpTT04ucGFyc2UoanNvbilcbiAgfSBjYXRjaCAoZXJyb3IpIHtcbiAgICByZXR1cm4gZXJyb3JcbiAgfVxufVxuXG5jb25zdCBzZWVtc1ZhbGlkID1cbiAgZGF0YSA9PiBkYXRhICYmIGRhdGEuY29uc3RydWN0b3IgPT09IE9iamVjdCAmJiBcInZhbHVlXCIgaW4gZGF0YVxuXG5jb25zdCBnZXRWYWx1ZSA9IChzdG9yYWdlLCBrZXksIHNjaGVtYSwgdmFsdWUpID0+IHtcbiAgY29uc3QganNvbiA9IHN0b3JhZ2UuZ2V0SXRlbShrZXkpXG4gIGlmICghanNvbilcbiAgICByZXR1cm4gdmFsdWVcblxuICBjb25zdCBkYXRhID0gdHJ5UGFyc2UoanNvbilcbiAgaWYgKCFzZWVtc1ZhbGlkKGRhdGEpKVxuICAgIHJldHVybiB2YWx1ZVxuXG4gIGlmIChkYXRhLnNjaGVtYSAhPT0gc2NoZW1hKVxuICAgIHJldHVybiB2YWx1ZVxuXG4gIHJldHVybiBkYXRhLnZhbHVlXG59XG5cbmV4cG9ydCBjb25zdCB1bnNhZmVEZWxldGVBdG9tID0gKHtzdG9yYWdlLCBrZXl9KSA9PiB7XG4gIGNvbnN0IGF0b21zID0gZ2V0QXRvbXMoc3RvcmFnZSlcbiAgZGVsZXRlIGF0b21zW2tleV1cbn1cblxuZXhwb3J0IGNvbnN0IGV4cGlyZU5vdyA9ICh7c3RvcmFnZSwgcmVnZXgsIHVuc2FmZURlbGV0ZUF0b21zfSkgPT4ge1xuICBmb3IgKGxldCBpPTA7IGk8c3RvcmFnZS5sZW5ndGg7ICsraSkge1xuICAgIGNvbnN0IGtleSA9IHN0b3JhZ2Uua2V5KGkpXG5cbiAgICBpZiAoIXJlZ2V4LnRlc3Qoa2V5KSlcbiAgICAgIGNvbnRpbnVlXG5cbiAgICBjb25zdCBkYXRhID0gdHJ5UGFyc2Uoc3RvcmFnZS5nZXRJdGVtKGtleSkpXG4gICAgaWYgKCFzZWVtc1ZhbGlkKGRhdGEpKVxuICAgICAgY29udGludWVcblxuICAgIGlmIChkYXRhLmV4cGlyZXMgPD0gRGF0ZS5ub3coKSkge1xuICAgICAgc3RvcmFnZS5yZW1vdmVJdGVtKGtleSlcblxuICAgICAgaWYgKHVuc2FmZURlbGV0ZUF0b21zKVxuICAgICAgICB1bnNhZmVEZWxldGVBdG9tKHtzdG9yYWdlLCBrZXl9KVxuICAgIH1cbiAgfVxufVxuXG5mdW5jdGlvbiBzaG93KHgpIHtcbiAgc3dpdGNoICh0eXBlb2YgeCkge1xuICBjYXNlIFwic3RyaW5nXCI6XG4gIGNhc2UgXCJvYmplY3RcIjpcbiAgICByZXR1cm4gSlNPTi5zdHJpbmdpZnkoeClcbiAgZGVmYXVsdDpcbiAgICByZXR1cm4gYCR7eH1gXG4gIH1cbn1cblxuZXhwb3J0IGRlZmF1bHQgKHtrZXksIHN0b3JhZ2UsIC4uLm9wdGlvbnN9KSA9PiB7XG4gIGNvbnN0IHt2YWx1ZSwgQXRvbSwgdGltZSwgc2NoZW1hLCBkZWJvdW5jZX0gPSBvcHRpb25zXG5cbiAgY29uc3QgYXRvbXMgPSBnZXRBdG9tcyhzdG9yYWdlKVxuXG4gIGxldCBhdG9tID0gYXRvbXNba2V5XVxuICBpZiAoIWF0b20pIHtcbiAgICBhdG9tc1trZXldID0gYXRvbSA9IEF0b20oZ2V0VmFsdWUoc3RvcmFnZSwga2V5LCBzY2hlbWEsIHZhbHVlKSlcblxuICAgIGlmIChwcm9jZXNzLk5PREVfRU5WICE9PSBcInByb2R1Y3Rpb25cIilcbiAgICAgIHVzZWRPcHRpb25zLnNldChhdG9tLCBvcHRpb25zKVxuXG4gICAgbGV0IGNoYW5nZXMgPSBhdG9tLmNoYW5nZXMoKVxuICAgIGlmICgwIDw9IGRlYm91bmNlKVxuICAgICAgY2hhbmdlcyA9IGNoYW5nZXMuZGVib3VuY2UoZGVib3VuY2UpXG5cbiAgICBjaGFuZ2VzLm9uVmFsdWUodmFsdWUgPT4ge1xuICAgICAgY29uc3QgZGF0YSA9IHt2YWx1ZX1cblxuICAgICAgaWYgKHNjaGVtYSAhPT0gdW5kZWZpbmVkKVxuICAgICAgICBkYXRhLnNjaGVtYSA9IHNjaGVtYVxuXG4gICAgICBpZiAoMCA8PSB0aW1lKVxuICAgICAgICBkYXRhLmV4cGlyZXMgPSB0aW1lICsgRGF0ZS5ub3coKVxuXG4gICAgICBzdG9yYWdlLnNldEl0ZW0oa2V5LCBKU09OLnN0cmluZ2lmeShkYXRhKSlcbiAgICB9KVxuICB9IGVsc2UgaWYgKHByb2Nlc3MuTk9ERV9FTlYgIT09IFwicHJvZHVjdGlvblwiKSB7XG4gICAgY29uc3Qgb2xkT3B0aW9ucyA9IHVzZWRPcHRpb25zLmdldChhdG9tKVxuICAgIGZvciAoY29uc3QgayBpbiBvcHRpb25zKSB7XG4gICAgICBpZiAob3B0aW9uc1trXSAhPT0gb2xkT3B0aW9uc1trXSlcbiAgICAgICAgdGhyb3cgbmV3IEVycm9yKGBhdG9tLnN0b3JhZ2U6IENyZWF0ZWQgdHdvIGF0b21zIHdpdGggc2FtZSBzdG9yYWdlIGFuZCBrZXkgJHtzaG93KGtleSl9LCBidXQgZGlmZmVyZW50ICR7c2hvdyhrKX06IGZpcnN0ICR7c2hvdyhvbGRPcHRpb25zW2tdKX0gYW5kIGxhdGVyICR7c2hvdyhvcHRpb25zW2tdKX0uYClcbiAgICB9XG4gIH1cblxuICByZXR1cm4gYXRvbVxufVxuIl19
+//# sourceMappingURL=data:application/json;base64,{"version":3,"sources":["../src/atom.storage.js"],"names":[],"mappings":"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","file":"atom.storage.js","sourcesContent":["import * as R from \"ramda\"\n\nconst storages = new WeakMap()\nlet usedOptions\nif (process.NODE_ENV !== \"production\")\n  usedOptions = new WeakMap()\n\nconst getAtoms = storage => {\n  let atoms = storages.get(storage)\n  if (!atoms)\n    storages.set(storage, atoms = {})\n  return atoms\n}\n\nconst tryParse = json => {\n  try {\n    return JSON.parse(json)\n  } catch (error) {\n    return error\n  }\n}\n\nconst seemsValid =\n  data => data && data.constructor === Object && \"value\" in data\n\nconst getValue = (storage, key, schema, defaultValue, time) => {\n  const json = storage.getItem(key)\n  if (!json)\n    return defaultValue\n\n  const data = tryParse(json)\n  if (!seemsValid(data) || R.equals(data.schema, schema) || R.equals(data.value, defaultValue)) {\n    storage.removeItem(key)\n    return defaultValue\n  }\n\n  if (0 <= time) {\n    data.expires = time + Date.now()\n\n    storage.setItem(key, JSON.stringify(data))\n  }\n\n  return data.value\n}\n\nexport const unsafeDeleteAtom = ({storage, key}) => {\n  const atoms = getAtoms(storage)\n  delete atoms[key]\n}\n\nexport const expireNow = ({storage, regex, unsafeDeleteAtoms}) => {\n  for (let i=0; i<storage.length; ++i) {\n    const key = storage.key(i)\n\n    if (!regex.test(key))\n      continue\n\n    const data = tryParse(storage.getItem(key))\n    if (!seemsValid(data))\n      continue\n\n    if (data.expires <= Date.now()) {\n      storage.removeItem(key)\n\n      if (unsafeDeleteAtoms)\n        unsafeDeleteAtom({storage, key})\n    }\n  }\n}\n\nfunction show(x) {\n  switch (typeof x) {\n  case \"string\":\n  case \"object\":\n    return JSON.stringify(x)\n  default:\n    return `${x}`\n  }\n}\n\nexport default ({key, storage, ...options}) => {\n  const {value: defaultValue, Atom, time, schema, debounce} = options\n\n  const atoms = getAtoms(storage)\n\n  let atom = atoms[key]\n  if (!atom) {\n    atoms[key] = atom = Atom(getValue(storage, key, schema, defaultValue, time))\n\n    if (process.NODE_ENV !== \"production\")\n      usedOptions.set(atom, options)\n\n    let changes = atom.changes()\n    if (0 <= debounce)\n      changes = changes.debounce(debounce)\n\n    changes.onValue(value => {\n      if (R.equals(value, defaultValue)) {\n        storage.removeItem(key)\n      } else {\n        const data = {value}\n\n        if (schema !== undefined)\n          data.schema = schema\n\n        if (0 <= time)\n          data.expires = time + Date.now()\n\n        storage.setItem(key, JSON.stringify(data))\n      }\n    })\n  } else if (process.NODE_ENV !== \"production\") {\n    const oldOptions = usedOptions.get(atom)\n    for (const k in options) {\n      if (options[k] !== oldOptions[k])\n        throw new Error(`atom.storage: Created two atoms with same storage and key ${show(key)}, but different ${show(k)}: first ${show(oldOptions[k])} and later ${show(options[k])}.`)\n    }\n  }\n\n  return atom\n}\n"]}

package.json

 {
   "name": "atom.storage",
-  "version": "0.2.0",
-  "description": "Minimalistic storage implementation for Atoms",
+  "version": "0.3.0",
+  "description": "Reactive variables with Storage",
   "main": "lib/atom.storage.js",
@@ -25,2 +25,5 @@ "scripts": {
   "homepage": "https://github.com/calmm-js/atom.storage#readme",
+  "dependencies": {
+    "ramda": ">=0.20.1 <0.22.0"
+  },
   "devDependencies": {
@@ -37,5 +40,4 @@ "babel-cli": "^6.7.5",
     "node-localstorage": "^1.3.0",
-    "nyc": "^6.4.0",
-    "ramda": "^0.21.0"
+    "nyc": "^6.4.0"
   }
 }

README.md

@@ -1,5 +0,5 @@
-Minimalistic
-[`Storage`](https://developer.mozilla.org/en-US/docs/Web/API/Storage)
+A [`Storage`](https://developer.mozilla.org/en-US/docs/Web/API/Storage)
 (e.g. [`localStorage`](https://developer.mozilla.org/en-US/docs/Web/API/Window/localStorage))
-implementation for Atoms.
+implementation for Atoms that is designed for persisting non-critical data such
+as selections made by the user over sessions.
 
@@ -41,3 +41,3 @@ [![npm version](https://badge.fury.io/js/atom.storage.svg)](http://badge.fury.io/js/atom.storage) [![Build Status](https://travis-ci.org/calmm-js/atom.storage.svg?branch=master)](https://travis-ci.org/calmm-js/atom.storage) [![](https://david-dm.org/calmm-js/atom.storage.svg)](https://david-dm.org/calmm-js/atom.storage) [![](https://david-dm.org/calmm-js/atom.storage/dev-status.svg)](https://david-dm.org/calmm-js/atom.storage#info=devDependencies) [![Gitter](https://img.shields.io/gitter/room/calmm-js/chat.js.svg?style=flat-square)](https://gitter.im/calmm-js/chat)
 ```js
-const stored = Stored({key: "my-stored-model",
+const stored = Stored({key: "my-unique-app-prefix:my-stored-model",
                        value: defaultValue,
@@ -48,4 +48,7 @@ Atom,
 
-The given default value is only used when the given storage does not already
-contain a value for the given key.
+The default value is used when the storage does not already contain a value for
+the key.  Also, when a stored atom is written to with a value that is
+[equal](http://ramdajs.com/0.21.0/docs/#equals) to the default value, the
+persisted value for the stored atom is removed from the storage.  This avoids
+unnecessary use of storage space.
 
@@ -66,3 +69,3 @@ The value of the atom is converted to a string by calling
 ```js
-const stored1 = Stored({key: "my-stored-model",
+const stored1 = Stored({key: "my-unique-app-prefix:my-stored-model",
                         value: defaultValue,
@@ -72,3 +75,3 @@ Atom,
 
-const stored2 = Stored({key: "my-stored-model",
+const stored2 = Stored({key: "my-unique-app-prefix:my-stored-model",
                         value: defaultValue,
@@ -92,3 +95,3 @@ Atom,
  time: Maybe Milliseconds,
- schema: Maybe (Number | Boolean | String | null),
+ schema: Maybe JSON,
  debounce: Maybe Milliseconds}
@@ -101,5 +104,5 @@ ```
 The `schema`, if specified, is stored with the value, and checked when a stored
-atom is created.  If the stored `schema` is not equal, as determined by `===`,
-to the given value, then the stored value is ignored and the given default is
-used instead.
+atom is created.  If the stored `schema` is not
+[equal](http://ramdajs.com/0.21.0/docs/#equals) to the given schema, then the
+stored value is removed and the given default is used instead.
 
@@ -112,2 +115,8 @@ The `debounce`, if specified, is the debounce period, in milliseconds, to use
 
+When a value is persisted to storage, the expiration time is set to `time +
+Date.now()`.  Also, when a stored atom with a particular key is first created
+(e.g. when the application is started), the expiration time is updated to
+`time + Date.now()`.  This way a value is kept alive as long as it is being
+used.
+
 The named export
@@ -128,2 +137,4 @@
 
+Note the use of `^` in the above regex.
+
 ### Combining with Undo
@@ -130,0 +141,0 @@

src/atom.storage.js

@@ -0,1 +1,3 @@
+import * as R from "ramda"
+
 const storages = new WeakMap()
@@ -24,14 +26,19 @@ let usedOptions
 
-const getValue = (storage, key, schema, value) => {
+const getValue = (storage, key, schema, defaultValue, time) => {
   const json = storage.getItem(key)
   if (!json)
-    return value
+    return defaultValue
 
   const data = tryParse(json)
-  if (!seemsValid(data))
-    return value
+  if (!seemsValid(data) || R.equals(data.schema, schema) || R.equals(data.value, defaultValue)) {
+    storage.removeItem(key)
+    return defaultValue
+  }
 
-  if (data.schema !== schema)
-    return value
+  if (0 <= time) {
+    data.expires = time + Date.now()
 
+    storage.setItem(key, JSON.stringify(data))
+  }
+
   return data.value
@@ -76,3 +83,3 @@ }
 export default ({key, storage, ...options}) => {
-  const {value, Atom, time, schema, debounce} = options
+  const {value: defaultValue, Atom, time, schema, debounce} = options
 
@@ -83,3 +90,3 @@ const atoms = getAtoms(storage)
   if (!atom) {
-    atoms[key] = atom = Atom(getValue(storage, key, schema, value))
+    atoms[key] = atom = Atom(getValue(storage, key, schema, defaultValue, time))
 
@@ -94,11 +101,15 @@ if (process.NODE_ENV !== "production")
     changes.onValue(value => {
-      const data = {value}
+      if (R.equals(value, defaultValue)) {
+        storage.removeItem(key)
+      } else {
+        const data = {value}
 
-      if (schema !== undefined)
-        data.schema = schema
+        if (schema !== undefined)
+          data.schema = schema
 
-      if (0 <= time)
-        data.expires = time + Date.now()
+        if (0 <= time)
+          data.expires = time + Date.now()
 
-      storage.setItem(key, JSON.stringify(data))
+        storage.setItem(key, JSON.stringify(data))
+      }
     })
@@ -105,0 +116,0 @@ } else if (process.NODE_ENV !== "production") {

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Deprecated

Maintenance

The maintainer of the package marked it as deprecated. This could indicate that a single version should not be used, or that the package is no longer maintained and any new vulnerabilities will not be fixed.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Major refactor

Supply chain risk

Package has recently undergone a major refactor. It may be unstable or indicate significant internal changes. Use caution when updating to versions that include significant changes.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

40833

increased by9.89%

Dev dependency count

11

decreased by-8.33%

Lines of code

253

increased by10%

Number of lines in readme file

154

increased by7.69%

Number of medium supply chain risk alerts

1

decreased by-50%

Worsened metrics

Dependency count

1

increased byInfinity%

Number of medium maintenance alerts

1

increased byInfinity%

Dependency changes

• + Addedramda@>=0.20.1 <0.22.0

• + Addedramda@0.21.0(transitive)