@e7w/easy-model 0.0.10 → 0.0.11

package/dist/index.es.js

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

package/package.json

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

package/src/helpers.ts

@@ -5,7 +5,17 @@ let triggerSymbol: Symbol | null = null;
 
 export type Ctor = new (...args: any[]) => any;
 export type Obj = Record<string | symbol | number, any>;
-const fakeArr: any = ["push", "pop", "shift", "unshift", "splice", "sort"];
+const fakeArr: any = [
+  "push",
+  "pop",
+  "shift",
+  "unshift",
+  "splice",
+  "sort",
+  "reverse",
+];
+const findMethods: any = ["includes", "indexOf", "lastIndexOf"];
+const safeMethods: any = ["forEach", "map"];
 export function safeGet(target: Obj, p: string | symbol): any {
   if (p === "hasOwnProperty") {
     return function (this: Obj, key: string) {
@@ -13,13 +23,14 @@ export function safeGet(target: Obj, p: string | symbol): any {
     };
   }
   if (Array.isArray(target) && typeof fakeArr[p] === "function") {
+    if (safeMethods.includes(p)) return target[p as keyof typeof target];
     return function (this: Obj, ...args: any) {
-      let ret: any;
+      const ret = fakeArr[p].apply(getOrigin(this), args);
+      if (findMethods.includes(p) && (ret === -1 || ret === false)) {
+        return fakeArr[p].apply(getOrigin(this), ...args.map(getOrigin));
+      }
       if (fakeArr.includes(p)) {
-        ret = fakeArr[p].apply(getOrigin(this), args);
         trigger(this, [p]);
-      } else {
-        ret = fakeArr[p].apply(this, args);
       }
       return ret;
     };

package/src/observe.ts

@@ -7,10 +7,16 @@ import {
   endTrigger,
 } from "./helpers";
 
+const unSafeCtor = [Promise, WeakMap, WeakSet, Map, Set];
+function isUnsafeInstance<T extends Obj>(target: T): boolean {
+  return unSafeCtor.some((ctor) => target instanceof ctor);
+}
+
 const observedMap = new WeakMap();
 const origin = Symbol("origin");
 export function observe<T extends Obj>(target: T): T {
   target = getOrigin(target);
+  if (isUnsafeInstance(target)) return target;
   if (observedMap.has(target)) return observedMap.get(target);
   const ret = new Proxy(target, new ObserveHandler(target));
   observedMap.set(target, ret);
@@ -34,6 +40,7 @@ class ObserveHandler<T extends Obj> implements ProxyHandler<T> {
 
   public get(target: T, p: string | symbol, receiver: any): any {
     if (p === origin) return this.obj;
+    if (isUnsafeInstance(target)) return Reflect.get(getOrigin(target), p);
     let ret = safeGet(target, p) || Reflect.get(target, p, receiver);
     if (typeof ret === "function")
       return (