octane 0.2.2 → 0.2.3

package/dist/server/index.d.ts

@@ -3,7 +3,7 @@
  *
  * Public API (React `react-dom/server` parity): `renderToString(Component,
  * props?, options?)` (a single sync pass; suspended boundaries render their
- * fallback) and `renderToStaticMarkup` (clean, non-hydratable HTML). Both return
+ * fallback) and `renderToStaticMarkup` (non-hydratable HTML). Both return
  * `{ html, css }`: hoisted head folds into `html` (plus the suspense seed script
  * when anything resolved synchronously) and the deduped scoped-style tags are in
  * `css`. The await-everything renderer is `prerender` in `octane/static`.
@@ -21,6 +21,8 @@
  * should call them.
  */
 export { executeServerFunction } from './rpc.js';
+export { version } from '../version.js';
+export { StrictMode, unstable_batchedUpdates } from '../compatibility.js';
 export { createSubSlot, subSlot, type SubSlot, type SlotlessSubSlot, type SubSlotOptions, } from '../sub-slot.js';
 export { __methodDep } from '../method-dep.js';
-export { renderToString, renderToStaticMarkup, renderToPipeableStream, renderToReadableStream, type RenderResult, type RenderOptions, type StreamOptions, type StreamInjectionSource, setSsrSuspenseTimeout, getSsrSuspenseTimeout, EXTERNAL_HYDRATION_PROMISE, HYDRATION_RANGE_BOUNDARY, useState, useLinkedState, useReducer, __useStateWithGetter, __useLinkedStateWithGetter, __useReducerWithGetter, type LinkedStatePrevious, type LinkedStateOptions, useEffect, useLayoutEffect, useInsertionEffect, useImperativeHandle, useMemo, useCallback, useRef, useId, useEffectEvent, useTransition, useDeferredValue, useSyncExternalStore, useActionState, useFormStatus, useOptimistic, useDebugValue, memo, lazy, hookSlots, withSlot, startTransition, flushSync, isChildrenBlock, isValidElement, cloneElement, Children, createPortal, requestFormReset, preload, preinit, preloadModule, preinitModule, preconnect, prefetchDNS, Suspense, ErrorBoundary, Hydrate, Fragment, Activity, Activity as unstable_Activity, ViewTransition, ViewTransition as unstable_ViewTransition, addTransitionType, addTransitionType as unstable_addTransitionType, createContext, use, useContext, ssrIsSuspense, type Context, type FormStatus, markChildrenBlock, descriptorChildren, createElement, createScopedValue, createScopedElement, positionalChildren, escapeHtml, escapeAttr, ssrText, ssrTextPre, ssrNestingText, ssrChild, ssrChildText, ssrAttr, normalizeClass, ssrStyle, ssrClass, ssrAttrs, ssrSnapshotSpread, ssrSpread, ssrInnerHtml, ssrScriptInnerHtml, ssrChildrenSources, ssrSpreadContent, ssrVoidContent, ssrValueAttr, ssrCheckedAttr, ssrInputAttrs, ssrFormAuthoringDiagnostics, ssrTextareaValue, ssrTextareaValueSources, ssrSelectAttrs, ssrSelectScope, ssrSelectScopeSources, ssrOptionValueSources, ssrOption, ssrElement, ssrComponent, ssrComponentNS, ssrInNamespace, ssrBlock, ssrFragmentMarker, ssrActivity, ssrForBlock, mapSlot, ssrControl, ssrArm, ssrTry, ssrPortal, injectStyle, ssrHeadEl, ssrStylesheetResource, ssrStyleResource, ssrScriptResource, namespaceHead, namespaceHeadElement, puMemo, puBatch, warmMemo, warmChild, } from '../runtime.server.js';
+export { renderToString, renderToStaticMarkup, renderToPipeableStream, renderToReadableStream, type RenderResult, type RenderOptions, type ServerRenderNode, type StreamOptions, type StreamInjectionSource, setSsrSuspenseTimeout, getSsrSuspenseTimeout, EXTERNAL_HYDRATION_PROMISE, HYDRATION_RANGE_BOUNDARY, useState, useLinkedState, useReducer, __useStateWithGetter, __useLinkedStateWithGetter, __useReducerWithGetter, type LinkedStatePrevious, type LinkedStateOptions, useEffect, useLayoutEffect, useInsertionEffect, useImperativeHandle, useMemo, useCallback, useRef, useId, useEffectEvent, useTransition, useDeferredValue, useSyncExternalStore, useActionState, useActionState as useFormState, useFormStatus, useOptimistic, useDebugValue, memo, lazy, hookSlots, withSlot, manualHook, invokeManualHook, startTransition, flushSync, isChildrenBlock, isValidElement, cloneElement, Children, createPortal, requestFormReset, preload, preinit, preloadModule, preinitModule, preconnect, prefetchDNS, Suspense, ErrorBoundary, Hydrate, Fragment, Activity, Activity as unstable_Activity, ViewTransition, ViewTransition as unstable_ViewTransition, addTransitionType, addTransitionType as unstable_addTransitionType, createContext, use, useContext, ssrIsSuspense, type Context, type FormStatus, markChildrenBlock, markWarm, ssrHtml, ssrChildTextPre, ssrChildPre, descriptorChildren, createElement, createScopedValue, createScopedElement, positionalChildren, escapeHtml, escapeAttr, ssrText, ssrTextPre, ssrNestingText, ssrChild, ssrChildText, ssrAttr, normalizeClass, ssrStyle, ssrClass, ssrAttrs, ssrSnapshotSpread, ssrSpread, ssrInnerHtml, ssrScriptInnerHtml, ssrChildrenSources, ssrSpreadContent, ssrVoidContent, ssrValueAttr, ssrCheckedAttr, ssrInputAttrs, ssrFormAuthoringDiagnostics, ssrTextareaValue, ssrTextareaValueSources, ssrSelectAttrs, ssrSelectScope, ssrSelectScopeSources, ssrOptionValueSources, ssrOption, ssrElement, ssrComponent, ssrComponentNS, ssrInNamespace, ssrBlock, ssrFragmentMarker, ssrActivity, ssrForBlock, mapSlot, ssrControl, ssrArm, ssrTry, ssrPortal, injectStyle, ssrHeadEl, ssrStylesheetResource, ssrStyleResource, ssrScriptResource, namespaceHead, namespaceHeadElement, puMemo, puBatch, warmMemo, warmChild, } from '../runtime.server.js';

