kiru 1.1.2 → 1.2.1

package/src/signals/base.ts

@@ -5,7 +5,7 @@ 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"
@@ -120,9 +120,19 @@ 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)
+      const subs = signalSubsMap.get(tgt.$id)!
+      if (__DEV__ && !subs) {
+        const name = tgt.displayName ?? tgt.$id
+        let message = `Attempting 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)
+      }
+      subs.add(cb)
+      return () => subs.delete(cb)
     }
     this.$subs!.add(cb)
     return () => this.$subs!.delete(cb)
@@ -130,7 +140,8 @@ export class Signal<T> {
 
   notify(filter?: (sub: SignalSubscriber) => boolean) {
     if (__DEV__) {
-      return signalSubsMap.get(this.$id)?.forEach((sub) => {
+      const tgt = latest(this)
+      return signalSubsMap.get(tgt.$id)?.forEach((sub) => {
         if (filter && !filter(sub)) return
         const { $value, $prevValue } = latest(this)
         return sub($value, $prevValue)
@@ -148,12 +159,14 @@ export class Signal<T> {
 
   static subscribers(signal: Signal<any>) {
     if (__DEV__) {
+      signal = latest(signal)
       return signalSubsMap.get(signal.$id)!
     }
     return signal.$subs
   }
 
   static makeReadonly<T>(signal: Signal<T>): ReadonlySignal<T> {
+    if (__DEV__) signal = latest(signal)
     const desc = Object.getOwnPropertyDescriptor(signal, "value")
     if (desc && !desc.writable) return signal
     return Object.defineProperty(signal, "value", {
@@ -166,6 +179,7 @@ export class Signal<T> {
   }
 
   static makeWritable<T>(signal: Signal<T>): Signal<T> {
+    if (__DEV__) signal = latest(signal)
     const desc = Object.getOwnPropertyDescriptor(signal, "value")
     if (desc && desc.writable) return signal
     return Object.defineProperty(signal, "value", {
@@ -183,6 +197,7 @@ export class Signal<T> {
 
   static entangle<T>(signal: Signal<T>) {
     if (tracking.enabled === false) return
+    if (__DEV__) signal = latest(signal)
 
     const vNode = node.current
     const trackedSignalObservations = tracking.current()
@@ -200,6 +215,7 @@ export class Signal<T> {
   static dispose(signal: Signal<any>) {
     signal.$isDisposed = true
     if (__DEV__) {
+      signal = latest(signal)
       signalSubsMap.delete(signal.$id)
       if (isBrowser) window.__kiru.devtools?.untrack(signal)
       return

package/src/signals/computed.ts

@@ -25,8 +25,16 @@ export class ComputedSignal<T> extends Signal<T> {
         },
         inject: (prev) => {
           inject(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>>
@@ -38,6 +46,10 @@ export class ComputedSignal<T> extends Signal<T> {
     return super.value
   }
 
+  set value(next: T) {
+    super.value = next
+  }
+
   toString() {
     this.ensureNotDirty()
     return super.toString()
@@ -48,9 +60,6 @@ export class ComputedSignal<T> extends Signal<T> {
     return super.peek()
   }
 
-  // @ts-expect-error
-  set value(next: T) {}
-
   subscribe(cb: (state: T, prevState?: T) => void): () => void {
     if (this.$isDirty) {
       ComputedSignal.run(this)

package/src/signals/index.ts

@@ -1,12 +1,5 @@
-/**
- * ISSUES:
- * 1. signal subscription when mixing local and global signals get reversed in hmr for ONLY the first update after HMR is dom
- * 2. global computed will lose its vNode subscription on HMR
- * */
-
 export { Signal, signal } from "./base.js"
 export { ComputedSignal, computed } from "./computed.js"
 export { Effect, effect } from "./effect.js"
 export { unwrap, tick } from "./utils.js"
-export * from "./jsx.js"
 export * from "./types.js"

package/src/types.utils.ts

@@ -74,3 +74,6 @@ export type RecordHas<T extends Record<string, any>, U> = [
 ] extends [never]
   ? false
   : true
+
+export type Falsy = false | 0 | 0n | "" | null | undefined
+export type Truthy<T> = Exclude<T, Falsy>

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/signals/jsx.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"jsx.d.ts","sourceRoot":"","sources":["../../src/signals/jsx.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAA;AACxC,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,WAAW,CAAA;AAGvC,KAAK,wBAAwB,CAAC,CAAC,SAAS,MAAM,CAAC,GAAG,EAAE,CAAC,GAAG,SAAS,OAAO,EAAE,IACxE,CAAC,SAAS,MAAM,CAAC,MAAM,CAAC,CAAC,GACrB,CAAC,SAAS,KAAK,CAAC,MAAM,CAAC,CAAC,GACtB,CAAC,GACD,KAAK,GACP,CAAC,SAAS,OAAO,EAAE,GACjB,CAAC,CAAC,MAAM,CAAC,GACT,KAAK,CAAA;AAEb,KAAK,QAAQ,CACX,CAAC,SAAS,MAAM,CAAC,GAAG,EAAE,CAAC,GAAG,SAAS,OAAO,EAAE,EAC5C,CAAC,GAAG,wBAAwB,CAAC,CAAC,CAAC,IAC7B;IACF,IAAI,EAAE,CAAC,CAAA;IACP,QAAQ,CAAC,EAAE,GAAG,CAAC,OAAO,CAAA;IACtB,QAAQ,EAAE,CAAC,KAAK,EAAE,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,EAAE,KAAK,GAAG,CAAC,OAAO,CAAA;CAC/D,CAAA;AAED,wBAAgB,GAAG,CAAC,CAAC,SAAS,MAAM,CAAC,GAAG,EAAE,CAAC,GAAG,OAAO,EAAE,EAAE,EACvD,IAAI,EACJ,QAAQ,EACR,QAAQ,GACT,EAAE,QAAQ,CAAC,CAAC,CAAC,eAIb;AAED,MAAM,WAAW,SAAS;IACxB,QAAQ,EAAE,GAAG,CAAC,OAAO,CAAA;IACrB,IAAI,EAAE,UAAU,CAAC,OAAO,CAAC,CAAA;IACzB,QAAQ,CAAC,EAAE,GAAG,CAAC,OAAO,CAAA;CACvB;AACD,wBAAgB,IAAI,CAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,QAAQ,EAAE,EAAE,SAAS,GAAG,GAAG,CAAC,OAAO,CAEzE"}

package/dist/signals/jsx.js

@@ -1,11 +0,0 @@
-import { unwrap } from "./utils.js";
-export function For({ each, fallback, children, }) {
-    const items = unwrap(each, true);
-    if (items.length === 0)
-        return fallback;
-    return items.map(children);
-}
-export function Show({ children, when, fallback }) {
-    return !!unwrap(when, true) ? children : fallback;
-}
-//# sourceMappingURL=jsx.js.map

package/dist/signals/jsx.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"jsx.js","sourceRoot":"","sources":["../../src/signals/jsx.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,MAAM,EAAE,MAAM,YAAY,CAAA;AAoBnC,MAAM,UAAU,GAAG,CAAsC,EACvD,IAAI,EACJ,QAAQ,EACR,QAAQ,GACI;IACZ,MAAM,KAAK,GAAG,MAAM,CAAC,IAAI,EAAE,IAAI,CAAC,CAAA;IAChC,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,QAAQ,CAAA;IACvC,OAAO,KAAK,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAA;AAC5B,CAAC;AAOD,MAAM,UAAU,IAAI,CAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,QAAQ,EAAa;IAC1D,OAAO,CAAC,CAAC,MAAM,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAA;AACnD,CAAC"}