kiru 1.2.1 → 1.3.0

package/dist/ssr/server.js

@@ -1,4 +1,3 @@
-import { Readable } from "node:stream";
 import { Fragment } from "../element.js";
 import { renderMode } from "../globals.js";
 import { STREAMED_DATA_EVENT } from "../constants.js";
@@ -19,7 +18,12 @@ d.currentScript.remove()
 </script>
 `;
 export function renderToReadableStream(element) {
-    const stream = new Readable({ read() { } });
+    let controller;
+    const stream = new ReadableStream({
+        start(c) {
+            controller = c;
+        },
+    });
     const rootNode = Fragment({ children: element });
     const streamPromises = new Set();
     const pendingWritePromises = [];
@@ -36,7 +40,7 @@ export function renderToReadableStream(element) {
                     .catch(() => ({ error: promise.error?.message }))
                     .then((value) => {
                     const content = JSON.stringify(value);
-                    stream.push(`<script id="${promise.id}" k-data type="application/json">${content}</script>`);
+                    controller.enqueue(`<script id="${promise.id}" k-data type="application/json">${content}</script>`);
                 });
                 pendingWritePromises.push(writePromise);
             }
@@ -44,16 +48,16 @@ export function renderToReadableStream(element) {
     };
     const prev = renderMode.current;
     renderMode.current = "stream";
-    headlessRender(ctx, rootNode, null, 0);
+    headlessRender(ctx, rootNode);
     renderMode.current = prev;
     if (pendingWritePromises.length > 0) {
         Promise.all(pendingWritePromises).then(() => {
-            stream.push(STREAMED_DATA_SETUP);
-            stream.push(null);
+            controller.enqueue(STREAMED_DATA_SETUP);
+            controller.close();
         });
     }
     else {
-        stream.push(null);
+        controller.close();
     }
     return { immediate, stream };
 }

package/dist/ssr/server.js.map

@@ -1 +1 @@
-{"version":3,"file":"server.js","sourceRoot":"","sources":["../../src/ssr/server.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAA;AACtC,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAA;AACxC,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAA;AAC1C,OAAO,EAAE,mBAAmB,EAAE,MAAM,iBAAiB,CAAA;AACrD,OAAO,EAAE,cAAc,EAAyB,MAAM,sBAAsB,CAAA;AAE5E,MAAM,mBAAmB,GAAG;;;iBAGX,mBAAmB;;;;;mCAKD,mBAAmB;;;;;;CAMrD,CAAA;AAED,MAAM,UAAU,sBAAsB,CAAC,OAAoB;IAIzD,MAAM,MAAM,GAAG,IAAI,QAAQ,CAAC,EAAE,IAAI,KAAI,CAAC,EAAE,CAAC,CAAA;IAC1C,MAAM,QAAQ,GAAG,QAAQ,CAAC,EAAE,QAAQ,EAAE,OAAO,EAAE,CAAC,CAAA;IAChD,MAAM,cAAc,GAAG,IAAI,GAAG,EAAqC,CAAA;IACnE,MAAM,oBAAoB,GAAoB,EAAE,CAAA;IAEhD,IAAI,SAAS,GAAG,EAAE,CAAA;IAElB,MAAM,GAAG,GAA0B;QACjC,KAAK,EAAE,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,SAAS,IAAI,KAAK,CAAC;QACtC,YAAY,CAAC,IAAI;YACf,KAAK,MAAM,OAAO,IAAI,IAAI,EAAE,CAAC;gBAC3B,IAAI,cAAc,CAAC,GAAG,CAAC,OAAO,CAAC;oBAAE,SAAQ;gBACzC,cAAc,CAAC,GAAG,CAAC,OAAO,CAAC,CAAA;gBAE3B,MAAM,YAAY,GAAG,OAAO;qBACzB,IAAI,CAAC,GAAG,EAAE,CAAC,CAAC,EAAE,IAAI,EAAE,OAAO,CAAC,KAAK,EAAE,CAAC,CAAC;qBACrC,KAAK,CAAC,GAAG,EAAE,CAAC,CAAC,EAAE,KAAK,EAAE,OAAO,CAAC,KAAK,EAAE,OAAO,EAAE,CAAC,CAAC;qBAChD,IAAI,CAAC,CAAC,KAAK,EAAE,EAAE;oBACd,MAAM,OAAO,GAAG,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAA;oBACrC,MAAM,CAAC,IAAI,CACT,eAAe,OAAO,CAAC,EAAE,oCAAoC,OAAO,WAAW,CAChF,CAAA;gBACH,CAAC,CAAC,CAAA;gBAEJ,oBAAoB,CAAC,IAAI,CAAC,YAAY,CAAC,CAAA;YACzC,CAAC;QACH,CAAC;KACF,CAAA;IAED,MAAM,IAAI,GAAG,UAAU,CAAC,OAAO,CAAA;IAC/B,UAAU,CAAC,OAAO,GAAG,QAAQ,CAAA;IAC7B,cAAc,CAAC,GAAG,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC,CAAC,CAAA;IACtC,UAAU,CAAC,OAAO,GAAG,IAAI,CAAA;IAEzB,IAAI,oBAAoB,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACpC,OAAO,CAAC,GAAG,CAAC,oBAAoB,CAAC,CAAC,IAAI,CAAC,GAAG,EAAE;YAC1C,MAAM,CAAC,IAAI,CAAC,mBAAmB,CAAC,CAAA;YAChC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;QACnB,CAAC,CAAC,CAAA;IACJ,CAAC;SAAM,CAAC;QACN,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;IACnB,CAAC;IAED,OAAO,EAAE,SAAS,EAAE,MAAM,EAAE,CAAA;AAC9B,CAAC"}
+{"version":3,"file":"server.js","sourceRoot":"","sources":["../../src/ssr/server.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAA;AACxC,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAA;AAC1C,OAAO,EAAE,mBAAmB,EAAE,MAAM,iBAAiB,CAAA;AACrD,OAAO,EAAE,cAAc,EAAyB,MAAM,sBAAsB,CAAA;AAE5E,MAAM,mBAAmB,GAAG;;;iBAGX,mBAAmB;;;;;mCAKD,mBAAmB;;;;;;CAMrD,CAAA;AAOD,MAAM,UAAU,sBAAsB,CAAC,OAAoB;IACzD,IAAI,UAAoD,CAAA;IACxD,MAAM,MAAM,GAAG,IAAI,cAAc,CAAS;QACxC,KAAK,CAAC,CAAC;YACL,UAAU,GAAG,CAAC,CAAA;QAChB,CAAC;KACF,CAAC,CAAA;IAEF,MAAM,QAAQ,GAAG,QAAQ,CAAC,EAAE,QAAQ,EAAE,OAAO,EAAE,CAAC,CAAA;IAChD,MAAM,cAAc,GAAG,IAAI,GAAG,EAAiC,CAAA;IAC/D,MAAM,oBAAoB,GAAoB,EAAE,CAAA;IAEhD,IAAI,SAAS,GAAG,EAAE,CAAA;IAElB,MAAM,GAAG,GAA0B;QACjC,KAAK,EAAE,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,SAAS,IAAI,KAAK,CAAC;QACtC,YAAY,CAAC,IAAI;YACf,KAAK,MAAM,OAAO,IAAI,IAAI,EAAE,CAAC;gBAC3B,IAAI,cAAc,CAAC,GAAG,CAAC,OAAO,CAAC;oBAAE,SAAQ;gBACzC,cAAc,CAAC,GAAG,CAAC,OAAO,CAAC,CAAA;gBAE3B,MAAM,YAAY,GAAG,OAAO;qBACzB,IAAI,CAAC,GAAG,EAAE,CAAC,CAAC,EAAE,IAAI,EAAE,OAAO,CAAC,KAAK,EAAE,CAAC,CAAC;qBACrC,KAAK,CAAC,GAAG,EAAE,CAAC,CAAC,EAAE,KAAK,EAAE,OAAO,CAAC,KAAK,EAAE,OAAO,EAAE,CAAC,CAAC;qBAChD,IAAI,CAAC,CAAC,KAAK,EAAE,EAAE;oBACd,MAAM,OAAO,GAAG,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAA;oBACrC,UAAU,CAAC,OAAO,CAChB,eAAe,OAAO,CAAC,EAAE,oCAAoC,OAAO,WAAW,CAChF,CAAA;gBACH,CAAC,CAAC,CAAA;gBAEJ,oBAAoB,CAAC,IAAI,CAAC,YAAY,CAAC,CAAA;YACzC,CAAC;QACH,CAAC;KACF,CAAA;IAED,MAAM,IAAI,GAAG,UAAU,CAAC,OAAO,CAAA;IAC/B,UAAU,CAAC,OAAO,GAAG,QAAQ,CAAA;IAC7B,cAAc,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAA;IAC7B,UAAU,CAAC,OAAO,GAAG,IAAI,CAAA;IAEzB,IAAI,oBAAoB,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACpC,OAAO,CAAC,GAAG,CAAC,oBAAoB,CAAC,CAAC,IAAI,CAAC,GAAG,EAAE;YAC1C,UAAU,CAAC,OAAO,CAAC,mBAAmB,CAAC,CAAA;YACvC,UAAU,CAAC,KAAK,EAAE,CAAA;QACpB,CAAC,CAAC,CAAA;IACJ,CAAC;SAAM,CAAC;QACN,UAAU,CAAC,KAAK,EAAE,CAAA;IACpB,CAAC;IAED,OAAO,EAAE,SAAS,EAAE,MAAM,EAAE,CAAA;AAC9B,CAAC"}

package/dist/types.d.ts

@@ -87,7 +87,7 @@ declare global {
             value?: T;
             error?: Error;
         }
-        interface StatefulPromiseBase<T> extends Promise<T>, PromiseState<T> {
+        interface StatefulPromise<T> extends Promise<T>, PromiseState<T> {
         }
         type RenderMode = "dom" | "hydrate" | "string" | "stream";
         type StateSetter<T> = T | ((prev: T) => T);

package/dist/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"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"}

package/dist/utils/index.d.ts

@@ -1,7 +1,8 @@
 export * from "./compare.js";
 export * from "./dom.js";
 export * from "./format.js";
+export * from "./generateId.js";
 export * from "./runtime.js";
+export * from "./stream.js";
 export * from "./vdom.js";
-export * from "./generateId.js";
 //# sourceMappingURL=index.d.ts.map

package/dist/utils/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/utils/index.ts"],"names":[],"mappings":"AAAA,cAAc,cAAc,CAAA;AAC5B,cAAc,UAAU,CAAA;AACxB,cAAc,aAAa,CAAA;AAC3B,cAAc,cAAc,CAAA;AAC5B,cAAc,WAAW,CAAA;AACzB,cAAc,iBAAiB,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/utils/index.ts"],"names":[],"mappings":"AAAA,cAAc,cAAc,CAAA;AAC5B,cAAc,UAAU,CAAA;AACxB,cAAc,aAAa,CAAA;AAC3B,cAAc,iBAAiB,CAAA;AAC/B,cAAc,cAAc,CAAA;AAC5B,cAAc,aAAa,CAAA;AAC3B,cAAc,WAAW,CAAA"}

package/dist/utils/index.js

@@ -1,7 +1,8 @@
 export * from "./compare.js";
 export * from "./dom.js";
 export * from "./format.js";
+export * from "./generateId.js";
 export * from "./runtime.js";
+export * from "./stream.js";
 export * from "./vdom.js";
-export * from "./generateId.js";
 //# sourceMappingURL=index.js.map

package/dist/utils/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/utils/index.ts"],"names":[],"mappings":"AAAA,cAAc,cAAc,CAAA;AAC5B,cAAc,UAAU,CAAA;AACxB,cAAc,aAAa,CAAA;AAC3B,cAAc,cAAc,CAAA;AAC5B,cAAc,WAAW,CAAA;AACzB,cAAc,iBAAiB,CAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/utils/index.ts"],"names":[],"mappings":"AAAA,cAAc,cAAc,CAAA;AAC5B,cAAc,UAAU,CAAA;AACxB,cAAc,aAAa,CAAA;AAC3B,cAAc,iBAAiB,CAAA;AAC/B,cAAc,cAAc,CAAA;AAC5B,cAAc,aAAa,CAAA;AAC3B,cAAc,WAAW,CAAA"}

package/dist/utils/stream.d.ts

@@ -0,0 +1,12 @@
+import { $STREAM_DATA } from "../constants.js";
+export interface StreamDataThrowValue {
+    [$STREAM_DATA]: {
+        fallback?: JSX.Element;
+        data: Kiru.StatefulPromise<unknown>[];
+    };
+}
+/**
+ * Returns true if the value is a {@link StreamDataThrowValue}
+ */
+export declare function isStreamDataThrowValue(value: unknown): value is StreamDataThrowValue;
+//# sourceMappingURL=stream.d.ts.map

package/dist/utils/stream.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"stream.d.ts","sourceRoot":"","sources":["../../src/utils/stream.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAA;AAE9C,MAAM,WAAW,oBAAoB;IACnC,CAAC,YAAY,CAAC,EAAE;QACd,QAAQ,CAAC,EAAE,GAAG,CAAC,OAAO,CAAA;QACtB,IAAI,EAAE,IAAI,CAAC,eAAe,CAAC,OAAO,CAAC,EAAE,CAAA;KACtC,CAAA;CACF;AAED;;GAEG;AACH,wBAAgB,sBAAsB,CACpC,KAAK,EAAE,OAAO,GACb,KAAK,IAAI,oBAAoB,CAE/B"}

package/dist/utils/stream.js

@@ -0,0 +1,8 @@
+import { $STREAM_DATA } from "../constants.js";
+/**
+ * Returns true if the value is a {@link StreamDataThrowValue}
+ */
+export function isStreamDataThrowValue(value) {
+    return typeof value === "object" && !!value && $STREAM_DATA in value;
+}
+//# sourceMappingURL=stream.js.map

package/dist/utils/stream.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"stream.js","sourceRoot":"","sources":["../../src/utils/stream.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAA;AAS9C;;GAEG;AACH,MAAM,UAAU,sBAAsB,CACpC,KAAc;IAEd,OAAO,OAAO,KAAK,KAAK,QAAQ,IAAI,CAAC,CAAC,KAAK,IAAI,YAAY,IAAI,KAAK,CAAA;AACtE,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "kiru",
-  "version": "1.2.1",
+  "version": "1.3.0",
   "description": "A batteries-included, easy-to-use rendering library with a tiny footprint",
   "main": "dist/index.js",
   "type": "module",
@@ -10,14 +10,6 @@
       "types": "./dist/index.d.ts",
       "default": "./dist/index.js"
     },
-    "./form": {
-      "types": "./dist/form/index.d.ts",
-      "default": "./dist/form/index.js"
-    },
-    "./swr": {
-      "types": "./dist/swr.d.ts",
-      "default": "./dist/swr.js"
-    },
     "./utils": {
       "types": "./dist/utils/index.d.ts",
       "default": "./dist/utils/index.js"
@@ -26,10 +18,6 @@
       "types": "./dist/router/index.d.ts",
       "default": "./dist/router/index.js"
     },
-    "./router/dev": {
-      "types": "./dist/router/dev/index.d.ts",
-      "default": "./dist/router/dev/index.js"
-    },
     "./router/client": {
       "types": "./dist/router/client/index.d.ts",
       "default": "./dist/router/client/index.js"

package/src/components/derive.ts

@@ -1,33 +1,28 @@
-import { sideEffectsEnabled } from "../utils/index.js"
+import {
+  sideEffectsEnabled,
+  type StreamDataThrowValue,
+} from "../utils/index.js"
 import { Signal } from "../signals/index.js"
 import { $STREAM_DATA } from "../constants.js"
 import { node } from "../globals.js"
-import { ref } from "../ref.js"
 import { requestUpdate } from "../scheduler.js"
-import { isStatefulPromise, StreamDataThrowValue } from "../statefulPromise.js"
+import { isResource, Resource } from "../resource.js"
 import type { RecordHas } from "../types.utils"
 
 export type Derivable =
   | Kiru.Signal<unknown>
-  | Kiru.StatefulPromiseBase<unknown>
-  | Record<string, Kiru.Signal<unknown> | Kiru.StatefulPromiseBase<unknown>>
+  | Record<string, Kiru.Signal<unknown>>
 
-type InnerOf<T> =
-  T extends Kiru.Signal<infer V>
-    ? V
-    : T extends Kiru.StatefulPromiseBase<infer P>
-      ? P
-      : never
+type InnerOf<T> = T extends Kiru.Signal<infer V> ? V : never
 
-type UnwrapDerive<T extends Derivable> = T extends
-  | Kiru.Signal<unknown>
-  | Kiru.StatefulPromiseBase<any>
-  ? InnerOf<T>
-  : { [K in keyof T]: InnerOf<T[K]> }
+type UnwrapDerivable<T extends Derivable> =
+  T extends Kiru.Signal<unknown>
+    ? InnerOf<T>
+    : { [K in keyof T]: InnerOf<T[K]> }
 
-type RecordHasPromise<T extends Record<string, any>> = RecordHas<
+type RecordHasResource<T extends Record<string, any>> = RecordHas<
   T,
-  Kiru.StatefulPromiseBase<any>
+  Resource<any>
 >
 
 type ChildFn<T> = (value: T) => JSX.Children
@@ -41,21 +36,21 @@ export interface DeriveProps<
 > {
   from: T
   mode?: Mode
-  children: T extends Kiru.StatefulPromiseBase<infer U>
+  children: T extends Resource<infer U>
     ? Mode extends "swr"
       ? ChildFnWithStale<U>
       : ChildFn<U>
     : T extends Record<string, any>
-      ? RecordHasPromise<T> extends true
+      ? RecordHasResource<T> extends true
         ? Mode extends "swr"
-          ? ChildFnWithStale<UnwrapDerive<T>>
-          : ChildFn<UnwrapDerive<T>>
-        : ChildFn<UnwrapDerive<T>>
-      : ChildFn<UnwrapDerive<T>>
-  fallback?: T extends Kiru.StatefulPromiseBase<any>
+          ? ChildFnWithStale<UnwrapDerivable<T>>
+          : ChildFn<UnwrapDerivable<T>>
+        : ChildFn<UnwrapDerivable<T>>
+      : ChildFn<UnwrapDerivable<T>>
+  fallback?: T extends Resource<any>
     ? JSX.Element
     : T extends Record<string, any>
-      ? RecordHasPromise<T> extends true
+      ? RecordHasResource<T> extends true
         ? JSX.Element
         : never
       : never
@@ -72,15 +67,15 @@ type Derive = {
  * @see https://kirujs.dev/docs/components/derive
  */
 export const Derive: Derive = () => {
+  let prevSuccess: unknown
   return (props) => {
     const { from, children, fallback, mode } = props
-    const prevSuccess = ref<unknown>(null)
 
-    const promises = new Set<Kiru.StatefulPromiseBase<any>>()
+    const promises = new Set<Kiru.StatefulPromise<any>>()
     let value: unknown
 
-    if (isStatefulPromise(from)) {
-      promises.add(from)
+    if (isResource(from)) {
+      promises.add(from.promise)
       value = from.value as unknown
     } else if (Signal.isSignal(from)) {
       value = from.value as unknown
@@ -88,10 +83,8 @@ export const Derive: Derive = () => {
       const out: Record<string, any> = {}
       for (const key in from) {
         const v = from[key]
-        if (isStatefulPromise(v)) promises.add(v)
-        out[key] = (
-          v as Signal<unknown> | Kiru.StatefulPromiseBase<unknown>
-        ).value
+        if (isResource(v)) promises.add(v.promise)
+        out[key] = (v as Signal<unknown> | Kiru.StatefulPromise<unknown>).value
       }
       value = out as unknown
     }
@@ -116,7 +109,7 @@ export const Derive: Derive = () => {
         const nodeRef = node.current!
         Promise.allSettled(promises).then(() => requestUpdate(nodeRef))
 
-        const prev = prevSuccess.current!
+        const prev = prevSuccess
         if (mode !== "fallback" && prev) {
           return (children as ChildFnWithStale<unknown>)(prev, true)
         }
@@ -124,7 +117,7 @@ export const Derive: Derive = () => {
       }
     }
 
-    prevSuccess.current = value
+    prevSuccess = value
     return (children as ChildFnWithStale<unknown>)(value, false)
   }
 }

package/src/components/errorBoundary.ts

@@ -3,7 +3,9 @@ import { createElement } from "../index.js"
 
 export interface ErrorBoundaryProps {
   children?: JSX.Children
-  fallback?: JSX.Element | ((error: Error) => JSX.Element)
+  fallback?:
+    | Exclude<JSX.Element, (props: any) => JSX.Element>
+    | ((error: Error) => JSX.Element)
   onError?: (error: Error) => void
 }
 

package/src/components/transition.ts

@@ -1,7 +1,7 @@
 import { onCleanup } from "../hooks/onCleanup.js"
-import { signal, Signal } from "../signals/base.js"
-import { effect } from "../signals/effect.js"
+import { Signal } from "../signals/base.js"
 import { unwrap } from "../signals/utils.js"
+import { setup } from "../hooks/setup.js"
 
 export type TransitionState = "entering" | "entered" | "exiting" | "exited"
 interface TransitionProps {
@@ -26,26 +26,29 @@ interface TransitionProps {
  * @see https://kirujs.dev/docs/components/transition
  */
 export const Transition: Kiru.FC<TransitionProps> = (props) => {
-  const tState = signal<TransitionState>(props.initialState || "exited")
+  const $ = setup<typeof Transition>()
+  const tState = $.derive<TransitionState>((p) => p.initialState || "exited")
+  const inState = $.derive((p) => unwrap(p.in, true))
   let timeoutRef: number | undefined
+  let onTransitionEnd = props.onTransitionEnd
+  let duration = props.duration
 
   const setTransitionState = (transitionState: TransitionState) => {
     clearTimeout(timeoutRef)
     tState.value = transitionState
     if (transitionState === "entered" || transitionState === "exited") {
-      if (props.onTransitionEnd) props.onTransitionEnd(transitionState)
+      onTransitionEnd?.(transitionState)
     }
   }
 
   const queueStateChange = (transitionState: "entered" | "exited") => {
     timeoutRef = window.setTimeout(
       () => setTransitionState(transitionState),
-      getTiming(transitionState, props.duration)
+      getTiming(transitionState, duration)
     )
   }
 
-  effect(() => {
-    const newIn = unwrap(props.in, true)
+  const unsub = inState.subscribe((newIn) => {
     const current = tState.peek()
     if (newIn && current !== "entered" && current !== "entering") {
       setTransitionState("entering")
@@ -56,10 +59,12 @@ export const Transition: Kiru.FC<TransitionProps> = (props) => {
     }
   })
 
-  onCleanup(() => clearTimeout(timeoutRef))
+  onCleanup(() => (unsub(), clearTimeout(timeoutRef)))
 
-  return (newProps) => {
-    return newProps.element(tState.value)
+  return (props) => {
+    duration = props.duration
+    onTransitionEnd = props.onTransitionEnd
+    return props.element(tState.value)
   }
 }
 

package/src/error.ts

@@ -1,6 +1,5 @@
-import { $KIRU_ERROR } from "./constants.js"
+import { $DEV_FILE_LINK, $KIRU_ERROR } from "./constants.js"
 import { __DEV__ } from "./env.js"
-import { findParent, noop } from "./utils/index.js"
 
 type KiruErrorOptions =
   | string
@@ -16,8 +15,6 @@ export class KiruError extends Error {
   [$KIRU_ERROR] = true
   /** Indicates whether the error is fatal and should crash the application */
   fatal?: boolean
-  /** Present if vNode is provided */
-  customNodeStack?: string
   constructor(optionsOrMessage: KiruErrorOptions) {
     const message =
       typeof optionsOrMessage === "string"
@@ -26,18 +23,21 @@ export class KiruError extends Error {
     super(message)
     if (typeof optionsOrMessage !== "string") {
       if (__DEV__ && optionsOrMessage?.vNode) {
-        this.customNodeStack = captureErrorStack(optionsOrMessage.vNode)
+        const stack = createVNodeStack(optionsOrMessage.vNode)
+        this.message = `${message}
+${stack.map((item) => `    at ${item}`).join("\n")}
+`
       }
       this.fatal = optionsOrMessage?.fatal
     }
   }
 
   static isKiruError(error: unknown): error is KiruError {
-    return error instanceof Error && (error as KiruError)[$KIRU_ERROR] === true
+    return error instanceof Error && $KIRU_ERROR in error
   }
 }
 
-function captureErrorStack(vNode: Kiru.VNode) {
+function createVNodeStack(vNode: Kiru.VNode) {
   let n = vNode
   let componentFns: string[] = []
   while (n) {
@@ -45,24 +45,16 @@ function captureErrorStack(vNode: Kiru.VNode) {
     if (typeof n.type === "function") {
       componentFns.push(getComponentErrorDisplayText(n.type))
     } else if (typeof n.type === "string") {
-      componentFns.push(n.type)
+      componentFns.push(`<${n.type}>`)
     }
     n = n.parent
   }
-  const componentNode = (
-    typeof vNode.type === "function"
-      ? vNode
-      : findParent(vNode, (n) => typeof n.type === "function")
-  ) as (Kiru.VNode & { type: Function }) | null
-  return `The above error occurred in the <${getFunctionName(
-    componentNode?.type || noop
-  )}> component:
 
