ezh 0.1.6 → 0.2.0

package/lib/index.d.ts

@@ -517,7 +517,7 @@ export declare const bindData: <T extends State<T>, K extends keyof T>(data: T,
 	K,
 	T[K]
 ];
-export declare const useState: <T extends State<T>>(initial: T | ((current?: T) => T), resetOnUnmount?: boolean) => T;
+export declare const useState: <T extends State<T>>(initial: T, hook?: (ver: number, state: T) => void) => T;
 export declare const navigate: (to: string, replace?: true) => void;
 export declare const route: <ParamT extends object>(com: Com<ParamT>, path: string, needAuth?: boolean) => IRoute<ParamT>;
 export declare const Router: Com<RouterProp>;

package/lib/router.js

@@ -2,10 +2,10 @@ import { Path } from 'path-parser';
 import { $ezh } from './elements';
 import { useState } from './state';
 export { navigate, route, Router, Link, RouteLink, };
-let d = 0;
-const e = useState({ c: 0 });
+let c = 0;
+const d = useState({ ver: 0 });
 window.addEventListener('popstate', () => {
-    e.c = ++d;
+    d.ver = ++c;
 });
 const navigate = (to, replace) => {
     const { pathname, search, hash } = window.location;
@@ -18,15 +18,15 @@ const navigate = (to, replace) => {
             window.history.replaceState(undefined, '', to);
         }
         queueMicrotask(() => {
-            e.c = ++d;
+            d.ver = ++c;
         });
     }
 };
