varstor 0.6.62 → 0.6.64

package/dist/varstor.js

@@ -12,6 +12,38 @@ return /******/ (() => { // webpackBootstrap
 /******/ 	"use strict";
 /******/ 	var __webpack_modules__ = ({
 
+/***/ "./src/actions.ts"
+/*!************************!*\
+  !*** ./src/actions.ts ***!
+  \************************/
+(__unused_webpack_module, __webpack_exports__, __webpack_require__) {
+
+__webpack_require__.r(__webpack_exports__);
+/* harmony export */ __webpack_require__.d(__webpack_exports__, {
+/* harmony export */   addStateActions: () => (/* binding */ addStateActions)
+/* harmony export */ });
+/* harmony import */ var ___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! . */ "./src/index.ts");
+
+function addStateActions(namespace, actions) {
+    const stateAcessor = {
+        get: ___WEBPACK_IMPORTED_MODULE_0__.getState.bind(null, namespace),
+        set: ___WEBPACK_IMPORTED_MODULE_0__.setState.bind(null, namespace),
+        reset: ___WEBPACK_IMPORTED_MODULE_0__.resetState.bind(null, namespace),
+    };
+    for (let [actionName, actionFn] of Object.entries(actions)) {
+        ___WEBPACK_IMPORTED_MODULE_0__.STATE[namespace(actionName)] = {
+            key: actionName,
+            namespace,
+            value: actionFn.bind(null, stateAcessor),
+            isAction: true,
+            listeners: [],
+        };
+    }
+}
+
+
+/***/ },
+
 /***/ "./src/constants.ts"
 /*!**************************!*\
   !*** ./src/constants.ts ***!
@@ -39,11 +71,13 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony export */   forEach: () => (/* binding */ forEach),
 /* harmony export */   getParamNames: () => (/* binding */ getParamNames),
 /* harmony export */   isArray: () => (/* binding */ isArray),
+/* harmony export */   isAsyncFunction: () => (/* binding */ isAsyncFunction),
 /* harmony export */   isFunction: () => (/* binding */ isFunction),
 /* harmony export */   isObject: () => (/* binding */ isObject),
 /* harmony export */   isString: () => (/* binding */ isString),
 /* harmony export */   map: () => (/* binding */ map),
-/* harmony export */   recreateStructure: () => (/* binding */ recreateStructure)
+/* harmony export */   recreateStructure: () => (/* binding */ recreateStructure),
+/* harmony export */   uid: () => (/* binding */ uid)
 /* harmony export */ });
 const STRIP_COMMENTS = /((\/\/.*$)|(\/\*[\s\S]*?\*\/))/gm;
 const ARGUMENT_NAMES = /([^\s,]+)/g;
@@ -56,6 +90,9 @@ function isString(obj) {
 function isFunction(obj) {
     return getObjectType(obj) === "[object Function]";
 }
+function isAsyncFunction(obj) {
+    return getObjectType(obj) === "[object AsyncFunction]";
+}
 function isObject(obj) {
     return getObjectType(obj) === "[object Object]";
 }
@@ -101,6 +138,9 @@ function recreateStructure(value) {
     }
     return newValue;
 }
+function uid() {
+    return Date.now().toString(36) + Math.random().toString(36).substr(2);
+}
 
 
 /***/ },
@@ -116,12 +156,17 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony export */   STATE: () => (/* binding */ STATE),
 /* harmony export */   createStore: () => (/* binding */ createStore),
 /* harmony export */   "default": () => (__WEBPACK_DEFAULT_EXPORT__),
-/* harmony export */   getValues: () => (/* binding */ getValues)
+/* harmony export */   getState: () => (/* binding */ getState),
+/* harmony export */   getValues: () => (/* binding */ getValues),
+/* harmony export */   joinStateChanges: () => (/* binding */ joinStateChanges),
+/* harmony export */   resetState: () => (/* binding */ resetState),
+/* harmony export */   setState: () => (/* binding */ setState),
+/* harmony export */   setupValue: () => (/* binding */ setupValue)
 /* harmony export */ });
 /* harmony import */ var _storage__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./storage */ "./src/storage.ts");
 /* harmony import */ var _helpers__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./helpers */ "./src/helpers.ts");
-/* harmony import */ var _constants__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ./constants */ "./src/constants.ts");
-/* harmony import */ var _validation__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ./validation */ "./src/validation.ts");
+/* harmony import */ var _actions__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ./actions */ "./src/actions.ts");
+/* harmony import */ var _constants__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ./constants */ "./src/constants.ts");
 /* harmony import */ var _listeners__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ./listeners */ "./src/listeners.ts");
 
 
@@ -129,6 +174,7 @@ __webpack_require__.r(__webpack_exports__);
 
 
 const STATE = {};
