varstor 0.6.63 → 0.6.65

package/dist/varstor.js

@@ -25,16 +25,11 @@ __webpack_require__.r(__webpack_exports__);
 /* 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)) {
+    for (const [actionName, actionFn] of Object.entries(actions)) {
         ___WEBPACK_IMPORTED_MODULE_0__.STATE[namespace(actionName)] = {
             key: actionName,
             namespace,
-            value: actionFn.bind(null, stateAcessor),
+            value: actionFn.bind(null, (0,___WEBPACK_IMPORTED_MODULE_0__.createStore)(namespace())),
             isAction: true,
             listeners: [],
         };
@@ -71,11 +66,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;
@@ -88,6 +85,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]";
 }
@@ -133,6 +133,9 @@ function recreateStructure(value) {
     }
     return newValue;
 }
+function uid() {
+    return Date.now().toString(36) + Math.random().toString(36).substr(2);
+}
 
 
 /***/ },
@@ -146,10 +149,12 @@ function recreateStructure(value) {
 __webpack_require__.r(__webpack_exports__);
 /* harmony export */ __webpack_require__.d(__webpack_exports__, {
 /* harmony export */   STATE: () => (/* binding */ STATE),
+/* harmony export */   createPendingChanges: () => (/* binding */ createPendingChanges),
 /* harmony export */   createStore: () => (/* binding */ createStore),
 /* harmony export */   "default": () => (__WEBPACK_DEFAULT_EXPORT__),
 /* 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)
@@ -158,15 +163,15 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony import */ var _helpers__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./helpers */ "./src/helpers.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 _validation__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ./validation */ "./src/validation.ts");
-/* harmony import */ var _listeners__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! ./listeners */ "./src/listeners.ts");
-
+/* harmony import */ var _listeners__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ./listeners */ "./src/listeners.ts");
 
 
 
 
 
 const STATE = {};
+const STATE_CHANGED_PIECES = {};
+const STATE_PENDING_CHANGES = {};
 const STORAGE = {};
 setStorageUtils(_storage__WEBPACK_IMPORTED_MODULE_0__["default"]);
 async function addState(namespace, initialState, isPersistent) {
@@ -176,12 +181,8 @@ async function addState(namespace, initialState, isPersistent) {
     if (STORAGE.IS_AVAILABE(storageType)) {
         await STORAGE.UPDATE_STATE(values, storageType);
     }
-    if (!_listeners__WEBPACK_IMPORTED_MODULE_5__.LISTENERS[namespace()]) {
-        _listeners__WEBPACK_IMPORTED_MODULE_5__.LISTENERS[namespace()] = [];
-    }
     for (const key in initialState) {
         const fullKey = namespace(key);
-        _validation__WEBPACK_IMPORTED_MODULE_4__.isValid.Defining(fullKey);
         STATE[fullKey] = setupValue(key, namespace, values[fullKey], defaultValues[key], storageType);
     }
     return createStore(namespace());
@@ -232,6 +233,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(STATE_CHANGED_PIECES)) {
+        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 STATE_CHANGED_PIECES[updateId];
+            await onStateChange(changes);
+        }
+    }
+}
 async function onStateChange(changes) {
     const realChanges = {};
     for (const key in changes) {
@@ -246,7 +267,7 @@ async function onStateChange(changes) {
         }
         updateDependencies(key, changes, realChanges);
     }
-    await (0,_listeners__WEBPACK_IMPORTED_MODULE_5__.runStateChangeListeners)((0,_helpers__WEBPACK_IMPORTED_MODULE_1__.filter)(realChanges, (k, v) => !v.isSame));
+    await (0,_listeners__WEBPACK_IMPORTED_MODULE_4__.runStateChangeListeners)((0,_helpers__WEBPACK_IMPORTED_MODULE_1__.filter)(realChanges, (k, v) => !v.isSame));
 }
 function updateDependencies(key, changes, realChanges) {
     STATE[key].dependants?.forEach((name) => {
@@ -279,6 +300,8 @@ 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, isAction } = STATE[fullKey];
@@ -288,10 +311,16 @@ async function setState(namespace, changes) {
         if (!storageChanges[storageType]) {
             storageChanges[storageType] = {};
         }
+        storageTypes[storageType] = true;
         storageChanges[storageType][fullKey] = v;
     });
+    STATE_CHANGED_PIECES[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());
 }