-${componentFns.map((x) => `   at ${x}`).join("\n")}\n`
+  return componentFns
 }
 
 function getComponentErrorDisplayText(fn: Function) {
-  let str = getFunctionName(fn)
+  let str = `<${getFunctionName(fn)}>`
   if (__DEV__) {
     const fileLink = getComponentFileLink(fn)
     if (fileLink) {
@@ -77,5 +69,5 @@ function getFunctionName(fn: Function) {
 }
 
 function getComponentFileLink(fn: Function) {
-  return fn.toString().match(/\/\/ \[kiru_devtools\]:(.*)/)?.[1] ?? null
+  return (fn as any)[$DEV_FILE_LINK] ?? null
 }

package/src/headlessRender.ts

@@ -7,8 +7,8 @@ import {
   assertValidElementProps,
   isPrimitiveChild,
   isValidTextChild,
+  isStreamDataThrowValue,
 } from "./utils/index.js"
-import { isStreamDataThrowValue } from "./statefulPromise.js"
 import { Signal } from "./signals/base.js"
 import { $ERROR_BOUNDARY, voidElements, $STREAM_DATA } from "./constants.js"
 import { __DEV__ } from "./env.js"
@@ -16,14 +16,14 @@ import type { ErrorBoundaryNode } from "./types.utils"
 
 export interface HeadlessRenderContext {
   write(chunk: string): void
-  onStreamData?: (data: Kiru.StatefulPromiseBase<unknown>[]) => void
+  onStreamData?: (data: Kiru.StatefulPromise<unknown>[]) => void
 }
 
 export function headlessRender(
   ctx: HeadlessRenderContext,
   el: unknown,
-  parent: Kiru.VNode | null,
-  idx: number
+  parent: Kiru.VNode | null = null,
+  idx: number = 0
 ): void {
   if (el === null) return
   if (el === undefined) return
@@ -66,7 +66,7 @@ export function headlessRender(
   if (isExoticType(type)) {
     if (type === $ERROR_BOUNDARY) {
       let boundaryBuffer = ""
-      const streamPromises = new Set<Kiru.StatefulPromiseBase<unknown>>()
+      const streamPromises = new Set<Kiru.StatefulPromise<unknown>>()
       const boundaryCtx: HeadlessRenderContext = {
         write(chunk) {
           boundaryBuffer += chunk

package/src/hmr.ts

@@ -98,6 +98,8 @@ export function createHmrContext() {
     if (currentModuleMemory === null)
       throw new Error("[kiru]: HMR could not register: No active module")
 
+    // TODO: we should call destroy() on unmatched old entries
+
     let dirtyNodes = new Set<Kiru.VNode>()
     for (const [name, newEntry] of Object.entries(hotVarRegistrationEntries)) {
       const oldEntry = currentModuleMemory.hotVars.get(name)
@@ -120,10 +122,10 @@ export function createHmrContext() {
         isGenericHmrAcceptor(oldEntry.value) &&
         isGenericHmrAcceptor(newEntry.value)
       ) {
-        newEntry.value[$HMR_ACCEPT].inject(
-          oldEntry.value[$HMR_ACCEPT].provide()
+        performHmrAccept(
+          oldEntry.value[$HMR_ACCEPT],
+          newEntry.value[$HMR_ACCEPT]
         )
-        oldEntry.value[$HMR_ACCEPT].destroy()
         continue
       }
       if (oldEntry.type === "component" && newEntry.type === "component") {
@@ -192,3 +194,11 @@ export function onHmr(callback: () => void): void {
     window.__kiru.HMRContext.onHmr(callback)
   }
 }
+
+export function performHmrAccept<T>(
+  oldThing: HMRAccept<T>,
+  newThing: HMRAccept<T>
+) {
+  newThing.inject(oldThing.provide())
+  oldThing.destroy()
+}

package/src/index.ts

@@ -22,7 +22,7 @@ export {
   requestUpdate,
   useRequestUpdate,
 } from "./scheduler.js"
-export * from "./statefulPromise.js"
+export * from "./resource.js"
 export * from "./viewTransitions.js"
 
 if (isBrowser) {

package/src/renderToString.ts

@@ -11,7 +11,7 @@ export function renderToString(element: JSX.Element) {
       result += chunk
     },
   }
-  headlessRender(ctx, Fragment({ children: element }), null, 0)
+  headlessRender(ctx, Fragment({ children: element }))
   renderMode.current = prev
   return result
 }