@dougongjs/reactive 0.3.0 → 0.4.0

package/README.md

@@ -81,7 +81,7 @@ On each change to `source`: release the previous `lifetime`, then build a new on
 - 文档站 / Documentation: https://tangerg.github.io/dougong/
 - 仓库 / Repository: https://github.com/Tangerg/dougong
 
-> 早期开发阶段（0.0.x），当前不承诺向后兼容。需要 Node.js ≥ 22，或 Chrome / Edge 119、Firefox 121、Safari 17.4 及以上浏览器 / WebView。
-> Early development (0.0.x); no backward-compatibility promises yet. Requires Node.js ≥ 22, or Chrome / Edge 119, Firefox 121 or Safari 17.4 and later.
+> 早期 0.x 开发阶段，当前不承诺向后兼容。需要 Node.js ≥ 22，或 Chrome / Edge 119、Firefox 121、Safari 17.4 及以上浏览器 / WebView。
+> Early 0.x development; no backward-compatibility promises yet. Requires Node.js ≥ 22, or Chrome / Edge 119, Firefox 121 or Safari 17.4 and later.
 
 MIT

package/dist/index.js

@@ -13,7 +13,7 @@ const w = v(
   Symbol.asyncDispose,
   "Symbol.asyncDispose"
 );
-function l(t, e) {
+function p(t, e) {
   if (y(t))
     throw Promise.resolve(t).catch(() => {
     }), new TypeError(e);
@@ -28,46 +28,50 @@ class D {
   #n = { present: !1 };
   #r = !1;
   #t;
-  #o;
   #c;
+  #o;
+  #a;
   constructor(e, s, i) {
     this.#e = { phase: "active", binding: { owner: e, source: s, observer: i } };
   }
   start() {
     const { owner: e, source: s } = this.#w(), i = s.get(), r = e.lifetime("observation");
     b(r), this.#i = r;
-    const n = s.subscribe(() => this.#p());
-    z(n, "Readable.subscribe()"), this.#s = n, this.#l(i, r), this.#n = { present: !0, value: i };
+    const n = s.subscribe(() => this.#u());
+    C(n, "Readable.subscribe()"), this.#s = n, this.#d(i, r), this.#n = { present: !0, value: i };
     const o = e.spawn((c) => this.#h(c));
-    P(o), this.#t = o, o.result.then(
+    R(o), this.#t = o, o.result.then(
       () => this.#v(o),
       () => this.#v(o)
     );
   }
+  attachOwnerCleanup(e) {
+    this.#c = e;
+  }
   dispose() {
-    if (this.#c) return this.#c;
+    if (this.#a) return this.#a;
     const e = Promise.withResolvers();
-    return this.#c = e.promise, this.#y("disposed"), this.#o?.(), this.#f().then(e.resolve, e.reject), e.promise;
+    return this.#a = e.promise, this.#c = void 0, this.#y("disposed"), this.#o?.(), this.#p().then(e.resolve, e.reject), e.promise;
   }
-  async #f() {
+  async #p() {
     const e = [];
-    if (await a(this.#b(), e), await a(this.#g(), e), await a(this.#u(), e), e.length === 1) throw e[0];
+    if (await a(this.#b(), e), await a(this.#O(), e), await a(this.#f(), e), e.length === 1) throw e[0];
     if (e.length > 1) throw new AggregateError(e, "Observation cleanup failed");
   }
-  #p() {
+  #u() {
     this.#e.phase === "active" && (this.#r = !0, this.#o?.());
   }
   async #h(e) {
     try {
       for (; this.#e.phase === "active" && !e.aborted; )
-        for (await this.#a(e); this.#e.phase === "active" && !e.aborted && this.#r; )
-          this.#r = !1, await this.#m();
+        for (await this.#m(e); this.#e.phase === "active" && !e.aborted && this.#r; )
+          this.#r = !1, await this.#g();
     } catch (s) {
       if (this.#e.phase !== "active") throw s;
-      await this.#d([s], "Observation stopped after a replacement failed");
+      await this.#l([s], "Observation stopped after a replacement failed");
     }
   }
-  #a(e) {
+  #m(e) {
     return this.#r || this.#e.phase !== "active" || e.aborted ? Promise.resolve() : new Promise((s) => {
       const i = () => {
         e.removeEventListener("abort", i), this.#o === i && (this.#o = void 0), s();
@@ -75,17 +79,17 @@ class D {
       this.#o = i, e.addEventListener("abort", i, { once: !0 }), (this.#r || this.#e.phase !== "active" || e.aborted) && i();
     });
   }
-  async #m() {
+  async #g() {
     if (this.#e.phase !== "active") return;
     const e = this.#e.binding.source.get();
     if (this.#n.present && Object.is(e, this.#n.value)) return;
-    const s = this.#u();
+    const s = this.#f();
     if (s)
       try {
         await s.dispose();
       } catch (r) {
         if (this.#e.phase !== "active") throw r;
-        return this.#d(
+        return this.#l(
           [r],
           "Observation stopped because the previous lifetime could not be disposed"
         );
@@ -94,9 +98,9 @@ class D {
     const i = this.#e.binding.owner.lifetime("observation");
     b(i), this.#i = i;
     try {
-      this.#l(e, i);
+      this.#d(e, i);
     } catch (r) {
-      const n = this.#u();
+      const n = this.#f();
       try {
         n && await n.dispose();
       } catch (o) {
@@ -105,7 +109,7 @@ class D {
             [r, o],
             "Observation callback failed and its resources could not be cleaned up"
           );
-        return this.#d(
+        return this.#l(
           [r, o],
           "Observation callback failed and its resources could not be cleaned up"
         );
@@ -114,27 +118,31 @@ class D {
     }
     this.#e.phase === "active" && (this.#n = { present: !0, value: e });
   }
-  #l(e, s) {
+  #d(e, s) {
     const i = this.#w().observer(e, s);
-    l(i, "Observers must be synchronous; use lifetime.spawn() for async work");
+    p(i, "Observers must be synchronous; use lifetime.spawn() for async work");
   }
   #b() {
     const e = this.#s;
     return this.#s = void 0, e;
   }
-  #u() {
+  #f() {
     const e = this.#i;
     return this.#i = void 0, e;
   }
-  #g() {
+  #O() {
     const e = this.#t;
     return this.#t = void 0, e;
   }
+  #k() {
+    const e = this.#c;
+    return this.#c = void 0, e;
+  }
   #v(e) {
     this.#t === e && (this.#t = void 0);
   }
-  async #d(e, s) {
-    throw this.#y("stopped"), this.#o?.(), await a(this.#b(), e), await a(this.#u(), e), e.length === 1 ? e[0] : new AggregateError(e, s);
+  async #l(e, s) {
+    throw this.#y("stopped"), this.#o?.(), await a(this.#b(), e), await a(this.#f(), e), this.#t = void 0, await a(this.#k(), e), e.length === 1 ? e[0] : new AggregateError(e, s);
   }
   #w() {
     const e = this.#e;
@@ -152,7 +160,7 @@ function L(t, e, s) {
   if (!t || typeof t.cleanup != "function" || typeof t.lifetime != "function" || typeof t.spawn != "function")
     throw new TypeError("observe() expects an observation owner");
   const i = new D(t, e, s), r = t.cleanup(() => i.dispose());
-  R(r, "ObservationOwner.cleanup()");
+  z(r, "ObservationOwner.cleanup()"), i.attachOwnerCleanup(r);
   try {
     return i.start(), r;
   } catch (n) {
@@ -160,11 +168,11 @@ function L(t, e, s) {
     }), n;
   }
 }
-function z(t, e) {
+function C(t, e) {
   if (!t || typeof t.dispose != "function" || typeof t[w] != "function")
     throw new TypeError(`${e} must return a Disposable`);
 }
-function R(t, e) {
+function z(t, e) {
   if (!t || typeof t.dispose != "function" || typeof t[d] != "function")
     throw new TypeError(`${e} must return an AsyncDisposable`);
 }
@@ -172,7 +180,7 @@ function b(t) {
   if (!t || typeof t.dispose != "function" || typeof t[d] != "function" || typeof t.cleanup != "function" || typeof t.lifetime != "function" || typeof t.spawn != "function")
     throw new TypeError("ObservationOwner.lifetime() must return an ObservationLifetime");
 }
-function P(t) {
+function R(t) {
   if (!t || typeof t.dispose != "function" || typeof t[d] != "function" || !y(t.result))
     throw new TypeError("ObservationOwner.spawn() must return an ObservationTask");
 }
@@ -185,11 +193,11 @@ async function a(t, e) {
     }
 }
 let u = 0, h, f;
-const p = /* @__PURE__ */ new WeakMap();
+const l = /* @__PURE__ */ new WeakMap();
 function m(t) {
-  return new j(t);
+  return new P(t);
 }
-class j {
+class P {
   #e;
   constructor(e) {
     this.#e = e, Object.freeze(this);
@@ -202,7 +210,7 @@ class j {
     this.dispose();
   }
 }
-function A() {
+function j() {
   const t = [];
   for (; h?.size; ) {
     const e = h;
@@ -224,7 +232,7 @@ function O(t, e) {
     const i = s.listener;
     if (i)
       try {
-        i();
+        p(i(), "Signal subscribers must be synchronous");
       } catch (r) {
         e.push(r);
       }
@@ -244,7 +252,7 @@ function x(t) {
   let e;
   try {
     const s = t();
-    l(s, "Reactive batches must be synchronous"), e = { ok: !0, value: s };
+    p(s, "Reactive batches must be synchronous"), e = { ok: !0, value: s };
   } catch (s) {
     e = { ok: !1, error: s };
   } finally {
@@ -252,7 +260,7 @@ function x(t) {
   }
   if (!u)
     try {
-      A();
+      j();
     } catch (s) {
       e = e.ok ? { ok: !1, error: s } : { ok: !1, error: new AggregateError([e.error, s], "Reactive batch failed") };
     }
@@ -276,7 +284,7 @@ function q(t) {
       });
     }
   };
-  return p.set(r, {
+  return l.set(r, {
     get version() {
       return s;
     },
@@ -286,53 +294,53 @@ function q(t) {
 }
 function B(t) {
   if (typeof t != "function") throw new TypeError("computed() expects a function");
-  return new C(t).view;
+  return new A(t).view;
 }
-class C {
+class A {
   #e;
   #s = /* @__PURE__ */ new Set();
   #i = /* @__PURE__ */ new Map();
   #n = { phase: "uninitialized" };
   #r = !1;
   #t = !0;
-  #o = 0;
+  #c = 0;
   view;
   constructor(e) {
     this.#e = e, this.view = Object.freeze({
-      get: () => this.#c(),
-      subscribe: (s) => this.#f(s)
-    }), p.set(this.view, this);
+      get: () => this.#o(),
+      subscribe: (s) => this.#a(s)
+    }), l.set(this.view, this);
   }
   get version() {
-    return this.#o;
+    return this.#c;
   }
   refresh() {
-    this.#a();
+    this.#h();
   }
-  #c() {
-    return E(this.view), this.#a();
+  #o() {
+    return E(this.view), this.#h();
   }
-  #f(e) {
+  #a(e) {
     S(e);
     const s = { listener: e }, i = this.#s.size === 0;
     if (this.#s.add(s), i)
       try {
-        this.#t = !0, this.#a();
+        this.#t = !0, this.#h();
       } catch (r) {
-        throw this.#s.delete(s), this.#s.size || this.#h(), r;
+        throw this.#s.delete(s), this.#s.size || this.#u(), r;
       }
     return m(() => {
-      s.listener = void 0, this.#s.delete(s), this.#s.size || this.#h();
+      s.listener = void 0, this.#s.delete(s), this.#s.size || this.#u();
     });
   }
   #p = () => {
     this.#t || (this.#t = !0, g(this.#s));
   };
-  #h() {
+  #u() {
     for (const e of this.#i.values())
       e.subscription?.dispose(), e.subscription = void 0;
   }
-  #a() {
+  #h() {
     const e = this.#n;
     if (e.phase === "cached" && !this.#t) {
       for (const n of this.#i.values())
@@ -347,14 +355,14 @@ class C {
     this.#r = !0, f = (n) => s.add(n);
     let r;
     try {
-      r = this.#e(), l(r, "Computed signal calculations must be synchronous");
+      r = this.#e(), p(r, "Computed signal calculations must be synchronous");
     } finally {
       f = i, this.#r = !1;
     }
     for (const [n, o] of this.#i)
       s.has(n) || (o.subscription?.dispose(), this.#i.delete(n));
     for (const n of s) {
-      const o = p.get(n);
+      const o = l.get(n);
       if (!o) continue;
       const c = this.#i.get(n) ?? {
         node: o,
@@ -363,7 +371,7 @@ class C {
       };
       c.version = o.version, this.#s.size && !c.subscription && (c.subscription = n.subscribe(this.#p)), this.#i.set(n, c);
     }
-    return (e.phase === "uninitialized" || !Object.is(e.value, r)) && this.#o++, this.#n = { phase: "cached", value: r }, this.#t = !1, r;
+    return (e.phase === "uninitialized" || !Object.is(e.value, r)) && this.#c++, this.#n = { phase: "cached", value: r }, this.#t = !1, r;
   }
 }
 function S(t) {

package/dist/observe.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"observe.d.ts","sourceRoot":"","sources":["../src/observe.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,KAAK,eAAe,EAEpB,KAAK,QAAQ,EAEd,MAAM,YAAY,CAAC;AAGpB,MAAM,WAAW,eAAe,CAAC,CAAC,GAAG,IAAI,CAAE,SAAQ,eAAe;IAChE,QAAQ,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC;CAC7B;AAED,MAAM,WAAW,mBAAoB,SAAQ,eAAe;IAC1D,QAAQ,CAAC,OAAO,EAAE,CAAC,OAAO,EAAE,MAAM,OAAO,KAAK,eAAe,CAAC;IAC9D,QAAQ,CAAC,QAAQ,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,mBAAmB,CAAC;IAC1D,QAAQ,CAAC,KAAK,EAAE,CAAC,CAAC,EAAE,IAAI,EAAE,CAAC,MAAM,EAAE,WAAW,KAAK,CAAC,GAAG,WAAW,CAAC,CAAC,CAAC,KAAK,eAAe,CAAC,CAAC,CAAC,CAAC;CAC9F;AAED,MAAM,WAAW,gBAAgB,CAAC,KAAK,SAAS,mBAAmB,GAAG,mBAAmB;IACvF,QAAQ,CAAC,OAAO,EAAE,CAAC,OAAO,EAAE,MAAM,OAAO,KAAK,eAAe,CAAC;IAC9D,QAAQ,CAAC,QAAQ,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,KAAK,CAAC;IAC5C,QAAQ,CAAC,KAAK,EAAE,CAAC,CAAC,EAAE,IAAI,EAAE,CAAC,MAAM,EAAE,WAAW,KAAK,CAAC,GAAG,WAAW,CAAC,CAAC,CAAC,KAAK,eAAe,CAAC,CAAC,CAAC,CAAC;CAC9F;AAED,MAAM,MAAM,QAAQ,CAAC,CAAC,EAAE,KAAK,SAAS,mBAAmB,IAAI,CAAC,KAAK,EAAE,CAAC,EAAE,QAAQ,EAAE,KAAK,KAAK,IAAI,CAAC;AA+MjG;;;GAGG;AACH,wBAAgB,OAAO,CAAC,CAAC,EAAE,KAAK,SAAS,mBAAmB,EAC1D,KAAK,EAAE,gBAAgB,CAAC,KAAK,CAAC,EAC9B,MAAM,EAAE,QAAQ,CAAC,CAAC,CAAC,EACnB,QAAQ,EAAE,QAAQ,CAAC,CAAC,EAAE,KAAK,CAAC,GAC3B,eAAe,CA0BjB"}
+{"version":3,"file":"observe.d.ts","sourceRoot":"","sources":["../src/observe.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,KAAK,eAAe,EAEpB,KAAK,QAAQ,EAEd,MAAM,YAAY,CAAC;AAGpB,MAAM,WAAW,eAAe,CAAC,CAAC,GAAG,IAAI,CAAE,SAAQ,eAAe;IAChE,QAAQ,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC;CAC7B;AAED,MAAM,WAAW,mBAAoB,SAAQ,eAAe;IAC1D,QAAQ,CAAC,OAAO,EAAE,CAAC,OAAO,EAAE,MAAM,OAAO,KAAK,eAAe,CAAC;IAC9D,QAAQ,CAAC,QAAQ,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,mBAAmB,CAAC;IAC1D,QAAQ,CAAC,KAAK,EAAE,CAAC,CAAC,EAAE,IAAI,EAAE,CAAC,MAAM,EAAE,WAAW,KAAK,CAAC,GAAG,WAAW,CAAC,CAAC,CAAC,KAAK,eAAe,CAAC,CAAC,CAAC,CAAC;CAC9F;AAED,MAAM,WAAW,gBAAgB,CAAC,KAAK,SAAS,mBAAmB,GAAG,mBAAmB;IACvF,QAAQ,CAAC,OAAO,EAAE,CAAC,OAAO,EAAE,MAAM,OAAO,KAAK,eAAe,CAAC;IAC9D,QAAQ,CAAC,QAAQ,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,KAAK,CAAC;IAC5C,QAAQ,CAAC,KAAK,EAAE,CAAC,CAAC,EAAE,IAAI,EAAE,CAAC,MAAM,EAAE,WAAW,KAAK,CAAC,GAAG,WAAW,CAAC,CAAC,CAAC,KAAK,eAAe,CAAC,CAAC,CAAC,CAAC;CAC9F;AAED,MAAM,MAAM,QAAQ,CAAC,CAAC,EAAE,KAAK,SAAS,mBAAmB,IAAI,CAAC,KAAK,EAAE,CAAC,EAAE,QAAQ,EAAE,KAAK,KAAK,IAAI,CAAC;AA+NjG;;;GAGG;AACH,wBAAgB,OAAO,CAAC,CAAC,EAAE,KAAK,SAAS,mBAAmB,EAC1D,KAAK,EAAE,gBAAgB,CAAC,KAAK,CAAC,EAC9B,MAAM,EAAE,QAAQ,CAAC,CAAC,CAAC,EACnB,QAAQ,EAAE,QAAQ,CAAC,CAAC,EAAE,KAAK,CAAC,GAC3B,eAAe,CA2BjB"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dougongjs/reactive",
-  "version": "0.3.0",
+  "version": "0.4.0",
   "type": "module",
   "engines": {
     "node": ">=22"