+const WAITING_CHANGES = {};
 const STORAGE = {};
 setStorageUtils(_storage__WEBPACK_IMPORTED_MODULE_0__["default"]);
 async function addState(namespace, initialState, isPersistent) {
@@ -143,7 +189,6 @@ async function addState(namespace, initialState, isPersistent) {
     }
     for (const key in initialState) {
         const fullKey = namespace(key);
-        _validation__WEBPACK_IMPORTED_MODULE_3__.isValid.Defining(fullKey);
         STATE[fullKey] = setupValue(key, namespace, values[fullKey], defaultValues[key], storageType);
     }
     return createStore(namespace());
@@ -194,6 +239,26 @@ function getArguments(dependencies, namespace) {
     const values = getValues(namespace);
     return dependencies.map((name) => values[name]);
 }
+async function joinStateChanges(changesPiece) {
+    for (const [updateId, { storageTypes, readyStorageTypes, changes },] of Object.entries(WAITING_CHANGES)) {
+        if (changesPiece[updateId]) {
+            const storageType = changesPiece[updateId].newValue;
+            readyStorageTypes[storageType] = true;
+            delete changesPiece[updateId];
+            Object.assign(changes, changesPiece);
+            if (STORAGE.IS_AVAILABE(storageType)) {
+                STORAGE.REMOVE_KEY(storageType, updateId);
+            }
+            for (const key in storageTypes) {
+                if (!readyStorageTypes[key]) {
+                    return;
+                }
+            }
+            delete WAITING_CHANGES[updateId];
+            await onStateChange(changes);
+        }
+    }
+}
 async function onStateChange(changes) {
     const realChanges = {};
     for (const key in changes) {
@@ -241,19 +306,27 @@ function getState(namespace, arg) {
 }
 async function setState(namespace, changes) {
     const storageChanges = {};
+    const updateId = (0,_helpers__WEBPACK_IMPORTED_MODULE_1__.uid)();
+    const storageTypes = {};
     (0,_helpers__WEBPACK_IMPORTED_MODULE_1__.forEach)(changes, (k, v) => {
         const fullKey = namespace(k);
-        const { storageType, computeFn } = STATE[fullKey];
-        if (computeFn) {
+        const { storageType, computeFn, isAction } = STATE[fullKey];
+        if (computeFn || isAction) {
             return;
         }
         if (!storageChanges[storageType]) {
             storageChanges[storageType] = {};
         }
+        storageTypes[storageType] = true;
         storageChanges[storageType][fullKey] = v;
     });
+    WAITING_CHANGES[updateId] = {
+        storageTypes,
+        readyStorageTypes: {},
+        changes: {},
+    };
     for (let [storageType, changes] of Object.entries(storageChanges)) {
-        await setValues(storageType, changes);
+        await setValues(storageType, { ...changes, [updateId]: storageType });
     }
     return createStore(namespace());
 }
@@ -264,7 +337,7 @@ async function setValues(storageType, changes) {
             return;
         }
     }
-    onStateChange((0,_helpers__WEBPACK_IMPORTED_MODULE_1__.map)(changes, (k, newValue) => [k, { newValue }]));
+    joinStateChanges((0,_helpers__WEBPACK_IMPORTED_MODULE_1__.map)(changes, (k, newValue) => [k, { newValue }]));
 }
 async function resetState(namespace, keys) {
     const namespaceState = getNamespaceState(namespace);
@@ -288,7 +361,7 @@ function setStorageUtils(storageUtils) {
     Object.assign(STORAGE, storageUtils);
 }
 function addNamespace(namespace, str) {
-    return `${namespace}${((0,_helpers__WEBPACK_IMPORTED_MODULE_1__.isString)(str) && _constants__WEBPACK_IMPORTED_MODULE_2__.NAMESPACE_DELIMITER) || ""}${str || ""}`;
+    return `${namespace}${((0,_helpers__WEBPACK_IMPORTED_MODULE_1__.isString)(str) && _constants__WEBPACK_IMPORTED_MODULE_3__.NAMESPACE_DELIMITER) || ""}${str || ""}`;
 }
 function createStore(_namespace) {
     const namespace = ((key) => addNamespace(_namespace, key));
@@ -300,8 +373,10 @@ function createStore(_namespace) {
         reset: (keys) => resetState(namespace, keys),
         onChange: (keys, cb) => (0,_listeners__WEBPACK_IMPORTED_MODULE_4__.addStateListener)(namespace, keys, cb),
         removeListener: (keys, cb) => (0,_listeners__WEBPACK_IMPORTED_MODULE_4__.removeStateListener)(namespace, keys, cb),
+        actions: (actions) => (0,_actions__WEBPACK_IMPORTED_MODULE_2__.addStateActions)(namespace, actions),
         setStorageUtils,
-        onStateChange,
+        joinStateChanges,
+        namespace,
     });
 }
 /* harmony default export */ const __WEBPACK_DEFAULT_EXPORT__ = (createStore(""));
@@ -336,20 +411,33 @@ async function runStateChangeListeners(realChanges) {
         for (let [changeKey, change] of Object.entries(realChanges)) {
             const { listeners, key } = ___WEBPACK_IMPORTED_MODULE_0__.STATE[changeKey];
             for (const cb of listeners) {
-                await cb([key], stateValues, change);
+                const fn = cb.bind(null, [key], stateValues, change);
+                if ((0,_helpers__WEBPACK_IMPORTED_MODULE_2__.isAsyncFunction)(cb)) {
+                    await fn();
+                }
+                else {
+                    fn();
+                }
             }
         }
-        const readableKeys = (0,_helpers__WEBPACK_IMPORTED_MODULE_2__.map)(realChanges, (k) => k.slice(_constants__WEBPACK_IMPORTED_MODULE_1__.NAMESPACE_DELIMITER.length));
+        const namespaceLength = `${namespace()}${_constants__WEBPACK_IMPORTED_MODULE_1__.NAMESPACE_DELIMITER}`.length;
+        const readableKeys = (0,_helpers__WEBPACK_IMPORTED_MODULE_2__.map)(realChanges, (k) => k.slice(namespaceLength));
         for (const cb of LISTENERS[namespace()]) {
-            await cb(readableKeys, stateValues, (0,_helpers__WEBPACK_IMPORTED_MODULE_2__.map)(realChanges, (k, v) => [
-                k.slice(_constants__WEBPACK_IMPORTED_MODULE_1__.NAMESPACE_DELIMITER.length),
+            const fn = cb.bind(null, readableKeys, stateValues, (0,_helpers__WEBPACK_IMPORTED_MODULE_2__.map)(realChanges, (k, v) => [
+                k.slice(namespaceLength),
                 v,
             ]));
+            if ((0,_helpers__WEBPACK_IMPORTED_MODULE_2__.isAsyncFunction)(cb)) {
+                await fn();
+            }
+            else {
+                fn();
+            }
         }
     }
 }
 function addStateListener(namespace, observables, cb) {
-    if ((0,_helpers__WEBPACK_IMPORTED_MODULE_2__.isFunction)(observables)) {
+    if ((0,_helpers__WEBPACK_IMPORTED_MODULE_2__.isFunction)(observables) || (0,_helpers__WEBPACK_IMPORTED_MODULE_2__.isAsyncFunction)(observables)) {
         LISTENERS[namespace()].push(observables);
         return (0,___WEBPACK_IMPORTED_MODULE_0__.createStore)(namespace());
     }
@@ -357,7 +445,7 @@ function addStateListener(namespace, observables, cb) {
     return (0,___WEBPACK_IMPORTED_MODULE_0__.createStore)(namespace());
 }
 function removeStateListener(namespace, observables, removeCb) {
-    if ((0,_helpers__WEBPACK_IMPORTED_MODULE_2__.isFunction)(observables)) {
+    if ((0,_helpers__WEBPACK_IMPORTED_MODULE_2__.isFunction)(observables) || (0,_helpers__WEBPACK_IMPORTED_MODULE_2__.isAsyncFunction)(observables)) {
         const removeIdx = LISTENERS[namespace()].findIndex((cb) => cb === observables);
         LISTENERS[namespace()].splice(removeIdx, 1);
         return (0,___WEBPACK_IMPORTED_MODULE_0__.createStore)(namespace());
@@ -405,52 +493,20 @@ async function setStorageValue(storageType, changes) {
     }
     return false;
 }
+function removeStorageKey(type, key) {
+    if (type) {
+        localStorage.removeItem(key);
+    }
+}
 /* harmony default export */ const __WEBPACK_DEFAULT_EXPORT__ = ({
     GET_TYPE: getStorageType,
     IS_AVAILABE: isStorageAvailable,
     UPDATE_STATE: updateFromLocalStorage,
     SET_VALUES: setStorageValue,
+    REMOVE_KEY: removeStorageKey,
 });
 
 
-/***/ },
-
-/***/ "./src/validation.ts"
-/*!***************************!*\
-  !*** ./src/validation.ts ***!
-  \***************************/
-(__unused_webpack_module, __webpack_exports__, __webpack_require__) {
-
-__webpack_require__.r(__webpack_exports__);
-/* harmony export */ __webpack_require__.d(__webpack_exports__, {
-/* harmony export */   isValid: () => (/* binding */ isValid)
-/* harmony export */ });
-/* harmony import */ var ___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! . */ "./src/index.ts");
-/* harmony import */ var _constants__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./constants */ "./src/constants.ts");
-
-
-function splitFullKey(fullKey) {
-    const segments = fullKey.split(_constants__WEBPACK_IMPORTED_MODULE_1__.NAMESPACE_DELIMITER);
-    return [segments.slice(-1)[0], segments.join(_constants__WEBPACK_IMPORTED_MODULE_1__.NAMESPACE_DELIMITER)];
-}
-const isValid = {
-    Setting: (fullKey) => {
-        if (!___WEBPACK_IMPORTED_MODULE_0__.STATE[fullKey]) {
-            const [key, namespace] = splitFullKey(fullKey);
-            throw new Error(`Setting "${key}" key in "${namespace}" namespace. DOES NOT EXIST`);
-        }
-        return true;
-    },
-    Defining: (fullKey) => {
-        if (___WEBPACK_IMPORTED_MODULE_0__.STATE[fullKey]) {
-            const [key, namespace] = splitFullKey(fullKey);
-            throw new Error(`Redefining "${key}" key in "${namespace}" namespace. ALREADY DEFINED`);
-        }
-        return true;
-    },
-};
-
-
 /***/ }
 
 /******/ 	});

package/dist/varstor.min.js

@@ -1,2 +1,2 @@
 /*! For license information please see varstor.min.js.LICENSE.txt */
-!function(e,t){"object"==typeof exports&&"object"==typeof module?module.exports=t():"function"==typeof define&&define.amd?define([],t):"object"==typeof exports?exports.Varstor=t():e.Varstor=t()}(this,()=>(()=>{"use strict";var e={"./src/constants.ts"(e,t,n){n.r(t),n.d(t,{NAMESPACE_DELIMITER:()=>r});const r="::"},"./src/helpers.ts"(e,t,n){n.r(t),n.d(t,{filter:()=>p,forEach:()=>d,getParamNames:()=>l,isArray:()=>o,isFunction:()=>i,isObject:()=>a,isString:()=>c,map:()=>f,recreateStructure:()=>E});const r=/((\/\/.*$)|(\/\*[\s\S]*?\*\/))/gm,s=/([^\s,]+)/g;function o(e){return"[object Array]"===u(e)}function c(e){return"[object String]"===u(e)}function i(e){return"[object Function]"===u(e)}function a(e){return"[object Object]"===u(e)}function u(e){return Object.prototype.toString.call(e)}function l(e){const t=e.toString().replace(r,"").split("=>")[0],n=t.slice(t.indexOf("(")+1,t.indexOf(")")).match(s);return null===n?[]:n}function f(e,t){const n=Object.entries(e).map(([e,n])=>t(e,n));return 2===n[0]?.length?Object.fromEntries(n):n}function d(e,t){Object.entries(e||{}).forEach(([e,n])=>t(e,n))}function p(e,t){return Object.fromEntries(Object.entries(e||{}).filter(([e,n])=>!0===t(e,n)))}function E(e){let t=e;if(o(e))return t=[],e.forEach(e=>t.push(E(e))),t;if(a(e)){t={};for(let n in e)t[n]=E(e[n]);return t}return t}},"./src/index.ts"(e,t,n){n.r(t),n.d(t,{STATE:()=>a,createStore:()=>j,default:()=>O,getValues:()=>p});var r=n("./src/storage.ts"),s=n("./src/helpers.ts"),o=n("./src/constants.ts"),c=n("./src/validation.ts"),i=n("./src/listeners.ts");const a={},u={};async function l(e,t,n){const r=u.GET_TYPE(n),o=Object.assign({},t),l=(0,s.map)(t,(t,n)=>[e(t),n]);u.IS_AVAILABE(r)&&await u.UPDATE_STATE(l,r),i.LISTENERS[e()]||(i.LISTENERS[e()]=[]);for(const n in t){const t=e(n);c.isValid.Defining(t),a[t]=f(n,e,l[t],o[n],r)}return j(e())}function f(e,t,n,r,o){const c=t(e),i=(0,s.isFunction)(n),u=i?(0,s.getParamNames)(n):[];return u.forEach(e=>{const n=t(e);a[n]||(a[n]={dependants:[],dependencies:[],namespace:t,storageType:o}),a[n].dependants?.push(c)}),{key:e,fullKey:c,value:i?n.apply(null,E(u,t)):n,computeFn:i&&n,dependencies:u,dependants:[],listeners:[],defaultValue:r,storageType:o,namespace:t}}function d(e){return(0,s.filter)(a,(t,{key:n})=>t===e(n))}function p(e){return(0,s.map)(d(e),(e,{key:t,value:n})=>[t,n])}function E(e,t){const n=p(t);return e.map(e=>n[e])}async function S(e){const t={};for(const n in e){const r=a[n].value,s=e[n].newValue;r!==s?(t[n]={newValue:s,prevValue:r},a[n].value=s):t[n]={isSame:!0},y(n,e,t)}await(0,i.runStateChangeListeners)((0,s.filter)(t,(e,t)=>!t.isSame))}function y(e,t,n){a[e].dependants?.forEach(e=>{const{dependencies:r,namespace:s}=a[e];if(!function(e,t,n,r){return e.every(e=>{const s=t(e);return n.includes(s)&&r.includes(s)||!n.includes(s)})}(r,s,Object.keys(t),Object.keys(n))||n[e])return;const o=a[e].value,c=a[e].computeFn?.apply(null,E(r,s));o!==c&&(n[e]={newValue:c,prevValue:o},a[e].value=c,y(e,t,n))})}function g(e,t){return(0,s.isString)(t)?j(t):(0,s.recreateStructure)(p(e))}async function T(e,t){const n={};(0,s.forEach)(t,(t,r)=>{const s=e(t),{storageType:o,computeFn:c}=a[s];c||(n[o]||(n[o]={}),n[o][s]=r)});for(let[e,t]of Object.entries(n))await m(e,t);return j(e())}async function m(e,t){if(u.IS_AVAILABE(e)){if(await u.SET_VALUES(e,t))return}S((0,s.map)(t,(e,t)=>[e,{newValue:t}]))}function A(e){return!arguments[1]||(0,s.isString)(arguments[1])?g.apply(null,arguments):(0,s.isArray)(arguments[1])?i.addStateListener.apply(null,arguments):(0,s.isObject)(arguments[1])?T.apply(null,arguments):void 0}function b(e){Object.assign(u,e)}function j(e){const t=t=>function(e,t){return`${e}${(0,s.isString)(t)&&o.NAMESPACE_DELIMITER||""}${t||""}`}(e,t);return Object.assign(A.bind(null,t),{add:e=>l(t,e,!1),addPersistent:e=>l(t,e,!0),get:e=>g(t,e),set:async e=>await T(t,e),reset:e=>async function(e,t){const n=d(e);return await T(e,(0,s.map)(t?(0,s.filter)(n,(e,{key:n})=>t.includes(n)):n,(e,{key:t,defaultValue:n})=>[t,n])),j(e())}(t,e),onChange:(e,n)=>(0,i.addStateListener)(t,e,n),removeListener:(e,n)=>(0,i.removeStateListener)(t,e,n),setStorageUtils:b,onStateChange:S})}b(r.default);const O=j("")},"./src/listeners.ts"(e,t,n){n.r(t),n.d(t,{LISTENERS:()=>c,addStateListener:()=>a,removeStateListener:()=>u,runStateChangeListeners:()=>i});var r=n("./src/index.ts"),s=n("./src/constants.ts"),o=n("./src/helpers.ts");const c={};async function i(e){if(Object.keys(e).length){const{namespace:t}=r.STATE[Object.keys(e)[0]],n=(0,r.getValues)(t);for(let[t,s]of Object.entries(e)){const{listeners:e,key:o}=r.STATE[t];for(const t of e)await t([o],n,s)}const i=(0,o.map)(e,e=>e.slice(s.NAMESPACE_DELIMITER.length));for(const r of c[t()])await r(i,n,(0,o.map)(e,(e,t)=>[e.slice(s.NAMESPACE_DELIMITER.length),t]))}}function a(e,t,n){return(0,o.isFunction)(t)?(c[e()].push(t),(0,r.createStore)(e())):(t.forEach(t=>r.STATE[e(t)].listeners?.push(n)),(0,r.createStore)(e()))}function u(e,t,n){if((0,o.isFunction)(t)){const n=c[e()].findIndex(e=>e===t);return c[e()].splice(n,1),(0,r.createStore)(e())}return t.forEach(t=>{const s=r.STATE[e(t)].listeners,o=s?.findIndex(e=>e===n);s?.splice(o,1)}),(0,r.createStore)(e())}},"./src/storage.ts"(e,t,n){n.r(t),n.d(t,{default:()=>r});const r={GET_TYPE:function(e){return e?"localStorage":""},IS_AVAILABE:function(e){return!!e},UPDATE_STATE:async function(e){const t={};for(const n in e){const e=localStorage.getItem(n);null!==e&&(t[n]=e)}return Object.assign(e,t)},SET_VALUES:async function(e,t){for(let[e,n]of Object.entries(t))localStorage.setItem(e,n);return!1}}},"./src/validation.ts"(e,t,n){n.r(t),n.d(t,{isValid:()=>c});var r=n("./src/index.ts"),s=n("./src/constants.ts");function o(e){const t=e.split(s.NAMESPACE_DELIMITER);return[t.slice(-1)[0],t.join(s.NAMESPACE_DELIMITER)]}const c={Setting:e=>{if(!r.STATE[e]){const[t,n]=o(e);throw new Error(`Setting "${t}" key in "${n}" namespace. DOES NOT EXIST`)}return!0},Defining:e=>{if(r.STATE[e]){const[t,n]=o(e);throw new Error(`Redefining "${t}" key in "${n}" namespace. ALREADY DEFINED`)}return!0}}}};const t={};function n(r){const s=t[r];if(void 0!==s)return s.exports;const o=t[r]={exports:{}};if(!(r in e)){delete t[r];const e=new Error("Cannot find module '"+r+"'");throw e.code="MODULE_NOT_FOUND",e}return e[r](o,o.exports,n),o.exports}n.d=(e,t)=>{if(Array.isArray(t))for(var r=0;r<t.length;){var s=t[r++],o=t[r++];n.o(e,s)?0===o&&r++:0===o?Object.defineProperty(e,s,{enumerable:!0,value:t[r++]}):Object.defineProperty(e,s,{enumerable:!0,get:o})}else for(var s in t)n.o(t,s)&&!n.o(e,s)&&Object.defineProperty(e,s,{enumerable:!0,get:t[s]})},n.o=(e,t)=>Object.prototype.hasOwnProperty.call(e,t),n.r=e=>{Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})};let r=n("./src/index.ts");return r=r.default,r})());
+!function(e,t){"object"==typeof exports&&"object"==typeof module?module.exports=t():"function"==typeof define&&define.amd?define([],t):"object"==typeof exports?exports.Varstor=t():e.Varstor=t()}(this,()=>(()=>{"use strict";var e={"./src/actions.ts"(e,t,n){n.r(t),n.d(t,{addStateActions:()=>s});var r=n("./src/index.ts");function s(e,t){const n={get:r.getState.bind(null,e),set:r.setState.bind(null,e),reset:r.resetState.bind(null,e)};for(let[s,o]of Object.entries(t))r.STATE[e(s)]={key:s,namespace:e,value:o.bind(null,n),isAction:!0,listeners:[]}}},"./src/constants.ts"(e,t,n){n.r(t),n.d(t,{NAMESPACE_DELIMITER:()=>r});const r="::"},"./src/helpers.ts"(e,t,n){n.r(t),n.d(t,{filter:()=>S,forEach:()=>p,getParamNames:()=>f,isArray:()=>o,isAsyncFunction:()=>a,isFunction:()=>i,isObject:()=>u,isString:()=>c,map:()=>d,recreateStructure:()=>y,uid:()=>E});const r=/((\/\/.*$)|(\/\*[\s\S]*?\*\/))/gm,s=/([^\s,]+)/g;function o(e){return"[object Array]"===l(e)}function c(e){return"[object String]"===l(e)}function i(e){return"[object Function]"===l(e)}function a(e){return"[object AsyncFunction]"===l(e)}function u(e){return"[object Object]"===l(e)}function l(e){return Object.prototype.toString.call(e)}function f(e){const t=e.toString().replace(r,"").split("=>")[0],n=t.slice(t.indexOf("(")+1,t.indexOf(")")).match(s);return null===n?[]:n}function d(e,t){const n=Object.entries(e).map(([e,n])=>t(e,n));return 2===n[0]?.length?Object.fromEntries(n):n}function p(e,t){Object.entries(e||{}).forEach(([e,n])=>t(e,n))}function S(e,t){return Object.fromEntries(Object.entries(e||{}).filter(([e,n])=>!0===t(e,n)))}function y(e){let t=e;if(o(e))return t=[],e.forEach(e=>t.push(y(e))),t;if(u(e)){t={};for(let n in e)t[n]=y(e[n]);return t}return t}function E(){return Date.now().toString(36)+Math.random().toString(36).substr(2)}},"./src/index.ts"(e,t,n){n.r(t),n.d(t,{STATE:()=>a,createStore:()=>v,default:()=>I,getState:()=>m,getValues:()=>S,joinStateChanges:()=>E,resetState:()=>j,setState:()=>A,setupValue:()=>d});var r=n("./src/storage.ts"),s=n("./src/helpers.ts"),o=n("./src/actions.ts"),c=n("./src/constants.ts"),i=n("./src/listeners.ts");const a={},u={},l={};async function f(e,t,n){const r=l.GET_TYPE(n),o=Object.assign({},t),c=(0,s.map)(t,(t,n)=>[e(t),n]);l.IS_AVAILABE(r)&&await l.UPDATE_STATE(c,r),i.LISTENERS[e()]||(i.LISTENERS[e()]=[]);for(const n in t){const t=e(n);a[t]=d(n,e,c[t],o[n],r)}return v(e())}function d(e,t,n,r,o){const c=t(e),i=(0,s.isFunction)(n),u=i?(0,s.getParamNames)(n):[];return u.forEach(e=>{const n=t(e);a[n]||(a[n]={dependants:[],dependencies:[],namespace:t,storageType:o}),a[n].dependants?.push(c)}),{key:e,fullKey:c,value:i?n.apply(null,y(u,t)):n,computeFn:i&&n,dependencies:u,dependants:[],listeners:[],defaultValue:r,storageType:o,namespace:t}}function p(e){return(0,s.filter)(a,(t,{key:n})=>t===e(n))}function S(e){return(0,s.map)(p(e),(e,{key:t,value:n})=>[t,n])}function y(e,t){const n=S(t);return e.map(e=>n[e])}async function E(e){for(const[t,{storageTypes:n,readyStorageTypes:r,changes:s}]of Object.entries(u))if(e[t]){const o=e[t].newValue;r[o]=!0,delete e[t],Object.assign(s,e),l.IS_AVAILABE(o)&&l.REMOVE_KEY(o,t);for(const e in n)if(!r[e])return;delete u[t],await g(s)}}async function g(e){const t={};for(const n in e){const r=a[n].value,s=e[n].newValue;r!==s?(t[n]={newValue:s,prevValue:r},a[n].value=s):t[n]={isSame:!0},b(n,e,t)}await(0,i.runStateChangeListeners)((0,s.filter)(t,(e,t)=>!t.isSame))}function b(e,t,n){a[e].dependants?.forEach(e=>{const{dependencies:r,namespace:s}=a[e];if(!function(e,t,n,r){return e.every(e=>{const s=t(e);return n.includes(s)&&r.includes(s)||!n.includes(s)})}(r,s,Object.keys(t),Object.keys(n))||n[e])return;const o=a[e].value,c=a[e].computeFn?.apply(null,y(r,s));o!==c&&(n[e]={newValue:c,prevValue:o},a[e].value=c,b(e,t,n))})}function m(e,t){return(0,s.isString)(t)?v(t):(0,s.recreateStructure)(S(e))}async function A(e,t){const n={},r=(0,s.uid)(),o={};(0,s.forEach)(t,(t,r)=>{const s=e(t),{storageType:c,computeFn:i,isAction:u}=a[s];i||u||(n[c]||(n[c]={}),o[c]=!0,n[c][s]=r)}),u[r]={storageTypes:o,readyStorageTypes:{},changes:{}};for(let[e,t]of Object.entries(n))await T(e,{...t,[r]:e});return v(e())}async function T(e,t){if(l.IS_AVAILABE(e)){if(await l.SET_VALUES(e,t))return}E((0,s.map)(t,(e,t)=>[e,{newValue:t}]))}async function j(e,t){const n=p(e);return await A(e,(0,s.map)(t?(0,s.filter)(n,(e,{key:n})=>t.includes(n)):n,(e,{key:t,defaultValue:n})=>[t,n])),v(e())}function O(e){return!arguments[1]||(0,s.isString)(arguments[1])?m.apply(null,arguments):(0,s.isArray)(arguments[1])?i.addStateListener.apply(null,arguments):(0,s.isObject)(arguments[1])?A.apply(null,arguments):void 0}function h(e){Object.assign(l,e)}function v(e){const t=t=>function(e,t){return`${e}${(0,s.isString)(t)&&c.NAMESPACE_DELIMITER||""}${t||""}`}(e,t);return Object.assign(O.bind(null,t),{add:e=>f(t,e,!1),addPersistent:e=>f(t,e,!0),get:e=>m(t,e),set:async e=>await A(t,e),reset:e=>j(t,e),onChange:(e,n)=>(0,i.addStateListener)(t,e,n),removeListener:(e,n)=>(0,i.removeStateListener)(t,e,n),actions:e=>(0,o.addStateActions)(t,e),setStorageUtils:h,joinStateChanges:E,namespace:t})}h(r.default);const I=v("")},"./src/listeners.ts"(e,t,n){n.r(t),n.d(t,{LISTENERS:()=>c,addStateListener:()=>a,removeStateListener:()=>u,runStateChangeListeners:()=>i});var r=n("./src/index.ts"),s=n("./src/constants.ts"),o=n("./src/helpers.ts");const c={};async function i(e){if(Object.keys(e).length){const{namespace:t}=r.STATE[Object.keys(e)[0]],n=(0,r.getValues)(t);for(let[t,s]of Object.entries(e)){const{listeners:e,key:c}=r.STATE[t];for(const t of e){const e=t.bind(null,[c],n,s);(0,o.isAsyncFunction)(t)?await e():e()}}const i=`${t()}${s.NAMESPACE_DELIMITER}`.length,a=(0,o.map)(e,e=>e.slice(i));for(const r of c[t()]){const t=r.bind(null,a,n,(0,o.map)(e,(e,t)=>[e.slice(i),t]));(0,o.isAsyncFunction)(r)?await t():t()}}}function a(e,t,n){return(0,o.isFunction)(t)||(0,o.isAsyncFunction)(t)?(c[e()].push(t),(0,r.createStore)(e())):(t.forEach(t=>r.STATE[e(t)].listeners?.push(n)),(0,r.createStore)(e()))}function u(e,t,n){if((0,o.isFunction)(t)||(0,o.isAsyncFunction)(t)){const n=c[e()].findIndex(e=>e===t);return c[e()].splice(n,1),(0,r.createStore)(e())}return t.forEach(t=>{const s=r.STATE[e(t)].listeners,o=s?.findIndex(e=>e===n);s?.splice(o,1)}),(0,r.createStore)(e())}},"./src/storage.ts"(e,t,n){n.r(t),n.d(t,{default:()=>r});const r={GET_TYPE:function(e){return e?"localStorage":""},IS_AVAILABE:function(e){return!!e},UPDATE_STATE:async function(e){const t={};for(const n in e){const e=localStorage.getItem(n);null!==e&&(t[n]=e)}return Object.assign(e,t)},SET_VALUES:async function(e,t){for(let[e,n]of Object.entries(t))localStorage.setItem(e,n);return!1},REMOVE_KEY:function(e,t){e&&localStorage.removeItem(t)}}}};const t={};function n(r){const s=t[r];if(void 0!==s)return s.exports;const o=t[r]={exports:{}};if(!(r in e)){delete t[r];const e=new Error("Cannot find module '"+r+"'");throw e.code="MODULE_NOT_FOUND",e}return e[r](o,o.exports,n),o.exports}n.d=(e,t)=>{if(Array.isArray(t))for(var r=0;r<t.length;){var s=t[r++],o=t[r++];n.o(e,s)?0===o&&r++:0===o?Object.defineProperty(e,s,{enumerable:!0,value:t[r++]}):Object.defineProperty(e,s,{enumerable:!0,get:o})}else for(var s in t)n.o(t,s)&&!n.o(e,s)&&Object.defineProperty(e,s,{enumerable:!0,get:t[s]})},n.o=(e,t)=>Object.prototype.hasOwnProperty.call(e,t),n.r=e=>{Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})};let r=n("./src/index.ts");return r=r.default,r})());

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "varstor",
-  "version": "0.6.62",
+  "version": "0.6.64",
   "description": "State manager for web applications and webextensions, employing reactivity, wrapping, and uniting the usage of different storages' values and common variables into a simple universal interface",
   "license": "MIT",
   "author": "Igor Morozov <ismorozs@gmail.com>",