@@ -302,21 +331,38 @@ 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) {
+    await setState(namespace, getDefaultValues(namespace, keys));
+    return createStore(namespace());
+}
+function getDefaultValues(namespace, keys) {
     const namespaceState = getNamespaceState(namespace);
-    await setState(namespace, (0,_helpers__WEBPACK_IMPORTED_MODULE_1__.map)(keys
+    return (0,_helpers__WEBPACK_IMPORTED_MODULE_1__.map)(keys
         ? (0,_helpers__WEBPACK_IMPORTED_MODULE_1__.filter)(namespaceState, (k, { key }) => keys.includes(key))
-        : namespaceState, (k, { key, defaultValue }) => [key, defaultValue]));
-    return createStore(namespace());
+        : namespaceState, (k, { key, defaultValue }) => [key, defaultValue]);
+}
+function createPendingChanges(namespace) {
+    const flush = () => {
+        const changes = STATE_PENDING_CHANGES[namespace()];
+        STATE_PENDING_CHANGES[namespace()] = {};
+        return changes;
+    };
+    return {
+        add: (changes) => Object.assign(STATE_PENDING_CHANGES[namespace()], changes),
+        reset: (keys) => Object.assign(STATE_PENDING_CHANGES[namespace()], getDefaultValues(namespace, keys)),
+        get: () => STATE_PENDING_CHANGES[namespace()],
+        flush,
+        commit: () => setState(namespace, flush()),
+    };
 }
 function main(namespace) {
     if (!arguments[1] || (0,_helpers__WEBPACK_IMPORTED_MODULE_1__.isString)(arguments[1])) {
         return getState.apply(null, arguments);
     }
-    if ((0,_helpers__WEBPACK_IMPORTED_MODULE_1__.isArray)(arguments[1])) {
-        return _listeners__WEBPACK_IMPORTED_MODULE_5__.addStateListener.apply(null, arguments);
+    if ((0,_helpers__WEBPACK_IMPORTED_MODULE_1__.isArray)(arguments[1]) || (0,_helpers__WEBPACK_IMPORTED_MODULE_1__.isFunction)(arguments[1]) || (0,_helpers__WEBPACK_IMPORTED_MODULE_1__.isAsyncFunction)(arguments[1])) {
+        return _listeners__WEBPACK_IMPORTED_MODULE_4__.addStateListener.apply(null, arguments);
     }
     if ((0,_helpers__WEBPACK_IMPORTED_MODULE_1__.isObject)(arguments[1])) {
         return setState.apply(null, arguments);
@@ -330,17 +376,25 @@ function addNamespace(namespace, str) {
 }
 function createStore(_namespace) {
     const namespace = ((key) => addNamespace(_namespace, key));
+    if (!STATE_PENDING_CHANGES[namespace()]) {
+        STATE_PENDING_CHANGES[namespace()] = {};
+    }
+    if (!_listeners__WEBPACK_IMPORTED_MODULE_4__.LISTENERS[namespace()]) {
+        _listeners__WEBPACK_IMPORTED_MODULE_4__.LISTENERS[namespace()] = [];
+    }
     return Object.assign(main.bind(null, namespace), {
         add: (state) => addState(namespace, state, false),
         addPersistent: (state) => addState(namespace, state, true),
         get: (newNamespace) => getState(namespace, newNamespace),
         set: async (changes) => await setState(namespace, changes),
         reset: (keys) => resetState(namespace, keys),
-        onChange: (keys, cb) => (0,_listeners__WEBPACK_IMPORTED_MODULE_5__.addStateListener)(namespace, keys, cb),
-        removeListener: (keys, cb) => (0,_listeners__WEBPACK_IMPORTED_MODULE_5__.removeStateListener)(namespace, keys, cb),
+        changes: createPendingChanges(namespace),
+        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(""));
@@ -371,24 +425,33 @@ const LISTENERS = {};
 async function runStateChangeListeners(realChanges) {
     if (Object.keys(realChanges).length) {
         const { namespace } = ___WEBPACK_IMPORTED_MODULE_0__.STATE[Object.keys(realChanges)[0]];
-        const stateValues = (0,___WEBPACK_IMPORTED_MODULE_0__.getValues)(namespace);
-        for (let [changeKey, change] of Object.entries(realChanges)) {
+        for (const [changeKey] 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], (0,___WEBPACK_IMPORTED_MODULE_0__.createStore)(namespace()));
+                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),
-                v,
-            ]));
+            const fn = cb.bind(null, readableKeys, (0,___WEBPACK_IMPORTED_MODULE_0__.createStore)(namespace()));
+            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());
     }
@@ -396,7 +459,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());
@@ -444,52 +507,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/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,c]of Object.entries(t))r.STATE[e(s)]={key:s,namespace:e,value:c.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:()=>p,forEach:()=>d,getParamNames:()=>l,isArray:()=>c,isFunction:()=>i,isObject:()=>a,isString:()=>o,map:()=>f,recreateStructure:()=>S});const r=/((\/\/.*$)|(\/\*[\s\S]*?\*\/))/gm,s=/([^\s,]+)/g;function c(e){return"[object Array]"===u(e)}function o(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 S(e){let t=e;if(c(e))return t=[],e.forEach(e=>t.push(S(e))),t;if(a(e)){t={};for(let n in e)t[n]=S(e[n]);return t}return t}},"./src/index.ts"(e,t,n){n.r(t),n.d(t,{STATE:()=>u,createStore:()=>h,default:()=>v,getState:()=>A,getValues:()=>S,resetState:()=>m,setState:()=>T,setupValue:()=>d});var r=n("./src/storage.ts"),s=n("./src/helpers.ts"),c=n("./src/actions.ts"),o=n("./src/constants.ts"),i=n("./src/validation.ts"),a=n("./src/listeners.ts");const u={},l={};async function f(e,t,n){const r=l.GET_TYPE(n),c=Object.assign({},t),o=(0,s.map)(t,(t,n)=>[e(t),n]);l.IS_AVAILABE(r)&&await l.UPDATE_STATE(o,r),a.LISTENERS[e()]||(a.LISTENERS[e()]=[]);for(const n in t){const t=e(n);i.isValid.Defining(t),u[t]=d(n,e,o[t],c[n],r)}return h(e())}function d(e,t,n,r,c){const o=t(e),i=(0,s.isFunction)(n),a=i?(0,s.getParamNames)(n):[];return a.forEach(e=>{const n=t(e);u[n]||(u[n]={dependants:[],dependencies:[],namespace:t,storageType:c}),u[n].dependants?.push(o)}),{key:e,fullKey:o,value:i?n.apply(null,E(a,t)):n,computeFn:i&&n,dependencies:a,dependants:[],listeners:[],defaultValue:r,storageType:c,namespace:t}}function p(e){return(0,s.filter)(u,(t,{key:n})=>t===e(n))}function S(e){return(0,s.map)(p(e),(e,{key:t,value:n})=>[t,n])}function E(e,t){const n=S(t);return e.map(e=>n[e])}async function g(e){const t={};for(const n in e){const r=u[n].value,s=e[n].newValue;r!==s?(t[n]={newValue:s,prevValue:r},u[n].value=s):t[n]={isSame:!0},y(n,e,t)}await(0,a.runStateChangeListeners)((0,s.filter)(t,(e,t)=>!t.isSame))}function y(e,t,n){u[e].dependants?.forEach(e=>{const{dependencies:r,namespace:s}=u[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 c=u[e].value,o=u[e].computeFn?.apply(null,E(r,s));c!==o&&(n[e]={newValue:o,prevValue:c},u[e].value=o,y(e,t,n))})}function A(e,t){return(0,s.isString)(t)?h(t):(0,s.recreateStructure)(S(e))}async function T(e,t){const n={};(0,s.forEach)(t,(t,r)=>{const s=e(t),{storageType:c,computeFn:o,isAction:i}=u[s];o||i||(n[c]||(n[c]={}),n[c][s]=r)});for(let[e,t]of Object.entries(n))await b(e,t);return h(e())}async function b(e,t){if(l.IS_AVAILABE(e)){if(await l.SET_VALUES(e,t))return}g((0,s.map)(t,(e,t)=>[e,{newValue:t}]))}async function m(e,t){const n=p(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])),h(e())}function j(e){return!arguments[1]||(0,s.isString)(arguments[1])?A.apply(null,arguments):(0,s.isArray)(arguments[1])?a.addStateListener.apply(null,arguments):(0,s.isObject)(arguments[1])?T.apply(null,arguments):void 0}function O(e){Object.assign(l,e)}function h(e){const t=t=>function(e,t){return`${e}${(0,s.isString)(t)&&o.NAMESPACE_DELIMITER||""}${t||""}`}(e,t);return Object.assign(j.bind(null,t),{add:e=>f(t,e,!1),addPersistent:e=>f(t,e,!0),get:e=>A(t,e),set:async e=>await T(t,e),reset:e=>m(t,e),onChange:(e,n)=>(0,a.addStateListener)(t,e,n),removeListener:(e,n)=>(0,a.removeStateListener)(t,e,n),actions:e=>(0,c.addStateActions)(t,e),setStorageUtils:O,onStateChange:g})}O(r.default);const v=h("")},"./src/listeners.ts"(e,t,n){n.r(t),n.d(t,{LISTENERS:()=>o,addStateListener:()=>a,removeStateListener:()=>u,runStateChangeListeners:()=>i});var r=n("./src/index.ts"),s=n("./src/constants.ts"),c=n("./src/helpers.ts");const o={};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)await t([c],n,s)}const i=(0,c.map)(e,e=>e.slice(s.NAMESPACE_DELIMITER.length));for(const r of o[t()])await r(i,n,(0,c.map)(e,(e,t)=>[e.slice(s.NAMESPACE_DELIMITER.length),t]))}}function a(e,t,n){return(0,c.isFunction)(t)?(o[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,c.isFunction)(t)){const n=o[e()].findIndex(e=>e===t);return o[e()].splice(n,1),(0,r.createStore)(e())}return t.forEach(t=>{const s=r.STATE[e(t)].listeners,c=s?.findIndex(e=>e===n);s?.splice(c,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:()=>o});var r=n("./src/index.ts"),s=n("./src/constants.ts");function c(e){const t=e.split(s.NAMESPACE_DELIMITER);return[t.slice(-1)[0],t.join(s.NAMESPACE_DELIMITER)]}const o={Setting:e=>{if(!r.STATE[e]){const[t,n]=c(e);throw new Error(`Setting "${t}" key in "${n}" namespace. DOES NOT EXIST`)}return!0},Defining:e=>{if(r.STATE[e]){const[t,n]=c(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 c=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](c,c.exports,n),c.exports}n.d=(e,t)=>{if(Array.isArray(t))for(var r=0;r<t.length;){var s=t[r++],c=t[r++];n.o(e,s)?0===c&&r++:0===c?Object.defineProperty(e,s,{enumerable:!0,value:t[r++]}):Object.defineProperty(e,s,{enumerable:!0,get:c})}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){for(const[n,s]of Object.entries(t))r.STATE[e(n)]={key:n,namespace:e,value:s.bind(null,(0,r.createStore)(e())),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:()=>c,isAsyncFunction:()=>a,isFunction:()=>i,isObject:()=>u,isString:()=>o,map:()=>d,recreateStructure:()=>y,uid:()=>g});const r=/((\/\/.*$)|(\/\*[\s\S]*?\*\/))/gm,s=/([^\s,]+)/g;function c(e){return"[object Array]"===l(e)}function o(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(c(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 g(){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,createPendingChanges:()=>v,createStore:()=>V,default:()=>_,getState:()=>A,getValues:()=>y,joinStateChanges:()=>E,resetState:()=>O,setState:()=>j,setupValue:()=>p});var r=n("./src/storage.ts"),s=n("./src/helpers.ts"),c=n("./src/actions.ts"),o=n("./src/constants.ts"),i=n("./src/listeners.ts");const a={},u={},l={},f={};async function d(e,t,n){const r=f.GET_TYPE(n),c=Object.assign({},t),o=(0,s.map)(t,(t,n)=>[e(t),n]);f.IS_AVAILABE(r)&&await f.UPDATE_STATE(o,r);for(const n in t){const t=e(n);a[t]=p(n,e,o[t],c[n],r)}return V(e())}function p(e,t,n,r,c){const o=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:c}),a[n].dependants?.push(o)}),{key:e,fullKey:o,value:i?n.apply(null,g(u,t)):n,computeFn:i&&n,dependencies:u,dependants:[],listeners:[],defaultValue:r,storageType:c,namespace:t}}function S(e){return(0,s.filter)(a,(t,{key:n})=>t===e(n))}function y(e){return(0,s.map)(S(e),(e,{key:t,value:n})=>[t,n])}function g(e,t){const n=y(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 c=e[t].newValue;r[c]=!0,delete e[t],Object.assign(s,e),f.IS_AVAILABE(c)&&f.REMOVE_KEY(c,t);for(const e in n)if(!r[e])return;delete u[t],await b(s)}}async function b(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},m(n,e,t)}await(0,i.runStateChangeListeners)((0,s.filter)(t,(e,t)=>!t.isSame))}function m(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 c=a[e].value,o=a[e].computeFn?.apply(null,g(r,s));c!==o&&(n[e]={newValue:o,prevValue:c},a[e].value=o,m(e,t,n))})}function A(e,t){return(0,s.isString)(t)?V(t):(0,s.recreateStructure)(y(e))}async function j(e,t){const n={},r=(0,s.uid)(),c={};(0,s.forEach)(t,(t,r)=>{const s=e(t),{storageType:o,computeFn:i,isAction:u}=a[s];i||u||(n[o]||(n[o]={}),c[o]=!0,n[o][s]=r)}),u[r]={storageTypes:c,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(f.IS_AVAILABE(e)){if(await f.SET_VALUES(e,t))return}E((0,s.map)(t,(e,t)=>[e,{newValue:t}]))}async function O(e,t){return await j(e,h(e,t)),V(e())}function h(e,t){const n=S(e);return(0,s.map)(t?(0,s.filter)(n,(e,{key:n})=>t.includes(n)):n,(e,{key:t,defaultValue:n})=>[t,n])}function v(e){const t=()=>{const t=l[e()];return l[e()]={},t};return{add:t=>Object.assign(l[e()],t),reset:t=>Object.assign(l[e()],h(e,t)),get:()=>l[e()],flush:t,commit:()=>j(e,t())}}function I(e){return!arguments[1]||(0,s.isString)(arguments[1])?A.apply(null,arguments):(0,s.isArray)(arguments[1])||(0,s.isFunction)(arguments[1])||(0,s.isAsyncFunction)(arguments[1])?i.addStateListener.apply(null,arguments):(0,s.isObject)(arguments[1])?j.apply(null,arguments):void 0}function L(e){Object.assign(f,e)}function V(e){const t=t=>function(e,t){return`${e}${(0,s.isString)(t)&&o.NAMESPACE_DELIMITER||""}${t||""}`}(e,t);return l[t()]||(l[t()]={}),i.LISTENERS[t()]||(i.LISTENERS[t()]=[]),Object.assign(I.bind(null,t),{add:e=>d(t,e,!1),addPersistent:e=>d(t,e,!0),get:e=>A(t,e),set:async e=>await j(t,e),reset:e=>O(t,e),changes:v(t),onChange:(e,n)=>(0,i.addStateListener)(t,e,n),removeListener:(e,n)=>(0,i.removeStateListener)(t,e,n),actions:e=>(0,c.addStateActions)(t,e),setStorageUtils:L,joinStateChanges:E,namespace:t})}L(r.default);const _=V("")},"./src/listeners.ts"(e,t,n){n.r(t),n.d(t,{LISTENERS:()=>o,addStateListener:()=>a,removeStateListener:()=>u,runStateChangeListeners:()=>i});var r=n("./src/index.ts"),s=n("./src/constants.ts"),c=n("./src/helpers.ts");const o={};async function i(e){if(Object.keys(e).length){const{namespace:t}=r.STATE[Object.keys(e)[0]];for(const[n]of Object.entries(e)){const{listeners:e,key:s}=r.STATE[n];for(const n of e){const e=n.bind(null,[s],(0,r.createStore)(t()));(0,c.isAsyncFunction)(n)?await e():e()}}const n=`${t()}${s.NAMESPACE_DELIMITER}`.length,i=(0,c.map)(e,e=>e.slice(n));for(const e of o[t()]){const n=e.bind(null,i,(0,r.createStore)(t()));(0,c.isAsyncFunction)(e)?await n():n()}}}function a(e,t,n){return(0,c.isFunction)(t)||(0,c.isAsyncFunction)(t)?(o[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,c.isFunction)(t)||(0,c.isAsyncFunction)(t)){const n=o[e()].findIndex(e=>e===t);return o[e()].splice(n,1),(0,r.createStore)(e())}return t.forEach(t=>{const s=r.STATE[e(t)].listeners,c=s?.findIndex(e=>e===n);s?.splice(c,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 c=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](c,c.exports,n),c.exports}n.d=(e,t)=>{if(Array.isArray(t))for(var r=0;r<t.length;){var s=t[r++],c=t[r++];n.o(e,s)?0===c&&r++:0===c?Object.defineProperty(e,s,{enumerable:!0,value:t[r++]}):Object.defineProperty(e,s,{enumerable:!0,get:c})}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.63",
+  "version": "0.6.65",
   "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

@@ -1,17 +1,11 @@
-import { STATE, getState, setState, resetState } from ".";
+import { STATE, createStore } 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)) {
+  for (const [actionName, actionFn] of Object.entries(actions)) {
     STATE[namespace(actionName)] = {
       key: actionName,
       namespace,
-      value: actionFn.bind(null, stateAcessor),
+      value: actionFn.bind(null, createStore(namespace())),
       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,13 +10,14 @@ import {
   filter,
   recreateStructure,
   forEach,
+  uid,
+  isAsyncFunction,
 } from "./helpers";
 
 import { addStateActions } from "./actions";
 
 import { NAMESPACE_DELIMITER } from "./constants";
 
-import { isValid } from "./validation";
 import {
   runStateChangeListeners,
   addStateListener,
@@ -25,6 +26,8 @@ import {
 } from "./listeners";
 
 export const STATE = {} as IState;
+const STATE_CHANGED_PIECES = {} as IStateUpdatePieces;
+const STATE_PENDING_CHANGES = {} as IStatePendingChanges;
 const STORAGE = {} as IStorageFunctions;
 
 setStorageUtils(storageUtils);
@@ -45,13 +48,8 @@ async function addState(
     await STORAGE.UPDATE_STATE(values, storageType as string);
   }
 
-  if (!LISTENERS[namespace()]) {
-    LISTENERS[namespace()] = [];
-  }
-
   for (const key in initialState) {
     const fullKey = namespace(key);
-    isValid.Defining(fullKey);
     STATE[fullKey] = setupValue(
       key,
       namespace,
@@ -125,6 +123,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(STATE_CHANGED_PIECES)) {
+    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 STATE_CHANGED_PIECES[updateId];
+
+      await onStateChange(changes);
+    }
+  }
+}
+
 async function onStateChange(changes: IStateChanges) {
   const realChanges = {} as IStateChanges;
 
@@ -207,6 +232,8 @@ export async function setState(
   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);
@@ -220,11 +247,19 @@ export async function setState(
       storageChanges[storageType!] = {};
     }
 
+    storageTypes[storageType!] = true;
+
     storageChanges[storageType!][fullKey] = v;
   });
 
+  STATE_CHANGED_PIECES[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());
@@ -241,25 +276,47 @@ async function setValues(
     }
   }
 
-  onStateChange(
+  joinStateChanges(
     map(changes, (k, newValue) => [k, { newValue }]) as Record<string, any>,
   );
 }
 
 export async function resetState(namespace: INamespace, keys?: string[]) {
+  await setState(namespace, getDefaultValues(namespace, keys));
+
+  return createStore(namespace());
+}
+
+function getDefaultValues(namespace: INamespace, keys?: string[]) {
   const namespaceState = getNamespaceState(namespace);
 
-  await setState(
-    namespace,
-    map(
-      keys
-        ? filter(namespaceState, (k, { key }) => keys.includes(key!))
-        : namespaceState,
-      (k, { key, defaultValue }) => [key, defaultValue],
-    ) as Record<string, any>,
-  );
+  return map(
+    keys
+      ? filter(namespaceState, (k, { key }) => keys.includes(key!))
+      : namespaceState,
+    (k, { key, defaultValue }) => [key, defaultValue],
+  ) as Record<string, any>;
+}
 
-  return createStore(namespace());
+export function createPendingChanges(namespace: INamespace) {
+  const flush = () => {
+    const changes = STATE_PENDING_CHANGES[namespace()];
+    STATE_PENDING_CHANGES[namespace()] = {};
+    return changes;
+  }
+
+  return {
+    add: (changes: Record<string, any>) =>
+      Object.assign(STATE_PENDING_CHANGES[namespace()], changes),
+    reset: (keys: string[]) =>
+      Object.assign(
+        STATE_PENDING_CHANGES[namespace()],
+        getDefaultValues(namespace, keys),
+      ),
+    get: () => STATE_PENDING_CHANGES[namespace()],
+    flush,
+    commit: () => setState(namespace, flush()),
+  };
 }
 
 function main(namespace: INamespace): any {
@@ -267,7 +324,7 @@ function main(namespace: INamespace): any {
     return getState.apply(null, arguments as unknown as [INamespace, string]);
   }
 
-  if (isArray(arguments[1])) {
+  if (isArray(arguments[1]) || isFunction(arguments[1]) || isAsyncFunction(arguments[1])) {
     return addStateListener.apply(
       null,
       arguments as unknown as [INamespace, string[], () => {}],
@@ -294,6 +351,14 @@ export function createStore(_namespace: string) {
   const namespace = ((key: string) =>
     addNamespace(_namespace, key)) as INamespace;
 
+  if (!STATE_PENDING_CHANGES[namespace()]) {
+    STATE_PENDING_CHANGES[namespace()] = {};
+  }
+
+  if (!LISTENERS[namespace()]) {
+    LISTENERS[namespace()] = [];
+  }
+
   return Object.assign(main.bind(null, namespace), {
     add: (state: IStateDefault) => addState(namespace, state, false),
     addPersistent: (state: IStateDefault) => addState(namespace, state, true),
@@ -301,13 +366,15 @@ export function createStore(_namespace: string) {
     set: async (changes: Record<string, unknown>) =>
       await setState(namespace, changes),
     reset: (keys: string[]) => resetState(namespace, keys),
+    changes: createPendingChanges(namespace),
     onChange: (keys: string[], cb: () => {}) =>
       addStateListener(namespace, keys, cb),
     removeListener: (keys: string[], cb: () => {}) =>
       removeStateListener(namespace, keys, cb),
     actions: (actions: IStateActions) => addStateActions(namespace, actions),
     setStorageUtils,
-    onStateChange,
+    joinStateChanges,
+    namespace,
   });
 }