@mittwald/react-tunnel 0.2.0-alpha.819 → 0.2.0-alpha.820

package/dist/index.js

@@ -1,97 +1,125 @@
 "use client"
 /* */
-import { jsx as x } from "react/jsx-runtime";
-import { useState as I, useRef as v, createContext as E, useContext as p, useId as w, useLayoutEffect as y, useEffect as b } from "react";
-import { observable as h, makeObservable as T, action as f } from "mobx";
-import { observer as g } from "mobx-react-lite";
-const u = "default", C = "default";
+import { jsx as P } from "react/jsx-runtime";
+import { useId as v, useState as E, useRef as a, createContext as g, useContext as I, useEffect as f, useLayoutEffect as R } from "react";
+import { observable as p, makeObservable as T, action as x } from "mobx";
+import { observer as b } from "mobx-react-lite";
+const h = "default", u = "default";
 class l {
   id;
-  children = h.map(
+  instanceId;
+  committedChildren = p.map(
     {},
     {
       deep: !1
     }
   );
+  renderPhaseChildren = /* @__PURE__ */ new Map();
   nextIndex = 0;
-  constructor(e = C) {
-    this.id = e, T(this, {
+  constructor(e = u, t = u) {
+    this.id = e, this.instanceId = t, T(this, {
       id: !1,
-      deleteChildren: f.bound,
-      setChildren: f.bound
+      deleteChildren: x.bound,
+      setChildren: x.bound
     });
   }
   static useNew(e) {
-    const t = I(() => new l(e))[0];
-    return t.resetIndex(), t;
+    const t = v(), r = E(() => new l(e, t))[0];
+    return r.resetIndex(), r;
   }
   resetIndex() {
     this.nextIndex = 0;
   }
   useEntryIndex() {
-    const e = v(null);
-    return e.current === null && (e.current = this.nextIndex++), e.current;
+    const e = a(this.instanceId), t = a(null);
+    return (t.current === null || e.current !== this.instanceId) && (e.current = this.instanceId, t.current = this.nextIndex++), t.current;
   }
-  setChildren(e = u, t, n, s) {
-    const i = {
+  setChildren(e = h, t, r, n) {
+    const s = {
       id: t,
-      index: n,
-      children: s
-    }, d = this.children.get(e) ?? h.map({}, { deep: !1 });
-    d.set(t, i), this.children.set(e, d);
+      index: r,
+      children: n
+    }, i = this.committedChildren.get(e) ?? p.map({}, { deep: !1 });
+    i.set(t, s), this.renderPhaseChildren.get(e)?.delete(t), this.committedChildren.set(e, i);
   }
-  deleteChildren(e = u, t) {
-    const n = this.children.get(e);
-    n?.delete(t), n?.size === 0 && this.children.delete(e);
+  setRenderPhaseChildren(e = h, t, r, n) {
+    const s = {
+      id: t,
+      index: r,
+      children: n
+    }, i = this.renderPhaseChildren.get(e) ?? /* @__PURE__ */ new Map();
+    i.set(t, s), this.renderPhaseChildren.set(e, i);
+  }
+  deleteChildrenFromMap(e, t, r) {
+    const n = e.get(t);
+    n?.delete(r), n?.size === 0 && e.delete(t);
+  }
+  deleteChildren(e = h, t) {
+    this.deleteChildrenFromMap(this.committedChildren, e, t), this.deleteChildrenFromMap(this.renderPhaseChildren, e, t);
   }
-  getEntries(e = u) {
-    const t = this.children.get(e)?.values();
-    if (t)
-      return Array.from(t).sort(
-        (n, s) => n.index - s.index
+  takeRenderPhaseChildren(e) {
+    if (this.renderPhaseChildren.has(e)) {
+      const t = this.renderPhaseChildren.get(e)?.values();
+      return this.renderPhaseChildren.delete(e), t;
+    }
+  }
+  getEntries(e = h) {
+    const t = this.committedChildren.get(e)?.values(), r = t ?? this.takeRenderPhaseChildren(e);
+    if (r) {
+      const n = !!t, s = Array.from(r).sort(
+        (i, d) => i.index - d.index
       );
+      return {
+        committed: n,
+        entries: s
+      };
+    }
   }
 }
-const c = E({
+const C = g({
   state: new l()
-}), m = (r = C) => {
-  let e = p(c);
+}), w = (o = u) => {
+  let e = I(C);
   for (; e; ) {
-    if (e.state.id === r)
+    if (e.state.id === o)
       return e.state;
     e = e.parentContext;
   }
   throw new Error(
-    `Could not get tunnel for provider ${r}. Please provider a TunnelProvider with this ID.`
+    `Could not get tunnel for provider ${o}. Please provider a TunnelProvider with this ID.`
   );
-}, k = (r) => {
-  const { children: e, id: t } = r, n = p(c);
-  return /* @__PURE__ */ x(
-    c.Provider,
+}, N = (o) => {
+  const { children: e, id: t } = o, r = I(C), n = l.useNew(t);
+  return /* @__PURE__ */ P(
+    C.Provider,
     {
       value: {
-        state: l.useNew(t),
-        parentContext: n
+        state: n,
+        parentContext: r
       },
       children: e
     }
   );
-}, z = (r) => {
-  const { children: e, id: t, staticEntryId: n, providerId: s } = r, i = m(s), d = w(), o = n ?? d, a = i.useEntryIndex();
-  return y(() => {
-    i.setChildren(t, o, a, e);
-  }, [e, t, o, a, s]), b(() => () => {
-    i.deleteChildren(t, o);
-  }, [t, o, s]), null;
-}, P = (r) => {
-  const { children: e } = r;
+}, j = (o) => {
+  const { children: e, id: t, staticEntryId: r, providerId: n } = o, s = w(n), i = v(), d = r ?? i, c = s.useEntryIndex(), m = a(!1);
+  return m.current || s.setRenderPhaseChildren(t, d, c, e), f(() => {
+    m.current = !0, s.setChildren(t, d, c, e);
+  }, [e, t, d, c, n]), f(() => () => {
+    s.deleteChildren(t, d);
+  }, [t, d, n]), null;
+}, y = (o) => {
+  const { children: e } = o;
   return typeof e == "function" ? e() : e;
-}, A = g((r) => {
-  const { children: e, id: t, providerId: n } = r, s = m(n).getEntries(t), i = s ? s.map((d) => /* @__PURE__ */ x(P, { children: d.children }, d.id)) : null;
+}, z = b((o) => {
+  const { children: e, id: t, providerId: r } = o, n = w(r).getEntries(t), [, s] = E(0);
+  R(() => {
+    n && !n.committed && s((d) => d + 1);
+  }, [n?.committed]);
+  const i = n?.entries.map((d) => /* @__PURE__ */ P(y, { children: d.children }, d.id));
   return typeof e == "function" ? e(i) : i ?? e;
 });
 export {
-  z as TunnelEntry,
-  A as TunnelExit,
-  k as TunnelProvider
+  j as TunnelEntry,
+  z as TunnelExit,
+  N as TunnelProvider
 };

package/dist/types/TunnelState.d.ts

@@ -7,17 +7,26 @@ interface TunnelEntryState {
     id: string;
     children: TunnelChildren;
 }
+interface TunnelEntries {
+    committed: boolean;
+    entries: TunnelEntryState[];
+}
 export declare class TunnelState {
     readonly id: string;
-    readonly children: ObservableMap<string, ObservableMap<string, TunnelEntryState>>;
+    private instanceId;
+    readonly committedChildren: ObservableMap<string, ObservableMap<string, TunnelEntryState>>;
+    private readonly renderPhaseChildren;
     private nextIndex;
-    constructor(id?: string);
+    constructor(id?: string, instanceId?: string);
     static useNew(id?: string): TunnelState;
     resetIndex(): void;
     useEntryIndex(): number;
     setChildren(tunnelId: string | undefined, entryId: string, index: number, children: TunnelChildren): void;
+    setRenderPhaseChildren(tunnelId: string | undefined, entryId: string, index: number, children: TunnelChildren): void;
+    private deleteChildrenFromMap;
     deleteChildren(tunnelId: string | undefined, entryId: string): void;
-    getEntries(tunnelId?: string): TunnelEntryState[] | undefined;
+    private takeRenderPhaseChildren;
+    getEntries(tunnelId?: string): TunnelEntries | undefined;
 }
 export {};
 //# sourceMappingURL=TunnelState.d.ts.map

package/dist/types/TunnelState.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"TunnelState.d.ts","sourceRoot":"","sources":["../../src/TunnelState.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,SAAS,EAAoB,MAAM,OAAO,CAAC;AACzD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,MAAM,CAAC;AAI1C,eAAO,MAAM,uBAAuB,YAAY,CAAC;AAEjD,MAAM,MAAM,cAAc,GACtB,SAAS,GACT,SAAS,GACT,CAAC,CAAC,cAAc,CAAC,EAAE,SAAS,GAAG,SAAS,KAAK,SAAS,GAAG,SAAS,CAAC,CAAC;AAExE,UAAU,gBAAgB;IACxB,KAAK,EAAE,MAAM,CAAC;IACd,EAAE,EAAE,MAAM,CAAC;IACX,QAAQ,EAAE,cAAc,CAAC;CAC1B;AAED,qBAAa,WAAW;IACtB,SAAgB,EAAE,EAAE,MAAM,CAAC;IAE3B,SAAgB,QAAQ,iEAQtB;IAEF,OAAO,CAAC,SAAS,CAAK;gBAEH,EAAE,SAA0B;WASjC,MAAM,CAAC,EAAE,CAAC,EAAE,MAAM,GAAG,WAAW;IAMvC,UAAU;IAIV,aAAa;IAQb,WAAW,CAChB,QAAQ,EAAE,MAAM,YAAY,EAC5B,OAAO,EAAE,MAAM,EACf,KAAK,EAAE,MAAM,EACb,QAAQ,EAAE,cAAc,GACvB,IAAI;IAgBA,cAAc,CAAC,QAAQ,EAAE,MAAM,YAAY,EAAE,OAAO,EAAE,MAAM,GAAG,IAAI;IAQnE,UAAU,CACf,QAAQ,GAAE,MAAkB,GAC3B,gBAAgB,EAAE,GAAG,SAAS;CAQlC"}
+{"version":3,"file":"TunnelState.d.ts","sourceRoot":"","sources":["../../src/TunnelState.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,SAAS,EAA2B,MAAM,OAAO,CAAC;AAChE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,MAAM,CAAC;AAI1C,eAAO,MAAM,uBAAuB,YAAY,CAAC;AAEjD,MAAM,MAAM,cAAc,GACtB,SAAS,GACT,SAAS,GACT,CAAC,CAAC,cAAc,CAAC,EAAE,SAAS,GAAG,SAAS,KAAK,SAAS,GAAG,SAAS,CAAC,CAAC;AAExE,UAAU,gBAAgB;IACxB,KAAK,EAAE,MAAM,CAAC;IACd,EAAE,EAAE,MAAM,CAAC;IACX,QAAQ,EAAE,cAAc,CAAC;CAC1B;AAED,UAAU,aAAa;IACrB,SAAS,EAAE,OAAO,CAAC;IACnB,OAAO,EAAE,gBAAgB,EAAE,CAAC;CAC7B;AAED,qBAAa,WAAW;IACtB,SAAgB,EAAE,EAAE,MAAM,CAAC;IAC3B,OAAO,CAAC,UAAU,CAAS;IAE3B,SAAgB,iBAAiB,iEAQ/B;IAEF,OAAO,CAAC,QAAQ,CAAC,mBAAmB,CAGhC;IAEJ,OAAO,CAAC,SAAS,CAAK;gBAGpB,EAAE,SAA0B,EAC5B,UAAU,SAA0B;WAWxB,MAAM,CAAC,EAAE,CAAC,EAAE,MAAM,GAAG,WAAW;IAOvC,UAAU;IAIV,aAAa;IAUb,WAAW,CAChB,QAAQ,EAAE,MAAM,YAAY,EAC5B,OAAO,EAAE,MAAM,EACf,KAAK,EAAE,MAAM,EACb,QAAQ,EAAE,cAAc,GACvB,IAAI;IAiBA,sBAAsB,CAC3B,QAAQ,EAAE,MAAM,YAAY,EAC5B,OAAO,EAAE,MAAM,EACf,KAAK,EAAE,MAAM,EACb,QAAQ,EAAE,cAAc,GACvB,IAAI;IAgBP,OAAO,CAAC,qBAAqB;IAYtB,cAAc,CAAC,QAAQ,EAAE,MAAM,YAAY,EAAE,OAAO,EAAE,MAAM,GAAG,IAAI;IAK1E,OAAO,CAAC,uBAAuB;IAQxB,UAAU,CAAC,QAAQ,SAAY,GAAG,aAAa,GAAG,SAAS;CAkBnE"}

package/dist/types/components/TunnelEntry.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"TunnelEntry.d.ts","sourceRoot":"","sources":["../../../src/components/TunnelEntry.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,EAAE,SAAS,EAAE,MAAM,OAAO,CAAC;AAI3C,MAAM,MAAM,mBAAmB,GAC3B,SAAS,GACT,SAAS,GACT,CAAC,MAAM,SAAS,GAAG,SAAS,CAAC,CAAC;AAElC,MAAM,WAAW,gBAAgB;IAC/B,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,QAAQ,CAAC,EAAE,mBAAmB,CAAC;IAC/B,yDAAyD;IACzD,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,gDAAgD;IAChD,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB;AAED,eAAO,MAAM,WAAW,EAAE,EAAE,CAAC,gBAAgB,CAwB5C,CAAC;AAEF,eAAe,WAAW,CAAC"}
+{"version":3,"file":"TunnelEntry.d.ts","sourceRoot":"","sources":["../../../src/components/TunnelEntry.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,EAAE,SAAS,EAAE,MAAM,OAAO,CAAC;AAI3C,MAAM,MAAM,mBAAmB,GAC3B,SAAS,GACT,SAAS,GACT,CAAC,MAAM,SAAS,GAAG,SAAS,CAAC,CAAC;AAElC,MAAM,WAAW,gBAAgB;IAC/B,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,QAAQ,CAAC,EAAE,mBAAmB,CAAC;IAC/B,yDAAyD;IACzD,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,gDAAgD;IAChD,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB;AAED,eAAO,MAAM,WAAW,EAAE,EAAE,CAAC,gBAAgB,CA+B5C,CAAC;AAEF,eAAe,WAAW,CAAC"}

package/dist/types/components/TunnelExit.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"TunnelExit.d.ts","sourceRoot":"","sources":["../../../src/components/TunnelExit.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,OAAO,CAAC;AAGhC,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,eAAe,CAAC;AACpD,MAAM,MAAM,kBAAkB,GAAG,cAAc,CAAC;AAEhD,MAAM,WAAW,eAAe;IAC9B,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,gDAAgD;IAChD,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,QAAQ,CAAC,EAAE,kBAAkB,CAAC;CAC/B;AAOD,eAAO,MAAM,UAAU,EAAE,EAAE,CAAC,eAAe,CAezC,CAAC;AAEH,eAAe,UAAU,CAAC"}
+{"version":3,"file":"TunnelExit.d.ts","sourceRoot":"","sources":["../../../src/components/TunnelExit.tsx"],"names":[],"mappings":"AAAA,OAAO,EAA6B,KAAK,EAAE,EAAE,MAAM,OAAO,CAAC;AAG3D,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,eAAe,CAAC;AACpD,MAAM,MAAM,kBAAkB,GAAG,cAAc,CAAC;AAEhD,MAAM,WAAW,eAAe;IAC9B,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,gDAAgD;IAChD,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,QAAQ,CAAC,EAAE,kBAAkB,CAAC;CAC/B;AAOD,eAAO,MAAM,UAAU,EAAE,EAAE,CAAC,eAAe,CAoBzC,CAAC;AAEH,eAAe,UAAU,CAAC"}

package/dist/types/components/TunnelProvider.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"TunnelProvider.d.ts","sourceRoot":"","sources":["../../../src/components/TunnelProvider.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAc,KAAK,EAAE,EAAE,KAAK,iBAAiB,EAAE,MAAM,OAAO,CAAC;AAIpE,MAAM,WAAW,mBAAoB,SAAQ,iBAAiB;IAC5D;;;OAGG;IACH,EAAE,CAAC,EAAE,MAAM,CAAC;CACb;AAED,eAAO,MAAM,cAAc,EAAE,EAAE,CAAC,mBAAmB,CAelD,CAAC;AAEF,eAAe,cAAc,CAAC"}
+{"version":3,"file":"TunnelProvider.d.ts","sourceRoot":"","sources":["../../../src/components/TunnelProvider.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAc,KAAK,EAAE,EAAE,KAAK,iBAAiB,EAAE,MAAM,OAAO,CAAC;AAIpE,MAAM,WAAW,mBAAoB,SAAQ,iBAAiB;IAC5D;;;OAGG;IACH,EAAE,CAAC,EAAE,MAAM,CAAC;CACb;AAED,eAAO,MAAM,cAAc,EAAE,EAAE,CAAC,mBAAmB,CAgBlD,CAAC;AAEF,eAAe,cAAc,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mittwald/react-tunnel",
-  "version": "0.2.0-alpha.819",
+  "version": "0.2.0-alpha.820",
   "type": "module",
   "description": "It's like a Portal – but with React components",
   "keywords": [
@@ -59,5 +59,5 @@
     "react": "^19.2.0",
     "react-dom": "^19.2.0"
   },
-  "gitHead": "f475d198902ad9e857714633d6ce7900326d9125"
+  "gitHead": "a113b886bd95adb2482c1c9bf387a0d6158df5b5"
 }