kiru 0.52.3 → 0.53.0

package/dist/utils/vdom.js

@@ -1,17 +1,17 @@
-import { Signal } from "../signals/base.js";
 import { FLAG_DELETION, $FRAGMENT, $CONTEXT_PROVIDER, FLAG_PLACEMENT, FLAG_UPDATE, $ERROR_BOUNDARY, } from "../constants.js";
 import { createElement } from "../index.js";
 import { KiruError } from "../error.js";
 import { node } from "../globals.js";
-export { cloneVNode, isVNodeDeleted, isVNode, isValidTextChild, isExoticType, isFragment, isLazy, isMemo, isContextProvider, vNodeContains, getCurrentVNode, getVNodeAppContext, commitSnapshot, traverseApply, findParent, findParentErrorBoundary, assertValidElementProps, isValidElementKeyProp, isValidElementRefProp, };
-function cloneVNode(vNode) {
+import { isMemoFn } from "../components/memo.js";
+export { cloneElement, isVNodeDeleted, isElement, isVNode, isValidTextChild, isExoticType, isFragment, isLazy, isMemo, isContextProvider, vNodeContains, getCurrentVNode, getVNodeAppContext, commitSnapshot, traverseApply, findParent, findParentErrorBoundary, assertValidElementProps, normalizeElementKey, };
+function cloneElement(vNode) {
     const children = vNode.props.children;
     let clonedChildren;
     if (isVNode(children)) {
-        clonedChildren = cloneVNode(children);
+        clonedChildren = cloneElement(children);
     }
     else if (Array.isArray(children)) {
-        clonedChildren = children.map((c) => (isVNode(c) ? cloneVNode(c) : c));
+        clonedChildren = children.map((c) => (isVNode(c) ? cloneElement(c) : c));
     }
     return createElement(vNode.type, { ...vNode.props, children: clonedChildren });
 }
@@ -21,6 +21,9 @@ function isVNodeDeleted(vNode) {
 function isVNode(thing) {
     return typeof thing === "object" && thing !== null && "type" in thing;
 }
+function isElement(thing) {
+    return typeof thing === "object" && thing !== null && "type" in thing;
+}
 function isValidTextChild(thing) {
     return ((typeof thing === "string" && thing !== "") ||
         typeof thing === "number" ||
@@ -38,9 +41,7 @@ function isLazy(vNode) {
         vNode.type.displayName === "Kiru.lazy");
 }
 function isMemo(vNode) {
-    return (typeof vNode.type === "function" &&
-        "displayName" in vNode.type &&
-        vNode.type.displayName === "Kiru.memo");
+    return typeof vNode.type === "function" && isMemoFn(vNode.type);
 }
 function isContextProvider(thing) {
     return isVNode(thing) && thing.type === $CONTEXT_PROVIDER;
@@ -59,8 +60,8 @@ function getVNodeAppContext(vNode) {
     return null;
 }
 function commitSnapshot(vNode) {
-    const { props: { children, ...props }, memoizedProps, index, } = vNode;
-    vNode.prev = { props, memoizedProps, index };
+    const { props: { children, ...props }, key, memoizedProps, index, } = vNode;
+    vNode.prev = { props, key, memoizedProps, index };
     vNode.flags &= ~(FLAG_UPDATE | FLAG_PLACEMENT | FLAG_DELETION);
 }
 function vNodeContains(haystack, needle) {
@@ -119,12 +120,12 @@ function assertValidElementProps(vNode) {
         }
     }
 }
-function isValidElementKeyProp(thing) {
-    return typeof thing === "string" || typeof thing === "number";
-}
-function isValidElementRefProp(thing) {
-    return (typeof thing === "function" ||
-        (typeof thing === "object" && !!thing && "current" in thing) ||
-        Signal.isSignal(thing));
+function normalizeElementKey(thing) {
+    if (thing === undefined)
+        return null;
+    if (typeof thing === "string" || typeof thing === "number") {
+        return thing;
+    }
+    return null;
 }
 //# sourceMappingURL=vdom.js.map

package/dist/utils/vdom.js.map

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

package/dist/vNode.d.ts

@@ -0,0 +1,4 @@
+type VNode = Kiru.VNode;
+export declare function createVNode(type: VNode["type"], parent?: VNode | null, props?: VNode["props"], key?: VNode["key"], index?: number): VNode;
+export {};
+//# sourceMappingURL=vNode.d.ts.map

package/dist/vNode.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"vNode.d.ts","sourceRoot":"","sources":["../src/vNode.ts"],"names":[],"mappings":"AAGA,KAAK,KAAK,GAAG,IAAI,CAAC,KAAK,CAAA;AAEvB,wBAAgB,WAAW,CACzB,IAAI,EAAE,KAAK,CAAC,MAAM,CAAC,EACnB,MAAM,GAAE,KAAK,GAAG,IAAW,EAC3B,KAAK,GAAE,KAAK,CAAC,OAAO,CAAM,EAC1B,GAAG,GAAE,KAAK,CAAC,KAAK,CAAQ,EACxB,KAAK,SAAI,GACR,KAAK,CAkBP"}

package/dist/vNode.js

@@ -0,0 +1,22 @@
+import { $FRAGMENT } from "./constants.js";
+import { Fragment } from "./element.js";
+export function createVNode(type, parent = null, props = {}, key = null, index = 0) {
+    if (type === Fragment) {
+        type = $FRAGMENT;
+    }
+    const depth = parent ? parent.depth + 1 : 0;
+    return {
+        type,
+        key,
+        props,
+        parent,
+        index,
+        depth,
+        flags: 0,
+        child: null,
+        sibling: null,
+        prev: null,
+        deletions: null,
+    };
+}
+//# sourceMappingURL=vNode.js.map

package/dist/vNode.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"vNode.js","sourceRoot":"","sources":["../src/vNode.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAA;AAC1C,OAAO,EAAE,QAAQ,EAAE,MAAM,cAAc,CAAA;AAIvC,MAAM,UAAU,WAAW,CACzB,IAAmB,EACnB,SAAuB,IAAI,EAC3B,QAAwB,EAAE,EAC1B,MAAoB,IAAI,EACxB,KAAK,GAAG,CAAC;IAET,IAAK,IAAY,KAAK,QAAQ,EAAE,CAAC;QAC/B,IAAI,GAAG,SAAS,CAAA;IAClB,CAAC;IACD,MAAM,KAAK,GAAG,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA;IAC3C,OAAO;QACL,IAAI;QACJ,GAAG;QACH,KAAK;QACL,MAAM;QACN,KAAK;QACL,KAAK;QACL,KAAK,EAAE,CAAC;QACR,KAAK,EAAE,IAAI;QACX,OAAO,EAAE,IAAI;QACb,IAAI,EAAE,IAAI;QACV,SAAS,EAAE,IAAI;KAChB,CAAA;AACH,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "kiru",
-  "version": "0.52.3",
+  "version": "0.53.0",
   "description": "A batteries-included, easy-to-use rendering library with a tiny footprint",
   "main": "dist/index.js",
   "type": "module",

package/src/appContext.ts

@@ -1,7 +1,7 @@
 import { FLAG_STATIC_DOM } from "./constants.js"
-import { createElement } from "./element.js"
 import { __DEV__ } from "./env.js"
-import { renderRootSync } from "./scheduler.js"
+import { renderRootSync, requestUpdate } from "./scheduler.js"
+import { createVNode } from "./vNode.js"
 
 type VNode = Kiru.VNode
 
@@ -34,19 +34,11 @@ export function mount(
       )
     }
   }
-  const rootNode = createElement(container.nodeName.toLowerCase(), {})
-  if (__DEV__) {
-    container.__kiruNode = rootNode
-  }
-
-  rootNode.dom = container
-  rootNode.flags |= FLAG_STATIC_DOM
-
+  const rootNode = createRootNode(container)
   const id = appId++
-  const name = options?.name ?? `App-${id}`
   const appContext: AppContext = {
     id,
-    name,
+    name: options?.name ?? `App-${id}`,
     rootNode,
     render,
     unmount,
@@ -72,7 +64,7 @@ export function mount(
   }
 
   render(children)
-  window.__kiru.emit("mount", appContext)
+  window.__kiru.emit("mount", appContext, requestUpdate)
   if (__DEV__) {
     queueMicrotask(() => {
       window.dispatchEvent(new Event("kiru:ready"))
@@ -81,3 +73,13 @@ export function mount(
 
   return appContext
 }
+
+function createRootNode(container: HTMLElement): Kiru.VNode {
+  const node = createVNode(container.nodeName.toLowerCase())
+  node.flags |= FLAG_STATIC_DOM
+  node.dom = container
+  if (__DEV__) {
+    container.__kiruNode = node
+  }
+  return node
+}

package/src/components/derive.ts

@@ -0,0 +1,121 @@
+import { node } from "../globals.js"
+import { $STREAM_DATA } from "../constants.js"
+import { requestUpdate } from "../scheduler.js"
+import { useRef } from "../hooks/index.js"
+import { Signal } from "../signals/index.js"
+import { sideEffectsEnabled } from "../utils/index.js"
+import type { RecordHas } from "../types.utils"
+import { isStatefulPromise, StreamDataThrowValue } from "../utils/promise.js"
+
+export type Derivable =
+  | Kiru.Signal<unknown>
+  | Kiru.StatefulPromise<unknown>
+  | Record<string, Kiru.Signal<unknown> | Kiru.StatefulPromise<unknown>>
+
+type InnerOf<T> = T extends Kiru.Signal<infer V>
+  ? V
+  : T extends Kiru.StatefulPromise<infer P>
+  ? P
+  : never
+
+type UnwrapDerive<T extends Derivable> = T extends
+  | Kiru.Signal<unknown>
+  | Kiru.StatefulPromise<any>
+  ? InnerOf<T>
+  : { [K in keyof T]: InnerOf<T[K]> }
+
+type RecordHasPromise<T extends Record<string, any>> = RecordHas<
+  T,
+  Kiru.StatefulPromise<any>
+>
+
+type ChildFn<T> = (value: T) => JSX.Children
+type ChildFnWithStale<T> = (value: T, isStale: boolean) => JSX.Children
+
+export type DeriveFallbackMode = "swr" | "fallback"
+
+export interface DeriveProps<
+  T extends Derivable,
+  Mode extends DeriveFallbackMode = "fallback"
+> {
+  from: T
+  mode?: Mode
+  children: T extends Kiru.StatefulPromise<infer U>
+    ? Mode extends "swr"
+      ? ChildFnWithStale<U>
+      : ChildFn<U>
+    : T extends Record<string, any>
+    ? RecordHasPromise<T> extends true
+      ? Mode extends "swr"
+        ? ChildFnWithStale<UnwrapDerive<T>>
+        : ChildFn<UnwrapDerive<T>>
+      : ChildFn<UnwrapDerive<T>>
+    : ChildFn<UnwrapDerive<T>>
+  fallback?: T extends Kiru.StatefulPromise<any>
+    ? JSX.Element
+    : T extends Record<string, any>
+    ? RecordHasPromise<T> extends true
+      ? JSX.Element
+      : never
+    : never
+}
+
+export function Derive<
+  T extends Derivable,
+  U extends DeriveFallbackMode = "swr"
+>(props: DeriveProps<T, U>) {
+  const { from, children, fallback, mode } = props
+  const prevSuccess = useRef<UnwrapDerive<T> | null>(null)
+
+  const promises = new Set<Kiru.StatefulPromise<any>>()
+  let value: UnwrapDerive<T>
+
+  if (isStatefulPromise(from)) {
+    promises.add(from)
+    value = from.value as UnwrapDerive<T>
+  } else if (Signal.isSignal(from)) {
+    value = from.value as UnwrapDerive<T>
+  } else {
+    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.StatefulPromise<unknown>).value
+    }
+    value = out as UnwrapDerive<T>
+  }
+
+  if (promises.size === 0) {
+    return (children as ChildFn<UnwrapDerive<T>>)(value)
+  }
+
+  if (!sideEffectsEnabled()) {
+    throw {
+      [$STREAM_DATA]: {
+        fallback,
+        data: Array.from(promises),
+      },
+    } satisfies StreamDataThrowValue
+  }
+
+  for (const p of promises) {
+    if (p.state === "rejected") {
+      throw p.error
+    }
+    if (p.state === "pending") {
+      const nodeRef = node.current!
+      Promise.allSettled(promises).then(() => requestUpdate(nodeRef))
+
+      if (mode !== "fallback" && prevSuccess.current) {
+        return (children as ChildFnWithStale<UnwrapDerive<T>>)(
+          prevSuccess.current,
+          true
+        )
+      }
+      return fallback
+    }
+  }
+
+  prevSuccess.current = value
+  return (children as ChildFnWithStale<UnwrapDerive<T>>)(value, false)
+}

package/src/components/index.ts

@@ -1,6 +1,6 @@
 export { ErrorBoundary, type ErrorBoundaryProps } from "./errorBoundary.js"
+export * from "./derive.js"
 export * from "./lazy.js"
 export { memo } from "./memo.js"
 export * from "./portal.js"
-export * from "./suspense.js"
 export * from "./transition.js"

package/src/components/memo.ts

@@ -15,7 +15,8 @@ function _arePropsEqual<T extends Record<string, unknown>>(
   return true
 }
 
-export type MemoFn = Function & {
+export interface MemoFn<T extends Record<string, unknown> = {}> {
+  (props: T): JSX.Element
   [$MEMO]: {
     arePropsEqual: (
       prevProps: Record<string, unknown>,
@@ -39,7 +40,7 @@ export function memo<T extends Record<string, unknown> = {}>(
   )
 }
 
-export function isMemoFn(fn: any): fn is MemoFn {
+export function isMemoFn(fn: Function & { [$MEMO]?: any }): fn is MemoFn {
   return (
     typeof fn === "function" && typeof fn[$MEMO]?.arePropsEqual === "function"
   )

package/src/constants.ts

@@ -7,10 +7,10 @@ export {
   $HMR_ACCEPT,
   $MEMO,
   $ERROR_BOUNDARY,
-  $SUSPENSE_THROW,
+  $STREAM_DATA,
   $DEV_FILE_LINK,
   CONSECUTIVE_DIRTY_LIMIT,
-  PREFETCHED_DATA_EVENT,
+  STREAMED_DATA_EVENT,
   EVENT_PREFIX_REGEX,
   FLAG_UPDATE,
   FLAG_PLACEMENT,
@@ -31,11 +31,11 @@ const $KIRU_ERROR = Symbol.for("kiru.error")
 const $HMR_ACCEPT = Symbol.for("kiru.hmrAccept")
 const $MEMO = Symbol.for("kiru.memo")
 const $ERROR_BOUNDARY = Symbol.for("kiru.errorBoundary")
-const $SUSPENSE_THROW = Symbol.for("kiru.suspenseThrow")
+const $STREAM_DATA = Symbol.for("kiru.streamData")
 const $DEV_FILE_LINK = Symbol.for("kiru.devFileLink")
 
 const CONSECUTIVE_DIRTY_LIMIT = 50
-const PREFETCHED_DATA_EVENT = "kiru:prefetched"
+const STREAMED_DATA_EVENT = "kiru:deferred"
 
 const FLAG_UPDATE = 1 << 1
 const FLAG_PLACEMENT = 1 << 2

package/src/dom.ts

@@ -4,6 +4,7 @@ import {
   propFilters,
   propToHtmlAttr,
   getVNodeAppContext,
+  setRef,
 } from "./utils/index.js"
 import {
   booleanAttributes,
@@ -73,21 +74,6 @@ function onAfterFlushDomChanges() {
   persistingFocus = false
 }
 
-function setDomRef(ref: Kiru.Ref<SomeDom | null>, value: SomeDom | null) {
-  if (typeof ref === "function") {
-    ref(value)
-    return
-  }
-  if (Signal.isSignal(ref)) {
-    ref.sneak(value)
-    ref.notify({
-      filter: (sub) => typeof sub === "function",
-    })
-    return
-  }
-  ;(ref as Kiru.MutableRefObject<SomeDom | null>).current = value
-}
-
 function createDom(vNode: DomVNode): SomeDom {
   const t = vNode.type
   const dom =
@@ -139,75 +125,85 @@ const vNodeToWrappedFocusEventHandlersMap = new WeakMap<
   WrappedFocusEventMap
 >()
 
-function updateDom(vNode: VNode) {
-  const dom = vNode.dom as SomeDom
-  const prevProps: Record<string, any> = vNode.prev?.props ?? {}
-  const nextProps: Record<string, any> = vNode.props ?? {}
-  const keys = new Set([...Object.keys(prevProps), ...Object.keys(nextProps)])
+function updateDom(vNode: DomVNode) {
+  const { dom, prev, props, cleanups } = vNode
+  const prevProps = prev?.props ?? {}
+  const nextProps = props ?? {}
   const isHydration = renderMode.current === "hydrate"
 
-  keys.forEach((key) => {
-    const prev = prevProps[key],
-      next = nextProps[key]
-    if (propFilters.internalProps.includes(key) && key !== "innerHTML") {
-      if (key === "ref" && prev !== next) {
-        if (prev) {
-          setDomRef(prev, null)
-        }
-        if (next) {
-          setDomRef(next, dom)
-        }
-      }
-      return
+  // TEXT NODE SHORT-PATH
+  if (dom instanceof Text) {
+    const nextVal = nextProps.nodeValue
+    if (!Signal.isSignal(nextVal) && dom.nodeValue !== nextVal) {
+      dom.nodeValue = nextVal
     }
+    return
+  }
+
+  const keys: string[] = []
+  for (const k in prevProps) keys.push(k)
+  for (const k in nextProps) {
+    if (!(k in prevProps)) keys.push(k)
+  }
+
+  for (let i = 0; i < keys.length; i++) {
+    const key = keys[i]
+    const prevVal = prevProps[key]
+    const nextVal = nextProps[key]
 
     if (propFilters.isEvent(key)) {
-      if (prev !== next || renderMode.current === "hydrate") {
+      if (prevVal !== nextVal || isHydration) {
         const evtName = key.replace(EVENT_PREFIX_REGEX, "")
+        const isFocus = evtName === "focus" || evtName === "blur"
+        const wrappedMap = vNodeToWrappedFocusEventHandlersMap.get(vNode)
 
-        const isFocusEvent = evtName === "focus" || evtName === "blur"
         if (key in prevProps) {
           dom.removeEventListener(
             evtName,
-            isFocusEvent
-              ? vNodeToWrappedFocusEventHandlersMap.get(vNode)?.[evtName]
-              : prev
+            isFocus ? wrappedMap?.[evtName] : prevVal
           )
         }
+
         if (key in nextProps) {
           dom.addEventListener(
             evtName,
-            isFocusEvent ? wrapFocusEventHandler(vNode, evtName, next) : next
+            isFocus ? wrapFocusEventHandler(vNode, evtName, nextVal) : nextVal
           )
         }
       }
-      return
+      continue
     }
 
-    if (!(dom instanceof Text)) {
-      if (prev === next || (isHydration && dom.getAttribute(key) === next)) {
-        return
-      }
+    if (propFilters.isInternalProp(key) && key !== "innerHTML") {
+      continue
+    }
 
-      if (Signal.isSignal(prev) && vNode.cleanups) {
-        const v = vNode.cleanups[key]
-        v && (v(), delete vNode.cleanups[key])
-      }
-      if (Signal.isSignal(next)) {
-        return setSignalProp(vNode, dom, key, next, prev)
-      }
-      setProp(dom, key, next, prev)
-      return
+    if (prevVal === nextVal) {
+      continue
     }
-    if (Signal.isSignal(next)) {
-      // signal textNodes are handled via 'subTextNode'.
-      return
+
+    if (Signal.isSignal(prevVal) && cleanups) {
+      const disposer = cleanups[key]
+      if (disposer) {
+        disposer()
+        delete cleanups[key]
+      }
     }
-    // text node
-    if (dom.nodeValue !== next) {
-      dom.nodeValue = next
+
+    if (Signal.isSignal(nextVal)) {
+      setSignalProp(vNode, dom, key, nextVal, prevVal)
+      continue
     }
-  })
+
+    setProp(dom, key, nextVal, prevVal)
+  }
+
+  const prevRef = prevProps.ref
+  const nextRef = nextProps.ref
+  if (prevRef !== nextRef) {
+    if (prevRef) setRef(prevRef, null)
+    if (nextRef) setRef(nextRef, dom)
+  }
 }
 
 function deriveSelectElementValue(dom: HTMLSelectElement) {
@@ -248,6 +244,7 @@ function setSignalProp(
   const [modifier, attr] = key.split(":")
   if (modifier !== "bind") {
     cleanups[key] = signal.subscribe((value, prev) => {
+      if (value === prev) return
       setProp(dom, key, value, prev)
       if (__DEV__) {
         window.__kiru.profilingContext?.emit(
@@ -257,7 +254,11 @@ function setSignalProp(
       }
     })
 
-    return setProp(dom, key, signal.peek(), unwrap(prevValue))
+    const value = signal.peek()
+    const prev = unwrap(prevValue)
+    if (value === prev) return
+    setProp(dom, key, value, prev)
+    return
   }
 
   const evtName = bindAttrToEventMap[attr]
@@ -285,7 +286,7 @@ function setSignalProp(
 
   const setSigFromElement = (val: any) => {
     signal.sneak(val)
-    signal.notify({ filter: (sub) => sub !== signalUpdateCallback })
+    signal.notify((sub) => sub !== signalUpdateCallback)
   }
 
   let evtHandler: (evt: Event) => void
@@ -323,7 +324,10 @@ function setSignalProp(
     unsub()
   }
 
-  return setProp(dom, attr, signal.peek(), unwrap(prevValue))
+  const value = signal.peek()
+  const prev = unwrap(prevValue)
+  if (value === prev) return
+  setProp(dom, attr, value, prev)
 }
 
 function subTextNode(vNode: VNode, textNode: Text, signal: Signal<string>) {
@@ -373,7 +377,7 @@ function hydrateDom(vNode: VNode) {
   }
   vNode.dom = dom
   if (vNode.type !== "#text" && !(vNode.flags & FLAG_STATIC_DOM)) {
-    updateDom(vNode)
+    updateDom(vNode as DomVNode)
     return
   }
   if (Signal.isSignal(vNode.props.nodeValue)) {
@@ -449,7 +453,6 @@ function setProp(
   value: unknown,
   prev: unknown
 ) {
-  if (value === prev) return
   switch (key) {
     case "style":
       return setStyleProp(element, value, prev)
@@ -706,10 +709,12 @@ function commitDeletion(vNode: VNode) {
     }
 
     if (dom) {
-      if (ref) setDomRef(ref as Kiru.Ref<SomeDom>, null)
       if (dom.isConnected && !(node.flags & FLAG_STATIC_DOM)) {
         dom.remove()
       }
+      if (ref) {
+        setRef(ref, null)
+      }
       delete node.dom
     }
   })