@rangojs/router 0.0.0-experimental.fb6e2f40 → 0.0.0-experimental.fce7fbd1

package/dist/__tests__/use-mount.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"use-mount.test.js","sourceRoot":"","sources":["../../src/__tests__/use-mount.test.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAE9C,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAClD,OAAO,EAAE,YAAY,EAAE,MAAM,mCAAmC,CAAC;AACjE,OAAO,EAAE,QAAQ,EAAE,MAAM,+BAA+B,CAAC;AAEzD,SAAS,YAAY;IACnB,MAAM,KAAK,GAAG,QAAQ,EAAE,CAAC;IACzB,OAAO,6BAAkB,KAAK,YAAG,KAAK,GAAQ,CAAC;AACjD,CAAC;AAED,QAAQ,CAAC,YAAY,EAAE,GAAG,EAAE;IAC1B,EAAE,CAAC,8BAA8B,EAAE,GAAG,EAAE;QACtC,MAAM,IAAI,GAAG,cAAc,CAAC,KAAC,YAAY,KAAG,CAAC,CAAC;QAC9C,MAAM,CAAC,IAAI,CAAC,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC;QAC5B,MAAM,CAAC,IAAI,CAAC,CAAC,SAAS,CAAC,gBAAgB,CAAC,CAAC;IAC3C,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,0CAA0C,EAAE,GAAG,EAAE;QAClD,MAAM,IAAI,GAAG,cAAc,CACzB,KAAC,YAAY,CAAC,QAAQ,IAAC,KAAK,EAAC,WAAW,YACtC,KAAC,YAAY,KAAG,GACM,CACzB,CAAC;QACF,MAAM,CAAC,IAAI,CAAC,CAAC,SAAS,CAAC,WAAW,CAAC,CAAC;QACpC,MAAM,CAAC,IAAI,CAAC,CAAC,SAAS,CAAC,wBAAwB,CAAC,CAAC;IACnD,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,yCAAyC,EAAE,GAAG,EAAE;QACjD,MAAM,IAAI,GAAG,cAAc,CACzB,KAAC,YAAY,CAAC,QAAQ,IAAC,KAAK,EAAC,WAAW,YACtC,KAAC,YAAY,CAAC,QAAQ,IAAC,KAAK,EAAC,oBAAoB,YAC/C,KAAC,YAAY,KAAG,GACM,GACF,CACzB,CAAC;QACF,MAAM,CAAC,IAAI,CAAC,CAAC,SAAS,CAAC,oBAAoB,CAAC,CAAC;QAC7C,MAAM,CAAC,IAAI,CAAC,CAAC,SAAS,CAAC,iCAAiC,CAAC,CAAC;IAC5D,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,mCAAmC,EAAE,GAAG,EAAE;QAC3C,SAAS,GAAG;YACV,OAAO,CACL,0BACE,KAAC,YAAY,CAAC,QAAQ,IAAC,KAAK,EAAC,OAAO,YAClC,KAAC,YAAY,KAAG,GACM,EACxB,KAAC,YAAY,CAAC,QAAQ,IAAC,KAAK,EAAC,OAAO,YAClC,KAAC,YAAY,KAAG,GACM,IACpB,CACP,CAAC;QACJ,CAAC;QAED,MAAM,IAAI,GAAG,cAAc,CAAC,KAAC,GAAG,KAAG,CAAC,CAAC;QACrC,MAAM,CAAC,IAAI,CAAC,CAAC,SAAS,CAAC,oBAAoB,CAAC,CAAC;QAC7C,MAAM,CAAC,IAAI,CAAC,CAAC,SAAS,CAAC,oBAAoB,CAAC,CAAC;IAC/C,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}

package/dist/bin/rango.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=rango.d.ts.map

package/dist/bin/rango.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"rango.d.ts","sourceRoot":"","sources":["../../src/bin/rango.ts"],"names":[],"mappings":""}

package/dist/bin/rango.js

