@e7w/easy-model 0.0.8 → 0.0.9

package/dist/helpers.d.ts

@@ -4,3 +4,5 @@ export declare function safeGet(target: Obj, p: string | symbol): any;
 export declare function track(target: Obj, handler: (path: (string | symbol)[]) => void): void;
 export declare function subscribe(target: Obj, handler: (path: (string | symbol)[]) => void): () => void;
 export declare function trigger(target: Obj, path: (string | symbol)[]): void;
+export declare function startTrigger(): symbol | null;
+export declare function endTrigger(symbol: symbol | null): void;

package/dist/index.d.ts

@@ -1,2 +1,2 @@
 export { subscribe } from "./helpers";
-export { provide, extend } from "./provide";
+export { provide, extend, filterSymbol } from "./provide";

package/dist/index.es.js

@@ -1,87 +1,95 @@
-var j = Object.defineProperty;
-var E = (n, t, e) => t in n ? j(n, t, { enumerable: !0, configurable: !0, writable: !0, value: e }) : n[t] = e;
-var i = (n, t, e) => (E(n, typeof t != "symbol" ? t + "" : t, e), e);
-const d = /* @__PURE__ */ new WeakMap(), v = Symbol("origin");
-function c(n) {
-  if (n = u(n), d.has(n))
-    return d.get(n);
-  const t = new Proxy(n, new R(n));
-  return d.set(n, t), t;
+var S = Object.defineProperty;
+var j = (n, t, e) => t in n ? S(n, t, { enumerable: !0, configurable: !0, writable: !0, value: e }) : n[t] = e;
+var c = (n, t, e) => (j(n, typeof t != "symbol" ? t + "" : t, e), e);
+const g = /* @__PURE__ */ new WeakMap(), O = Symbol("origin");
+function o(n) {
+  if (n = f(n), g.has(n))
+    return g.get(n);
+  const t = new Proxy(n, new E(n));
+  return g.set(n, t), t;
 }
-function u(n) {
-  return n && (n[v] || n);
+function f(n) {
+  return n && (n[O] || n);
 }
-class R {
+class E {
   constructor(t) {
-    i(this, "triggers", {});
-    i(this, "cachedFns", {});
+    c(this, "triggers", {});
+    c(this, "cachedFns", {});
     this.obj = t;
   }
-  get(t, e, s) {
-    if (e === v)
+  get(t, e, r) {
+    if (e === O)
       return this.obj;
-    let r = w(t, e) || Reflect.get(t, e, s);
-    return typeof r == "function" ? this.cachedFns[e] || (this.cachedFns[e] = r.bind(c(t))) : (typeof r == "object" && (r = c(r), l(r, this.getTrigger(e))), r);
+    let s = m(t, e) || Reflect.get(t, e, r);
+    return typeof s == "function" ? this.cachedFns[e] || (this.cachedFns[e] = s.bind(o(t))) : (typeof s == "object" && (s = o(s), k(s, this.getTrigger(e))), s);
   }
-  set(t, e, s, r) {
-    if (s && (s = u(s)), s === u(Reflect.get(t, e)))
+  set(t, e, r, s) {
+    if (r && (r = f(r)), r === f(Reflect.get(t, e)))
       return !0;
-    const o = Reflect.set(t, e, s, r);
-    return g(this.obj, [e]), o;
+    const i = A(), y = Reflect.set(t, e, r, s);
+    return _(this.obj, [e]), C(i), y;
   }
   getTrigger(t) {
-    return t in this.triggers || (this.triggers[t] = (e) => g(this.obj, [t, ...e])), this.triggers[t];
+    return t in this.triggers || (this.triggers[t] = (e) => _(this.obj, [t, ...e])), this.triggers[t];
   }
 }
-const b = /* @__PURE__ */ new Set(), f = ["push", "pop", "shift", "unshift", "splice", "sort"];
-function w(n, t) {
+const b = /* @__PURE__ */ new Set();
+let a = null;
+const u = ["push", "pop", "shift", "unshift", "splice", "sort"];
+function m(n, t) {
   return t === "hasOwnProperty" ? function(e) {
-    return u(this).hasOwnProperty(e);
-  } : Array.isArray(n) && typeof f[t] == "function" ? function(...e) {
-    let s;
-    return f.includes(t) ? (s = f[t].apply(u(this), e), g(this, [t])) : s = f[t].apply(this, e), s;
+    return f(this).hasOwnProperty(e);
+  } : Array.isArray(n) && typeof u[t] == "function" ? function(...e) {
+    let r;
+    return u.includes(t) ? (r = u[t].apply(f(this), e), _(this, [t])) : r = u[t].apply(this, e), r;
   } : null;
 }
-const p = /* @__PURE__ */ new WeakMap();
-function k(n) {
-  return n = u(n), p.has(n) || p.set(n, /* @__PURE__ */ new Set()), p.get(n);
+const d = /* @__PURE__ */ new WeakMap();
+function w(n) {
+  return n = f(n), d.has(n) || d.set(n, /* @__PURE__ */ new Set()), d.get(n);
 }
-function l(n, t) {
-  k(n).add(t);
+function k(n, t) {
+  w(n).add(t);
 }
-function m(n, t) {
-  const e = (r) => {
-    if (b.has(t))
-      return l(n, e);
-    C(() => t(r)), b.add(t), l(n, e);
-  }, s = () => {
-    k(n).delete(e);
+function M(n, t) {
+  const e = (s) => {
+    const i = b.has(t);
+    b.add(t), i || R(() => t(s)), k(n, e);
+  }, r = () => {
+    w(n).delete(e);
   };
-  return l(n, e), s;
+  return k(n, e), r;
 }
-function g(n, t) {
-  const e = k(n), s = [...e].reverse();
-  e.clear(), s.forEach((r) => r(t)), b.clear();
+function _(n, t) {
+  const e = w(n), r = [...e];
+  e.clear(), r.forEach((s) => s(t));
 }
-const y = "__easy_model_event__";
-function C(n) {
-  const t = new EventTarget(), e = new Event(y);
-  t.addEventListener(y, () => {
-    t.removeEventListener(y, n), n();
+const p = "__easy_model_event__";
+function R(n) {
+  const t = new EventTarget(), e = new Event(p);
+  t.addEventListener(p, () => {
+    t.removeEventListener(p, n), n();
   }), t.dispatchEvent(e);
 }
-let h = null;
-function M(n) {
-  return new Proxy(n, new a(n));
+function A() {
+  return a ? null : a = Symbol();
 }
-function S(n, t, e) {
-  const s = e ? n(...e) : Object.create(n.prototype);
-  return c(Object.assign(s, t));
+function C(n) {
+  a === n && (a = null, b.clear());
 }
-const _ = class {
+let l = null;
+const H = Symbol("filterSymbol");
+function x(n) {
+  return new Proxy(n, new h(n));
+}
+function F(n, t, e) {
+  const r = e ? n(...e) : Object.create(n.prototype);
+  return o(Object.assign(r, t));
+}
+const v = class {
   constructor(t) {
-    i(this, "fakeCtor");
-    i(this, "caches", /* @__PURE__ */ new Map());
+    c(this, "fakeCtor");
+    c(this, "caches", /* @__PURE__ */ new Map());
     this.Ctor = t;
     const e = function() {
     };
@@ -90,59 +98,63 @@ const _ = class {
         constructor: t,
         __proto__: t.prototype
       },
-      _.prototypeHandlers
+      v.prototypeHandlers
     ), this.fakeCtor = e;
   }
-  apply(t, e, s) {
-    const r = h;
-    h = this.fakeCtor;
-    const o = this.getInstance(s) || this.register(
-      s,
-      Reflect.construct(this.Ctor, s, this.fakeCtor)
+  apply(t, e, r) {
+    const s = l;
+    l = this.fakeCtor;
+    const i = this.getInstance(r) || this.register(
+      r,
+      Reflect.construct(this.Ctor, this.filterArgs(r), this.fakeCtor)
     );
-    return h = r, o;
+    return l = s, i;
   }
-  construct(t, e, s) {
-    const r = Reflect.construct(
+  construct(t, e, r) {
+    const s = Reflect.construct(
       t,
-      e,
-      s === this.Ctor ? this.fakeCtor : s
+      this.filterArgs(e),
+      r === this.Ctor ? this.fakeCtor : r
     );
-    return h !== s ? c(r) : r;
+    return l !== r ? o(s) : s;
   }
   getInstance(t) {
     for (const e of this.caches.keys()) {
       if (e.length !== t.length || !e.every(
-        (r, o) => r === t[o] ? !0 : typeof r == "object" && typeof t[o] == "object" ? this.isShallowEqualObj(r, t[o]) : !1
+        (s, i) => s === t[i] ? !0 : typeof s == "object" && typeof t[i] == "object" ? this.isShallowEqualObj(s, t[i]) : !1
       ))
         continue;
-      const s = this.caches.get(e);
-      return s.deref() ? c(s.deref()) : (this.caches.delete(e), null);
+      const r = this.caches.get(e);
+      return r.deref() ? o(r.deref()) : (this.caches.delete(e), null);
     }
     return null;
   }
   register(t, e) {
-    return this.caches.set(t, new WeakRef(e)), c(e);
+    return this.caches.set(t, new WeakRef(e)), o(e);
   }
   isShallowEqualObj(t, e) {
-    const s = Object.keys(t), r = e.keys(e);
-    return s.length === r.length && s.every((o) => t[o] === e[o]);
+    const r = Object.keys(t), s = e.keys(e);
+    return r.length === s.length && r.every((i) => t[i] === e[i]);
+  }
+  filterArgs(t) {
+    return t.filter((e) => e !== H);
   }
 };
-let a = _;
-i(a, "prototypeHandlers", {
-  get(t, e, s) {
-    const r = w(t, e);
-    if (r)
-      return r;
-    const o = Reflect.get(t, e, s);
-    return typeof e == "symbol" || ["constructor", "__proto__"].includes(e) || typeof o != "function" ? o : function(...O) {
-      return o.apply(c(this), O);
+let h = v;
+c(h, "prototypeHandlers", {
+  get(t, e, r) {
+    const s = m(t, e);
+    if (s)
+      return s;
+    const i = Reflect.get(t, e, r);
+    return typeof e == "symbol" || ["constructor", "__proto__"].includes(e) || typeof i != "function" ? i : function(...y) {
+      return i.apply(o(this), y);
     };
   }
 });
 export {
-  S as extend,
-  M as provide,
-  m as subscribe
+  F as extend,
+  H as filterSymbol,
+  x as provide,
+  M as subscribe
 };

package/dist/index.umd.js

@@ -1 +1 @@
-(function(i,o){typeof exports=="object"&&typeof module<"u"?o(exports):typeof define=="function"&&define.amd?define(["exports"],o):(i=typeof globalThis<"u"?globalThis:i||self,o(i["@e7w/easy-model"]={}))})(this,function(i){"use strict";var H=Object.defineProperty;var M=(i,o,f)=>o in i?H(i,o,{enumerable:!0,configurable:!0,writable:!0,value:f}):i[o]=f;var l=(i,o,f)=>(M(i,typeof o!="symbol"?o+"":o,f),f);const o=new WeakMap,f=Symbol("origin");function u(n){if(n=h(n),o.has(n))return o.get(n);const e=new Proxy(n,new j(n));return o.set(n,e),e}function h(n){return n&&(n[f]||n)}class j{constructor(e){l(this,"triggers",{});l(this,"cachedFns",{});this.obj=e}get(e,t,s){if(t===f)return this.obj;let r=O(e,t)||Reflect.get(e,t,s);return typeof r=="function"?this.cachedFns[t]||(this.cachedFns[t]=r.bind(u(e))):(typeof r=="object"&&(r=u(r),d(r,this.getTrigger(t))),r)}set(e,t,s,r){if(s&&(s=h(s)),s===h(Reflect.get(e,t)))return!0;const c=Reflect.set(e,t,s,r);return _(this.obj,[t]),c}getTrigger(e){return e in this.triggers||(this.triggers[e]=t=>_(this.obj,[e,...t])),this.triggers[e]}}const b=new Set,a=["push","pop","shift","unshift","splice","sort"];function O(n,e){return e==="hasOwnProperty"?function(t){return h(this).hasOwnProperty(t)}:Array.isArray(n)&&typeof a[e]=="function"?function(...t){let s;return a.includes(e)?(s=a[e].apply(h(this),t),_(this,[e])):s=a[e].apply(this,t),s}:null}const g=new WeakMap;function k(n){return n=h(n),g.has(n)||g.set(n,new Set),g.get(n)}function d(n,e){k(n).add(e)}function m(n,e){const t=r=>{if(b.has(e))return d(n,t);E(()=>e(r)),b.add(e),d(n,t)},s=()=>{k(n).delete(t)};return d(n,t),s}function _(n,e){const t=k(n),s=[...t].reverse();t.clear(),s.forEach(r=>r(e)),b.clear()}const v="__easy_model_event__";function E(n){const e=new EventTarget,t=new Event(v);e.addEventListener(v,()=>{e.removeEventListener(v,n),n()}),e.dispatchEvent(t)}let p=null;function R(n){return new Proxy(n,new y(n))}function S(n,e,t){const s=t?n(...t):Object.create(n.prototype);return u(Object.assign(s,e))}const w=class{constructor(e){l(this,"fakeCtor");l(this,"caches",new Map);this.Ctor=e;const t=function(){};t.prototype=new Proxy({constructor:e,__proto__:e.prototype},w.prototypeHandlers),this.fakeCtor=t}apply(e,t,s){const r=p;p=this.fakeCtor;const c=this.getInstance(s)||this.register(s,Reflect.construct(this.Ctor,s,this.fakeCtor));return p=r,c}construct(e,t,s){const r=Reflect.construct(e,t,s===this.Ctor?this.fakeCtor:s);return p!==s?u(r):r}getInstance(e){for(const t of this.caches.keys()){if(t.length!==e.length||!t.every((r,c)=>r===e[c]?!0:typeof r=="object"&&typeof e[c]=="object"?this.isShallowEqualObj(r,e[c]):!1))continue;const s=this.caches.get(t);return s.deref()?u(s.deref()):(this.caches.delete(t),null)}return null}register(e,t){return this.caches.set(e,new WeakRef(t)),u(t)}isShallowEqualObj(e,t){const s=Object.keys(e),r=t.keys(t);return s.length===r.length&&s.every(c=>e[c]===t[c])}};let y=w;l(y,"prototypeHandlers",{get(e,t,s){const r=O(e,t);if(r)return r;const c=Reflect.get(e,t,s);return typeof t=="symbol"||["constructor","__proto__"].includes(t)||typeof c!="function"?c:function(...C){return c.apply(u(this),C)}}}),i.extend=S,i.provide=R,i.subscribe=m,Object.defineProperty(i,Symbol.toStringTag,{value:"Module"})});
+(function(o,c){typeof exports=="object"&&typeof module<"u"?c(exports):typeof define=="function"&&define.amd?define(["exports"],c):(o=typeof globalThis<"u"?globalThis:o||self,c(o["@e7w/easy-model"]={}))})(this,function(o){"use strict";var F=Object.defineProperty;var P=(o,c,f)=>c in o?F(o,c,{enumerable:!0,configurable:!0,writable:!0,value:f}):o[c]=f;var h=(o,c,f)=>(P(o,typeof c!="symbol"?c+"":c,f),f);const c=new WeakMap,f=Symbol("origin");function u(n){if(n=l(n),c.has(n))return c.get(n);const e=new Proxy(n,new T(n));return c.set(n,e),e}function l(n){return n&&(n[f]||n)}class T{constructor(e){h(this,"triggers",{});h(this,"cachedFns",{});this.obj=e}get(e,t,r){if(t===f)return this.obj;let s=O(e,t)||Reflect.get(e,t,r);return typeof s=="function"?this.cachedFns[t]||(this.cachedFns[t]=s.bind(u(e))):(typeof s=="object"&&(s=u(s),m(s,this.getTrigger(t))),s)}set(e,t,r,s){if(r&&(r=l(r)),r===l(Reflect.get(e,t)))return!0;const i=A(),S=Reflect.set(e,t,r,s);return _(this.obj,[t]),C(i),S}getTrigger(e){return e in this.triggers||(this.triggers[e]=t=>_(this.obj,[e,...t])),this.triggers[e]}}const p=new Set;let a=null;const d=["push","pop","shift","unshift","splice","sort"];function O(n,e){return e==="hasOwnProperty"?function(t){return l(this).hasOwnProperty(t)}:Array.isArray(n)&&typeof d[e]=="function"?function(...t){let r;return d.includes(e)?(r=d[e].apply(l(this),t),_(this,[e])):r=d[e].apply(this,t),r}:null}const b=new WeakMap;function k(n){return n=l(n),b.has(n)||b.set(n,new Set),b.get(n)}function m(n,e){k(n).add(e)}function E(n,e){const t=s=>{const i=p.has(e);p.add(e),i||R(()=>e(s)),m(n,t)},r=()=>{k(n).delete(t)};return m(n,t),r}function _(n,e){const t=k(n),r=[...t];t.clear(),r.forEach(s=>s(e))}const v="__easy_model_event__";function R(n){const e=new EventTarget,t=new Event(v);e.addEventListener(v,()=>{e.removeEventListener(v,n),n()}),e.dispatchEvent(t)}function A(){return a?null:a=Symbol()}function C(n){a===n&&(a=null,p.clear())}let y=null;const j=Symbol("filterSymbol");function H(n){return new Proxy(n,new g(n))}function M(n,e,t){const r=t?n(...t):Object.create(n.prototype);return u(Object.assign(r,e))}const w=class{constructor(e){h(this,"fakeCtor");h(this,"caches",new Map);this.Ctor=e;const t=function(){};t.prototype=new Proxy({constructor:e,__proto__:e.prototype},w.prototypeHandlers),this.fakeCtor=t}apply(e,t,r){const s=y;y=this.fakeCtor;const i=this.getInstance(r)||this.register(r,Reflect.construct(this.Ctor,this.filterArgs(r),this.fakeCtor));return y=s,i}construct(e,t,r){const s=Reflect.construct(e,this.filterArgs(t),r===this.Ctor?this.fakeCtor:r);return y!==r?u(s):s}getInstance(e){for(const t of this.caches.keys()){if(t.length!==e.length||!t.every((s,i)=>s===e[i]?!0:typeof s=="object"&&typeof e[i]=="object"?this.isShallowEqualObj(s,e[i]):!1))continue;const r=this.caches.get(t);return r.deref()?u(r.deref()):(this.caches.delete(t),null)}return null}register(e,t){return this.caches.set(e,new WeakRef(t)),u(t)}isShallowEqualObj(e,t){const r=Object.keys(e),s=t.keys(t);return r.length===s.length&&r.every(i=>e[i]===t[i])}filterArgs(e){return e.filter(t=>t!==j)}};let g=w;h(g,"prototypeHandlers",{get(e,t,r){const s=O(e,t);if(s)return s;const i=Reflect.get(e,t,r);return typeof t=="symbol"||["constructor","__proto__"].includes(t)||typeof i!="function"?i:function(...S){return i.apply(u(this),S)}}}),o.extend=M,o.filterSymbol=j,o.provide=H,o.subscribe=E,Object.defineProperty(o,Symbol.toStringTag,{value:"Module"})});

package/dist/provide.d.ts

@@ -1,4 +1,5 @@
 import { type Ctor } from "./helpers";
+export declare const filterSymbol: unique symbol;
 export declare function provide<T extends Ctor>(Ctor: T): T & ((...args: ConstructorParameters<T>) => InstanceType<T>);
 export declare function extend<T extends ReturnType<typeof provide>, P extends Partial<InstanceType<T>>>(Provider: T, extendData: P): P & Partial<Omit<InstanceType<T>, keyof P>>;
 export declare function extend<T extends ReturnType<typeof provide>, P extends Partial<InstanceType<T>>, M extends Parameters<T>>(Provider: T, extendData: P, args: M): InstanceType<T>;

package/package.json

@@ -1,10 +1,10 @@
 {
   "name": "@e7w/easy-model",
-  "version": "0.0.8",
+  "version": "0.0.9",
   "description": "一个简单的状态管理包, A simple state management lib for Typescript",
   "main": "./src/index.ts",
   "module": "./dist/index.es.js",
-  "types": "./src/index.d.ts",
+  "types": "./src/index.ts",
   "typings": "./dist/index.d.ts",
   "exports": {
     "import": "./dist/index.es.js",

package/src/helpers.ts

@@ -1,6 +1,7 @@
 import { getOrigin } from "./observe";
 
 const triggered = new Set();
+let triggerSymbol: Symbol | null = null;
 
 export type Ctor = new (...args: any[]) => any;
 export type Obj = Record<string | symbol | number, any>;
@@ -49,9 +50,9 @@ export function subscribe(
   handler: (path: (string | symbol)[]) => void
 ): () => void {
   const wrappedHandler: typeof handler = (path) => {
-    if (triggered.has(handler)) return track(target, wrappedHandler);
-    triggerTop(() => handler(path));
+    const isTriggered = triggered.has(handler);
     triggered.add(handler);
+    if (!isTriggered) triggerTop(() => handler(path));
     track(target, wrappedHandler);
   };
   const unsubscribe = () => {
@@ -63,11 +64,9 @@ export function subscribe(
 
 export function trigger(target: Obj, path: (string | symbol)[]): void {
   const handlers = getUpdateHandlers(target);
-  const cbs = [...handlers].reverse();
+  const cbs = [...handlers];
   handlers.clear();
-
   cbs.forEach((fn) => fn(path));
-  triggered.clear();
 }
 
 const eventName = "__easy_model_event__";
@@ -80,3 +79,14 @@ function triggerTop(cb: () => void): void {
   });
   target.dispatchEvent(e);
 }
+
+export function startTrigger() {
+  if (triggerSymbol) return null;
+  return (triggerSymbol = Symbol());
+}
+
+export function endTrigger(symbol: symbol | null) {
+  if (triggerSymbol !== symbol) return;
+  triggerSymbol = null;
+  triggered.clear();
+}

package/src/index.ts

@@ -1,2 +1,2 @@
 export { subscribe } from "./helpers";
-export { provide, extend } from "./provide";
+export { provide, extend, filterSymbol } from "./provide";

package/src/observe.ts

@@ -1,4 +1,11 @@
-import { type Obj, safeGet, track, trigger } from "./helpers";
+import {
+  type Obj,
+  safeGet,
+  track,
+  trigger,
+  startTrigger,
+  endTrigger,
+} from "./helpers";
 
 const observedMap = new WeakMap();
 const origin = Symbol("origin");
@@ -48,8 +55,10 @@ class ObserveHandler<T extends Obj> implements ProxyHandler<T> {
   ): boolean {
     if (newValue) newValue = getOrigin(newValue);
     if (newValue === getOrigin(Reflect.get(target, p))) return true;
+    const flag = startTrigger();
     const ret = Reflect.set(target, p, newValue, receiver);
     trigger(this.obj, [p]);
+    endTrigger(flag);
     return ret;
   }
 

package/src/provide.ts

@@ -3,6 +3,8 @@ import { observe } from "./observe";
 
 let creatingTarget: any = null;
 
+export const filterSymbol = Symbol("filterSymbol");
+
 export function provide<T extends Ctor>(
   Ctor: T
 ): T & ((...args: ConstructorParameters<T>) => InstanceType<T>) {
@@ -84,7 +86,7 @@ class Provider<T extends Ctor> implements ProxyHandler<T> {
       this.getInstance(argArray) ||
       this.register(
         argArray,
-        Reflect.construct(this.Ctor, argArray, this.fakeCtor)
+        Reflect.construct(this.Ctor, this.filterArgs(argArray), this.fakeCtor)
       );
     creatingTarget = last;
     return instance;
@@ -97,7 +99,7 @@ class Provider<T extends Ctor> implements ProxyHandler<T> {
   ): InstanceType<T> {
     const instance = Reflect.construct(
       target,
-      argArray,
+      this.filterArgs(argArray),
       newTarget === this.Ctor ? this.fakeCtor : newTarget
     );
     if (creatingTarget !== newTarget) return observe(instance);
@@ -142,4 +144,8 @@ class Provider<T extends Ctor> implements ProxyHandler<T> {
       kOfA.every((key) => objectA[key] === objectB[key])
     );
   }
+
+  private filterArgs(args: any[]): any[] {
+    return args.filter((arg) => arg !== filterSymbol);
+  }
 }