@e7w/easy-model 0.0.2 → 0.0.4

package/dist/index.es.js

@@ -3,12 +3,12 @@ var _ = (n, t, e) => t in n ? j(n, t, { enumerable: !0, configurable: !0, writab
 var i = (n, t, e) => (_(n, typeof t != "symbol" ? t + "" : t, e), e);
 const h = /* @__PURE__ */ new WeakMap(), k = Symbol("origin");
 function o(n) {
-  if (n = f(n), h.has(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;
 }
-function f(n) {
+function u(n) {
   return n[k] || n;
 }
 class C {
@@ -20,10 +20,11 @@ class C {
   get(t, e, s) {
     if (e === k)
       return this.obj;
-    let r = w(t, e) || Reflect.get(t, e, s);
+    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);
   }
   set(t, e, s, r) {
+    s && (s = u(s));
     const c = Reflect.set(t, e, s, r);
     return d(this.obj, [e]), c;
   }
@@ -32,17 +33,17 @@ class C {
   }
 }
 const l = ["push", "pop", "shift", "unshift", "splice"];
-function w(n, t) {
+function O(n, t) {
   return t === "hasOwnProperty" ? function(e) {
-    return f(this).hasOwnProperty(e);
+    return u(this).hasOwnProperty(e);
   } : Array.isArray(n) && typeof l[t] == "function" ? function(...e) {
-    const s = l[t].apply(f(this), e);
+    const s = l[t].apply(u(this), e);
     return l.includes(t) && d(this, [t]), s;
   } : null;
 }
 const a = /* @__PURE__ */ new WeakMap();
 function b(n) {
-  return n = f(n), a.has(n) || a.set(n, /* @__PURE__ */ new Set()), a.get(n);
+  return n = u(n), a.has(n) || a.set(n, /* @__PURE__ */ new Set()), a.get(n);
 }
 function y(n, t) {
   b(n).add(t);
@@ -61,7 +62,7 @@ function d(n, t) {
 }
 let p = null;
 function M(n) {
-  return new Proxy(n, new u(n));
+  return new Proxy(n, new f(n));
 }
 function S(n, t, e) {
   const s = e ? n(...e) : Object.create(n.prototype);
@@ -100,7 +101,7 @@ const g = class {
   }
   getInstance(t) {
     for (const e of this.caches.keys()) {
-      if (!e.every(
+      if (e.length !== t.length || !e.every(
         (r, c) => r === t[c] ? !0 : typeof r == "object" && typeof t[c] == "object" ? this.isShallowEqualObj(r, t[c]) : !1
       ))
         continue;
@@ -117,15 +118,15 @@ const g = class {
     return s.length === r.length && s.every((c) => t[c] === e[c]);
   }
 };
-let u = g;
-i(u, "prototypeHandlers", {
+let f = g;
+i(f, "prototypeHandlers", {
   get(t, e, s) {
-    const r = w(t, e);
+    const r = O(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(...O) {
-      return c.apply(o(this), O);
+    return typeof e == "symbol" || ["constructor", "__proto__"].includes(e) || typeof c != "function" ? c : function(...w) {
+      return c.apply(o(this), w);
     };
   }
 });

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 j(n));return o.set(n,e),e}function l(n){return n[u]||n}class j{constructor(e){h(this,"triggers",{});h(this,"cachedFns",{});this.obj=e}get(e,t,s){if(t===u)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(f(e))):(typeof r=="object"&&(r=f(r),b(r,this.getTrigger(t))),r)}set(e,t,s,r){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 O(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 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,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.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=w;h(a,"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(...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 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"})});

package/package.json

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

package/src/observe.ts

@@ -45,6 +45,7 @@ class ObserveHandler<T extends Obj> implements ProxyHandler<T> {
     newValue: any,
     receiver: any
   ): boolean {
+    if (newValue) newValue = getOrigin(newValue);
     const ret = Reflect.set(target, p, newValue, receiver);
     trigger(this.obj, [p]);
     return ret;

package/src/provide.ts

@@ -106,6 +106,7 @@ class Provider<T extends Ctor> implements ProxyHandler<T> {
   private getInstance(args: ConstructorParameters<T>): InstanceType<T> | null {
     for (const cachedArgs of this.caches.keys()) {
       if (
+        cachedArgs.length !== args.length ||
         !cachedArgs.every((arg, index) =>
           arg === args[index]
             ? true