package/dist/server/index.js

@@ -1,4 +1,6 @@
 import { executeServerFunction } from "./rpc.js";
+import { version } from "../version.js";
+import { StrictMode, unstable_batchedUpdates } from "../compatibility.js";
 import {
   createSubSlot,
   subSlot
@@ -32,6 +34,7 @@ import {
   useDeferredValue,
   useSyncExternalStore,
   useActionState,
+  useActionState as useActionState2,
   useFormStatus,
   useOptimistic,
   useDebugValue,
@@ -39,6 +42,8 @@ import {
   lazy,
   hookSlots,
   withSlot,
+  manualHook,
+  invokeManualHook,
   startTransition,
   flushSync,
   isChildrenBlock,
@@ -68,6 +73,10 @@ import {
   useContext,
   ssrIsSuspense,
   markChildrenBlock,
+  markWarm,
+  ssrHtml,
+  ssrChildTextPre,
+  ssrChildPre,
   descriptorChildren,
   createElement,
   createScopedValue,
@@ -136,6 +145,7 @@ export {
   Fragment,
   HYDRATION_RANGE_BOUNDARY,
   Hydrate,
+  StrictMode,
   Suspense,
   ViewTransition,
   __methodDep,
@@ -158,11 +168,14 @@ export {
   getSsrSuspenseTimeout,
   hookSlots,
   injectStyle,
+  invokeManualHook,
   isChildrenBlock,
   isValidElement,
   lazy,
+  manualHook,
   mapSlot,
   markChildrenBlock,
+  markWarm,
   memo,
   namespaceHead,
   namespaceHeadElement,
@@ -189,7 +202,9 @@ export {
   ssrBlock,
   ssrCheckedAttr,
   ssrChild,
+  ssrChildPre,
   ssrChildText,
+  ssrChildTextPre,
   ssrChildrenSources,
   ssrClass,
   ssrComponent,
@@ -200,6 +215,7 @@ export {
   ssrFormAuthoringDiagnostics,
   ssrFragmentMarker,
   ssrHeadEl,
+  ssrHtml,
   ssrInNamespace,
   ssrInnerHtml,
   ssrInputAttrs,
@@ -231,6 +247,7 @@ export {
   Activity2 as unstable_Activity,
   ViewTransition2 as unstable_ViewTransition,
   addTransitionType2 as unstable_addTransitionType,
+  unstable_batchedUpdates,
   use,
   useActionState,
   useCallback,
@@ -239,6 +256,7 @@ export {
   useDeferredValue,
   useEffect,
   useEffectEvent,
+  useActionState2 as useFormState,
   useFormStatus,
   useId,
   useImperativeHandle,
@@ -252,6 +270,7 @@ export {
   useState,
   useSyncExternalStore,
   useTransition,
+  version,
   warmChild,
   warmMemo,
   withSlot

package/dist/static/index.d.ts

@@ -18,4 +18,5 @@
  * `postponed` field and the buffered `prerender` resolves `{ html, css }`
  * rather than React's `{ prelude: ReadableStream }`.
  */
-export { prerender, prerenderToNodeStream, type RenderResult, type RenderOptions, } from '../runtime.server.js';
+export { version } from '../version.js';
+export { prerender, prerenderToNodeStream, type RenderResult, type RenderOptions, type ServerRenderNode, } from '../runtime.server.js';

package/dist/static/index.js

@@ -1,8 +1,10 @@
+import { version } from "../version.js";
 import {
   prerender,
   prerenderToNodeStream
 } from "../runtime.server.js";
 export {
   prerender,
-  prerenderToNodeStream
+  prerenderToNodeStream,
+  version
 };

package/dist/universal-core.d.ts

@@ -661,7 +661,11 @@ export declare function hasCrossRealmPlainPrototype(value: object): boolean;
  */
 export declare function sameUniversalHostPropValue(left: unknown, right: unknown, depth?: number): boolean;
 export declare function hookSlots(count: number): number;
-export declare function withSlot<T>(slot: unknown, fn: (...args: any[]) => T, ...args: any[]): T;
+/** @internal Invoke a provider that owns the trailing hook-slot ABI. */
+export declare function invokeManualHook<T>(fn: (...args: any[]) => T, receiver: unknown, args: IArguments): T;
+/** @internal Adapt an expression provider that owns the trailing hook-slot ABI. */
+export declare function manualHook<F extends (...args: any[]) => any>(fn: F, name?: string): F;
+export declare function withSlot<T>(sym: unknown, fn: (...a: any[]) => T, ...args: any[]): T;
 export declare function useState<T>(initial: T | (() => T), slot?: unknown): [T, (value: T | ((previous: T) => T)) => void, () => T];
 export declare const __useStateWithGetter: typeof useState;
 export declare function useLinkedState<Source, Value>(source: Source, reconcile: (source: Source, previous: LinkedStatePrevious<Source, Value> | undefined) => Value, options?: LinkedStateOptions<Source, Value>, slot?: unknown): [Value, (next: Value | ((previous: Value) => Value)) => void, () => Value];
@@ -717,6 +721,8 @@ export declare function useContext<T>(context: UniversalContext<T>): T;
 export declare function useBatch(items: any[], warm?: () => void): void;
 /** Compiler ABI: cache one speculative creation per plan occurrence, slot, and deps. */
 export declare function warmMemo(compute: () => any, deps: readonly any[], slot: unknown): void;
+/** Keep compiler-owned plans from following static hoisting onto unrelated HOCs. */
+export declare function markWarm<T extends Function>(component: T, plan: unknown): T;
 /** Compiler ABI: recurse into a compiled child's statically attached warm plan. */
 export declare function warmChild(component: any, props: any): void;
 /**
@@ -737,6 +743,7 @@ export declare function useEffectEvent<T extends (...args: any[]) => any>(fn: T,
 export declare function useDebugValue(): void;
 export declare function startTransition(fn: () => void | Promise<unknown>): void;
 export declare function requestFormReset(): void;
+export declare function memo<C extends UniversalComponent<any>>(component: C, compare?: (previous: Readonly<Parameters<C>[0]>, next: Readonly<Parameters<C>[0]>) => boolean): C;
 export declare function memo<P>(component: UniversalComponent<P>, compare?: (previous: Readonly<P>, next: Readonly<P>) => boolean): UniversalComponent<P>;
 export declare function createPortal(children: UniversalRenderable, target: unknown): UniversalPortalValue;
 /** Compiler sentinel for the supported universal Activity descriptor. */

package/dist/universal-core.js

@@ -655,7 +655,7 @@ function hmrUniversalComponent(renderer, component) {
         __profileComponentSource(wrapper, next);
       }
       if (next.__warm === void 0) delete wrapper.__warm;
-      else wrapper.__warm = next.__warm;
+      else markWarm(wrapper, next.__warm);
       for (const owner of owners) {
         if (owner.disposed) {
           owners.delete(owner);
@@ -678,13 +678,17 @@ function hmrUniversalComponent(renderer, component) {
     { module: metadata.module }
   );
   Object.defineProperties(wrapper, {
-    [UNIVERSAL_HMR]: { value: meta },
+    [UNIVERSAL_HMR]: {
+      get() {
+        return this === wrapper ? meta : void 0;
+      }
+    },
     [UNIVERSAL_COMPONENT_REVISION]: { get: () => meta.revision }
   });
   if (typeof __OCTANE_PROFILE_ENABLED__ !== "undefined" && __OCTANE_PROFILE_ENABLED__) {
     __profileComponentSource(wrapper, component);
   }
-  if (component.__warm !== void 0) wrapper.__warm = component.__warm;
+  if (component.__warm !== void 0) markWarm(wrapper, component.__warm);
   return wrapper;
 }
 function getComponentMetadata(component) {
@@ -2833,12 +2837,66 @@ function hookSlots(count) {
   NEXT_HOOK_SLOT += count;
   return base;
 }
-function withSlot(slot, fn, ...args) {
-  UNIVERSAL_SLOT_STACK.push(slot);
+let MANUAL_HOOK_DRIVER = null;
+function invokeManualHook(fn, receiver, args) {
+  const driver = MANUAL_HOOK_DRIVER ??= {
+    pending: UNIVERSAL_SLOT_STACK[UNIVERSAL_SLOT_STACK.length - 1],
+    active: false
+  };
+  const pending = driver.pending;
+  const active = driver.active;
+  driver.pending = void 0;
+  driver.active = true;
+  try {
+    if (pending === void 0) return Reflect.apply(fn, receiver, args);
+    switch (args.length) {
+      case 0:
+        return fn.call(receiver, pending);
+      case 1:
+        return fn.call(receiver, args[0], pending);
+      case 2:
+        return fn.call(receiver, args[0], args[1], pending);
+      case 3:
+        return fn.call(receiver, args[0], args[1], args[2], pending);
+      case 4:
+        return fn.call(receiver, args[0], args[1], args[2], args[3], pending);
+      default: {
+        const forwarded = new Array(args.length + 1);
+        for (let index = 0; index < args.length; index++) forwarded[index] = args[index];
+        forwarded[args.length] = pending;
+        return fn.apply(receiver, forwarded);
+      }
+    }
+  } finally {
+    driver.pending = pending;
+    driver.active = active;
+  }
+}
+function manualHook(fn, name) {
+  function provider() {
+    return invokeManualHook(fn, this, arguments);
+  }
+  Object.defineProperty(provider, "name", { value: name ?? fn.name, configurable: true });
+  Object.defineProperty(provider, "length", { value: fn.length, configurable: true });
+  return provider;
+}
+function withSlot(sym, fn, ...args) {
+  const driver = MANUAL_HOOK_DRIVER;
+  const pending = driver?.pending;
+  const active = driver?.active ?? false;
+  if (driver !== null) {
+    driver.pending = sym;
+    driver.active = false;
+  }
+  UNIVERSAL_SLOT_STACK.push(sym);
   try {
     return fn(...args);
   } finally {
     UNIVERSAL_SLOT_STACK.pop();
+    if (MANUAL_HOOK_DRIVER !== null) {
+      MANUAL_HOOK_DRIVER.pending = driver === null ? UNIVERSAL_SLOT_STACK[UNIVERSAL_SLOT_STACK.length - 1] : pending;
+      MANUAL_HOOK_DRIVER.active = active;
+    }
   }
 }
 function createUniversalTransitionBatch() {
@@ -3135,6 +3193,10 @@ function visibleStateValue(record, slot, fallback) {
   return value;
 }
 function useState(initial, slot) {
+  if (slot === void 0 && typeof initial === "symbol" && arguments.length === 1 && MANUAL_HOOK_DRIVER?.active === true) {
+    slot = initial;
+    initial = void 0;
+  }
   const owner = currentDraftOwner();
   const resolved = resolveHookSlot(slot);
   let hook = cloneStateHook(owner, resolved);
@@ -3449,6 +3511,10 @@ function useCallback(callback, deps, slot) {
   return memoHookValue(callback, false, deps, slot);
 }
 function useRef(initial, slot) {
+  if (slot === void 0 && typeof initial === "symbol" && arguments.length === 1 && MANUAL_HOOK_DRIVER?.active === true) {
+    slot = initial;
+    initial = void 0;
+  }
   const owner = currentDraftOwner();
   const resolved = resolveHookSlot(slot);
   let hook = owner.hooks.get(resolved);
@@ -3860,6 +3926,15 @@ function warmMemo(compute, deps, slot) {
   entries.push(entry);
   CURRENT_UNIVERSAL_WARM_CLAIMS?.add(entry);
 }
+function markWarm(component, plan) {
+  Object.defineProperty(component, "__warm", {
+    configurable: true,
+    get() {
+      return this === component ? plan : void 0;
+    }
+  });
+  return component;
+}
 function warmChild(component, props) {
   if (CURRENT_UNIVERSAL_WARM === null || component == null) return;
   const plan = component.__warm;
@@ -3940,9 +4015,13 @@ function lazy(load) {
     throw new UniversalSuspense(thenable);
   });
   Object.defineProperties(wrapper, {
-    [LAZY_COMPONENT]: { value: true },
-    __warm: { value: initialize }
+    [LAZY_COMPONENT]: {
+      get() {
+        return this === wrapper;
+      }
+    }
   });
+  markWarm(wrapper, initialize);
   return wrapper;
 }
 function use(usable) {
@@ -4124,7 +4203,11 @@ function memo(component, compare) {
   let wrapper;
   if (metadata === UNIVERSAL_LAZY_METADATA) {
     wrapper = renderMemo;
-    Object.defineProperty(wrapper, LAZY_COMPONENT, { value: true });
+    Object.defineProperty(wrapper, LAZY_COMPONENT, {
+      get() {
+        return this === wrapper;
+      }
+    });
   } else {
     wrapper = defineUniversalComponent(metadata.id, renderMemo, { module: metadata.module });
   }
@@ -4134,7 +4217,7 @@ function memo(component, compare) {
   if (typeof __OCTANE_PROFILE_ENABLED__ !== "undefined" && __OCTANE_PROFILE_ENABLED__) {
     __profileComponentSource(wrapper, component);
   }
-  if (component.__warm !== void 0) wrapper.__warm = component.__warm;
+  if (component.__warm !== void 0) markWarm(wrapper, component.__warm);
   return wrapper;
 }
 function createPortal(children, target) {
@@ -9320,9 +9403,12 @@ export {
   hasCrossRealmPlainPrototype,
   hmrUniversalComponent,
   hookSlots,
+  invokeManualHook,
   isRendererRegion,
   lazy,
+  manualHook,
   markUniversalHostComponent,
+  markWarm,
   memo,
   rendererRegion,
   requestFormReset,

package/dist/version.js

@@ -1,4 +1,4 @@
-const version = "0.2.2";
+const version = "0.2.3";
 export {
   version
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "octane",
-  "version": "0.2.2",
+  "version": "0.2.3",
   "license": "MIT",
   "type": "module",
   "sideEffects": [
@@ -157,6 +157,7 @@
     "@volar/typescript": "2.4.28",
     "alien-signals": "3.2.0",
     "devalue": "^5.8.2",
+    "entities": "7.0.1",
     "es-module-lexer": "^1.7.0",
     "esrap": "^2.3.2",
     "oxc-tsrx": "0.5.0"