package/src/actions.ts

@@ -0,0 +1,19 @@
+import { STATE, getState, setState, resetState } from ".";
+
+export function addStateActions(namespace: INamespace, actions: IStateActions) {
+  const stateAcessor = {
+    get: getState.bind(null, namespace),
+    set: setState.bind(null, namespace),
+    reset: resetState.bind(null, namespace),
+  };
+
+  for (let [actionName, actionFn] of Object.entries(actions)) {
+    STATE[namespace(actionName)] = {
+      key: actionName,
+      namespace,
+      value: actionFn.bind(null, stateAcessor),
+      isAction: true,
+      listeners: [],
+    };
+  }
+}

package/src/helpers.ts

@@ -13,6 +13,10 @@ export function isFunction(obj: unknown) {
   return getObjectType(obj) === "[object Function]";
 }
 
+export function isAsyncFunction (obj: unknown) {
+  return getObjectType(obj) === "[object AsyncFunction]";
+}
+
 export function isObject(obj: unknown) {
   return getObjectType(obj) === "[object Object]";
 }
@@ -86,3 +90,7 @@ export function recreateStructure(value: unknown) {
 
   return newValue;
 }
+
+export function uid() {
+  return Date.now().toString(36) + Math.random().toString(36).substr(2);
+}

package/src/index.ts

