@e7w/easy-model 0.0.11 → 0.0.12

package/dist/index.es.js

@@ -5,17 +5,17 @@ const H = [Promise, WeakMap, WeakSet, Map, Set];
 function v(n) {
   return H.some((t) => n instanceof t);
 }
-const g = /* @__PURE__ */ new WeakMap(), E = Symbol("origin");
-function c(n) {
-  if (n = o(n), v(n))
+const g = /* @__PURE__ */ new WeakMap(), j = Symbol("origin");
+function o(n) {
+  if (n = c(n), v(n))
     return n;
   if (g.has(n))
     return g.get(n);
   const t = new Proxy(n, new T(n));
   return g.set(n, t), t;
 }
-function o(n) {
-  return n && (n[E] || n);
+function c(n) {
+  return n && (n[j] || n);
 }
 class T {
   constructor(t) {
@@ -24,17 +24,17 @@ class T {
     this.obj = t;
   }
   get(t, e, r) {
-    if (e === E)
+    if (e === j)
       return this.obj;
     if (v(t))
-      return Reflect.get(o(t), e);
-    let s = R(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);
+      return Reflect.get(c(t), e);
+    let s = E(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), _(s, this.getTrigger(e))), s);
   }
   set(t, e, r, s) {
-    if (r && (r = o(r)), r === o(Reflect.get(t, e)))
+    if (r && (r = c(r)), r === c(Reflect.get(t, e)))
       return !0;
-    const i = j(), u = Reflect.set(t, e, r, s);
+    const i = R(), u = Reflect.set(t, e, r, s);
     return y(this.obj, [e]), M(i), u;
   }
   getTrigger(t) {
@@ -52,17 +52,17 @@ const l = [
   "sort",
   "reverse"
 ], x = ["includes", "indexOf", "lastIndexOf"], W = ["forEach", "map"];
-function R(n, t) {
+function E(n, t) {
   return t === "hasOwnProperty" ? function(e) {
-    return o(this).hasOwnProperty(e);
+    return c(this).hasOwnProperty(e);
   } : Array.isArray(n) && typeof l[t] == "function" ? W.includes(t) ? n[t] : function(...e) {
-    const r = l[t].apply(o(this), e);
-    return x.includes(t) && (r === -1 || r === !1) ? l[t].apply(o(this), ...e.map(o)) : (l.includes(t) && y(this, [t]), r);
+    const r = l[t].apply(c(this), e);
+    return x.includes(t) && (r === -1 || r === !1) ? l[t].apply(c(this), ...e.map(c)) : (l.includes(t) && y(this, [t]), r);
   } : null;
 }
 const p = /* @__PURE__ */ new WeakMap();
 function m(n) {
-  return n = o(n), p.has(n) || p.set(n, /* @__PURE__ */ new Set()), p.get(n);
+  return n = c(n), p.has(n) || p.set(n, /* @__PURE__ */ new Set()), p.get(n);
 }
 function _(n, t) {
   m(n).add(t);
@@ -87,7 +87,7 @@ function I(n) {
     t.removeEventListener(b, n), n();
   }), t.dispatchEvent(e);
 }
-function j() {
+function R() {
   return d ? null : d = Symbol();
 }
 function M(n) {
@@ -100,7 +100,7 @@ function L(n) {
 }
 function U(n, t, e) {
   const r = e ? n(...e) : Object.create(n.prototype);
-  return c(Object.assign(r, t));
+  return o(Object.assign(r, t));
 }
 const O = class {
   constructor(t) {
@@ -132,12 +132,12 @@ const O = class {
       this.filterArgs(e),
       r === this.Ctor ? this.fakeCtor : r
     );
-    return h !== r ? c(s) : s;
+    return h !== r ? o(s) : s;
   }
   set(t, e, r, s) {
-    if (r && (r = o(r)), r === o(Reflect.get(t, e)))
+    if (r && (r = c(r)), r === c(Reflect.get(t, e)))
       return !0;
-    const i = j(), u = Reflect.set(t, e, r, s);
+    const i = R(), u = Reflect.set(t, e, r, s);
     return this.caches.forEach((w) => {
       const S = w.deref();
       S && y(S, []);
@@ -150,15 +150,15 @@ const O = class {
       ))
         continue;
       const r = this.caches.get(e);
-      return r.deref() ? c(r.deref()) : (this.caches.delete(e), null);
+      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 r = Object.keys(t), s = e.keys(e);
+    const r = Object.keys(t), s = Object.keys(e);
     return r.length === s.length && r.every((i) => t[i] === e[i]);
   }
   filterArgs(t) {
@@ -168,12 +168,12 @@ const O = class {
 let a = O;
 f(a, "prototypeHandlers", {
   get(t, e, r) {
-    const s = R(t, e);
+    const s = E(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(...u) {
-      return i.apply(c(this), u);
+      return i.apply(o(this), u);
     };
   }
 });

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

package/package.json

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

package/src/provide.ts

@@ -163,7 +163,7 @@ class Provider<T extends Ctor> implements ProxyHandler<T> {
 
   private isShallowEqualObj(objectA: Obj, objectB: Obj): Boolean {
     const kOfA = Object.keys(objectA);
-    const kOfB = objectB.keys(objectB);
+    const kOfB = Object.keys(objectB);
     return (
       kOfA.length === kOfB.length &&
       kOfA.every((key) => objectA[key] === objectB[key])