@e7w/easy-model 0.0.4 → 0.0.6

package/dist/index.es.js

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@e7w/easy-model",
-  "version": "0.0.4",
+  "version": "0.0.6",
   "description": "一个简单的状态管理包, A simple state management lib for Typescript",
   "main": "./src/index.ts",
   "module": "./dist/index.es.js",

package/src/helpers.ts

@@ -1,5 +1,7 @@
 import { getOrigin } from "./observe";
 
+const triggered = new Set();
+
 export type Ctor = new (...args: any[]) => any;
 export type Obj = Record<string | symbol | number, any>;
 const fakeArr: any = ["push", "pop", "shift", "unshift", "splice"];
@@ -42,7 +44,9 @@ export function subscribe(
   handler: (path: (string | symbol)[]) => void
 ): () => void {
   const wrappedHandler: typeof handler = (path) => {
-    handler(path);
+    if (triggered.has(handler)) return;
+    triggerTop(() => handler(path));
+    triggered.add(handler);
     track(target, wrappedHandler);
   };
   const unsubscribe = () => {
@@ -54,8 +58,20 @@ export function subscribe(
 
 export function trigger(target: Obj, path: (string | symbol)[]): void {
   const handlers = getUpdateHandlers(target);
-  const cbs = [...handlers];
+  const cbs = [...handlers].reverse();
   handlers.clear();
 
-  return cbs.forEach((fn) => fn(path));
+  cbs.forEach((fn) => fn(path));
+  triggered.clear();
+}
+
+const eventName = "__easy_model_event__";
+function triggerTop(cb: () => void): void {
+  const target = new EventTarget();
+  const e = new Event(eventName);
+  target.addEventListener(eventName, () => {
+    target.removeEventListener(eventName, cb);
+    cb();
+  });
+  target.dispatchEvent(e);
 }

package/src/observe.ts

@@ -11,6 +11,7 @@ export function observe<T extends Obj>(target: T): T {
 }
 
 export function getOrigin<T extends Obj>(target: T): T {
+  if (!target) return target;
   return target[origin] || target;
 }
 
@@ -46,6 +47,7 @@ class ObserveHandler<T extends Obj> implements ProxyHandler<T> {
     receiver: any
   ): boolean {
     if (newValue) newValue = getOrigin(newValue);
+    if (newValue === getOrigin(Reflect.get(target, p))) return true;
     const ret = Reflect.set(target, p, newValue, receiver);
     trigger(this.obj, [p]);
     return ret;

package/src/provide.ts

@@ -78,6 +78,7 @@ class Provider<T extends Ctor> implements ProxyHandler<T> {
     argArray: ConstructorParameters<T>
   ): InstanceType<T> {
     // todo: 循环引用创建时抛出错误
+    const last = creatingTarget;
     creatingTarget = this.fakeCtor;
     const instance =
       this.getInstance(argArray) ||
@@ -85,7 +86,7 @@ class Provider<T extends Ctor> implements ProxyHandler<T> {
         argArray,
         Reflect.construct(this.Ctor, argArray, this.fakeCtor)
       );
-    creatingTarget = null;
+    creatingTarget = last;
     return instance;
   }