kiru 1.2.0 → 1.3.0

package/src/signals/base.ts

@@ -5,20 +5,19 @@ import {
   generateRandomID,
   registerVNodeCleanup,
 } from "../utils/index.js"
-import { $HMR_ACCEPT, $SIGNAL } from "../constants.js"
+import { $DEV_FILE_LINK, $HMR_ACCEPT, $SIGNAL } from "../constants.js"
 import { __DEV__, isBrowser } from "../env.js"
 import { node } from "../globals.js"
 import { requestUpdate } from "../scheduler.js"
-import { signalSubsMap } from "./globals.js"
 import { tracking } from "./tracking.js"
-import type { SignalSubscriber, ReadonlySignal } from "./types.js"
+import type { SignalSubscriber } from "./types.js"
 import type { HMRAccept } from "../hmr.js"
 
 export class Signal<T> {
   [$SIGNAL] = true;
   [$HMR_ACCEPT]?: HMRAccept<Signal<any>>
   displayName?: string
-  protected $subs?: Set<SignalSubscriber<any>>
+  protected $subs: Set<SignalSubscriber<any>>
   protected $id: string
   protected $value: T
   protected $prevValue?: T
@@ -29,10 +28,10 @@ export class Signal<T> {
   constructor(initial: T, displayName?: string) {
     this.$id = generateRandomID()
     this.$value = initial
+    this.$subs = new Set()
     if (displayName) this.displayName = displayName
 
     if (__DEV__) {
-      signalSubsMap.set(this.$id, new Set())
       this.$initialValue = safeStringify(initial)
       this[$HMR_ACCEPT] = {
         provide: () => {
@@ -40,11 +39,11 @@ export class Signal<T> {
         },
         inject: (prev) => {
           if (isBrowser) window.__kiru.devtools?.untrack(prev)
-          signalSubsMap.get(this.$id)?.clear?.()
-          signalSubsMap.delete(this.$id)
           this.$id = prev.$id
-          // @ts-ignore - this handles scenarios where a reference to the prev has been encapsulated
-          // and we need to be able to refer to the latest version of the signal.
+          this.$subs = prev.$subs
+          // this is a nice-to-have so that implementations of signal-on-signal don't need to do it themselves.
+          // eg. Object.assign(signal, { nestedSignal })
+          // it's only done by our HMR pass for top-level signals.
           prev.__next = this
 
           if (this.$initialValue === prev.$initialValue) {
@@ -55,8 +54,6 @@ export class Signal<T> {
         },
         destroy: () => {},
       } satisfies HMRAccept<Signal<any>>
-    } else {
-      this.$subs = new Set()
     }
 
     const n = node.current
@@ -120,23 +117,31 @@ export class Signal<T> {
 
   subscribe(cb: (state: T, prevState?: T) => void): () => void {
     if (__DEV__) {
-      const subs = signalSubsMap.get(this.$id)!
-      subs!.add(cb)
-      return () => signalSubsMap.get(this.$id)?.delete(cb)
+      const tgt = latest(this)
+      if (__DEV__ && tgt.$isDisposed) {
+        const name = tgt.displayName ?? tgt.$id
+        let message = `Attempted to subscribe to a signal that has been disposed: ${name}`
+        if ($DEV_FILE_LINK in tgt) {
+          message += `\nFile: ${tgt[$DEV_FILE_LINK]}`
+        }
+        message += `\nInitial value: ${tgt.$initialValue}`
+        throw new Error(message)
+      }
     }
-    this.$subs!.add(cb)
-    return () => this.$subs!.delete(cb)
+    this.$subs.add(cb)
+    return () => this.$subs.delete(cb)
   }
 
   notify(filter?: (sub: SignalSubscriber) => boolean) {
     if (__DEV__) {
-      return signalSubsMap.get(this.$id)?.forEach((sub) => {
+      const tgt = latest(this)
+      return tgt.$subs.forEach((sub) => {
         if (filter && !filter(sub)) return
         const { $value, $prevValue } = latest(this)
         return sub($value, $prevValue)
       })
     }
-    this.$subs!.forEach((sub) => {
+    this.$subs.forEach((sub) => {
       if (filter && !filter(sub)) return
       return sub(this.$value, this.$prevValue)
     })
@@ -147,46 +152,17 @@ export class Signal<T> {
   }
 
   static subscribers(signal: Signal<any>) {
-    if (__DEV__) {
-      return signalSubsMap.get(signal.$id)!
-    }
     return signal.$subs
   }
 
-  static makeReadonly<T>(signal: Signal<T>): ReadonlySignal<T> {
-    const desc = Object.getOwnPropertyDescriptor(signal, "value")
-    if (desc && !desc.writable) return signal
-    return Object.defineProperty(signal, "value", {
-      get: function (this: Signal<T>) {
-        Signal.entangle(this)
-        return this.$value
-      },
-      configurable: true,
-    })
-  }
-
-  static makeWritable<T>(signal: Signal<T>): Signal<T> {
-    const desc = Object.getOwnPropertyDescriptor(signal, "value")
-    if (desc && desc.writable) return signal
-    return Object.defineProperty(signal, "value", {
-      get: function (this: Signal<T>) {
-        Signal.entangle(this)
-        return this.$value
-      },
-      set: function (this: Signal<T>, value) {
-        this.$value = value
-        this.notify()
-      },
-      configurable: true,
-    })
-  }
-
   static entangle<T>(signal: Signal<T>) {
     if (tracking.enabled === false) return
+    if (__DEV__) signal = latest(signal)
 
     const vNode = node.current
     const trackedSignalObservations = tracking.current()
     if (trackedSignalObservations) {
+      // track non-rendering access, only track rendering access if renderMode is DOM/hydrate
       if (!vNode || (vNode && sideEffectsEnabled())) {
         trackedSignalObservations.set(signal.$id, signal)
       }
@@ -198,13 +174,14 @@ export class Signal<T> {
   }
 
   static dispose(signal: Signal<any>) {
+    if (signal.$isDisposed) return
+
     signal.$isDisposed = true
     if (__DEV__) {
-      signalSubsMap.delete(signal.$id)
-      if (isBrowser) window.__kiru.devtools?.untrack(signal)
+      if (isBrowser) window.__kiru.devtools?.untrack(latest(signal))
       return
     }
-    signal.$subs!.clear()
+    signal.$subs.clear()
   }
 }
 

package/src/signals/computed.ts

@@ -1,7 +1,7 @@
 import { __DEV__ } from "../env.js"
 import { $HMR_ACCEPT } from "../constants.js"
 import { call, latest } from "../utils/index.js"
-import { effectQueue, signalSubsMap } from "./globals.js"
+import { effectQueue } from "./globals.js"
 import { executeWithTracking } from "./tracking.js"
 import { Signal } from "./base.js"
 import type { HMRAccept } from "../hmr.js"
@@ -17,16 +17,24 @@ export class ComputedSignal<T> extends Signal<T> {
     this.$isDirty = true
 
     if (__DEV__) {
-      const inject = this[$HMR_ACCEPT]!.inject!
+      const { inject: baseInject } = this[$HMR_ACCEPT]!
       // @ts-expect-error this is fine 😅
       this[$HMR_ACCEPT] = {
         provide: () => {
           return this
         },
         inject: (prev) => {
-          inject(prev)
+          baseInject(prev)
+          // Stop any pending reactions on the previous instance and mark
+          // this computed as dirty so it will recompute with the latest
+          // dependencies after HMR.
           ComputedSignal.stop(prev)
-          this.$isDirty = prev.$isDirty
+          this.$isDirty = true
+          // Force a recompute immediately so any active subscribers (like
+          // text nodes bound to a computed signal) see the updated value
+          // after a hot reload where only its dependencies changed.
+          ComputedSignal.run(this)
+          this.notify()
         },
         destroy: () => {},
       } satisfies HMRAccept<ComputedSignal<T>>
@@ -88,11 +96,7 @@ export class ComputedSignal<T> extends Signal<T> {
       fn: () => $getter(computed.$value),
       onDepChanged: () => {
         computed.$isDirty = true
-        if (__DEV__) {
-          if (!signalSubsMap?.get(id)?.size) return
-        } else {
-          if (!computed.$subs!.size) return
-        }
+        if (!computed.$subs.size) return
         ComputedSignal.run(computed)
         if (Object.is(computed.$value, computed.$prevValue)) return
         computed.notify()

package/src/signals/globals.ts

@@ -1,4 +1 @@
-import type { SignalSubscriber } from "./types.js"
-
 export const effectQueue = new Map<string, Function>()
-export const signalSubsMap: Map<string, Set<SignalSubscriber<any>>> = new Map()

package/src/signals/types.ts

@@ -7,7 +7,7 @@ export type SignalSubscriber<T = unknown> = (value: T, prevValue?: T) => void
 
 export type SignalValues<T extends readonly Signal<unknown>[]> = {
   [I in keyof T]: T[I] extends Signal<infer V>
-    ? V extends Kiru.StatefulPromiseBase<infer P>
+    ? V extends Kiru.StatefulPromise<infer P>
       ? P
       : V
     : never

package/src/ssr/server.ts

@@ -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"
@@ -20,13 +19,21 @@ d.currentScript.remove()
 </script>
 `
 
-export function renderToReadableStream(element: JSX.Element): {
+export interface ReadableStreamRenderResult {
   immediate: string
-  stream: Readable
-} {
-  const stream = new Readable({ read() {} })
+  stream: ReadableStream
+}
+
+export function renderToReadableStream(element: JSX.Element): ReadableStreamRenderResult {
+  let controller!: ReadableStreamDefaultController<string>
+  const stream = new ReadableStream<string>({
+    start(c) {
+      controller = c
+    },
+  })
+  
   const rootNode = Fragment({ children: element })
-  const streamPromises = new Set<Kiru.StatefulPromiseBase<unknown>>()
+  const streamPromises = new Set<Kiru.StatefulPromise<unknown>>()
   const pendingWritePromises: Promise<void>[] = []
 
   let immediate = ""
@@ -43,7 +50,7 @@ export function renderToReadableStream(element: JSX.Element): {
           .catch(() => ({ error: promise.error?.message }))
           .then((value) => {
             const content = JSON.stringify(value)
-            stream.push(
+            controller.enqueue(
               `<script id="${promise.id}" k-data type="application/json">${content}</script>`
             )
           })
@@ -55,16 +62,16 @@ export function renderToReadableStream(element: JSX.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/src/types.ts

@@ -123,9 +123,9 @@ declare global {
     }
 
     export interface FC<T = {}> {
-      (props: T):
-        | Exclude<JSX.Element, Kiru.FC<any>>
-        | ((props: T) => JSX.Element)
+      (
+        props: T
+      ): Exclude<JSX.Element, Kiru.FC<any>> | ((props: T) => JSX.Element)
       /** Used to display the name of the component in devtools  */
       displayName?: string
     }
@@ -148,7 +148,7 @@ declare global {
       error?: Error
     }
 
-    interface StatefulPromiseBase<T> extends Promise<T>, PromiseState<T> {}
+    interface StatefulPromise<T> extends Promise<T>, PromiseState<T> {}
 
     type RenderMode = "dom" | "hydrate" | "string" | "stream"
 

package/src/utils/index.ts

@@ -1,6 +1,7 @@
 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"

package/src/utils/stream.ts

@@ -0,0 +1,17 @@
+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 function isStreamDataThrowValue(
+  value: unknown
+): value is StreamDataThrowValue {
+  return typeof value === "object" && !!value && $STREAM_DATA in value
+}

package/src/utils/vdom.ts

@@ -34,6 +34,7 @@ export {
   createVNodeId,
   registerVNodeCleanup,
   propsChanged,
+  depthSort,
 }
 
 function cloneElement(vNode: Kiru.VNode): Kiru.Element {
@@ -219,3 +220,7 @@ function propsChanged(
   }
   return false
 }
+
+function depthSort(a: Kiru.VNode, b: Kiru.VNode): number {
+  return a.depth - b.depth
+}

package/dist/statefulPromise.d.ts

@@ -1,22 +0,0 @@
-import { $STREAM_DATA } from "./constants.js";
-import { Signal } from "./signals/base.js";
-export interface StreamDataThrowValue {
-    [$STREAM_DATA]: {
-        fallback?: JSX.Element;
-        data: Kiru.StatefulPromiseBase<unknown>[];
-    };
-}
-/**
- * Returns true if the value is a {@link StreamDataThrowValue}
- */
-export declare function isStreamDataThrowValue(value: unknown): value is StreamDataThrowValue;
-/**
- * Returns true if the value is a {@link Kiru.StatefulPromiseBase}
- */
-export declare function isStatefulPromise(thing: unknown): thing is Kiru.StatefulPromiseBase<unknown>;
-type StatefulPromise<T> = Kiru.StatefulPromiseBase<T> & {
-    isPending: Signal<boolean>;
-};
-export declare function statefulPromise<T>(callback: (signal: AbortSignal) => Promise<T>): StatefulPromise<T>;
-export {};
-//# sourceMappingURL=statefulPromise.d.ts.map

package/dist/statefulPromise.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"statefulPromise.d.ts","sourceRoot":"","sources":["../src/statefulPromise.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAuB,MAAM,gBAAgB,CAAA;AAElE,OAAO,EAAE,MAAM,EAAU,MAAM,mBAAmB,CAAA;AAIlD,MAAM,WAAW,oBAAoB;IACnC,CAAC,YAAY,CAAC,EAAE;QACd,QAAQ,CAAC,EAAE,GAAG,CAAC,OAAO,CAAA;QACtB,IAAI,EAAE,IAAI,CAAC,mBAAmB,CAAC,OAAO,CAAC,EAAE,CAAA;KAC1C,CAAA;CACF;AAED;;GAEG;AACH,wBAAgB,sBAAsB,CACpC,KAAK,EAAE,OAAO,GACb,KAAK,IAAI,oBAAoB,CAE/B;AAED;;GAEG;AACH,wBAAgB,iBAAiB,CAC/B,KAAK,EAAE,OAAO,GACb,KAAK,IAAI,IAAI,CAAC,mBAAmB,CAAC,OAAO,CAAC,CAE5C;AAID,KAAK,eAAe,CAAC,CAAC,IAAI,IAAI,CAAC,mBAAmB,CAAC,CAAC,CAAC,GAAG;IACtD,SAAS,EAAE,MAAM,CAAC,OAAO,CAAC,CAAA;CAC3B,CAAA;AAED,wBAAgB,eAAe,CAAC,CAAC,EAC/B,QAAQ,EAAE,CAAC,MAAM,EAAE,WAAW,KAAK,OAAO,CAAC,CAAC,CAAC,GAC5C,eAAe,CAAC,CAAC,CAAC,CAuDpB"}

package/dist/statefulPromise.js

@@ -1,94 +0,0 @@
-import { $STREAM_DATA, STREAMED_DATA_EVENT } from "./constants.js";
-import { hydrationMode, node, renderMode } from "./globals.js";
-import { signal } from "./signals/base.js";
-import { createVNodeId } from "./utils/vdom.js";
-import { onCleanup } from "./hooks/onCleanup.js";
-/**
- * Returns true if the value is a {@link StreamDataThrowValue}
- */
-export function isStreamDataThrowValue(value) {
-    return typeof value === "object" && !!value && $STREAM_DATA in value;
-}
-/**
- * Returns true if the value is a {@link Kiru.StatefulPromiseBase}
- */
-export function isStatefulPromise(thing) {
-    return thing instanceof Promise && "id" in thing && "state" in thing;
-}
-const nodeToPromiseIndex = new WeakMap();
-export function statefulPromise(callback) {
-    const vNode = node.current;
-    if (!vNode) {
-        throw new Error("statefulPromise must be called inside a Kiru component");
-    }
-    const id = createVNodeId(vNode);
-    const isPending = signal(true);
-    isPending.value = true;
-    const controller = new AbortController();
-    onCleanup(() => controller.abort());
-    const index = nodeToPromiseIndex.get(vNode) ?? 0;
-    nodeToPromiseIndex.set(vNode, index + 1);
-    const promiseId = `${id}:data:${index}`;
-    let promise;
-    if (renderMode.current === "string") {
-        // if we're rendering to a string, there's no need to fire the callback
-        promise = Promise.resolve();
-    }
-    else if (renderMode.current === "hydrate" &&
-        hydrationMode.current === "dynamic") {
-        // if we're hydrating and the hydration mode is not static,
-        // we need to resolve the promise from cache/event
-        promise = resolveDeferredPromise(promiseId, controller.signal);
-    }
-    else {
-        // dom / stream / (hydrate + static)
-        promise = callback(controller.signal);
-    }
-    const state = {
-        id: promiseId,
-        state: "pending",
-    };
-    const statefulPromise = Object.assign(promise, state);
-    statefulPromise
-        .then((value) => {
-        statefulPromise.state = "fulfilled";
-        statefulPromise.value = value;
-        isPending.value = false;
-    })
-        .catch((error) => {
-        statefulPromise.state = "rejected";
-        statefulPromise.error = error instanceof Error ? error : new Error(error);
-    });
-    return Object.assign(statefulPromise, { isPending });
-}
-function resolveDeferredPromise(id, signal) {
-    return new Promise((resolve, reject) => {
-        const deferralCache = // @ts-ignore
-         (window[STREAMED_DATA_EVENT] ?? (window[STREAMED_DATA_EVENT] = new Map()));
-        const existing = deferralCache.get(id);
-        if (existing) {
-            const { data, error } = existing;
-            deferralCache.delete(id);
-            if (error)
-                return reject(error);
-            return resolve(data);
-        }
-        const onDataEvent = (event) => {
-            const { detail } = event;
-            if (detail.id === id) {
-                deferralCache.delete(id);
-                window.removeEventListener(STREAMED_DATA_EVENT, onDataEvent);
-                const { data, error } = detail;
-                if (error)
-                    return reject(error);
-                resolve(data);
-            }
-        };
-        window.addEventListener(STREAMED_DATA_EVENT, onDataEvent);
-        signal.addEventListener("abort", () => {
-            window.removeEventListener(STREAMED_DATA_EVENT, onDataEvent);
-            reject();
-        });
-    });
-}
-//# sourceMappingURL=statefulPromise.js.map

package/dist/statefulPromise.js.map

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

package/src/statefulPromise.ts

@@ -1,136 +0,0 @@
-import { $STREAM_DATA, STREAMED_DATA_EVENT } from "./constants.js"
-import { hydrationMode, node, renderMode } from "./globals.js"
-import { Signal, signal } from "./signals/base.js"
-import { createVNodeId } from "./utils/vdom.js"
-import { onCleanup } from "./hooks/onCleanup.js"
-
-export interface StreamDataThrowValue {
-  [$STREAM_DATA]: {
-    fallback?: JSX.Element
-    data: Kiru.StatefulPromiseBase<unknown>[]
-  }
-}
-
-/**
- * Returns true if the value is a {@link StreamDataThrowValue}
- */
-export function isStreamDataThrowValue(
-  value: unknown
-): value is StreamDataThrowValue {
-  return typeof value === "object" && !!value && $STREAM_DATA in value
-}
-
-/**
- * Returns true if the value is a {@link Kiru.StatefulPromiseBase}
- */
-export function isStatefulPromise(
-  thing: unknown
-): thing is Kiru.StatefulPromiseBase<unknown> {
-  return thing instanceof Promise && "id" in thing && "state" in thing
-}
-
-const nodeToPromiseIndex = new WeakMap<Kiru.VNode, number>()
-
-type StatefulPromise<T> = Kiru.StatefulPromiseBase<T> & {
-  isPending: Signal<boolean>
-}
-
-export function statefulPromise<T>(
-  callback: (signal: AbortSignal) => Promise<T>
-): StatefulPromise<T> {
-  const vNode = node.current!
-  if (!vNode) {
-    throw new Error("statefulPromise must be called inside a Kiru component")
-  }
-  const id = createVNodeId(vNode)
-  const isPending = signal(true)
-
-  isPending.value = true
-
-  const controller = new AbortController()
-  onCleanup(() => controller.abort())
-
-  const index = nodeToPromiseIndex.get(vNode) ?? 0
-  nodeToPromiseIndex.set(vNode, index + 1)
-
-  const promiseId = `${id}:data:${index}`
-
-  let promise: Promise<T>
-  if (renderMode.current === "string") {
-    // if we're rendering to a string, there's no need to fire the callback
-    promise = Promise.resolve() as Promise<T>
-  } else if (
-    renderMode.current === "hydrate" &&
-    hydrationMode.current === "dynamic"
-  ) {
-    // if we're hydrating and the hydration mode is not static,
-    // we need to resolve the promise from cache/event
-    promise = resolveDeferredPromise<T>(promiseId, controller.signal)
-  } else {
-    // dom / stream / (hydrate + static)
-    promise = callback(controller.signal)
-  }
-
-  const state: Kiru.PromiseState<T> = {
-    id: promiseId,
-    state: "pending",
-  }
-  const statefulPromise: Kiru.StatefulPromiseBase<T> = Object.assign(
-    promise,
-    state
-  )
-
-  statefulPromise
-    .then((value) => {
-      statefulPromise.state = "fulfilled"
-      statefulPromise.value = value
-      isPending.value = false
-    })
-    .catch((error) => {
-      statefulPromise.state = "rejected"
-      statefulPromise.error = error instanceof Error ? error : new Error(error)
-    })
-
-  return Object.assign(statefulPromise, { isPending })
-}
-
-interface DeferredPromiseEventDetail<T> {
-  id: string
-  data?: T
-  error?: string
-}
-
-function resolveDeferredPromise<T>(
-  id: string,
-  signal: AbortSignal
-): Promise<T> {
-  return new Promise<T>((resolve, reject) => {
-    const deferralCache: Map<string, { data?: T; error?: string }> = // @ts-ignore
-      (window[STREAMED_DATA_EVENT] ??= new Map())
-
-    const existing = deferralCache.get(id)
-    if (existing) {
-      const { data, error } = existing
-      deferralCache.delete(id)
-      if (error) return reject(error)
-      return resolve(data!)
-    }
-
-    const onDataEvent = (event: Event) => {
-      const { detail } = event as CustomEvent<DeferredPromiseEventDetail<T>>
-      if (detail.id === id) {
-        deferralCache.delete(id)
-        window.removeEventListener(STREAMED_DATA_EVENT, onDataEvent)
-        const { data, error } = detail
-        if (error) return reject(error)
-        resolve(data!)
-      }
-    }
-
-    window.addEventListener(STREAMED_DATA_EVENT, onDataEvent)
-    signal.addEventListener("abort", () => {
-      window.removeEventListener(STREAMED_DATA_EVENT, onDataEvent)
-      reject()
-    })
-  })
-}