@e7w/easy-model 0.0.1 → 0.0.3

package/README.md

@@ -21,6 +21,8 @@ const A = provide(
 );
 
 A(1) === A(1); // true
+A(1) !== new A(1); // true
 subscribe(A(1), console.log.bind(console, "Path of changed value:"));
-A(1).msg = "123"; // Path of changed value: ["msg"]
+const { random } = A(1);
+random(); // Path of changed value: ["msg"]
 ```

package/dist/index.d.ts

@@ -1,2 +1,2 @@
 export { subscribe } from "./helpers";
-export { provide } from "./provide";
+export { provide, extend } from "./provide";

package/dist/index.es.js

@@ -1,70 +1,77 @@
-var O = Object.defineProperty;
-var _ = (n, t, e) => t in n ? O(n, t, { enumerable: !0, configurable: !0, writable: !0, value: e }) : n[t] = e;
-var c = (n, t, e) => (_(n, typeof t != "symbol" ? t + "" : t, e), e);
-const h = /* @__PURE__ */ new WeakMap(), g = Symbol("origin");
-function i(n) {
-  if (n = f(n), h.has(n))
+var j = Object.defineProperty;
+var _ = (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) => (_(n, typeof t != "symbol" ? t + "" : t, e), e);
+const h = /* @__PURE__ */ new WeakMap(), k = Symbol("origin");
+function o(n) {
+  if (n = u(n), h.has(n))
     return h.get(n);
-  const t = new Proxy(n, new j(n));
+  const t = new Proxy(n, new C(n));
   return h.set(n, t), t;
 }
-function f(n) {
-  return n[g] || n;
+function u(n) {
+  return n[k] || n;
 }
-class j {
+class C {
   constructor(t) {
-    c(this, "triggers", {});
+    i(this, "triggers", {});
+    i(this, "cachedFns", {});
     this.obj = t;
   }
-  get(t, e, r) {
-    if (e === g)
+  get(t, e, s) {
+    if (e === k)
       return this.obj;
-    let s = k(t, e) || Reflect.get(t, e, r);
-    return typeof s == "function" ? s.bind(i(t)) : (typeof s == "object" && (s = i(s), p(s, this.getTrigger(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, r, s) {
-    const o = Reflect.set(t, e, r, s);
-    return y(this.obj, [e]), o;
+  set(t, e, s, r) {
+    s && (s = u(s));
+    const c = Reflect.set(t, e, s, r);
+    return d(this.obj, [e]), c;
   }
   getTrigger(t) {
-    return t in this.triggers || (this.triggers[t] = (e) => y(this.obj, [t, ...e])), this.triggers[t];
+    return t in this.triggers || (this.triggers[t] = (e) => d(this.obj, [t, ...e])), this.triggers[t];
   }
 }
 const l = ["push", "pop", "shift", "unshift", "splice"];
-function k(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 r = l[t].apply(f(this), e);
-    return l.includes(t) && y(this, [t]), r;
+    const s = l[t].apply(u(this), e);
+    return l.includes(t) && d(this, [t]), s;
   } : null;
 }
 const a = /* @__PURE__ */ new WeakMap();
-function d(n) {
-  return n = f(n), a.has(n) || a.set(n, /* @__PURE__ */ new Set()), a.get(n);
+function b(n) {
+  return n = u(n), a.has(n) || a.set(n, /* @__PURE__ */ new Set()), a.get(n);
 }
-function p(n, t) {
-  d(n).add(t);
+function y(n, t) {
+  b(n).add(t);
 }
 function R(n, t) {
-  const e = (s) => {
-    t(s), p(n, e);
-  }, r = () => {
-    d(n).delete(e);
+  const e = (r) => {
+    t(r), y(n, e);
+  }, s = () => {
+    b(n).delete(e);
   };
-  return p(n, e), r;
+  return y(n, e), s;
 }
-function y(n, t) {
-  const e = d(n), r = [...e];
-  return e.clear(), r.forEach((s) => s(t));
+function d(n, t) {
+  const e = b(n), s = [...e];
+  return e.clear(), s.forEach((r) => r(t));
+}
+let p = null;
+function M(n) {
+  return new Proxy(n, new f(n));
 }
-function C(n) {
-  return new Proxy(n, new u(n));
+function S(n, t, e) {
+  const s = e ? n(...e) : Object.create(n.prototype);
+  return o(Object.assign(s, t));
 }
-const b = class {
+const g = class {
   constructor(t) {
-    c(this, "fakeCtor");
-    c(this, "caches", /* @__PURE__ */ new Map());
+    i(this, "fakeCtor");
+    i(this, "caches", /* @__PURE__ */ new Map());
     this.Ctor = t;
     const e = function() {
     };
@@ -73,54 +80,58 @@ const b = class {
         constructor: t,
         __proto__: t.prototype
       },
-      b.prototypeHandlers
+      g.prototypeHandlers
     ), this.fakeCtor = e;
   }
-  apply(t, e, r) {
-    return this.getInstance(r) || this.register(
-      r,
-      Reflect.construct(this.Ctor, r, this.fakeCtor)
+  apply(t, e, s) {
+    p = this.fakeCtor;
+    const r = this.getInstance(s) || this.register(
+      s,
+      Reflect.construct(this.Ctor, s, this.fakeCtor)
     );
+    return p = null, r;
   }
-  construct(t, e, r) {
-    return Reflect.construct(
+  construct(t, e, s) {
+    const r = Reflect.construct(
       t,
       e,
-      r === this.Ctor ? this.fakeCtor : r
+      s === this.Ctor ? this.fakeCtor : s
     );
+    return p !== s ? o(r) : r;
   }
   getInstance(t) {
     for (const e of this.caches.keys()) {
-      if (!e.every(
-        (s, o) => s === t[o] ? !0 : typeof s == "object" && typeof t[o] == "object" ? this.isShallowEqualObj(s, t[o]) : !1
+      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;
-      const r = this.caches.get(e);
-      return r.deref() ? i(r.deref()) : (this.caches.delete(e), null);
+      const s = this.caches.get(e);
+      return s.deref() ? o(s.deref()) : (this.caches.delete(e), null);
     }
     return null;
   }
   register(t, e) {
-    return this.caches.set(t, new WeakRef(e)), i(e);
+    return this.caches.set(t, new WeakRef(e)), o(e);
   }
   isShallowEqualObj(t, e) {
-    const r = Object.keys(t), s = e.keys(e);
-    return r.length === s.length && r.every((o) => t[o] === e[o]);
+    const s = Object.keys(t), r = e.keys(e);
+    return s.length === r.length && s.every((c) => t[c] === e[c]);
   }
 };
-let u = b;
-c(u, "prototypeHandlers", {
-  get(t, e, r) {
-    const s = k(t, e);
-    if (s)
-      return s;
-    const o = Reflect.get(t, e, r);
-    return typeof e == "symbol" || ["constructor", "__proto__"].includes(e) || typeof o != "function" ? o : function(...w) {
-      return o.apply(i(this), w);
+let f = g;
+i(f, "prototypeHandlers", {
+  get(t, e, s) {
+    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(...w) {
+      return c.apply(o(this), w);
     };
   }
 });
 export {
-  C as provide,
+  S as extend,
+  M as provide,
   R as subscribe
 };

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 v=Object.defineProperty;var H=(i,o,u)=>o in i?v(i,o,{enumerable:!0,configurable:!0,writable:!0,value:u}):i[o]=u;var h=(i,o,u)=>(H(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 O(n));return o.set(n,e),e}function l(n){return n[u]||n}class O{constructor(e){h(this,"triggers",{});this.obj=e}get(e,t,r){if(t===u)return this.obj;let s=k(e,t)||Reflect.get(e,t,r);return typeof s=="function"?s.bind(f(e)):(typeof s=="object"&&(s=f(s),b(s,this.getTrigger(t))),s)}set(e,t,r,s){const c=Reflect.set(e,t,r,s);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 k(n,e){return e==="hasOwnProperty"?function(t){return l(this).hasOwnProperty(t)}:Array.isArray(n)&&typeof d[e]=="function"?function(...t){const r=d[e].apply(l(this),t);return d.includes(e)&&g(this,[e]),r}: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 j(n,e){const t=s=>{e(s),b(n,t)},r=()=>{y(n).delete(t)};return b(n,t),r}function g(n,e){const t=y(n),r=[...t];return t.clear(),r.forEach(s=>s(e))}function _(n){return new Proxy(n,new a(n))}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){return this.getInstance(r)||this.register(r,Reflect.construct(this.Ctor,r,this.fakeCtor))}construct(e,t,r){return Reflect.construct(e,t,r===this.Ctor?this.fakeCtor:r)}getInstance(e){for(const t of this.caches.keys()){if(!t.every((s,c)=>s===e[c]?!0:typeof s=="object"&&typeof e[c]=="object"?this.isShallowEqualObj(s,e[c]):!1))continue;const r=this.caches.get(t);return r.deref()?f(r.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 r=Object.keys(e),s=t.keys(t);return r.length===s.length&&r.every(c=>e[c]===t[c])}};let a=w;h(a,"prototypeHandlers",{get(e,t,r){const s=k(e,t);if(s)return s;const c=Reflect.get(e,t,r);return typeof t=="symbol"||["constructor","__proto__"].includes(t)||typeof c!="function"?c:function(...m){return c.apply(f(this),m)}}}),i.provide=_,i.subscribe=j,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/dist/provide.d.ts

@@ -1,2 +1,4 @@
 import { type Ctor } from "./helpers";
 export declare function provide<T extends Ctor>(Ctor: T): T & ((...args: ConstructorParameters<T>) => InstanceType<T>);
+export declare function extend<T extends ReturnType<typeof provide>, P extends Partial<InstanceType<T>>>(Provider: T, extendData: P): P & Partial<Omit<InstanceType<T>, keyof P>>;
+export declare function extend<T extends ReturnType<typeof provide>, P extends Partial<InstanceType<T>>, M extends Parameters<T>>(Provider: T, extendData: P, args: M): InstanceType<T>;

package/package.json

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

package/src/index.ts

@@ -1,2 +1,2 @@
 export { subscribe } from "./helpers";
-export { provide } from "./provide";
+export { provide, extend } from "./provide";

package/src/observe.ts

@@ -20,12 +20,18 @@ class ObserveHandler<T extends Obj> implements ProxyHandler<T> {
     (path: (string | symbol)[]) => void
   > = {};
 
+  private cachedFns: { [K in keyof T]?: T[K] } = {};
+
   public constructor(private obj: T) {}
 
   public get(target: T, p: string | symbol, receiver: any): any {
     if (p === origin) return this.obj;
     let ret = safeGet(target, p) || Reflect.get(target, p, receiver);
-    if (typeof ret === "function") return ret.bind(observe(target));
+    if (typeof ret === "function")
+      return (
+        this.cachedFns[p] ||
+        (this.cachedFns[p as keyof T] = ret.bind(observe(target)))
+      );
     if (typeof ret === "object") {
       ret = observe(ret);
       track(ret, this.getTrigger(p));
@@ -39,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

@@ -1,12 +1,40 @@
 import { type Ctor, type Obj, safeGet } from "./helpers";
 import { observe } from "./observe";
 
+let creatingTarget: any = null;
+
 export function provide<T extends Ctor>(
   Ctor: T
 ): T & ((...args: ConstructorParameters<T>) => InstanceType<T>) {
   return new Proxy(Ctor, new Provider(Ctor)) as any;
 }
 
+// type RequireAtLeastOne<T> = {
+//   [K in keyof T]-?: undefined extends T[K]
+//     ? never
+//     : T[K] extends Function
+//     ? never
+//     : Required<Pick<T, K>> & Partial<Pick<T, Exclude<keyof T, K>>>;
+// }[keyof T];
+// todo: 想办法过滤出所有field
+export function extend<
+  T extends ReturnType<typeof provide>,
+  P extends Partial<InstanceType<T>>
+>(Provider: T, extendData: P): P & Partial<Omit<InstanceType<T>, keyof P>>;
+export function extend<
+  T extends ReturnType<typeof provide>,
+  P extends Partial<InstanceType<T>>,
+  M extends Parameters<T>
+>(Provider: T, extendData: P, args: M): InstanceType<T>;
+export function extend<
+  T extends ReturnType<typeof provide>,
+  P extends Partial<InstanceType<T>>,
+  M extends Parameters<T> | null | undefined
+>(Provider: T, extendData: P, args?: M) {
+  const instance = args ? Provider(...args) : Object.create(Provider.prototype);
+  return observe(Object.assign(instance, extendData));
+}
+
 class Provider<T extends Ctor> implements ProxyHandler<T> {
   private static prototypeHandlers: ProxyHandler<Obj> = {
     get(target, p, receiver) {
@@ -50,13 +78,15 @@ class Provider<T extends Ctor> implements ProxyHandler<T> {
     argArray: ConstructorParameters<T>
   ): InstanceType<T> {
     // todo: 循环引用创建时抛出错误
-    return (
+    creatingTarget = this.fakeCtor;
+    const instance =
       this.getInstance(argArray) ||
       this.register(
         argArray,
         Reflect.construct(this.Ctor, argArray, this.fakeCtor)
-      )
-    );
+      );
+    creatingTarget = null;
+    return instance;
   }
 
   public construct(
@@ -64,16 +94,19 @@ class Provider<T extends Ctor> implements ProxyHandler<T> {
     argArray: any[],
     newTarget: any
   ): InstanceType<T> {
-    return Reflect.construct(
+    const instance = Reflect.construct(
       target,
       argArray,
       newTarget === this.Ctor ? this.fakeCtor : newTarget
     );
+    if (creatingTarget !== newTarget) return observe(instance);
+    return instance;
   }
 
-  public getInstance(args: ConstructorParameters<T>): InstanceType<T> | null {
+  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
@@ -92,7 +125,7 @@ class Provider<T extends Ctor> implements ProxyHandler<T> {
     return null;
   }
 
-  public register(
+  private register(
     args: ConstructorParameters<T>,
     instance: InstanceType<T>
   ): InstanceType<T> {