@@ -10,11 +10,13 @@ import {
   filter,
   recreateStructure,
   forEach,
+  uid,
 } from "./helpers";
 
+import { addStateActions } from "./actions";
+
 import { NAMESPACE_DELIMITER } from "./constants";
 
-import { isValid } from "./validation";
 import {
   runStateChangeListeners,
   addStateListener,
@@ -23,6 +25,7 @@ import {
 } from "./listeners";
 
 export const STATE = {} as IState;
+const WAITING_CHANGES = {} as IStateUpdatePieces;
 const STORAGE = {} as IStorageFunctions;
 
 setStorageUtils(storageUtils);
@@ -49,7 +52,6 @@ async function addState(
 
   for (const key in initialState) {
     const fullKey = namespace(key);
-    isValid.Defining(fullKey);
     STATE[fullKey] = setupValue(
       key,
       namespace,
@@ -62,7 +64,7 @@ async function addState(
   return createStore(namespace());
 }
 
-function setupValue(
+export function setupValue(
   key: string,
   namespace: INamespace,
   value: unknown,
@@ -123,6 +125,33 @@ function getArguments(dependencies: string[], namespace: INamespace) {
   return dependencies.map((name) => values[name as keyof typeof values]);
 }
 
+export async function joinStateChanges(changesPiece: IStateChanges) {
+  for (const [
+    updateId,
+    { storageTypes, readyStorageTypes, changes },
+  ] of Object.entries(WAITING_CHANGES)) {
+    if (changesPiece[updateId]) {
+      const storageType = changesPiece[updateId].newValue;
+      readyStorageTypes[storageType] = true;
+      delete changesPiece[updateId];
+      Object.assign(changes, changesPiece);
+      if (STORAGE.IS_AVAILABE(storageType)) {
+        STORAGE.REMOVE_KEY(storageType, updateId);
+      }
+
+      for (const key in storageTypes) {
+        if (!readyStorageTypes[key]) {
+          return;
+        }
+      }
+
+      delete WAITING_CHANGES[updateId];
+
+      await onStateChange(changes);
+    }
+  }
+}
+
 async function onStateChange(changes: IStateChanges) {
   const realChanges = {} as IStateChanges;
 
@@ -153,7 +182,7 @@ function updateDependencies(
 
     if (
       !isEveryDependencyReady(
-        dependencies,
+        dependencies!,
         namespace,
         Object.keys(changes),
         Object.keys(realChanges),
@@ -166,7 +195,7 @@ function updateDependencies(
     const prevValue = STATE[name].value;
     const newValue = (STATE[name].computeFn as IComputeFunction)?.apply(
       null,
-      getArguments(dependencies, namespace),
+      getArguments(dependencies!, namespace),
     );
 
     if (prevValue !== newValue) {
@@ -192,7 +221,7 @@ function isEveryDependencyReady(
   });
 }
 
-function getState(namespace: INamespace, arg: string) {
+export function getState(namespace: INamespace, arg: string) {
   if (isString(arg)) {
     return createStore(arg);
   }
@@ -200,29 +229,39 @@ function getState(namespace: INamespace, arg: string) {
   return recreateStructure(getValues(namespace));
 }
 
-async function setState(
+export async function setState(
   namespace: INamespace,
   changes: Record<string, unknown>,
 ): Promise<unknown> {
   const storageChanges: Record<string, any> = {};
+  const updateId = uid();
+  const storageTypes = {} as Record<string, boolean>;
 
   forEach(changes, (k, v) => {
     const fullKey = namespace(k);
-    const { storageType, computeFn } = STATE[fullKey];
+    const { storageType, computeFn, isAction } = STATE[fullKey];
 
-    if (computeFn) {
+    if (computeFn || isAction) {
       return;
     }
 
-    if (!storageChanges[storageType]) {
-      storageChanges[storageType] = {};
+    if (!storageChanges[storageType!]) {
+      storageChanges[storageType!] = {};
     }
 
-    storageChanges[storageType][fullKey] = v;
+    storageTypes[storageType!] = true;
+
+    storageChanges[storageType!][fullKey] = v;
   });
 
+  WAITING_CHANGES[updateId] = {
+    storageTypes,
+    readyStorageTypes: {},
+    changes: {},
+  };
+
   for (let [storageType, changes] of Object.entries(storageChanges)) {
-    await setValues(storageType, changes);
+    await setValues(storageType, { ...changes, [updateId]: storageType });
   }
 
   return createStore(namespace());
@@ -239,12 +278,12 @@ async function setValues(
     }
   }
 
-  onStateChange(
+  joinStateChanges(
     map(changes, (k, newValue) => [k, { newValue }]) as Record<string, any>,
   );
 }
 
-async function resetState(namespace: INamespace, keys?: string[]) {
+export async function resetState(namespace: INamespace, keys?: string[]) {
   const namespaceState = getNamespaceState(namespace);
 
   await setState(
@@ -303,8 +342,10 @@ export function createStore(_namespace: string) {
       addStateListener(namespace, keys, cb),
     removeListener: (keys: string[], cb: () => {}) =>
       removeStateListener(namespace, keys, cb),
+    actions: (actions: IStateActions) => addStateActions(namespace, actions),
     setStorageUtils,
-    onStateChange,
+    joinStateChanges,
+    namespace,
   });
 }
 

package/src/listeners.ts

@@ -1,6 +1,6 @@
 import { STATE, getValues, createStore } from ".";
 import { NAMESPACE_DELIMITER } from "./constants";
-import { map, isFunction } from "./helpers";
+import { map, isFunction, isAsyncFunction } from "./helpers";
 
 export const LISTENERS = {} as IStateListeners;
 
@@ -13,23 +13,35 @@ export async function runStateChangeListeners(realChanges: IStateChanges) {
     for (let [changeKey, change] of Object.entries(realChanges)) {
       const { listeners, key } = STATE[changeKey];
       for (const cb of listeners!) {
-        await cb([key], stateValues, change);
+        const fn = cb.bind(null, [key], stateValues, change);
+        if (isAsyncFunction(cb)) {
+          await fn();
+        } else {
+          fn();
+        }
       }
     }
 
+    const namespaceLength = `${namespace()}${NAMESPACE_DELIMITER}`.length;
     const readableKeys = map(realChanges, (k) =>
-      k.slice(NAMESPACE_DELIMITER.length),
+      k.slice(namespaceLength),
     ) as string[];
 
     for (const cb of LISTENERS[namespace()]) {
-      await cb(
+      const fn = cb.bind(
+        null,
         readableKeys,
         stateValues,
         map(realChanges, (k, v) => [
-          k.slice(NAMESPACE_DELIMITER.length),
+          k.slice(namespaceLength),
           v,
         ]) as IStateChanges,
       );
+      if (isAsyncFunction(cb)) {
+        await fn();
+      } else {
+        fn();
+      }
     }
   }
 }
@@ -39,7 +51,7 @@ export function addStateListener(
   observables: string[] | IStateListener,
   cb: () => {},
 ) {
-  if (isFunction(observables)) {
+  if (isFunction(observables) || isAsyncFunction(observables)) {
     LISTENERS[namespace()].push(observables as IStateListener);
     return createStore(namespace());
   }
@@ -56,7 +68,7 @@ export function removeStateListener(
   observables: string[] | IStateListener,
   removeCb: () => {},
 ) {
-  if (isFunction(observables)) {
+  if (isFunction(observables) || isAsyncFunction(observables)) {
     const removeIdx = LISTENERS[namespace()].findIndex(
       (cb) => cb === observables,
     );

package/src/storage.ts

@@ -29,9 +29,16 @@ async function setStorageValue(
   return false;
 }
 
+function removeStorageKey (type: string, key: string) {
+  if (type) {
+    localStorage.removeItem(key);
+  }
+}
+
 export default {
   GET_TYPE: getStorageType,
   IS_AVAILABE: isStorageAvailable,
   UPDATE_STATE: updateFromLocalStorage,
   SET_VALUES: setStorageValue,
+  REMOVE_KEY: removeStorageKey,
 };