-const f = 'ezhEZH';
-class i {
+const e = 'ezhEZH';
+class h {
     constructor(com, path, needAuth) {
         this.com = com;
-        this.b = Path.createPath(path + f);
+        this.b = Path.createPath(path + e);
         this.needAuth = needAuth;
     }
     com;
@@ -34,16 +34,16 @@ class i {
     parseParam(url) {
         const param = this.b.test(url);
         if (param) {
-            delete param[f];
+            delete param[e];
             return param;
         }
     }
-    buildUrl(k) {
+    buildUrl(j) {
         throw new Error('WildcardRoute does not support buildUrl');
     }
     b;
 }
-class j {
+class i {
     constructor(com, path, needAuth) {
         this.com = com;
         this.b = Path.createPath(path);
@@ -60,10 +60,10 @@ class j {
     b;
 }
 const route = (com, path, needAuth = true) => {
-    return path.endsWith('*') ? new i(com, path, needAuth) : new j(com, path, needAuth);
+    return path.endsWith('*') ? new h(com, path, needAuth) : new i(com, path, needAuth);
 };
 const Router = ({ routes, notFound, checkAuth }) => {
-    d = e.c;
+    c = d.ver;
     const { pathname, search, hash } = window.location;
     const a = `${pathname}${search}${hash}`;
     const { $s, $k, $c } = $ezh;
@@ -72,9 +72,9 @@ const Router = ({ routes, notFound, checkAuth }) => {
         const param = route.parseParam(a);
         if (param) {
             if (checkAuth && route.needAuth) {
-                const g = checkAuth(a);
-                if (g) {
-                    navigate(g);
+                const f = checkAuth(a);
+                if (f) {
+                    navigate(f);
                     return;
                 }
             }
@@ -83,8 +83,8 @@ const Router = ({ routes, notFound, checkAuth }) => {
     }
     return notFound ? $s($k('404'), $c('_', notFound, {})) : undefined;
 };
-const h = (v, url, replace) => {
-    v.preventDefault();
+const g = (u, url, replace) => {
+    u.preventDefault();
     const { pathname, search, hash } = window.location;
     const a = `${pathname}${search}${hash}`;
     if (url !== a) {
@@ -94,18 +94,18 @@ const h = (v, url, replace) => {
         else {
             window.history.replaceState(undefined, '', url);
         }
-        e.c = ++d;
+        d.ver = ++c;
     }
 };
 const Link = (props, children) => {
     const { href, className, style, title, replace } = props;
-    const onclick = href ? (v) => h(v, href, replace) : undefined;
+    const onclick = href ? (u) => g(u, href, replace) : undefined;
     return $ezh.$('_', 'a', { className, style, title, href, onclick }, children, -1, 1);
 };
 const RouteLink = (props, children) => {
     const { route, params, className, style, title, replace } = props;
     const href = route.buildUrl(params);
-    const onclick = (v) => h(v, href, replace);
+    const onclick = (u) => g(u, href, replace);
     return $ezh.$('_', 'a', { className, style, title, href, onclick }, children, -1, 1);
 };
 //# sourceMappingURL=router.js.map

package/lib/state.js

@@ -1,86 +1,86 @@
-import { addComReader, p, refreshComReaders } from './elements';
-const f = Symbol();
-const j = Array.prototype;
+import { addComReader, o, refreshComReaders } from './elements';
+const i = Symbol();
+const k = Array.prototype;
 const x = addComReader;
-let l = (readerRecord, key) => {
-    l = refreshComReaders;
-    l(readerRecord, key);
+let m = (readerRecord, key) => {
+    m = refreshComReaders;
+    m(readerRecord, key);
 };
-export let t = false;
+export let u = false;
 export const y = new WeakMap();
-const q = (_) => {
-    return function (...m) {
-        const i = this.length;
-        let begin, c, k;
+const r = (_) => {
+    return function (...n) {
+        const h = this.length;
+        let begin, d, l;
         switch (_) {
-            case j.push:
-                begin = i;
-                c = begin + m.length;
-                k = i;
+            case k.push:
+                begin = h;
+                d = begin + n.length;
+                l = h;
                 break;
-            case j.unshift:
+            case k.unshift:
                 begin = 0;
-                c = m.length;
-                k = i;
+                d = n.length;
+                l = h;
                 break;
-            case j.fill:
-                begin = m[1];
-                if (begin === undefined || begin <= -i) {
+            case k.fill:
+                begin = n[1];
+                if (begin === undefined || begin <= -h) {
                     begin = 0;
                 }
                 else if (begin < 0) {
-                    begin = i + begin;
+                    begin = h + begin;
                 }
-                c = m[2];
-                if (c === undefined || c > i) {
-                    c = i;
+                d = n[2];
+                if (d === undefined || d > h) {
+                    d = h;
                 }
-                else if (c <= -i) {
-                    c = 0;
+                else if (d <= -h) {
+                    d = 0;
                 }
-                else if (c < 0) {
-                    c = i + c;
+                else if (d < 0) {
+                    d = h + d;
                 }
-                k = c;
+                l = d;
                 break;
-            case j.sort:
-            case j.reverse:
-                begin = c = 0;
-                k = i;
+            case k.sort:
+            case k.reverse:
+                begin = d = 0;
+                l = h;
                 break;
-            case j.pop:
-                begin = c = i - 1;
-                k = i;
+            case k.pop:
+                begin = d = h - 1;
+                l = h;
                 break;
-            case j.shift:
-                begin = c = 0;
-                k = i;
+            case k.shift:
+                begin = d = 0;
+                l = h;
                 break;
             default:
-                begin = m[0];
+                begin = n[0];
                 if (begin < 0) {
-                    begin = i + begin;
+                    begin = h + begin;
                 }
-                c = m.length > 2 ? m.length - 2 : 0;
-                k = m[1];
-                if (k === undefined) {
-                    k = i - begin;
+                d = n.length > 2 ? n.length - 2 : 0;
+                l = n[1];
+                if (l === undefined) {
+                    l = h - begin;
                 }
-                k = k > 0 ? (k !== c ? i : begin + c) : (c ? i : begin);
-                c += begin;
+                l = l > 0 ? (l !== d ? h : begin + d) : (d ? h : begin);
+                d += begin;
         }
-        const h = _.bind(this)(...m);
-        const n = this[f];
-        let o;
-        for (let b = begin; b < c; b++) {
-            o = this[b];
-            switch (typeof o) {
+        const e = _.bind(this)(...n);
+        const p = this[i];
+        let q;
+        for (let b = begin; b < d; b++) {
+            q = this[b];
+            switch (typeof q) {
                 case 'object':
-                    if (o) {
-                        while (b < c) {
-                            o = this[b];
-                            if (o && !o[f]) {
-                                this[b] = r(o);
+                    if (q) {
+                        while (b < d) {
+                            q = this[b];
+                            if (q && !q[i]) {
+                                this[b] = s(q);
                             }
                             b++;
                         }
@@ -91,126 +91,126 @@ const q = (_) => {
             }
             break;
         }
-        if (i !== this.length) {
-            l(n, 'length');
+        if (h !== this.length) {
+            m(p, 'length');
         }
-        l(n, Symbol.iterator);
-        return h;
+        m(p, Symbol.iterator);
+        return e;
     };
 };
-const D = {
-    'push': q(j.push),
-    'unshift': q(j.unshift),
-    'fill': q(j.fill),
-    'sort': q(j.sort),
-    'reverse': q(j.reverse),
-    'pop': q(j.pop),
-    'shift': q(j.shift),
-    'splice': q(j.splice),
+const C = {
+    'push': r(k.push),
+    'unshift': r(k.unshift),
+    'fill': r(k.fill),
+    'sort': r(k.sort),
+    'reverse': r(k.reverse),
+    'pop': r(k.pop),
+    'shift': r(k.shift),
+    'splice': r(k.splice),
 };
-const E = (target, d) => {
-    const v = d.length;
-    const i = target.length;
+const D = (target, f) => {
+    const w = f.length;
+    const h = target.length;
     let g;
-    for (let b = 0; b < v; b++) {
-        let a = d[b];
-        if (a && typeof a === 'object') {
+    for (let b = 0; b < w; b++) {
+        let c = f[b];
+        if (c && typeof c === 'object') {
             do {
-                a = d[b];
+                c = f[b];
                 g = target[b];
-                if (a) {
+                if (c) {
                     if (g) {
-                        if (g !== a) {
-                            g[f] = a;
+                        if (g !== c) {
+                            g[i] = c;
                         }
                     }
                     else {
-                        target[b] = r(a);
+                        target[b] = s(c);
                     }
                 }
                 else {
-                    target[b] = a;
+                    target[b] = c;
                 }
-            } while (++b < v);
+            } while (++b < w);
             break;
         }
-        else if (a !== null && a !== undefined) {
+        else if (c !== null && c !== undefined) {
             do {
-                target[b] = d[b];
-            } while (++b < v);
+                target[b] = f[b];
+            } while (++b < w);
             break;
         }
         else {
-            target[b] = a;
+            target[b] = c;
         }
     }
-    const n = target[f];
-    if (i !== v) {
-        if (i > v) {
-            target.length = v;
+    const p = target[i];
+    if (h !== w) {
+        if (h > w) {
+            target.length = w;
         }
-        l(n, 'length');
+        m(p, 'length');
     }
-    l(n, Symbol.iterator);
+    m(p, Symbol.iterator);
 };
-const F = (target, z, d) => {
+const E = (target, z, f) => {
     const A = { ...target };
     let g;
-    for (const u in d) {
-        delete A[u];
-        const a = d[u];
-        if (a && typeof a === 'object') {
-            g = target[u];
+    for (const v in f) {
+        delete A[v];
+        const c = f[v];
+        if (c && typeof c === 'object') {
+            g = target[v];
             if (g) {
-                g[f] = a;
+                g[i] = c;
                 continue;
             }
         }
-        if (target[u] !== a) {
-            z[u] = a;
+        if (target[v] !== c) {
+            z[v] = c;
         }
     }
-    for (const u in A) {
-        delete z[u];
+    for (const v in A) {
+        delete z[v];
     }
 };
-const G = {
+const F = {
     get(target, key) {
-        if (key !== f) {
-            let h = target[key];
-            if (h && h === j[key]) {
-                const C = D[key];
-                if (C) {
-                    return C.bind(target);
+        if (key !== i) {
+            let e = target[key];
+            if (e && e === k[key]) {
+                const B = C[key];
+                if (B) {
+                    return B.bind(target);
                 }
-                h = h.bind(target);
+                e = e.bind(target);
             }
-            x(target[f], key !== 'length' ? Symbol.iterator : key);
-            return h;
+            x(target[i], key !== 'length' ? Symbol.iterator : key);
+            return e;
         }
         return target;
     },
-    set(target, key, d) {
-        if (key !== f) {
-            if (target[key] === d) {
+    set(target, key, f) {
+        if (key !== i) {
+            if (target[key] === f) {
                 return true;
             }
-            const n = target[f];
-            if (d && typeof d === 'object') {
-                d = r(d);
+            const p = target[i];
+            if (f && typeof f === 'object') {
+                f = s(f);
             }
-            target[key] = d;
+            target[key] = f;
             if (key === 'length') {
-                l(n, key);
+                m(p, key);
             }
-            l(n, Symbol.iterator);
+            m(p, Symbol.iterator);
             return true;
         }
-        E(target, d);
+        D(target, f);
         return true;
     },
     has(target, key) {
-        x(target[f], !isNaN(parseInt(key)) ? Symbol.iterator : key);
+        x(target[i], !isNaN(parseInt(key)) ? Symbol.iterator : key);
         return key in target;
     },
     deleteProperty(target, key) {
@@ -218,137 +218,123 @@ const G = {
             key = Symbol.iterator;
         }
         if (target[key] !== undefined) {
-            l(target[f], key);
+            m(target[i], key);
         }
         return delete target[key];
     },
 };
-const H = {
+const G = {
     get(target, key) {
-        if (key !== f) {
-            const h = target[key];
+        if (key !== i) {
+            const e = target[key];
             if (key !== 'id') {
-                x(target[f], key);
+                x(target[i], key);
             }
-            return h;
+            return e;
         }
         return target;
     },
-    set(target, key, d, z) {
-        if (key !== f) {
-            if (target[key] === d) {
+    set(target, key, f, z) {
+        if (key !== i) {
+            if (target[key] === f) {
                 return true;
             }
-            const n = target[f];
-            if (d && typeof d === 'object') {
-                d = r(d);
+            const p = target[i];
+            if (f && typeof f === 'object') {
+                f = s(f);
             }
-            target[key] = d;
-            l(n, key);
+            target[key] = f;
+            m(p, key);
             return true;
         }
-        F(target, z, d);
+        E(target, z, f);
         return true;
     },
     has(target, key) {
-        x(target[f], key);
+        x(target[i], key);
         return key in target;
     },
     deleteProperty(target, key) {
         if (target[key] !== undefined) {
-            l(target[f], key);
+            m(target[i], key);
         }
         return delete target[key];
     },
 };
-const r = (e) => {
+const s = (state) => {
     let target;
-    if (!Array.isArray(e)) {
+    if (!Array.isArray(state)) {
         target = {};
-        for (const key in e) {
-            const a = e[key];
-            target[key] = a && typeof a === 'object' ? r(a) : a;
+        for (const key in state) {
+            const c = state[key];
+            target[key] = c && typeof c === 'object' ? s(c) : c;
         }
-        e = new Proxy(target, H);
+        state = new Proxy(target, G);
     }
     else {
         target = [];
-        const length = e.length;
+        const length = state.length;
         for (let b = 0; b < length; b++) {
-            let a = e[b];
-            if (a && typeof a === 'object') {
+            let c = state[b];
+            if (c && typeof c === 'object') {
                 do {
-                    target[b] = (a = e[b]) && r(a);
+                    target[b] = (c = state[b]) && s(c);
                 } while (++b < length);
                 break;
             }
-            else if (a !== null && a !== undefined) {
+            else if (c !== null && c !== undefined) {
                 do {
-                    target[b] = e[b];
+                    target[b] = state[b];
                 } while (++b < length);
                 break;
             }
-            target[b] = a;
+            target[b] = c;
         }
-        e = new Proxy(target, G);
+        state = new Proxy(target, F);
     }
-    target[f] = {};
-    return e;
+    target[i] = {};
+    return state;
 };
-const $ = (B, a2) => {
-    if (a2) {
-        B.w = true;
+const $ = (a, a1) => {
+    if (a1) {
+        a.ver = 0;
+        a.hook(0, a.state);
     }
     else {
-        B.com.watchMountChange('s', $, B);
+        a.com.watchMountChange('s', $, a);
     }
 };
 export const bindData = (data, key) => {
     return [data, key, data[key]];
 };
-export const useState = (initial, resetOnUnmount) => {
-    const com = p;
+export const useState = (initial, hook) => {
+    const com = o;
     if (com.id) {
-        let s = y.get(com);
-        if (s) {
-            const e = s.e;
-            if (!s.w) {
-                if (typeof initial === 'function') {
-                    t = true;
-                    initial = initial(e);
-                    if (initial !== e) {
-                        e[f] = initial;
-                    }
-                    t = false;
+        let t = y.get(com);
+        if (t) {
+            const { state, hook } = t;
+            if (hook) {
+                if (!t.ver) {
+                    com.watchMountChange('s', $, t);
                 }
+                u = true;
+                hook(++t.ver, state);
+                u = false;
             }
-            else {
-                t = true;
-                if (typeof initial === 'function') {
-                    initial = initial();
-                }
-                e[f] = initial;
-                t = false;
-                s.w = false;
-                com.watchMountChange('s', $, s);
-            }
-            return e;
+            return state;
         }
-        if (typeof initial === 'function') {
-            initial = initial();
+        const state = s(initial);
+        t = { com, state, ver: 1, hook };
+        y.set(com, t);
+        if (hook) {
+            com.watchMountChange('s', $, t);
+            u = true;
+            hook(1, state);
+            u = false;
         }
-        const e = r(initial);
-        s = { com, e, w: false };
-        y.set(com, s);
-        if (resetOnUnmount) {
-            com.watchMountChange('s', $, s);
-        }
-        return e;
-    }
-    if (typeof initial === 'function') {
-        initial = initial();
+        return state;
     }
-    const e = r(initial);
-    return e;
+    const state = s(initial);
+    return state;
 };
 //# sourceMappingURL=state.js.map