@e7w/easy-model 0.0.9 → 0.0.10

package/dist/index.es.js

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

package/dist/index.umd.js

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

package/package.json

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

package/src/provide.ts

@@ -1,5 +1,12 @@
-import { type Ctor, type Obj, safeGet } from "./helpers";
-import { observe } from "./observe";
+import {
+  type Ctor,
+  type Obj,
+  safeGet,
+  trigger,
+  startTrigger,
+  endTrigger,
+} from "./helpers";
+import { getOrigin, observe } from "./observe";
 
 let creatingTarget: any = null;
 
@@ -106,6 +113,24 @@ class Provider<T extends Ctor> implements ProxyHandler<T> {
     return instance;
   }
 
+  public set(
+    target: T,
+    p: string | symbol,
+    newValue: any,
+    receiver: any
+  ): boolean {
+    if (newValue) newValue = getOrigin(newValue);
+    if (newValue === getOrigin(Reflect.get(target, p) as any)) return true;
+    const flag = startTrigger();
+    const ret = Reflect.set(target, p, newValue, receiver);
+    this.caches.forEach((ref) => {
+      const instance = ref.deref();
+      if (instance) trigger(instance, []);
+    });
+    endTrigger(flag);
+    return ret;
+  }
+
   private getInstance(args: ConstructorParameters<T>): InstanceType<T> | null {
     for (const cachedArgs of this.caches.keys()) {
       if (