@@ -139,7 +139,7 @@ function generatePerModuleTypesSource(routes) {
   const valid = routes.filter(({ name }) => {
     if (!name || /["'\\`\n\r]/.test(name)) {
       console.warn(
-        `[rsc-router] Skipping route with invalid name: ${JSON.stringify(name)}`
+        `[rango] Skipping route with invalid name: ${JSON.stringify(name)}`
       );
       return false;
     }
@@ -149,7 +149,7 @@ function generatePerModuleTypesSource(routes) {
   for (const { name, pattern, params, search } of valid) {
     if (deduped.has(name)) {
       console.warn(
-        `[rsc-router] Duplicate route name "${name}" \u2014 keeping first definition`
+        `[rango] Duplicate route name "${name}" \u2014 keeping first definition`
       );
       continue;
     }
@@ -186,7 +186,7 @@ ${objectBody}
 } as const;
 
 declare global {
-  namespace RSCRouter {
+  namespace Rango {
     interface GeneratedRouteMap extends Readonly<typeof NamedRoutes> {}
   }
 }
@@ -211,7 +211,7 @@ function findTsFiles(dir, filter) {
     entries = readdirSync(dir, { withFileTypes: true });
   } catch (err) {
     console.warn(
-      `[rsc-router] Failed to scan directory ${dir}: ${err.message}`
+      `[rango] Failed to scan directory ${dir}: ${err.message}`
     );
     return results;
   }
@@ -456,7 +456,7 @@ function buildCombinedRouteMapWithSearch(filePath, variableName, visited, diagno
   const realPath = resolve(filePath);
   const key = variableName ? `${realPath}:${variableName}` : realPath;
   if (visited.has(key)) {
-    console.warn(`[rsc-router] Circular include detected, skipping: ${key}`);
+    console.warn(`[rango] Circular include detected, skipping: ${key}`);
     return { routes: {}, searchSchemas: {} };
   }
   visited.add(key);
@@ -543,12 +543,12 @@ function writePerModuleRouteTypesForFile(filePath) {
     } else {
       routes = extractRoutesFromSource(source);
     }
-    const genPath = filePath.replace(/\.(tsx?)$/, ".gen.ts");
+    const genPath = filePath.replace(/\.(tsx?|jsx?)$/, ".gen.ts");
     if (routes.length === 0) {
       if (varNames.length > 0 && !existsSync2(genPath)) {
         writeFileSync(genPath, generatePerModuleTypesSource([]));
         console.log(
-          `[rsc-router] Generated route types (placeholder) -> ${genPath}`
+          `[rango] Generated route types (placeholder) -> ${genPath}`
         );
       }
       return;
@@ -557,11 +557,11 @@ function writePerModuleRouteTypesForFile(filePath) {
     const existing = existsSync2(genPath) ? readFileSync2(genPath, "utf-8") : null;
     if (existing !== genSource) {
       writeFileSync(genPath, genSource);
-      console.log(`[rsc-router] Generated route types -> ${genPath}`);
+      console.log(`[rango] Generated route types -> ${genPath}`);
     }
   } catch (err) {
     console.warn(
-      `[rsc-router] Failed to generate route types for ${filePath}: ${err.message}`
+      `[rango] Failed to generate route types for ${filePath}: ${err.message}`
     );
   }
 }
@@ -576,6 +576,75 @@ var init_per_module_writer = __esm({
   }
 });
 
+// src/build/route-types/source-scan.ts
+function isLineTerminator(ch) {
+  const c = ch.charCodeAt(0);
+  return c === 10 || c === 13 || c === 8232 || c === 8233;
+}
+function makeCodeClassifier(code) {
+  const n = code.length;
+  let i = 0;
+  let skipStart = -1;
+  let skipEnd = -1;
+  return (q) => {
+    if (q >= skipStart && q < skipEnd) return false;
+    while (i < n && i <= q) {
+      const c = code[i];
+      const d = i + 1 < n ? code[i + 1] : "";
+      let end = -1;
+      if (c === "/" && d === "/") {
+        let j = i + 2;
+        while (j < n && !isLineTerminator(code[j])) j++;
+        end = j;
+      } else if (c === "/" && d === "*") {
+        let j = i + 2;
+        while (j < n && !(code[j] === "*" && code[j + 1] === "/")) j++;
+        end = Math.min(n, j + 2);
+      } else if (c === '"' || c === "'" || c === "`") {
+        let j = i + 1;
+        while (j < n) {
+          if (code[j] === "\\") {
+            j += 2;
+            continue;
+          }
+          if (code[j] === c) {
+            j++;
+            break;
+          }
+          j++;
+        }
+        end = j;
+      }
+      if (end >= 0) {
+        if (q < end) {
+          skipStart = i;
+          skipEnd = end;
+          return false;
+        }
+        i = end;
+      } else {
+        i++;
+      }
+    }
+    return true;
+  };
+}
+function firstCodeMatchIndex(code, pattern) {
+  const inCode = makeCodeClassifier(code);
+  pattern.lastIndex = 0;
+  let m;
+  while ((m = pattern.exec(code)) !== null) {
+    if (inCode(m.index)) return m.index;
+    if (pattern.lastIndex <= m.index) pattern.lastIndex = m.index + 1;
+  }
+  return -1;
+}
+var init_source_scan = __esm({
+  "src/build/route-types/source-scan.ts"() {
+    "use strict";
+  }
+});
+
 // src/build/route-types/router-processing.ts
 import {
   readFileSync as readFileSync3,
@@ -612,7 +681,7 @@ function findRouterFilesRecursive(dir, filter, results) {
     entries = readdirSync2(dir, { withFileTypes: true });
   } catch (err) {
     console.warn(
-      `[rsc-router] Failed to scan directory ${dir}: ${err.message}`
+      `[rango] Failed to scan directory ${dir}: ${err.message}`
     );
     return;
   }
@@ -630,7 +699,7 @@ function findRouterFilesRecursive(dir, filter, results) {
     if (filter && !filter(fullPath)) continue;
     try {
       const source = readFileSync3(fullPath, "utf-8");
-      if (ROUTER_CALL_PATTERN.test(source)) {
+      if (ROUTER_CALL_PATTERN.test(source) && firstCodeMatchIndex(source, ROUTER_CALL_PATTERN_G) >= 0) {
         routerFilesInDir.push(fullPath);
       }
     } catch {
@@ -668,7 +737,7 @@ function findNestedRouterConflict(routerFiles) {
   }
   return null;
 }
-function formatNestedRouterConflictError(conflict, prefix = "[rsc-router]") {
+function formatNestedRouterConflictError(conflict, prefix = "[rango]") {
   return `${prefix} Nested router roots are not supported.
 Router root: ${conflict.ancestor}
 Nested router: ${conflict.nested}
@@ -764,19 +833,38 @@ function extractBasenameFromRouter(code) {
   visit(sourceFile);
   return result;
 }
-function applyBasenameToRoutes(result, basename2) {
+function applyBasenameToRoutes(result, basename) {
   const prefixed = {};
   for (const [name, pattern] of Object.entries(result.routes)) {
     if (pattern === "/") {
-      prefixed[name] = basename2;
-    } else if (basename2.endsWith("/") && pattern.startsWith("/")) {
-      prefixed[name] = basename2 + pattern.slice(1);
+      prefixed[name] = basename;
+    } else if (basename.endsWith("/") && pattern.startsWith("/")) {
+      prefixed[name] = basename + pattern.slice(1);
     } else {
-      prefixed[name] = basename2 + pattern;
+      prefixed[name] = basename + pattern;
     }
   }
   return { routes: prefixed, searchSchemas: result.searchSchemas };
 }
+function genFileTsPath(sourceFile) {
+  const base = pathBasename(sourceFile).replace(/\.(tsx?|jsx?)$/, "");
+  return join2(dirname2(sourceFile), `${base}.named-routes.gen.ts`);
+}
+function resolveSearchSchemas(publicRouteNames, runtimeSchemas, sourceFile) {
+  if (runtimeSchemas && Object.keys(runtimeSchemas).length > 0) {
+    return runtimeSchemas;
+  }
+  const staticParsed = buildCombinedRouteMapForRouterFile(sourceFile);
+  if (Object.keys(staticParsed.searchSchemas).length === 0) {
+    return runtimeSchemas;
+  }
+  const filtered = {};
+  for (const name of publicRouteNames) {
+    const schema = staticParsed.searchSchemas[name];
+    if (schema) filtered[name] = schema;
+  }
+  return Object.keys(filtered).length > 0 ? filtered : runtimeSchemas;
+}
 function buildCombinedRouteMapForRouterFile(routerFilePath) {
   let routerSource;
   try {
@@ -789,7 +877,7 @@ function buildCombinedRouteMapForRouterFile(routerFilePath) {
     return { routes: {}, searchSchemas: {} };
   }
   const rawBasename = extractBasenameFromRouter(routerSource);
-  const basename2 = rawBasename ? ("/" + rawBasename.replace(/^\/+|\/+$/g, "")).replace(/^\/$/, "") : void 0;
+  const basename = rawBasename ? ("/" + rawBasename.replace(/^\/+|\/+$/g, "")).replace(/^\/$/, "") : void 0;
   let result;
   if (extraction.kind === "inline") {
     result = buildCombinedRouteMapWithSearch(
@@ -814,8 +902,8 @@ function buildCombinedRouteMapForRouterFile(routerFilePath) {
       result = buildCombinedRouteMapWithSearch(routerFilePath, extraction.name);
     }
   }
-  if (basename2) {
-    result = applyBasenameToRoutes(result, basename2);
+  if (basename) {
+    result = applyBasenameToRoutes(result, basename);
   }
   return result;
 }
@@ -897,7 +985,7 @@ function writeCombinedRouteTypes(root, knownRouterFiles, opts) {
     if (existsSync3(oldCombinedPath)) {
       unlinkSync(oldCombinedPath);
       console.log(
-        `[rsc-router] Removed stale combined route types: ${oldCombinedPath}`
+        `[rango] Removed stale combined route types: ${oldCombinedPath}`
       );
     }
   } catch {
@@ -919,18 +1007,12 @@ function writeCombinedRouteTypes(root, knownRouterFiles, opts) {
       }
       if (!extractUrlsFromRouter(routerSource)) continue;
     }
-    const routerBasename = pathBasename(routerFilePath).replace(
-      /\.(tsx?|jsx?)$/,
-      ""
-    );
-    const outPath = join2(
-      dirname2(routerFilePath),
-      `${routerBasename}.named-routes.gen.ts`
-    );
+    const outPath = genFileTsPath(routerFilePath);
     const existing = existsSync3(outPath) ? readFileSync3(outPath, "utf-8") : null;
     if (Object.keys(result.routes).length === 0) {
       if (!existing) {
         const emptySource = generateRouteTypesSource({});
+        opts?.onWrite?.(outPath, emptySource);
         writeFileSync2(outPath, emptySource);
       }
       continue;
@@ -950,22 +1032,25 @@ function writeCombinedRouteTypes(root, knownRouterFiles, opts) {
           continue;
         }
       }
+      opts?.onWrite?.(outPath, source);
       writeFileSync2(outPath, source);
       console.log(
-        `[rsc-router] Generated route types (${Object.keys(result.routes).length} routes) -> ${outPath}`
+        `[rango] Generated route types (${Object.keys(result.routes).length} routes) -> ${outPath}`
       );
     }
   }
 }
-var ROUTER_CALL_PATTERN;
+var ROUTER_CALL_PATTERN, ROUTER_CALL_PATTERN_G;
 var init_router_processing = __esm({
   "src/build/route-types/router-processing.ts"() {
     "use strict";
     init_codegen();
+    init_source_scan();
     init_include_resolution();
     init_per_module_writer();
     init_route_name();
     ROUTER_CALL_PATTERN = /\bcreateRouter\s*[<(]/;
+    ROUTER_CALL_PATTERN_G = /\bcreateRouter\s*[<(]/g;
   }
 });
 
@@ -1003,7 +1088,7 @@ import {
 import { createElement, StrictMode } from "react";
 import { hydrateRoot } from "react-dom/client";
 import { rscStream } from "@rangojs/router/internal/deps/html-stream-client";
-import { initBrowserApp, RSCRouter } from "@rangojs/router/browser";
+import { initBrowserApp, Rango } from "@rangojs/router/browser";
 
 async function initializeApp() {
   const deps = {
@@ -1018,7 +1103,7 @@ async function initializeApp() {
 
   hydrateRoot(
     document,
-    createElement(StrictMode, null, createElement(RSCRouter))
+    createElement(StrictMode, null, createElement(Rango))
   );
 }
 
@@ -1050,7 +1135,8 @@ export const renderHTML = createSSRHandler({
 // src/vite/plugins/version-plugin.ts
 var version_plugin_exports = {};
 __export(version_plugin_exports, {
-  createVersionPlugin: () => createVersionPlugin
+  createVersionPlugin: () => createVersionPlugin,
+  isViteDepCachePath: () => isViteDepCachePath
 });
 import { parseAst } from "vite";
 function isCodeModule(id) {
@@ -1062,7 +1148,7 @@ function normalizeModuleId(id) {
 function getClientModuleSignature(source) {
   let program;
   try {
-    program = parseAst(source, { jsx: true });
+    program = parseAst(source, { lang: "tsx" });
   } catch {
     return void 0;
   }
@@ -1145,11 +1231,12 @@ function createVersionPlugin() {
   let currentVersion = buildVersion;
   let isDev = false;
   let server = null;
+  let resolvedCacheDir;
   const clientModuleSignatures = /* @__PURE__ */ new Map();
   let versionCounter = 0;
   const bumpVersion = (reason) => {
     currentVersion = Date.now().toString(16) + String(++versionCounter);
-    console.log(`[rsc-router] ${reason}, version updated: ${currentVersion}`);
+    console.log(`[rango] ${reason}, version updated: ${currentVersion}`);
     const rscEnv = server?.environments?.rsc;
     const versionMod = rscEnv?.moduleGraph?.getModuleById(
       "\0" + VIRTUAL_IDS.version
@@ -1163,6 +1250,7 @@ function createVersionPlugin() {
     enforce: "pre",
     configResolved(config) {
       isDev = config.command === "serve";
+      resolvedCacheDir = config.cacheDir ? String(config.cacheDir).replace(/\\/g, "/") : void 0;
     },
     configureServer(devServer) {
       server = devServer;
@@ -1204,6 +1292,7 @@ function createVersionPlugin() {
       if (!isDev) return;
       const isRscModule = this.environment?.name === "rsc";
       if (!isRscModule) return;
+      if (isViteDepCachePath(ctx.file, resolvedCacheDir)) return;
       if (ctx.modules.length === 1 && ctx.modules[0].id === "\0" + VIRTUAL_IDS.version) {
         return;
       }
@@ -1233,6 +1322,17 @@ function createVersionPlugin() {
     }
   };
 }
+function isViteDepCachePath(filePath, cacheDir) {
+  if (!filePath) return false;
+  const normalized = filePath.replace(/\\/g, "/");
+  if (cacheDir) {
+    const normalizedCacheDir = cacheDir.replace(/\\/g, "/").replace(/\/+$/, "");
+    if (normalized === normalizedCacheDir || normalized.startsWith(normalizedCacheDir + "/")) {
+      return true;
+    }
+  }
+  return /\/node_modules\/\.vite[^/]*\//.test(normalized) || normalized.includes("/.vite-isolated/");
+}
 var init_version_plugin = __esm({
   "src/vite/plugins/version-plugin.ts"() {
     "use strict";
@@ -1278,7 +1378,7 @@ var runtime_discovery_exports = {};
 __export(runtime_discovery_exports, {
   discoverAndWriteRouteTypes: () => discoverAndWriteRouteTypes
 });
-import { dirname as dirname3, join as join3, basename, resolve as resolve3 } from "node:path";
+import { resolve as resolve3 } from "node:path";
 import { existsSync as existsSync4, readFileSync as readFileSync4, writeFileSync as writeFileSync3 } from "node:fs";
 async function discoverAndWriteRouteTypes(opts) {
   let createViteServer;
@@ -1388,22 +1488,12 @@ This means createRouter() stack trace parsing matched an internal frame.
 Set an explicit \`id\` on createRouter() or check the call site.`
         );
       }
-      if (!routeSearchSchemas || Object.keys(routeSearchSchemas).length === 0) {
-        const staticParsed = buildCombinedRouteMapForRouterFile(sourceFile);
-        if (Object.keys(staticParsed.searchSchemas).length > 0) {
-          const filtered = {};
-          for (const name of Object.keys(routeManifest)) {
-            const schema = staticParsed.searchSchemas[name];
-            if (schema) filtered[name] = schema;
-          }
-          if (Object.keys(filtered).length > 0) {
-            routeSearchSchemas = filtered;
-          }
-        }
-      }
-      const routerDir = dirname3(sourceFile);
-      const routerBasename = basename(sourceFile).replace(/\.(tsx?|jsx?)$/, "");
-      const outPath = join3(routerDir, `${routerBasename}.named-routes.gen.ts`);
+      routeSearchSchemas = resolveSearchSchemas(
+        Object.keys(routeManifest),
+        routeSearchSchemas,
+        sourceFile
+      );
+      const outPath = genFileTsPath(sourceFile);
       const source = generateRouteTypesSource(
         routeManifest,
         routeSearchSchemas && Object.keys(routeSearchSchemas).length > 0 ? routeSearchSchemas : void 0
@@ -1440,7 +1530,7 @@ var init_runtime_discovery = __esm({
 
 // src/bin/rango.ts
 init_generate_route_types();
-import { resolve as resolve4, dirname as dirname4 } from "node:path";
+import { resolve as resolve4, dirname as dirname3 } from "node:path";
 import { readFileSync as readFileSync5, statSync, existsSync as existsSync5 } from "node:fs";
 var [command, ...rawArgs] = process.argv.slice(2);
 if (command === "generate") {
@@ -1511,12 +1601,12 @@ Examples:
   );
 }
 function findProjectRoot(fromPath) {
-  let dir = dirname4(resolve4(fromPath));
-  while (dir !== dirname4(dir)) {
+  let dir = dirname3(resolve4(fromPath));
+  while (dir !== dirname3(dir)) {
     if (existsSync5(resolve4(dir, "package.json")) || existsSync5(resolve4(dir, "vite.config.ts")) || existsSync5(resolve4(dir, "vite.config.js"))) {
       return dir;
     }
-    dir = dirname4(dir);
+    dir = dirname3(dir);
   }
   return process.cwd();
 }

package/dist/bin/rango.js.map

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

package/dist/browser/event-controller.d.ts

@@ -0,0 +1,191 @@
+import type { ReactNode } from "react";
+import type { NavigationLocation, NavigateOptions, TrackedActionState, InflightAction, RscMetadata, HandleData } from "./types.js";
+/**
+ * Phase of a navigation operation
+ */
+export type NavigationPhase = "fetching" | "streaming";
+/**
+ * Phase of an action operation
+ */
+export type ActionPhase = "fetching" | "streaming" | "settling";
+/**
+ * Entry tracking an in-flight navigation
+ */
+export interface NavigationEntry {
+    url: string;
+    abort: AbortController;
+    phase: NavigationPhase;
+    startedAt: number;
+    options?: NavigateOptions & {
+        skipLoadingState?: boolean;
+    };
+}
+/**
+ * Entry tracking an in-flight action
+ */
+export interface ActionEntry {
+    /** Unique instance ID for this action invocation */
+    id: string;
+    /** Server action function ID (normalized name like "addToCart") */
+    actionId: string;
+    /** Abort controller for this action */
+    abort: AbortController;
+    /** Current phase of the action */
+    phase: ActionPhase;
+    /** Action arguments */
+    payload: unknown[];
+    /** Result from action (set on completion) */
+    result?: unknown;
+    /** Error from action (set on failure) */
+    error?: unknown;
+    /** Segment IDs that were revalidated by this action */
+    revalidatedSegments: string[];
+    /** Timestamp when action started */
+    startedAt: number;
+    /** Whether action processing is complete (may still be streaming) */
+    completed?: boolean;
+}
+/**
+ * Derived navigation state (computed from source of truth)
+ */
+export interface DerivedNavigationState {
+    /** Navigation lifecycle state */
+    state: "idle" | "loading";
+    /** Whether any operation is streaming */
+    isStreaming: boolean;
+    /** Current committed location */
+    location: NavigationLocation;
+    /** URL being navigated to (null if idle) */
+    pendingUrl: string | null;
+    /** List of inflight actions (for compatibility) */
+    inflightActions: InflightAction[];
+}
+/**
+ * Callback for UI updates when root should re-render
+ */
+export type UpdateCallback = (update: {
+    root: ReactNode | Promise<ReactNode>;
+    metadata: RscMetadata;
+}) => void;
+/**
+ * State change listener
+ */
+export type StateListener = () => void;
+/**
+ * Action state listener
+ */
+export type ActionStateListener = (state: TrackedActionState) => void;
+/**
+ * Handle state listener
+ */
+export type HandleListener = () => void;
+/**
+ * Internal handle state stored in controller
+ */
+export interface HandleState {
+    data: HandleData;
+    segmentOrder: string[];
+}
+/**
+ * Token for tracking an active stream
+ * Call end() when the stream completes
+ */
+export interface StreamingToken {
+    /** End this streaming operation */
+    end(): void;
+}
+/**
+ * Result from starting a navigation
+ * Implements Disposable for use with `using` keyword
+ */
+export interface NavigationHandle extends Disposable {
+    /** Abort controller for this navigation */
+    abort: AbortController;
+    /** Signal for this navigation */
+    signal: AbortSignal;
+    /** Start streaming and get a token to end it later */
+    startStreaming(): StreamingToken;
+    /** Complete the navigation successfully */
+    complete(location: NavigationLocation): void;
+    /** Whether navigation was completed successfully */
+    readonly completed: boolean;
+}
+/**
+ * Result from starting an action
+ * Implements Disposable for use with `using` keyword
+ */
+export interface ActionHandle extends Disposable {
+    /** Unique instance ID */
+    id: string;
+    /** Abort controller for this action */
+    abort: AbortController;
+    /** Signal for this action */
+    signal: AbortSignal;
+    /** Start streaming and get a token to end it later */
+    startStreaming(): StreamingToken;
+    /** Record segments that were revalidated */
+    recordRevalidatedSegments(segmentIds: string[]): void;
+    /** Complete the action with result */
+    complete(result?: unknown): void;
+    /** Fail the action with error */
+    fail(error: unknown): void;
+    /** Whether action was completed (success or failure) */
+    readonly settled: boolean;
+    /** Check if any concurrent actions were started */
+    hadConcurrentActions: boolean;
+    /** Get segments to consolidate (only valid when this is the last action) */
+    getConsolidationSegments(): string[] | null;
+    /** Clear consolidation tracking */
+    clearConsolidation(): void;
+}
+/**
+ * Event controller interface
+ */
+export interface EventController {
+    startNavigation(url: string, options?: NavigateOptions & {
+        skipLoadingState?: boolean;
+    }): NavigationHandle;
+    abortNavigation(): void;
+    startAction(actionId: string, args: unknown[]): ActionHandle;
+    abortAllActions(): void;
+    getState(): DerivedNavigationState;
+    getActionState(actionId: string): TrackedActionState;
+    setLocation(location: NavigationLocation): void;
+    subscribe(listener: StateListener): () => void;
+    subscribeToAction(actionId: string, listener: ActionStateListener): () => void;
+    subscribeToHandles(listener: HandleListener): () => void;
+    setHandleData(data: HandleData, matched?: string[], isPartial?: boolean): void;
+    getHandleState(): HandleState;
+    getCurrentNavigation(): NavigationEntry | null;
+    getInflightActions(): Map<string, ActionEntry>;
+}
+/**
+ * Configuration for creating an event controller
+ */
+export interface EventControllerConfig {
+    initialLocation?: NavigationLocation;
+}
+/**
+ * Create an event controller for managing navigation and action state
+ *
+ * The controller uses a reactive model where:
+ * - Source of truth: currentNavigation, inflightActions, location
+ * - Derived state: navState, isStreaming computed from source
+ *
+ * Navigation uses switchMap semantics (new nav cancels previous).
+ * Actions use mergeMap semantics (all run concurrently, consolidate at end).
+ */
+export declare function createEventController(config?: EventControllerConfig): EventController;
+/**
+ * Initialize the global event controller
+ */
+export declare function initEventController(config?: EventControllerConfig): EventController;
+/**
+ * Get the global event controller
+ */
+export declare function getEventController(): EventController;
+/**
+ * Reset the controller instance (for testing)
+ */
+export declare function resetEventController(): void;
+//# sourceMappingURL=event-controller.d.ts.map

package/dist/browser/event-controller.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"event-controller.d.ts","sourceRoot":"","sources":["../../src/browser/event-controller.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,OAAO,CAAC;AACvC,OAAO,KAAK,EACV,kBAAkB,EAClB,eAAe,EACf,kBAAkB,EAElB,cAAc,EAEd,WAAW,EACX,UAAU,EACX,MAAM,YAAY,CAAC;AAcpB;;GAEG;AACH,MAAM,MAAM,eAAe,GAAG,UAAU,GAAG,WAAW,CAAC;AAEvD;;GAEG;AACH,MAAM,MAAM,WAAW,GAAG,UAAU,GAAG,WAAW,GAAG,UAAU,CAAC;AAEhE;;GAEG;AACH,MAAM,WAAW,eAAe;IAC9B,GAAG,EAAE,MAAM,CAAC;IACZ,KAAK,EAAE,eAAe,CAAC;IACvB,KAAK,EAAE,eAAe,CAAC;IACvB,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,CAAC,EAAE,eAAe,GAAG;QAAE,gBAAgB,CAAC,EAAE,OAAO,CAAA;KAAE,CAAC;CAC5D;AAED;;GAEG;AACH,MAAM,WAAW,WAAW;IAC1B,oDAAoD;IACpD,EAAE,EAAE,MAAM,CAAC;IACX,mEAAmE;IACnE,QAAQ,EAAE,MAAM,CAAC;IACjB,uCAAuC;IACvC,KAAK,EAAE,eAAe,CAAC;IACvB,kCAAkC;IAClC,KAAK,EAAE,WAAW,CAAC;IACnB,uBAAuB;IACvB,OAAO,EAAE,OAAO,EAAE,CAAC;IACnB,6CAA6C;IAC7C,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,yCAAyC;IACzC,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,uDAAuD;IACvD,mBAAmB,EAAE,MAAM,EAAE,CAAC;IAC9B,oCAAoC;IACpC,SAAS,EAAE,MAAM,CAAC;IAClB,qEAAqE;IACrE,SAAS,CAAC,EAAE,OAAO,CAAC;CACrB;AAED;;GAEG;AACH,MAAM,WAAW,sBAAsB;IACrC,iCAAiC;IACjC,KAAK,EAAE,MAAM,GAAG,SAAS,CAAC;IAC1B,yCAAyC;IACzC,WAAW,EAAE,OAAO,CAAC;IACrB,iCAAiC;IACjC,QAAQ,EAAE,kBAAkB,CAAC;IAC7B,4CAA4C;IAC5C,UAAU,EAAE,MAAM,GAAG,IAAI,CAAC;IAC1B,mDAAmD;IACnD,eAAe,EAAE,cAAc,EAAE,CAAC;CACnC;AAED;;GAEG;AACH,MAAM,MAAM,cAAc,GAAG,CAAC,MAAM,EAAE;IACpC,IAAI,EAAE,SAAS,GAAG,OAAO,CAAC,SAAS,CAAC,CAAC;IACrC,QAAQ,EAAE,WAAW,CAAC;CACvB,KAAK,IAAI,CAAC;AAEX;;GAEG;AACH,MAAM,MAAM,aAAa,GAAG,MAAM,IAAI,CAAC;AAEvC;;GAEG;AACH,MAAM,MAAM,mBAAmB,GAAG,CAAC,KAAK,EAAE,kBAAkB,KAAK,IAAI,CAAC;AAEtE;;GAEG;AACH,MAAM,MAAM,cAAc,GAAG,MAAM,IAAI,CAAC;AAExC;;GAEG;AACH,MAAM,WAAW,WAAW;IAC1B,IAAI,EAAE,UAAU,CAAC;IACjB,YAAY,EAAE,MAAM,EAAE,CAAC;CACxB;AAED;;;GAGG;AACH,MAAM,WAAW,cAAc;IAC7B,mCAAmC;IACnC,GAAG,IAAI,IAAI,CAAC;CACb;AAED;;;GAGG;AACH,MAAM,WAAW,gBAAiB,SAAQ,UAAU;IAClD,2CAA2C;IAC3C,KAAK,EAAE,eAAe,CAAC;IACvB,iCAAiC;IACjC,MAAM,EAAE,WAAW,CAAC;IACpB,sDAAsD;IACtD,cAAc,IAAI,cAAc,CAAC;IACjC,2CAA2C;IAC3C,QAAQ,CAAC,QAAQ,EAAE,kBAAkB,GAAG,IAAI,CAAC;IAC7C,oDAAoD;IACpD,QAAQ,CAAC,SAAS,EAAE,OAAO,CAAC;CAC7B;AAED;;;GAGG;AACH,MAAM,WAAW,YAAa,SAAQ,UAAU;IAC9C,yBAAyB;IACzB,EAAE,EAAE,MAAM,CAAC;IACX,uCAAuC;IACvC,KAAK,EAAE,eAAe,CAAC;IACvB,6BAA6B;IAC7B,MAAM,EAAE,WAAW,CAAC;IACpB,sDAAsD;IACtD,cAAc,IAAI,cAAc,CAAC;IACjC,4CAA4C;IAC5C,yBAAyB,CAAC,UAAU,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC;IACtD,sCAAsC;IACtC,QAAQ,CAAC,MAAM,CAAC,EAAE,OAAO,GAAG,IAAI,CAAC;IACjC,iCAAiC;IACjC,IAAI,CAAC,KAAK,EAAE,OAAO,GAAG,IAAI,CAAC;IAC3B,wDAAwD;IACxD,QAAQ,CAAC,OAAO,EAAE,OAAO,CAAC;IAC1B,mDAAmD;IACnD,oBAAoB,EAAE,OAAO,CAAC;IAC9B,4EAA4E;IAC5E,wBAAwB,IAAI,MAAM,EAAE,GAAG,IAAI,CAAC;IAC5C,mCAAmC;IACnC,kBAAkB,IAAI,IAAI,CAAC;CAC5B;AAED;;GAEG;AACH,MAAM,WAAW,eAAe;IAE9B,eAAe,CAAC,GAAG,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,eAAe,GAAG;QAAE,gBAAgB,CAAC,EAAE,OAAO,CAAA;KAAE,GAAG,gBAAgB,CAAC;IAC3G,eAAe,IAAI,IAAI,CAAC;IAGxB,WAAW,CAAC,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,GAAG,YAAY,CAAC;IAC7D,eAAe,IAAI,IAAI,CAAC;IAGxB,QAAQ,IAAI,sBAAsB,CAAC;IACnC,cAAc,CAAC,QAAQ,EAAE,MAAM,GAAG,kBAAkB,CAAC;IAGrD,WAAW,CAAC,QAAQ,EAAE,kBAAkB,GAAG,IAAI,CAAC;IAGhD,SAAS,CAAC,QAAQ,EAAE,aAAa,GAAG,MAAM,IAAI,CAAC;IAC/C,iBAAiB,CACf,QAAQ,EAAE,MAAM,EAChB,QAAQ,EAAE,mBAAmB,GAC5B,MAAM,IAAI,CAAC;IACd,kBAAkB,CAAC,QAAQ,EAAE,cAAc,GAAG,MAAM,IAAI,CAAC;IAGzD,aAAa,CACX,IAAI,EAAE,UAAU,EAChB,OAAO,CAAC,EAAE,MAAM,EAAE,EAClB,SAAS,CAAC,EAAE,OAAO,GAClB,IAAI,CAAC;IACR,cAAc,IAAI,WAAW,CAAC;IAG9B,oBAAoB,IAAI,eAAe,GAAG,IAAI,CAAC;IAC/C,kBAAkB,IAAI,GAAG,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC;CAChD;AAkCD;;GAEG;AACH,MAAM,WAAW,qBAAqB;IACpC,eAAe,CAAC,EAAE,kBAAkB,CAAC;CACtC;AAED;;;;;;;;;GASG;AACH,wBAAgB,qBAAqB,CACnC,MAAM,CAAC,EAAE,qBAAqB,GAC7B,eAAe,CAukBjB;AAQD;;GAEG;AACH,wBAAgB,mBAAmB,CACjC,MAAM,CAAC,EAAE,qBAAqB,GAC7B,eAAe,CAKjB;AAED;;GAEG;AACH,wBAAgB,kBAAkB,IAAI,eAAe,CAOpD;AAED;;GAEG;AACH,wBAAgB,oBAAoB,IAAI,IAAI,CAE3C"}