@e7w/easy-model 0.0.7 → 0.0.8

package/dist/index.es.js

@@ -1,12 +1,12 @@
 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 l = /* @__PURE__ */ new WeakMap(), v = Symbol("origin");
-function o(n) {
-  if (n = u(n), l.has(n))
-    return l.get(n);
+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 l.set(n, t), t;
+  return d.set(n, t), t;
 }
 function u(n) {
   return n && (n[v] || n);
@@ -21,60 +21,62 @@ class R {
     if (e === v)
       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(o(t))) : (typeof r == "object" && (r = o(r), g(r, this.getTrigger(e))), r);
+    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);
   }
   set(t, e, s, r) {
     if (s && (s = u(s)), s === u(Reflect.get(t, e)))
       return !0;
-    const c = Reflect.set(t, e, s, r);
-    return b(this.obj, [e]), c;
+    const o = Reflect.set(t, e, s, r);
+    return g(this.obj, [e]), o;
   }
   getTrigger(t) {
-    return t in this.triggers || (this.triggers[t] = (e) => b(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 y = /* @__PURE__ */ new Set(), a = ["push", "pop", "shift", "unshift", "splice"];
+const b = /* @__PURE__ */ new Set(), f = ["push", "pop", "shift", "unshift", "splice", "sort"];
 function w(n, t) {
   return t === "hasOwnProperty" ? function(e) {
     return u(this).hasOwnProperty(e);
-  } : 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;
+  } : 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;
   } : null;
 }
-const d = /* @__PURE__ */ new WeakMap();
+const p = /* @__PURE__ */ new WeakMap();
 function k(n) {
-  return n = u(n), d.has(n) || d.set(n, /* @__PURE__ */ new Set()), d.get(n);
+  return n = u(n), p.has(n) || p.set(n, /* @__PURE__ */ new Set()), p.get(n);
 }
-function g(n, t) {
+function l(n, t) {
   k(n).add(t);
 }
 function m(n, t) {
   const e = (r) => {
-    y.has(t) || (C(() => t(r)), y.add(t), g(n, e));
+    if (b.has(t))
+      return l(n, e);
+    C(() => t(r)), b.add(t), l(n, e);
   }, s = () => {
     k(n).delete(e);
   };
-  return g(n, e), s;
+  return l(n, e), s;
 }
-function b(n, t) {
+function g(n, t) {
   const e = k(n), s = [...e].reverse();
-  e.clear(), s.forEach((r) => r(t)), y.clear();
+  e.clear(), s.forEach((r) => r(t)), b.clear();
 }
-const p = "__easy_model_event__";
+const y = "__easy_model_event__";
 function C(n) {
-  const t = new EventTarget(), e = new Event(p);
-  t.addEventListener(p, () => {
-    t.removeEventListener(p, n), n();
+  const t = new EventTarget(), e = new Event(y);
+  t.addEventListener(y, () => {
+    t.removeEventListener(y, n), n();
   }), t.dispatchEvent(e);
 }
-let f = null;
+let h = null;
 function M(n) {
-  return new Proxy(n, new h(n));
+  return new Proxy(n, new a(n));
 }
 function S(n, t, e) {
   const s = e ? n(...e) : Object.create(n.prototype);
-  return o(Object.assign(s, t));
+  return c(Object.assign(s, t));
 }
 const _ = class {
   constructor(t) {
@@ -92,13 +94,13 @@ const _ = class {
     ), this.fakeCtor = e;
   }
   apply(t, e, s) {
-    const r = f;
-    f = this.fakeCtor;
-    const c = this.getInstance(s) || this.register(
+    const r = h;
+    h = this.fakeCtor;
+    const o = this.getInstance(s) || this.register(
       s,
       Reflect.construct(this.Ctor, s, this.fakeCtor)
     );
-    return f = r, c;
+    return h = r, o;
   }
   construct(t, e, s) {
     const r = Reflect.construct(
@@ -106,36 +108,36 @@ const _ = class {
       e,
       s === this.Ctor ? this.fakeCtor : s
     );
-    return f !== s ? o(r) : r;
+    return h !== s ? c(r) : r;
   }
   getInstance(t) {
     for (const e of this.caches.keys()) {
       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
+        (r, o) => r === t[o] ? !0 : typeof r == "object" && typeof t[o] == "object" ? this.isShallowEqualObj(r, t[o]) : !1
       ))
         continue;
       const s = this.caches.get(e);
-      return s.deref() ? o(s.deref()) : (this.caches.delete(e), null);
+      return s.deref() ? c(s.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 s = Object.keys(t), r = e.keys(e);
-    return s.length === r.length && s.every((c) => t[c] === e[c]);
+    return s.length === r.length && s.every((o) => t[o] === e[o]);
   }
 };
-let h = _;
-i(h, "prototypeHandlers", {
+let a = _;
+i(a, "prototypeHandlers", {
   get(t, e, s) {
     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(...O) {
-      return c.apply(o(this), O);
+    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);
     };
   }
 });

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),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"})});
+(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"})});

package/package.json

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

package/src/helpers.ts

@@ -4,7 +4,7 @@ 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"];
+const fakeArr: any = ["push", "pop", "shift", "unshift", "splice", "sort"];
 export function safeGet(target: Obj, p: string | symbol): any {
   if (p === "hasOwnProperty") {
     return function (this: Obj, key: string) {
@@ -13,8 +13,13 @@ export function safeGet(target: Obj, p: string | symbol): any {
   }
   if (Array.isArray(target) && typeof fakeArr[p] === "function") {
     return function (this: Obj, ...args: any) {
-      const ret = fakeArr[p].apply(getOrigin(this), args);
-      if (fakeArr.includes(p)) trigger(this, [p]);
+      let ret: any;
+      if (fakeArr.includes(p)) {
+        ret = fakeArr[p].apply(getOrigin(this), args);
+        trigger(this, [p]);
+      } else {
+        ret = fakeArr[p].apply(this, args);
+      }
       return ret;
     };
   }
@@ -44,7 +49,7 @@ export function subscribe(
   handler: (path: (string | symbol)[]) => void
 ): () => void {
   const wrappedHandler: typeof handler = (path) => {
-    if (triggered.has(handler)) return;
+    if (triggered.has(handler)) return track(target, wrappedHandler);
     triggerTop(() => handler(path));
     triggered.add(handler);
     track(target, wrappedHandler);