@e7w/easy-model 0.1.2 → 0.1.3

package/dist/index.d.ts

@@ -3,8 +3,12 @@
 export type WatchCallback = (path: Array<string | symbol>, oldValue: any, newValue: any) => void;
 export declare function watch(target: object, callback: WatchCallback): () => void;
 export declare function provide<T extends new (...args: any[]) => InstanceType<T>>(ctor: T): T & ((...args: ConstructorParameters<T>) => InstanceType<T>);
-export declare function revoke(model: object): void;
+export declare function finalizationRegistry(model: object): {
+	register(callback: () => void): void;
+	unregister(): void;
+};
 export declare function useModel<T extends new (...args: any[]) => InstanceType<T>>(Ctor: T, args: ConstructorParameters<T>): InstanceType<T>;
 export declare function useModel<T extends new (...args: any[]) => InstanceType<T>>(Ctor: T, args: ConstructorParameters<T> | null): InstanceType<T> | Partial<InstanceType<T>>;
+export declare function useInstance<T extends object>(model: T): T;
 
 export {};

package/dist/index.es.js

@@ -1,136 +1,158 @@
-import { useReducer as O, useEffect as E } from "react";
-const b = /* @__PURE__ */ new WeakMap(), y = /* @__PURE__ */ new WeakMap(), P = Symbol("origin");
-let l = null;
-const _ = ["includes", "indexOf", "lastIndexOf"], j = [Promise, WeakMap, WeakSet, Map, Set];
-function d(e) {
-  if (e = u(e), !e || j.some((r) => e instanceof r)) return e;
-  if (b.has(e)) return b.get(e);
-  const o = {}, c = {}, i = new Proxy(e, {
-    get(r, n, s) {
-      if (n === P) return r;
-      let t = R(r, n);
-      return t || (t = Reflect.get(r, n, s), typeof t == "function" ? (c[n] || (c[n] = t.bind(d(r))), t = c[n]) : typeof t == "object" && t !== null && (o[n] || (o[n] = m(t, v(e, n))), t = d(t)), t);
+import { useRef as C, useReducer as A, useEffect as L } from "react";
+const _ = /* @__PURE__ */ new WeakMap(), p = /* @__PURE__ */ new WeakMap(), O = Symbol("origin");
+let d = null;
+const v = ["includes", "indexOf", "lastIndexOf"], U = [Promise, RegExp, Date, WeakMap, WeakSet, Map, Set];
+function w(e) {
+  if (e = l(e), !e || U.some((c) => e instanceof c)) return e;
+  if (_.has(e)) return _.get(e);
+  const n = {}, r = {}, i = new Proxy(e, {
+    get(c, t, s) {
+      if (t === O) return c;
+      let o = j(c, t);
+      return o || (o = Reflect.get(c, t, s), typeof o == "function" ? (r[t] || (r[t] = o.bind(w(c))), o = r[t]) : typeof o == "object" && o !== null && (n[t] || (n[t] = R(o, x(e, t))), o = w(o)), o);
     },
-    set(r, n, s, t) {
-      let f = Reflect.get(r, n, t);
-      if (f = u(f), s = u(s), f === s) return !0;
-      const k = Reflect.set(r, n, s, t);
-      if (k) {
-        o[n] && (o[n](), delete o[n]), typeof s == "object" && s !== null && (o[n] = m(s, v(e, n))), c[n] && delete c[n];
-        const S = l;
-        l = /* @__PURE__ */ new WeakSet(), M(r, [n], f, s), l = S;
+    set(c, t, s, o) {
+      let u = Reflect.get(c, t, o);
+      if (u = l(u), s = l(s), u === s) return !0;
+      const f = Reflect.set(c, t, s, o);
+      if (f) {
+        n[t] && (n[t](), delete n[t]), typeof s == "object" && s !== null && (n[t] = R(s, x(e, t))), r[t] && delete r[t];
+        const y = d;
+        d = /* @__PURE__ */ new WeakSet(), W(c, [t], u, s), d = y;
       }
-      return k;
+      return f;
     },
-    deleteProperty(r, n) {
-      let s = Reflect.get(r, n);
-      s = u(s);
-      const t = Reflect.deleteProperty(r, n);
-      return t && (o[n] && (o[n](), delete o[n]), c[n] && delete c[n], M(r, [n], s, void 0)), t;
+    deleteProperty(c, t) {
+      let s = Reflect.get(c, t);
+      s = l(s);
+      const o = Reflect.deleteProperty(c, t);
+      return o && (n[t] && (n[t](), delete n[t]), r[t] && delete r[t], W(c, [t], s, void 0)), o;
     }
   });
-  return b.set(e, i), i;
+  return _.set(e, i), i;
 }
-function m(e, o) {
-  e = u(e), y.has(e) || y.set(e, /* @__PURE__ */ new Map());
-  const c = y.get(e), i = Symbol();
-  return c.set(i, o), function() {
-    c.delete(i);
+function R(e, n) {
+  e = l(e), p.has(e) || p.set(e, /* @__PURE__ */ new Map());
+  const r = p.get(e), i = Symbol();
+  return r.set(i, n), function() {
+    r.delete(i);
   };
 }
-function v(e, o) {
-  return function(...c) {
-    const [i, ...r] = c;
-    M(e, [o, ...i], ...r);
+function x(e, n) {
+  return function(...r) {
+    const [i, ...c] = r;
+    W(e, [n, ...i], ...c);
   };
 }
-function M(e, ...o) {
-  if (e = u(e), l != null && l.has(e)) return;
-  l == null || l.add(e);
-  const c = y.get(e);
-  if (!c) return;
-  [...c.values()].forEach((r) => {
-    const n = new EventTarget(), s = new Event("__trigger__");
-    n.addEventListener(s.type, t), n.dispatchEvent(s);
-    function t() {
-      n.removeEventListener(s.type, t), r(...o);
+function W(e, ...n) {
+  if (e = l(e), d != null && d.has(e)) return;
+  d == null || d.add(e);
+  const r = p.get(e);
+  if (!r) return;
+  [...r.values()].forEach((c) => {
+    const t = new EventTarget(), s = new Event("__trigger__");
+    t.addEventListener(s.type, o), t.dispatchEvent(s);
+    function o() {
+      t.removeEventListener(s.type, o), c(...n);
     }
   });
 }
-function u(e) {
-  return typeof e != "object" || e === null ? e : e[P] ?? e;
+function l(e) {
+  return typeof e != "object" || e === null ? e : e[O] ?? e;
 }
-function R(e, o) {
-  if (e = u(e), ["constructor", "__proto__"].includes(o))
-    return Reflect.get(e, o);
-  if (o === "hasOwnProperty")
-    return function(c) {
-      return Object.prototype.hasOwnProperty.call(u(this), c);
+function j(e, n) {
+  if (e = l(e), ["constructor", "__proto__"].includes(n))
+    return Reflect.get(e, n);
+  if (n === "hasOwnProperty")
+    return function(r) {
+      return Object.prototype.hasOwnProperty.call(l(this), r);
     };
-  if (Array.isArray(e) && _.includes(o))
-    return function(...c) {
-      const i = _[o].apply(u(this), c);
-      return i === -1 || i === !1 ? _[o].apply(u(this), c.map(u)) : i;
+  if (Array.isArray(e) && v.includes(n))
+    return function(...r) {
+      const i = v[n].apply(l(this), r);
+      return i === -1 || i === !1 ? v[n].apply(l(this), r.map(l)) : i;
     };
 }
-const a = Symbol("instance"), w = /* @__PURE__ */ new Map(), p = /* @__PURE__ */ new WeakMap(), h = /* @__PURE__ */ new WeakMap(), W = /* @__PURE__ */ new WeakSet();
-function x(e) {
-  if (W.has(e))
+const h = Symbol("instance"), b = /* @__PURE__ */ new WeakMap(), E = /* @__PURE__ */ new WeakSet(), z = /* @__PURE__ */ new WeakMap(), m = /* @__PURE__ */ new WeakMap();
+function D(e) {
+  if (E.has(e))
     return e;
-  if (h.has(e))
-    return h.get(e);
-  const o = {};
-  i.prototype = new Proxy(
+  if (b.has(e))
+    return b.get(e);
+  const n = {};
+  t.prototype = new Proxy(
     {
       constructor: e,
       __proto__: e.prototype
     },
     {
-      get(r, n, s) {
-        let t = R(r, n);
-        return t || (t = Reflect.get(r, n, s), typeof n == "symbol" || ["constructor", "__proto__"].includes(n) || typeof t != "function") ? t : (o[n] || (o[n] = function(...f) {
-          return t.apply(d(this), f);
-        }), o[n]);
+      get(s, o, u) {
+        let f = j(s, o);
+        return f || (f = Reflect.get(s, o, u), typeof o == "symbol" || ["constructor", "__proto__"].includes(o) || typeof f != "function") ? f : (n[o] || (n[o] = function(...y) {
+          return f.apply(w(this), y);
+        }), n[o]);
       }
     }
   );
-  const c = new Proxy(e, {
-    apply(r, n, s) {
-      w.has(e) || w.set(e, /* @__PURE__ */ new Map());
-      let t = w.get(e);
-      for (let f = 0; f < s.length; f++)
-        t.has(s[f]) || t.set(s[f], /* @__PURE__ */ new Map()), t = t.get(s[f]);
-      if (!t.has(a)) {
-        t.set(a, void 0);
-        const f = d(Reflect.construct(r, s, i));
-        t.set(a, f), p.set(f, s);
+  const r = /* @__PURE__ */ new Map(), i = new FinalizationRegistry(
+    ({ args: s, token: o }) => {
+      var u;
+      F(r, s), (u = m.get(o)) == null || u(), i.unregister(o);
+    }
+  ), c = new Proxy(e, {
+    apply(s, o, u) {
+      var y, P, k, S;
+      let f = r;
+      for (let a = 0; a < u.length; a++)
+        f.has(u[a]) || f.set(u[a], /* @__PURE__ */ new Map()), f = f.get(u[a]);
+      if (!f.has(h) || f.get(h) !== void 0 && !((P = (y = f.get(h)) == null ? void 0 : y.deref) != null && P.call(y))) {
+        f.set(h, void 0);
+        const a = w(Reflect.construct(s, u, t));
+        f.set(h, new WeakRef(a));
+        const M = {};
+        z.set(a, M), i.register(a, { args: u, token: M }, M);
       }
-      return t.get(a);
+      return (S = (k = f.get(h)) == null ? void 0 : k.deref) == null ? void 0 : S.call(k);
     }
   });
-  return h.set(e, c), W.add(c), h.get(e);
-  function i() {
+  return b.set(e, c), E.add(c), b.get(e);
+  function t() {
   }
 }
-function C(e) {
-  const o = d(e);
-  if (!p.has(o)) return;
-  const c = p.get(o);
-  let i = w.get(o.constructor);
-  for (; c.length; )
-    i = i.get(c.shift());
-  i.delete(a), p.delete(o);
+function F(e, n) {
+  if (n.length === 0) return e.delete(h);
+  const [r, ...i] = n, c = e.get(r);
+  if (!(c instanceof Map && (F(c, i), c.size > 0)))
+    return e.delete(r);
+}
+function q(e) {
+  const n = w(e), r = z.get(n);
+  return {
+    register(i) {
+      r && m.set(r, i);
+    },
+    unregister() {
+      r && m.delete(r);
+    }
+  };
+}
+const G = /* @__PURE__ */ Object.create(null);
+function B(e, n) {
+  const r = D(e), i = n ? r(...n) : G;
+  return I(i);
 }
-const A = /* @__PURE__ */ Object.create(null);
-function L(e, o) {
-  const c = x(e), i = o ? c(...o) : A, [, r] = O((n) => (n + 1) % 100, 0);
-  return E(() => m(i, () => {
+function I(e) {
+  const n = C(null);
+  n.current !== e && (n.current = e);
+  const [, r] = A((i) => (i + 1) % 100, 0);
+  return L(() => R(n.current, () => {
     r();
-  }), [i]), i;
+  }), [n.current]), n.current;
 }
 export {
-  x as provide,
-  C as revoke,
-  L as useModel,
-  m as watch
+  q as finalizationRegistry,
+  D as provide,
+  I as useInstance,
+  B as useModel,
+  R as watch
 };

package/dist/index.umd.js

@@ -1 +1 @@
-(function(l,d){typeof exports=="object"&&typeof module<"u"?d(exports,require("react")):typeof define=="function"&&define.amd?define(["exports","react"],d):(l=typeof globalThis<"u"?globalThis:l||self,d(l["@e7w/easy-model"]={},l.React))})(this,function(l,d){"use strict";const _=new WeakMap,w=new WeakMap,W=Symbol("origin");let a=null;const v=["includes","indexOf","lastIndexOf"],E=[Promise,WeakMap,WeakSet,Map,Set];function h(e){if(e=u(e),!e||E.some(i=>e instanceof i))return e;if(_.has(e))return _.get(e);const o={},c={},r=new Proxy(e,{get(i,n,s){if(n===W)return i;let t=P(i,n);return t||(t=Reflect.get(i,n,s),typeof t=="function"?(c[n]||(c[n]=t.bind(h(i))),t=c[n]):typeof t=="object"&&t!==null&&(o[n]||(o[n]=p(t,S(e,n))),t=h(t)),t)},set(i,n,s,t){let f=Reflect.get(i,n,t);if(f=u(f),s=u(s),f===s)return!0;const j=Reflect.set(i,n,s,t);if(j){o[n]&&(o[n](),delete o[n]),typeof s=="object"&&s!==null&&(o[n]=p(s,S(e,n))),c[n]&&delete c[n];const F=a;a=new WeakSet,k(i,[n],f,s),a=F}return j},deleteProperty(i,n){let s=Reflect.get(i,n);s=u(s);const t=Reflect.deleteProperty(i,n);return t&&(o[n]&&(o[n](),delete o[n]),c[n]&&delete c[n],k(i,[n],s,void 0)),t}});return _.set(e,r),r}function p(e,o){e=u(e),w.has(e)||w.set(e,new Map);const c=w.get(e),r=Symbol();return c.set(r,o),function(){c.delete(r)}}function S(e,o){return function(...c){const[r,...i]=c;k(e,[o,...r],...i)}}function k(e,...o){if(e=u(e),a!=null&&a.has(e))return;a==null||a.add(e);const c=w.get(e);if(!c)return;[...c.values()].forEach(i=>{const n=new EventTarget,s=new Event("__trigger__");n.addEventListener(s.type,t),n.dispatchEvent(s);function t(){n.removeEventListener(s.type,t),i(...o)}})}function u(e){return typeof e!="object"||e===null?e:e[W]??e}function P(e,o){if(e=u(e),["constructor","__proto__"].includes(o))return Reflect.get(e,o);if(o==="hasOwnProperty")return function(c){return Object.prototype.hasOwnProperty.call(u(this),c)};if(Array.isArray(e)&&v.includes(o))return function(...c){const r=v[o].apply(u(this),c);return r===-1||r===!1?v[o].apply(u(this),c.map(u)):r}}const y=Symbol("instance"),b=new Map,m=new WeakMap,M=new WeakMap,R=new WeakSet;function O(e){if(R.has(e))return e;if(M.has(e))return M.get(e);const o={};r.prototype=new Proxy({constructor:e,__proto__:e.prototype},{get(i,n,s){let t=P(i,n);return t||(t=Reflect.get(i,n,s),typeof n=="symbol"||["constructor","__proto__"].includes(n)||typeof t!="function")?t:(o[n]||(o[n]=function(...f){return t.apply(h(this),f)}),o[n])}});const c=new Proxy(e,{apply(i,n,s){b.has(e)||b.set(e,new Map);let t=b.get(e);for(let f=0;f<s.length;f++)t.has(s[f])||t.set(s[f],new Map),t=t.get(s[f]);if(!t.has(y)){t.set(y,void 0);const f=h(Reflect.construct(i,s,r));t.set(y,f),m.set(f,s)}return t.get(y)}});return M.set(e,c),R.add(c),M.get(e);function r(){}}function x(e){const o=h(e);if(!m.has(o))return;const c=m.get(o);let r=b.get(o.constructor);for(;c.length;)r=r.get(c.shift());r.delete(y),m.delete(o)}const T=Object.create(null);function A(e,o){const c=O(e),r=o?c(...o):T,[,i]=d.useReducer(n=>(n+1)%100,0);return d.useEffect(()=>p(r,()=>{i()}),[r]),r}l.provide=O,l.revoke=x,l.useModel=A,l.watch=p,Object.defineProperty(l,Symbol.toStringTag,{value:"Module"})});
+(function(l,w){typeof exports=="object"&&typeof module<"u"?w(exports,require("react")):typeof define=="function"&&define.amd?define(["exports","react"],w):(l=typeof globalThis<"u"?globalThis:l||self,w(l["@e7w/easy-model"]={},l.React))})(this,function(l,w){"use strict";const R=new WeakMap,k=new WeakMap,O=Symbol("origin");let d=null;const m=["includes","indexOf","lastIndexOf"],L=[Promise,RegExp,Date,WeakMap,WeakSet,Map,Set];function p(e){if(e=a(e),!e||L.some(r=>e instanceof r))return e;if(R.has(e))return R.get(e);const n={},o={},s=new Proxy(e,{get(r,t,c){if(t===O)return r;let i=E(r,t);return i||(i=Reflect.get(r,t,c),typeof i=="function"?(o[t]||(o[t]=i.bind(p(r))),i=o[t]):typeof i=="object"&&i!==null&&(n[t]||(n[t]=M(i,j(e,t))),i=p(i)),i)},set(r,t,c,i){let u=Reflect.get(r,t,i);if(u=a(u),c=a(c),u===c)return!0;const f=Reflect.set(r,t,c,i);if(f){n[t]&&(n[t](),delete n[t]),typeof c=="object"&&c!==null&&(n[t]=M(c,j(e,t))),o[t]&&delete o[t];const h=d;d=new WeakSet,W(r,[t],u,c),d=h}return f},deleteProperty(r,t){let c=Reflect.get(r,t);c=a(c);const i=Reflect.deleteProperty(r,t);return i&&(n[t]&&(n[t](),delete n[t]),o[t]&&delete o[t],W(r,[t],c,void 0)),i}});return R.set(e,s),s}function M(e,n){e=a(e),k.has(e)||k.set(e,new Map);const o=k.get(e),s=Symbol();return o.set(s,n),function(){o.delete(s)}}function j(e,n){return function(...o){const[s,...r]=o;W(e,[n,...s],...r)}}function W(e,...n){if(e=a(e),d!=null&&d.has(e))return;d==null||d.add(e);const o=k.get(e);if(!o)return;[...o.values()].forEach(r=>{const t=new EventTarget,c=new Event("__trigger__");t.addEventListener(c.type,i),t.dispatchEvent(c);function i(){t.removeEventListener(c.type,i),r(...n)}})}function a(e){return typeof e!="object"||e===null?e:e[O]??e}function E(e,n){if(e=a(e),["constructor","__proto__"].includes(n))return Reflect.get(e,n);if(n==="hasOwnProperty")return function(o){return Object.prototype.hasOwnProperty.call(a(this),o)};if(Array.isArray(e)&&m.includes(n))return function(...o){const s=m[n].apply(a(this),o);return s===-1||s===!1?m[n].apply(a(this),o.map(a)):s}}const b=Symbol("instance"),_=new WeakMap,x=new WeakSet,z=new WeakMap,S=new WeakMap;function F(e){if(x.has(e))return e;if(_.has(e))return _.get(e);const n={};t.prototype=new Proxy({constructor:e,__proto__:e.prototype},{get(c,i,u){let f=E(c,i);return f||(f=Reflect.get(c,i,u),typeof i=="symbol"||["constructor","__proto__"].includes(i)||typeof f!="function")?f:(n[i]||(n[i]=function(...h){return f.apply(p(this),h)}),n[i])}});const o=new Map,s=new FinalizationRegistry(({args:c,token:i})=>{var u;T(o,c),(u=S.get(i))==null||u(),s.unregister(i)}),r=new Proxy(e,{apply(c,i,u){var h,A,v,I;let f=o;for(let y=0;y<u.length;y++)f.has(u[y])||f.set(u[y],new Map),f=f.get(u[y]);if(!f.has(b)||f.get(b)!==void 0&&!((A=(h=f.get(b))==null?void 0:h.deref)!=null&&A.call(h))){f.set(b,void 0);const y=p(Reflect.construct(c,u,t));f.set(b,new WeakRef(y));const P={};z.set(y,P),s.register(y,{args:u,token:P},P)}return(I=(v=f.get(b))==null?void 0:v.deref)==null?void 0:I.call(v)}});return _.set(e,r),x.add(r),_.get(e);function t(){}}function T(e,n){if(n.length===0)return e.delete(b);const[o,...s]=n,r=e.get(o);if(!(r instanceof Map&&(T(r,s),r.size>0)))return e.delete(o)}function U(e){const n=p(e),o=z.get(n);return{register(s){o&&S.set(o,s)},unregister(){o&&S.delete(o)}}}const g=Object.create(null);function q(e,n){const o=F(e),s=n?o(...n):g;return C(s)}function C(e){const n=w.useRef(null);n.current!==e&&(n.current=e);const[,o]=w.useReducer(s=>(s+1)%100,0);return w.useEffect(()=>M(n.current,()=>{o()}),[n.current]),n.current}l.finalizationRegistry=U,l.provide=F,l.useInstance=C,l.useModel=q,l.watch=M,Object.defineProperty(l,Symbol.toStringTag,{value:"Module"})});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@e7w/easy-model",
-  "version": "0.1.2",
+  "version": "0.1.3",
   "module": "./dist/index.es.js",
   "publishConfig": {
     "access": "public",
@@ -15,21 +15,6 @@
       "require": "./dist/index.umd.js"
     }
   },
-  "scripts": {
-    "dev": "vite --host",
-    "build": "npm run build:lib && npm run build:dts",
-    "build:lib": "rimraf dist && tsc && vite build",
-    "build:dts": "dts-bundle-generator --config ./dts-bundle-generator.config.cjs",
-    "test": "vitest",
-    "test:coverage": "vitest --coverage",
-    "lint:scripts": "eslint . --fix --ext .ts",
-    "lint:styles": "stylelint ./**/*.{css,scss}",
-    "format:scripts": "prettier . --write",
-    "format:styles": "stylelint ./**/*.{css,scss} --fix",
-    "format": "npm run format:scripts && npm run format:styles",
-    "prepare": "husky && echo 'npx lint-staged' > .husky/pre-commit && git add .husky/pre-commit",
-    "uninstall-husky": "npm uninstall husky --no-save && git config --unset core.hooksPath && npx rimraf .husky"
-  },
   "peerDependencies": {
     "react": ">=17.0.0"
   },
@@ -73,5 +58,19 @@
     "README.md",
     "LICENSE.md"
   ],
-  "license": "MIT"
-}
+  "license": "MIT",
+  "scripts": {
+    "dev": "vite --host",
+    "build": "npm run build:lib && npm run build:dts",
+    "build:lib": "rimraf dist && tsc && vite build",
+    "build:dts": "dts-bundle-generator --config ./dts-bundle-generator.config.cjs",
+    "test": "vitest",
+    "test:coverage": "vitest --coverage",
+    "lint:scripts": "eslint . --fix --ext .ts",
+    "lint:styles": "stylelint ./**/*.{css,scss}",
+    "format:scripts": "prettier . --write",
+    "format:styles": "stylelint ./**/*.{css,scss} --fix",
+    "format": "npm run format:scripts && npm run format:styles",
+    "uninstall-husky": "npm uninstall husky --no-save && git config --unset core.hooksPath && npx rimraf .husky"
+  }
+}