@rangojs/router 0.0.0-experimental.31 → 0.0.0-experimental.3232cd17

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (376) hide show
  1. package/AGENTS.md +4 -0
  2. package/README.md +198 -44
  3. package/dist/bin/rango.js +287 -105
  4. package/dist/testing/vitest.js +82 -0
  5. package/dist/vite/index.js +3248 -1117
  6. package/dist/vite/plugins/cloudflare-protocol-loader-hook.mjs +76 -0
  7. package/package.json +73 -21
  8. package/skills/api-client/SKILL.md +211 -0
  9. package/skills/breadcrumbs/SKILL.md +107 -1
  10. package/skills/bundle-analysis/SKILL.md +159 -0
  11. package/skills/cache-guide/SKILL.md +245 -21
  12. package/skills/caching/SKILL.md +302 -6
  13. package/skills/composability/SKILL.md +27 -2
  14. package/skills/css/SKILL.md +76 -0
  15. package/skills/document-cache/SKILL.md +78 -55
  16. package/skills/handler-use/SKILL.md +364 -0
  17. package/skills/hooks/SKILL.md +270 -30
  18. package/skills/host-router/SKILL.md +82 -22
  19. package/skills/i18n/SKILL.md +276 -0
  20. package/skills/intercept/SKILL.md +49 -5
  21. package/skills/layout/SKILL.md +35 -9
  22. package/skills/links/SKILL.md +249 -17
  23. package/skills/loader/SKILL.md +294 -30
  24. package/skills/middleware/SKILL.md +52 -13
  25. package/skills/migrate-nextjs/SKILL.md +584 -0
  26. package/skills/migrate-react-router/SKILL.md +769 -0
  27. package/skills/mime-routes/SKILL.md +27 -0
  28. package/skills/observability/SKILL.md +137 -0
  29. package/skills/parallel/SKILL.md +203 -7
  30. package/skills/prerender/SKILL.md +123 -100
  31. package/skills/rango/SKILL.md +250 -22
  32. package/skills/react-compiler/SKILL.md +168 -0
  33. package/skills/response-routes/SKILL.md +122 -47
  34. package/skills/route/SKILL.md +97 -5
  35. package/skills/router-setup/SKILL.md +90 -5
  36. package/skills/server-actions/SKILL.md +775 -0
  37. package/skills/streams-and-websockets/SKILL.md +283 -0
  38. package/skills/tailwind/SKILL.md +27 -3
  39. package/skills/testing/SKILL.md +129 -0
  40. package/skills/testing/bindings.md +89 -0
  41. package/skills/testing/cache-prerender.md +124 -0
  42. package/skills/testing/client-components.md +122 -0
  43. package/skills/testing/e2e-parity.md +125 -0
  44. package/skills/testing/flight.md +92 -0
  45. package/skills/testing/handles.md +129 -0
  46. package/skills/testing/loader.md +128 -0
  47. package/skills/testing/middleware.md +99 -0
  48. package/skills/testing/render-handler.md +121 -0
  49. package/skills/testing/response-routes.md +95 -0
  50. package/skills/testing/reverse-and-types.md +84 -0
  51. package/skills/testing/server-actions.md +107 -0
  52. package/skills/testing/server-tree.md +128 -0
  53. package/skills/testing/setup.md +120 -0
  54. package/skills/typesafety/SKILL.md +329 -27
  55. package/skills/use-cache/SKILL.md +36 -5
  56. package/skills/view-transitions/SKILL.md +294 -0
  57. package/src/__augment-tests__/augment.ts +81 -0
  58. package/src/__augment-tests__/augmented.check.ts +116 -0
  59. package/src/__internal.ts +67 -40
  60. package/src/browser/action-coordinator.ts +53 -36
  61. package/src/browser/action-fence.ts +47 -0
  62. package/src/browser/app-shell.ts +39 -0
  63. package/src/browser/app-version.ts +14 -0
  64. package/src/browser/cookie-name.ts +140 -0
  65. package/src/browser/event-controller.ts +86 -147
  66. package/src/browser/history-state.ts +21 -0
  67. package/src/browser/index.ts +3 -3
  68. package/src/browser/invalidate-client-cache.ts +52 -0
  69. package/src/browser/link-interceptor.ts +4 -0
  70. package/src/browser/navigation-bridge.ts +148 -19
  71. package/src/browser/navigation-client.ts +187 -67
  72. package/src/browser/navigation-store-handle.ts +38 -0
  73. package/src/browser/navigation-store.ts +76 -67
  74. package/src/browser/navigation-transaction.ts +18 -66
  75. package/src/browser/partial-update.ts +123 -94
  76. package/src/browser/prefetch/cache.ts +214 -36
  77. package/src/browser/prefetch/fetch.ts +260 -38
  78. package/src/browser/prefetch/policy.ts +6 -0
  79. package/src/browser/prefetch/queue.ts +126 -20
  80. package/src/browser/prefetch/resource-ready.ts +77 -0
  81. package/src/browser/rango-state.ts +158 -76
  82. package/src/browser/react/Link.tsx +93 -11
  83. package/src/browser/react/NavigationProvider.tsx +115 -34
  84. package/src/browser/react/ScrollRestoration.tsx +10 -6
  85. package/src/browser/react/context.ts +7 -2
  86. package/src/browser/react/filter-segment-order.ts +49 -7
  87. package/src/browser/react/index.ts +0 -48
  88. package/src/browser/react/location-state-shared.ts +166 -8
  89. package/src/browser/react/location-state.ts +39 -14
  90. package/src/browser/react/use-action.ts +6 -15
  91. package/src/browser/react/use-handle.ts +23 -69
  92. package/src/browser/react/use-link-status.ts +0 -4
  93. package/src/browser/react/use-navigation.ts +22 -5
  94. package/src/browser/react/use-params.ts +20 -10
  95. package/src/browser/react/use-reverse.ts +106 -0
  96. package/src/browser/react/use-router.ts +46 -11
  97. package/src/browser/react/use-search-params.ts +0 -5
  98. package/src/browser/react/use-segments.ts +11 -21
  99. package/src/browser/response-adapter.ts +52 -1
  100. package/src/browser/rsc-router.tsx +215 -76
  101. package/src/browser/scroll-restoration.ts +46 -39
  102. package/src/browser/segment-reconciler.ts +36 -9
  103. package/src/browser/segment-structure-assert.ts +2 -2
  104. package/src/browser/server-action-bridge.ts +176 -50
  105. package/src/browser/types.ts +95 -11
  106. package/src/browser/validate-redirect-origin.ts +43 -16
  107. package/src/build/collect-fallback-refs.ts +107 -0
  108. package/src/build/generate-manifest.ts +65 -40
  109. package/src/build/generate-route-types.ts +5 -0
  110. package/src/build/index.ts +8 -2
  111. package/src/build/prefix-tree-utils.ts +123 -0
  112. package/src/build/route-trie.ts +137 -32
  113. package/src/build/route-types/codegen.ts +4 -4
  114. package/src/build/route-types/include-resolution.ts +9 -2
  115. package/src/build/route-types/param-extraction.ts +6 -3
  116. package/src/build/route-types/per-module-writer.ts +7 -4
  117. package/src/build/route-types/router-processing.ts +278 -96
  118. package/src/build/route-types/scan-filter.ts +9 -2
  119. package/src/build/route-types/source-scan.ts +118 -0
  120. package/src/build/runtime-discovery.ts +9 -20
  121. package/src/cache/cache-error.ts +104 -0
  122. package/src/cache/cache-policy.ts +68 -28
  123. package/src/cache/cache-runtime.ts +149 -43
  124. package/src/cache/cache-scope.ts +148 -81
  125. package/src/cache/cache-tag.ts +98 -0
  126. package/src/cache/cf/cf-cache-store.ts +2550 -93
  127. package/src/cache/cf/index.ts +11 -17
  128. package/src/cache/document-cache.ts +78 -27
  129. package/src/cache/handle-snapshot.ts +63 -0
  130. package/src/cache/index.ts +23 -20
  131. package/src/cache/memory-segment-store.ts +136 -37
  132. package/src/cache/profile-registry.ts +6 -30
  133. package/src/cache/read-through-swr.ts +41 -11
  134. package/src/cache/segment-codec.ts +0 -16
  135. package/src/cache/tag-invalidation.ts +230 -0
  136. package/src/cache/taint.ts +55 -0
  137. package/src/cache/types.ts +33 -100
  138. package/src/cache/vercel/index.ts +11 -0
  139. package/src/cache/vercel/vercel-cache-store.ts +799 -0
  140. package/src/client.rsc.tsx +6 -21
  141. package/src/client.tsx +108 -290
  142. package/src/component-utils.ts +19 -0
  143. package/src/context-var.ts +84 -2
  144. package/src/debug.ts +2 -2
  145. package/src/decode-loader-results.ts +36 -0
  146. package/src/defer.ts +196 -0
  147. package/src/deps/ssr.ts +0 -1
  148. package/src/errors.ts +30 -4
  149. package/src/handle.ts +70 -22
  150. package/src/handles/MetaTags.tsx +0 -14
  151. package/src/handles/breadcrumbs.ts +16 -5
  152. package/src/handles/meta.ts +0 -39
  153. package/src/host/cookie-handler.ts +0 -36
  154. package/src/host/errors.ts +0 -24
  155. package/src/host/index.ts +8 -2
  156. package/src/host/pattern-matcher.ts +7 -50
  157. package/src/host/router.ts +107 -99
  158. package/src/host/testing.ts +40 -27
  159. package/src/host/types.ts +37 -4
  160. package/src/host/utils.ts +1 -1
  161. package/src/href-client.ts +137 -22
  162. package/src/index.rsc.ts +52 -26
  163. package/src/index.ts +100 -38
  164. package/src/internal-debug.ts +2 -4
  165. package/src/loader-store.ts +500 -0
  166. package/src/loader.rsc.ts +20 -13
  167. package/src/loader.ts +12 -11
  168. package/src/missing-id-error.ts +68 -0
  169. package/src/network-error-thrower.tsx +1 -6
  170. package/src/outlet-context.ts +1 -1
  171. package/src/outlet-provider.tsx +1 -5
  172. package/src/prerender/param-hash.ts +10 -11
  173. package/src/prerender/store.ts +37 -41
  174. package/src/prerender.ts +198 -82
  175. package/src/redirect-origin.ts +100 -0
  176. package/src/response-utils.ts +37 -0
  177. package/src/reverse.ts +65 -15
  178. package/src/root-error-boundary.tsx +1 -19
  179. package/src/route-content-wrapper.tsx +7 -72
  180. package/src/route-definition/dsl-helpers.ts +437 -274
  181. package/src/route-definition/helper-factories.ts +29 -139
  182. package/src/route-definition/helpers-types.ts +113 -37
  183. package/src/route-definition/index.ts +3 -0
  184. package/src/route-definition/redirect.ts +52 -10
  185. package/src/route-definition/resolve-handler-use.ts +161 -0
  186. package/src/route-definition/use-item-types.ts +32 -0
  187. package/src/route-map-builder.ts +7 -17
  188. package/src/route-types.ts +37 -41
  189. package/src/router/basename.ts +14 -0
  190. package/src/router/content-negotiation.ts +108 -9
  191. package/src/router/error-handling.ts +13 -17
  192. package/src/router/find-match.ts +45 -22
  193. package/src/router/handler-context.ts +83 -41
  194. package/src/router/intercept-resolution.ts +25 -23
  195. package/src/router/lazy-includes.ts +19 -53
  196. package/src/router/loader-resolution.ts +213 -30
  197. package/src/router/logging.ts +5 -8
  198. package/src/router/manifest.ts +49 -45
  199. package/src/router/match-api.ts +121 -205
  200. package/src/router/match-context.ts +0 -22
  201. package/src/router/match-handlers.ts +58 -58
  202. package/src/router/match-middleware/background-revalidation.ts +27 -6
  203. package/src/router/match-middleware/cache-lookup.ts +205 -249
  204. package/src/router/match-middleware/cache-store.ts +45 -32
  205. package/src/router/match-middleware/intercept-resolution.ts +8 -28
  206. package/src/router/match-middleware/segment-resolution.ts +52 -18
  207. package/src/router/match-pipelines.ts +1 -42
  208. package/src/router/match-result.ts +104 -40
  209. package/src/router/metrics.ts +5 -34
  210. package/src/router/middleware-types.ts +13 -142
  211. package/src/router/middleware.ts +173 -143
  212. package/src/router/navigation-snapshot.ts +131 -0
  213. package/src/router/params-util.ts +23 -0
  214. package/src/router/pattern-matching.ts +109 -63
  215. package/src/router/prerender-match.ts +192 -54
  216. package/src/router/preview-match.ts +32 -102
  217. package/src/router/request-classification.ts +276 -0
  218. package/src/router/revalidation.ts +63 -55
  219. package/src/router/route-snapshot.ts +244 -0
  220. package/src/router/router-context.ts +6 -28
  221. package/src/router/router-interfaces.ts +100 -35
  222. package/src/router/router-options.ts +91 -11
  223. package/src/router/router-registry.ts +2 -5
  224. package/src/router/segment-resolution/fresh.ts +242 -75
  225. package/src/router/segment-resolution/helpers.ts +64 -25
  226. package/src/router/segment-resolution/loader-cache.ts +41 -37
  227. package/src/router/segment-resolution/revalidation.ts +456 -372
  228. package/src/router/segment-resolution/static-store.ts +19 -5
  229. package/src/router/segment-resolution/streamed-handler-telemetry.ts +52 -0
  230. package/src/router/segment-resolution/view-transition-default.ts +36 -0
  231. package/src/router/segment-resolution.ts +4 -1
  232. package/src/router/segment-wrappers.ts +2 -3
  233. package/src/router/state-cookie-name.ts +33 -0
  234. package/src/router/substitute-pattern-params.ts +56 -0
  235. package/src/router/telemetry-otel.ts +0 -20
  236. package/src/router/telemetry.ts +96 -19
  237. package/src/router/timeout.ts +0 -20
  238. package/src/router/trie-matching.ts +91 -46
  239. package/src/router/types.ts +10 -63
  240. package/src/router/url-params.ts +44 -0
  241. package/src/router.ts +134 -43
  242. package/src/rsc/handler-context.ts +3 -2
  243. package/src/rsc/handler.ts +492 -383
  244. package/src/rsc/helpers.ts +162 -46
  245. package/src/rsc/index.ts +1 -1
  246. package/src/rsc/json-route-result.ts +38 -0
  247. package/src/rsc/loader-fetch.ts +23 -3
  248. package/src/rsc/manifest-init.ts +33 -42
  249. package/src/rsc/origin-guard.ts +39 -25
  250. package/src/rsc/progressive-enhancement.ts +30 -3
  251. package/src/rsc/redirect-guard.ts +99 -0
  252. package/src/rsc/response-error.ts +79 -12
  253. package/src/rsc/response-route-handler.ts +90 -63
  254. package/src/rsc/rsc-rendering.ts +56 -54
  255. package/src/rsc/runtime-warnings.ts +23 -10
  256. package/src/rsc/server-action.ts +74 -67
  257. package/src/rsc/ssr-setup.ts +18 -2
  258. package/src/rsc/types.ts +25 -6
  259. package/src/runtime-env.ts +18 -0
  260. package/src/search-params.ts +4 -20
  261. package/src/segment-content-promise.ts +67 -0
  262. package/src/segment-loader-promise.ts +134 -0
  263. package/src/segment-system.tsx +272 -129
  264. package/src/serialize.ts +243 -0
  265. package/src/server/context.ts +309 -61
  266. package/src/server/cookie-store.ts +80 -5
  267. package/src/server/handle-store.ts +26 -24
  268. package/src/server/loader-registry.ts +10 -28
  269. package/src/server/request-context.ts +348 -128
  270. package/src/ssr/index.tsx +23 -15
  271. package/src/static-handler.ts +27 -18
  272. package/src/testing/cache-status.ts +162 -0
  273. package/src/testing/collect-handle.ts +40 -0
  274. package/src/testing/dispatch.ts +618 -0
  275. package/src/testing/dom.entry.ts +22 -0
  276. package/src/testing/e2e/fixture.ts +188 -0
  277. package/src/testing/e2e/index.ts +128 -0
  278. package/src/testing/e2e/matchers.ts +35 -0
  279. package/src/testing/e2e/page-helpers.ts +272 -0
  280. package/src/testing/e2e/parity.ts +387 -0
  281. package/src/testing/e2e/server.ts +195 -0
  282. package/src/testing/flight-matchers.ts +97 -0
  283. package/src/testing/flight-normalize.ts +11 -0
  284. package/src/testing/flight-runtime.d.ts +57 -0
  285. package/src/testing/flight-tree.ts +682 -0
  286. package/src/testing/flight.entry.ts +52 -0
  287. package/src/testing/flight.ts +232 -0
  288. package/src/testing/generated-routes.ts +183 -0
  289. package/src/testing/index.ts +99 -0
  290. package/src/testing/internal/context.ts +348 -0
  291. package/src/testing/internal/flight-client-globals.ts +30 -0
  292. package/src/testing/internal/seed-vars.ts +54 -0
  293. package/src/testing/render-handler.ts +330 -0
  294. package/src/testing/render-route.tsx +566 -0
  295. package/src/testing/run-loader.ts +378 -0
  296. package/src/testing/run-middleware.ts +205 -0
  297. package/src/testing/vitest-stubs/cloudflare-email.ts +9 -0
  298. package/src/testing/vitest-stubs/cloudflare-workers.ts +21 -0
  299. package/src/testing/vitest-stubs/plugin-rsc.ts +16 -0
  300. package/src/testing/vitest-stubs/version.ts +5 -0
  301. package/src/testing/vitest.ts +305 -0
  302. package/src/theme/ThemeProvider.tsx +0 -52
  303. package/src/theme/ThemeScript.tsx +0 -6
  304. package/src/theme/constants.ts +0 -12
  305. package/src/theme/index.ts +0 -7
  306. package/src/theme/theme-context.ts +1 -5
  307. package/src/theme/theme-script.ts +0 -14
  308. package/src/theme/use-theme.ts +0 -3
  309. package/src/types/boundaries.ts +0 -35
  310. package/src/types/cache-types.ts +17 -8
  311. package/src/types/error-types.ts +30 -90
  312. package/src/types/global-namespace.ts +54 -41
  313. package/src/types/handler-context.ts +233 -81
  314. package/src/types/index.ts +1 -10
  315. package/src/types/loader-types.ts +44 -15
  316. package/src/types/request-scope.ts +107 -0
  317. package/src/types/route-config.ts +6 -50
  318. package/src/types/route-entry.ts +19 -7
  319. package/src/types/segments.ts +37 -14
  320. package/src/urls/include-helper.ts +33 -70
  321. package/src/urls/index.ts +1 -11
  322. package/src/urls/path-helper-types.ts +58 -11
  323. package/src/urls/path-helper.ts +57 -111
  324. package/src/urls/pattern-types.ts +48 -19
  325. package/src/urls/response-types.ts +25 -22
  326. package/src/urls/type-extraction.ts +58 -139
  327. package/src/urls/urls-function.ts +1 -18
  328. package/src/use-loader.tsx +346 -89
  329. package/src/vite/debug.ts +185 -0
  330. package/src/vite/discovery/bundle-postprocess.ts +36 -38
  331. package/src/vite/discovery/discover-routers.ts +130 -85
  332. package/src/vite/discovery/discovery-errors.ts +194 -0
  333. package/src/vite/discovery/gate-state.ts +171 -0
  334. package/src/vite/discovery/prerender-collection.ts +192 -99
  335. package/src/vite/discovery/route-types-writer.ts +40 -84
  336. package/src/vite/discovery/self-gen-tracking.ts +27 -1
  337. package/src/vite/discovery/state.ts +51 -6
  338. package/src/vite/discovery/virtual-module-codegen.ts +14 -34
  339. package/src/vite/index.ts +8 -0
  340. package/src/vite/plugin-types.ts +187 -69
  341. package/src/vite/plugins/cjs-to-esm.ts +8 -18
  342. package/src/vite/plugins/client-ref-dedup.ts +16 -11
  343. package/src/vite/plugins/client-ref-hashing.ts +28 -15
  344. package/src/vite/plugins/cloudflare-protocol-loader-hook.d.mts +23 -0
  345. package/src/vite/plugins/cloudflare-protocol-loader-hook.mjs +76 -0
  346. package/src/vite/plugins/cloudflare-protocol-stub.ts +194 -0
  347. package/src/vite/plugins/expose-action-id.ts +49 -98
  348. package/src/vite/plugins/expose-id-utils.ts +11 -50
  349. package/src/vite/plugins/expose-ids/export-analysis.ts +76 -34
  350. package/src/vite/plugins/expose-ids/handler-transform.ts +10 -48
  351. package/src/vite/plugins/expose-ids/loader-transform.ts +3 -20
  352. package/src/vite/plugins/expose-ids/router-transform.ts +20 -16
  353. package/src/vite/plugins/expose-internal-ids.ts +554 -317
  354. package/src/vite/plugins/performance-tracks.ts +89 -0
  355. package/src/vite/plugins/refresh-cmd.ts +89 -27
  356. package/src/vite/plugins/use-cache-transform.ts +73 -83
  357. package/src/vite/plugins/vercel-output.ts +258 -0
  358. package/src/vite/plugins/version-injector.ts +21 -25
  359. package/src/vite/plugins/version-plugin.ts +41 -20
  360. package/src/vite/plugins/virtual-entries.ts +2 -17
  361. package/src/vite/rango.ts +257 -289
  362. package/src/vite/router-discovery.ts +930 -140
  363. package/src/vite/utils/ast-handler-extract.ts +15 -31
  364. package/src/vite/utils/banner.ts +4 -4
  365. package/src/vite/utils/bundle-analysis.ts +10 -15
  366. package/src/vite/utils/client-chunks.ts +184 -0
  367. package/src/vite/utils/forward-user-plugins.ts +171 -0
  368. package/src/vite/utils/manifest-utils.ts +4 -59
  369. package/src/vite/utils/package-resolution.ts +20 -52
  370. package/src/vite/utils/prerender-utils.ts +27 -29
  371. package/src/vite/utils/shared-utils.ts +92 -42
  372. package/src/browser/action-response-classifier.ts +0 -99
  373. package/src/browser/react/use-client-cache.ts +0 -58
  374. package/src/browser/shallow.ts +0 -40
  375. package/src/handles/index.ts +0 -7
  376. package/src/router/middleware-cookies.ts +0 -55
@@ -6,7 +6,7 @@
6
6
  * generation.
7
7
  */
8
8
 
9
- import { contextSet } from "../../context-var.js";
9
+ import { contextSet, hasContextVars } from "../../context-var.js";
10
10
  import {
11
11
  encodePathParam,
12
12
  substituteRouteParams,
@@ -16,6 +16,9 @@ import {
16
16
  stageBuildAssetModule,
17
17
  } from "../utils/prerender-utils.js";
18
18
  import type { DiscoveryState } from "./state.js";
19
+ import { createRangoDebugger, NS } from "../debug.js";
20
+
21
+ const debug = createRangoDebugger(NS.prerender);
19
22
 
20
23
  /**
21
24
  * Expand prerender routes into concrete URLs and render them via the
@@ -30,6 +33,12 @@ export async function expandPrerenderRoutes(
30
33
  ): Promise<void> {
31
34
  if (!state.opts?.enableBuildPrerender || !state.isBuildMode) return;
32
35
 
36
+ const overallStart = debug ? performance.now() : 0;
37
+ debug?.(
38
+ "expandPrerenderRoutes: start (%d router manifest(s))",
39
+ allManifests.length,
40
+ );
41
+
33
42
  type PrerenderEntry = {
34
43
  urlPath: string;
35
44
  routeName: string;
@@ -51,103 +60,170 @@ export async function expandPrerenderRoutes(
51
60
  return substituteRouteParams(pattern, params);
52
61
  };
53
62
 
63
+ let resolvedRoutes = 0;
64
+ let totalDynamic = 0;
65
+
66
+ // Count dynamic routes upfront for progress reporting
54
67
  for (const { manifest } of allManifests) {
55
68
  if (!manifest.prerenderRoutes) continue;
56
- const defs = manifest._prerenderDefs || {};
57
69
  for (const routeName of manifest.prerenderRoutes) {
58
70
  const pattern = manifest.routeManifest[routeName];
59
- if (!pattern) continue;
60
- const def = defs[routeName];
61
- const isPassthroughRoute = !!def?.options?.passthrough;
62
- const hasDynamic = pattern.includes(":") || pattern.includes("*");
63
- if (!hasDynamic) {
64
- // Static route: use pattern directly (strip trailing slash for URL)
65
- entries.push({
66
- urlPath: pattern.replace(/\/$/, "") || "/",
67
- routeName,
68
- concurrency: 1,
69
- isPassthroughRoute,
70
- });
71
- } else {
72
- // Dynamic route: call getParams() to enumerate param combinations
73
- if (def?.getParams) {
74
- try {
75
- const buildVars: Record<string, any> = {};
76
- const getParamsCtx = {
77
- build: true as const,
78
- set: ((keyOrVar: any, value: any) => {
79
- contextSet(buildVars, keyOrVar, value);
80
- }) as any,
81
- reverse: getParamsReverse,
82
- };
83
- const paramsList = await def.getParams(getParamsCtx);
84
- const concurrency = def.options?.concurrency ?? 1;
85
- const hasBuildVars =
86
- Object.keys(buildVars).length > 0 ||
87
- Object.getOwnPropertySymbols(buildVars).length > 0;
88
- for (const params of paramsList) {
89
- let url = substituteRouteParams(
90
- pattern,
91
- params as Record<string, string>,
92
- encodePathParam,
71
+ if (pattern && (pattern.includes(":") || pattern.includes("*"))) {
72
+ totalDynamic++;
73
+ }
74
+ }
75
+ }
76
+
77
+ // Periodic progress log so long getParams() calls don't look stalled
78
+ const paramsStart = performance.now();
79
+ const progressInterval =
80
+ totalDynamic > 0
81
+ ? setInterval(() => {
82
+ const elapsed = ((performance.now() - paramsStart) / 1000).toFixed(1);
83
+ console.log(
84
+ `[rango] Resolving prerender params... ${resolvedRoutes}/${totalDynamic} routes (${elapsed}s)`,
85
+ );
86
+ }, 5000)
87
+ : undefined;
88
+
89
+ try {
90
+ for (const { manifest } of allManifests) {
91
+ if (!manifest.prerenderRoutes) continue;
92
+ const defs = manifest._prerenderDefs || {};
93
+ const passthroughSet = new Set(manifest.passthroughRoutes || []);
94
+ for (const routeName of manifest.prerenderRoutes) {
95
+ const pattern = manifest.routeManifest[routeName];
96
+ if (!pattern) continue;
97
+ const def = defs[routeName];
98
+ const isPassthroughRoute = passthroughSet.has(routeName);
99
+ const hasDynamic = pattern.includes(":") || pattern.includes("*");
100
+ if (!hasDynamic) {
101
+ // Static route: use pattern directly (strip trailing slash for URL)
102
+ entries.push({
103
+ urlPath: pattern.replace(/\/$/, "") || "/",
104
+ routeName,
105
+ concurrency: 1,
106
+ isPassthroughRoute,
107
+ });
108
+ } else {
109
+ // Dynamic route: call getParams() to enumerate param combinations
110
+ if (def?.getParams) {
111
+ const getParamsStart = debug ? performance.now() : 0;
112
+ try {
113
+ const buildVars: Record<string, any> = {};
114
+ const buildEnv = state.resolvedBuildEnv;
115
+ const getParamsCtx = {
116
+ build: true as const,
117
+ dev: !state.isBuildMode,
118
+ set: ((keyOrVar: any, value: any) => {
119
+ contextSet(buildVars, keyOrVar, value);
120
+ }) as any,
121
+ reverse: getParamsReverse,
122
+ get env() {
123
+ if (buildEnv !== undefined) return buildEnv;
124
+ throw new Error(
125
+ "[rango] ctx.env is not available during build-time getParams(). " +
126
+ "Configure buildEnv in your rango() plugin options to enable build-time env access.",
127
+ );
128
+ },
129
+ };
130
+ const paramsList = await def.getParams(getParamsCtx);
131
+ debug?.(
132
+ "getParams %s -> %d params (%sms)",
133
+ routeName,
134
+ paramsList.length,
135
+ (performance.now() - getParamsStart).toFixed(1),
93
136
  );
94
- // Anonymous wildcard fallback: use conventional keys if provided
95
- if (url.includes("*")) {
96
- const wildcardValue =
97
- (params as Record<string, string>)["*"] ??
98
- (params as Record<string, string>).splat;
99
- if (wildcardValue !== undefined) {
100
- url = url.replace(/\*[^/]*$/, encodePathParam(wildcardValue));
137
+ const concurrency = def.options?.concurrency ?? 1;
138
+ const hasBuildVars = hasContextVars(buildVars);
139
+ for (const params of paramsList) {
140
+ let url = substituteRouteParams(
141
+ pattern,
142
+ params as Record<string, string>,
143
+ encodePathParam,
144
+ );
145
+ // Anonymous wildcard fallback: use conventional keys if provided
146
+ if (url.includes("*")) {
147
+ const wildcardValue =
148
+ (params as Record<string, string>)["*"] ??
149
+ (params as Record<string, string>).splat;
150
+ if (wildcardValue !== undefined) {
151
+ url = url.replace(
152
+ /\*[^/]*$/,
153
+ encodePathParam(wildcardValue),
154
+ );
155
+ }
101
156
  }
157
+ entries.push({
158
+ urlPath: url.replace(/\/$/, "") || "/",
159
+ routeName,
160
+ concurrency,
161
+ ...(hasBuildVars ? { buildVars } : {}),
162
+ isPassthroughRoute,
163
+ });
102
164
  }
103
- entries.push({
104
- urlPath: url.replace(/\/$/, "") || "/",
105
- routeName,
106
- concurrency,
107
- ...(hasBuildVars ? { buildVars } : {}),
108
- isPassthroughRoute,
109
- });
110
- }
111
- } catch (err: any) {
112
- // Skip in getParams() skips the entire route
113
- if (err.name === "Skip") {
114
- console.log(
115
- `[rsc-router] SKIP route "${routeName}" - ${err.message}`,
116
- );
117
- notifyOnError(
118
- registry,
119
- err,
120
- "prerender",
121
- routeName,
122
- undefined,
123
- true,
165
+ resolvedRoutes++;
166
+ } catch (err: any) {
167
+ resolvedRoutes++;
168
+ // Skip in getParams() skips the entire route
169
+ if (err.name === "Skip") {
170
+ console.log(
171
+ `[rango] SKIP route "${routeName}" - ${err.message}`,
172
+ );
173
+ notifyOnError(
174
+ registry,
175
+ err,
176
+ "prerender",
177
+ routeName,
178
+ undefined,
179
+ true,
180
+ );
181
+ continue;
182
+ }
183
+ // Regular error: fail the build
184
+ console.error(
185
+ `[rango] Failed to get params for prerender route "${routeName}": ${err.message}`,
124
186
  );
125
- continue;
187
+ notifyOnError(registry, err, "prerender", routeName);
188
+ throw err;
126
189
  }
127
- // Regular error: fail the build
128
- console.error(
129
- `[rsc-router] Failed to get params for prerender route "${routeName}": ${err.message}`,
190
+ } else {
191
+ console.warn(
192
+ `[rango] Dynamic prerender route "${routeName}" has no getParams(), skipping`,
130
193
  );
131
- notifyOnError(registry, err, "prerender", routeName);
132
- throw err;
133
194
  }
134
- } else {
135
- console.warn(
136
- `[rsc-router] Dynamic prerender route "${routeName}" has no getParams(), skipping`,
137
- );
138
195
  }
139
196
  }
140
197
  }
198
+ } finally {
199
+ if (progressInterval) {
200
+ clearInterval(progressInterval);
201
+ const elapsed = ((performance.now() - paramsStart) / 1000).toFixed(1);
202
+ console.log(
203
+ `[rango] Resolved prerender params: ${resolvedRoutes}/${totalDynamic} routes (${elapsed}s)`,
204
+ );
205
+ }
141
206
  }
142
207
 
143
- if (entries.length === 0) return;
208
+ if (entries.length === 0) {
209
+ debug?.(
210
+ "no prerender entries (done in %sms)",
211
+ (performance.now() - overallStart).toFixed(1),
212
+ );
213
+ return;
214
+ }
144
215
 
145
216
  // Determine the max concurrency for the log header
146
217
  const maxConcurrency = Math.max(...entries.map((e) => e.concurrency));
147
218
  const concurrencyNote =
148
219
  maxConcurrency > 1 ? ` (concurrency: ${maxConcurrency})` : "";
149
220
  console.log(
150
- `[rsc-router] Pre-rendering ${entries.length} URL(s)${concurrencyNote}...`,
221
+ `[rango] Pre-rendering ${entries.length} URL(s)${concurrencyNote}...`,
222
+ );
223
+ debug?.(
224
+ "prerender loop: %d entries, max concurrency %d",
225
+ entries.length,
226
+ maxConcurrency,
151
227
  );
152
228
 
153
229
  const { hashParams } = await rscEnv.runner.import("@rangojs/router/build");
@@ -175,6 +251,7 @@ export async function expandPrerenderRoutes(
175
251
  {},
176
252
  entry.buildVars,
177
253
  entry.isPassthroughRoute,
254
+ state.resolvedBuildEnv,
178
255
  );
179
256
  if (!result) continue;
180
257
 
@@ -182,7 +259,7 @@ export async function expandPrerenderRoutes(
182
259
  if (result.passthrough) {
183
260
  const elapsed = (performance.now() - startUrl).toFixed(0);
184
261
  console.log(
185
- `[rsc-router] PASS ${entry.urlPath.padEnd(40)} (${elapsed}ms) - live fallback`,
262
+ `[rango] PASS ${entry.urlPath.padEnd(40)} (${elapsed}ms) - live fallback`,
186
263
  );
187
264
  doneCount++;
188
265
  break;
@@ -203,10 +280,9 @@ export async function expandPrerenderRoutes(
203
280
  const interceptKey = `${result.routeName}/${paramHash}/i`;
204
281
  const interceptValue = JSON.stringify({
205
282
  segments: [...result.segments, ...result.interceptSegments],
206
- handles: {
207
- ...result.handles,
208
- ...(result.interceptHandles || {}),
209
- },
283
+ // interceptHandles is the pre-encoded MERGED (main + intercept)
284
+ // handle string (the producer merged before encoding).
285
+ handles: result.interceptHandles ?? "",
210
286
  });
211
287
  manifestEntries[interceptKey] = stageBuildAssetModule(
212
288
  state.projectRoot,
@@ -216,7 +292,7 @@ export async function expandPrerenderRoutes(
216
292
  }
217
293
  const elapsed = (performance.now() - startUrl).toFixed(0);
218
294
  console.log(
219
- `[rsc-router] OK ${entry.urlPath.padEnd(40)} (${elapsed}ms)`,
295
+ `[rango] OK ${entry.urlPath.padEnd(40)} (${elapsed}ms)`,
220
296
  );
221
297
  doneCount++;
222
298
  break;
@@ -224,7 +300,7 @@ export async function expandPrerenderRoutes(
224
300
  if (err.name === "Skip") {
225
301
  const elapsed = (performance.now() - startUrl).toFixed(0);
226
302
  console.log(
227
- `[rsc-router] SKIP ${entry.urlPath.padEnd(40)} (${elapsed}ms) - ${err.message}`,
303
+ `[rango] SKIP ${entry.urlPath.padEnd(40)} (${elapsed}ms) - ${err.message}`,
228
304
  );
229
305
  skipCount++;
230
306
  notifyOnError(
@@ -240,7 +316,7 @@ export async function expandPrerenderRoutes(
240
316
  // Regular error: log, notify, and fail the build
241
317
  const elapsed = (performance.now() - startUrl).toFixed(0);
242
318
  console.error(
243
- `[rsc-router] FAIL ${entry.urlPath.padEnd(40)} (${elapsed}ms) - ${err.message}`,
319
+ `[rango] FAIL ${entry.urlPath.padEnd(40)} (${elapsed}ms) - ${err.message}`,
244
320
  );
245
321
  notifyOnError(
246
322
  registry,
@@ -263,7 +339,14 @@ export async function expandPrerenderRoutes(
263
339
  const parts = [`${doneCount} done`];
264
340
  if (skipCount > 0) parts.push(`${skipCount} skipped`);
265
341
  console.log(
266
- `[rsc-router] Pre-render complete: ${parts.join(", ")} (${totalElapsed}ms total)`,
342
+ `[rango] Pre-render complete: ${parts.join(", ")} (${totalElapsed}ms total)`,
343
+ );
344
+ debug?.(
345
+ "expandPrerenderRoutes done: %d done, %d skipped, %sms (overall %sms)",
346
+ doneCount,
347
+ skipCount,
348
+ totalElapsed,
349
+ (performance.now() - overallStart).toFixed(1),
267
350
  );
268
351
  }
269
352
 
@@ -285,6 +368,12 @@ export async function renderStaticHandlers(
285
368
  )
286
369
  return;
287
370
 
371
+ const overallStart = debug ? performance.now() : 0;
372
+ debug?.(
373
+ "renderStaticHandlers: start (%d static module(s))",
374
+ state.resolvedStaticModules.size,
375
+ );
376
+
288
377
  const manifestEntries: Record<string, string> = {};
289
378
  let staticDone = 0;
290
379
  let staticSkip = 0;
@@ -295,9 +384,7 @@ export async function renderStaticHandlers(
295
384
  totalStaticCount += exportNames.length;
296
385
  }
297
386
  const startStatic = performance.now();
298
- console.log(
299
- `[rsc-router] Rendering ${totalStaticCount} static handler(s)...`,
300
- );
387
+ console.log(`[rango] Rendering ${totalStaticCount} static handler(s)...`);
301
388
 
302
389
  for (const [moduleId, exportNames] of state.resolvedStaticModules) {
303
390
  let mod: any;
@@ -305,7 +392,7 @@ export async function renderStaticHandlers(
305
392
  mod = await rscEnv!.runner.import(moduleId);
306
393
  } catch (err: any) {
307
394
  console.error(
308
- `[rsc-router] Failed to import static module ${moduleId}: ${err.message}`,
395
+ `[rango] Failed to import static module ${moduleId}: ${err.message}`,
309
396
  );
310
397
  notifyOnError(registry, err, "static");
311
398
  throw err;
@@ -326,9 +413,12 @@ export async function renderStaticHandlers(
326
413
  def.handler,
327
414
  def.$$id,
328
415
  (def as any).$$routePrefix,
416
+ state.resolvedBuildEnv,
417
+ !state.isBuildMode,
329
418
  );
330
419
  if (result) {
331
- const hasHandles = Object.keys(result.handles).length > 0;
420
+ // result.handles is the pre-encoded handle string ("" when none).
421
+ const hasHandles = result.handles !== "";
332
422
  const exportValue = hasHandles
333
423
  ? JSON.stringify(result)
334
424
  : JSON.stringify(result.encoded);
@@ -338,9 +428,7 @@ export async function renderStaticHandlers(
338
428
  exportValue,
339
429
  );
340
430
  const elapsed = (performance.now() - startHandler).toFixed(0);
341
- console.log(
342
- `[rsc-router] OK ${name.padEnd(40)} (${elapsed}ms)`,
343
- );
431
+ console.log(`[rango] OK ${name.padEnd(40)} (${elapsed}ms)`);
344
432
  staticDone++;
345
433
  handled = true;
346
434
  break;
@@ -349,7 +437,7 @@ export async function renderStaticHandlers(
349
437
  if (err.name === "Skip") {
350
438
  const elapsed = (performance.now() - startHandler).toFixed(0);
351
439
  console.log(
352
- `[rsc-router] SKIP ${name.padEnd(40)} (${elapsed}ms) - ${err.message}`,
440
+ `[rango] SKIP ${name.padEnd(40)} (${elapsed}ms) - ${err.message}`,
353
441
  );
354
442
  staticSkip++;
355
443
  notifyOnError(registry, err, "static", undefined, undefined, true);
@@ -359,16 +447,14 @@ export async function renderStaticHandlers(
359
447
  // Regular error: log, notify, and fail the build
360
448
  const elapsed = (performance.now() - startHandler).toFixed(0);
361
449
  console.error(
362
- `[rsc-router] FAIL ${name.padEnd(40)} (${elapsed}ms) - ${err.message}`,
450
+ `[rango] FAIL ${name.padEnd(40)} (${elapsed}ms) - ${err.message}`,
363
451
  );
364
452
  notifyOnError(registry, err, "static");
365
453
  throw err;
366
454
  }
367
455
  }
368
456
  if (!handled) {
369
- console.warn(
370
- `[rsc-router] No router could render static handler "${name}"`,
371
- );
457
+ console.warn(`[rango] No router could render static handler "${name}"`);
372
458
  }
373
459
  }
374
460
  }
@@ -380,6 +466,13 @@ export async function renderStaticHandlers(
380
466
  const staticParts = [`${staticDone} done`];
381
467
  if (staticSkip > 0) staticParts.push(`${staticSkip} skipped`);
382
468
  console.log(
383
- `[rsc-router] Static render complete: ${staticParts.join(", ")} (${totalStaticElapsed}ms total)`,
469
+ `[rango] Static render complete: ${staticParts.join(", ")} (${totalStaticElapsed}ms total)`,
470
+ );
471
+ debug?.(
472
+ "renderStaticHandlers done: %d done, %d skipped, %sms (overall %sms)",
473
+ staticDone,
474
+ staticSkip,
475
+ totalStaticElapsed,
476
+ (performance.now() - overallStart).toFixed(1),
384
477
  );
385
478
  }
@@ -5,13 +5,15 @@
5
5
  * from discovered router manifests and static source parsing.
6
6
  */
7
7
 
8
- import { dirname, basename, join, resolve } from "node:path";
8
+ import { dirname, join, resolve } from "node:path";
9
9
  import { readFileSync, writeFileSync, existsSync, unlinkSync } from "node:fs";
10
10
  import {
11
11
  generateRouteTypesSource,
12
12
  writeCombinedRouteTypes,
13
13
  findRouterFiles,
14
14
  buildCombinedRouteMapForRouterFile,
15
+ genFileTsPath,
16
+ resolveSearchSchemas,
15
17
  } from "../../build/generate-route-types.js";
16
18
  import type { DiscoveryState } from "./state.js";
17
19
  import { markSelfGenWrite } from "./self-gen-tracking.js";
@@ -35,6 +37,22 @@ function filterUserNamedRoutes(
35
37
  return filtered;
36
38
  }
37
39
 
40
+ // Write a gen file only when content changed, marking the write as
41
+ // self-generated BEFORE writeFileSync so the watcher distinguishes it from a
42
+ // manual edit (the HMR self-gen-loop guard).
43
+ function writeGenFileIfChanged(
44
+ state: DiscoveryState,
45
+ outPath: string,
46
+ source: string,
47
+ opts?: { log?: boolean },
48
+ ): void {
49
+ const existing = existsSync(outPath) ? readFileSync(outPath, "utf-8") : null;
50
+ if (existing === source) return;
51
+ markSelfGenWrite(state, outPath, source);
52
+ writeFileSync(outPath, source);
53
+ if (opts?.log) console.log(`[rango] Generated route types -> ${outPath}`);
54
+ }
55
+
38
56
  /**
39
57
  * Write combined route types for all router files.
40
58
  * Only writes when content has changed to avoid triggering HMR loops.
@@ -48,45 +66,16 @@ export function writeCombinedRouteTypesWithTracking(
48
66
  findRouterFiles(state.projectRoot, state.scanFilter);
49
67
  state.cachedRouterFiles = routerFiles;
50
68
 
51
- // Snapshot pre-write content to detect which files actually change.
52
- const preContent = new Map<string, string>();
53
- for (const routerFilePath of routerFiles) {
54
- const routerDir = dirname(routerFilePath);
55
- const routerBasename = basename(routerFilePath).replace(
56
- /\.(tsx?|jsx?)$/,
57
- "",
58
- );
59
- const outPath = join(routerDir, `${routerBasename}.named-routes.gen.ts`);
60
- try {
61
- preContent.set(outPath, readFileSync(outPath, "utf-8"));
62
- } catch {
63
- // File doesn't exist yet — any write is a real change.
64
- }
65
- }
66
-
67
- writeCombinedRouteTypes(state.projectRoot, routerFiles, opts);
68
-
69
- // Mark only files that were actually written so the watcher can
70
- // distinguish self-triggered change events from manual edits.
71
- // Marking unchanged files creates stale entries that interfere with
72
- // multi-server setups (e.g. shared webServer + isolated HMR server).
73
- for (const routerFilePath of routerFiles) {
74
- const routerDir = dirname(routerFilePath);
75
- const routerBasename = basename(routerFilePath).replace(
76
- /\.(tsx?|jsx?)$/,
77
- "",
78
- );
79
- const outPath = join(routerDir, `${routerBasename}.named-routes.gen.ts`);
80
- if (!existsSync(outPath)) continue;
81
- try {
82
- const content = readFileSync(outPath, "utf-8");
83
- if (content !== preContent.get(outPath)) {
84
- markSelfGenWrite(state, outPath, content);
85
- }
86
- } catch {
87
- // Ignore transient fs errors while files are being rewritten.
88
- }
89
- }
69
+ // Mark each gen file as self-generated BEFORE it is written, via the onWrite
70
+ // callback fired at every writeFileSync site, so the watcher distinguishes
71
+ // self-triggered change events from manual edits. The callback fires only
72
+ // for files actually written, so unchanged files are never marked (stale
73
+ // entries interfere with multi-server setups such as a shared webServer plus
74
+ // an isolated HMR server).
75
+ writeCombinedRouteTypes(state.projectRoot, routerFiles, {
76
+ ...opts,
77
+ onWrite: (outPath, content) => markSelfGenWrite(state, outPath, content),
78
+ });
90
79
  }
91
80
 
92
81
  /**
@@ -104,7 +93,7 @@ export function writeRouteTypesFiles(state: DiscoveryState): void {
104
93
  if (existsSync(oldCombinedPath)) {
105
94
  unlinkSync(oldCombinedPath);
106
95
  console.log(
107
- `[rsc-router] Removed stale combined route types: ${oldCombinedPath}`,
96
+ `[rango] Removed stale combined route types: ${oldCombinedPath}`,
108
97
  );
109
98
  }
110
99
  } catch {}
@@ -122,40 +111,22 @@ export function writeRouteTypesFiles(state: DiscoveryState): void {
122
111
  // the wrong location, causing non-deterministic type resolution.
123
112
  if (sourceFile.includes("node_modules")) {
124
113
  throw new Error(
125
- `[rsc-router] Router "${id}" has sourceFile inside node_modules: ${sourceFile}\n` +
114
+ `[rango] Router "${id}" has sourceFile inside node_modules: ${sourceFile}\n` +
126
115
  `This means createRouter() stack trace parsing matched a Vite internal frame.\n` +
127
116
  `Set an explicit \`id\` on createRouter() or check the call site.`,
128
117
  );
129
118
  }
130
119
 
131
- const routerDir = dirname(sourceFile);
132
- const routerBasename = basename(sourceFile).replace(/\.(tsx?|jsx?)$/, "");
133
- const outPath = join(routerDir, `${routerBasename}.named-routes.gen.ts`);
120
+ const outPath = genFileTsPath(sourceFile);
134
121
 
135
122
  // Filter out auto-generated route names (e.g. "$path____debug_reverse-test")
136
123
  // to match the static parser's output and prevent HMR oscillation.
137
124
  const userRoutes = filterUserNamedRoutes(routeManifest);
138
- let effectiveSearchSchemas = routeSearchSchemas;
139
-
140
- // Runtime manifest may omit search schema metadata in some module-runner
141
- // flows. Fall back to static source parsing from the router file.
142
- if (
143
- (!effectiveSearchSchemas ||
144
- Object.keys(effectiveSearchSchemas).length === 0) &&
145
- sourceFile
146
- ) {
147
- const staticParsed = buildCombinedRouteMapForRouterFile(sourceFile);
148
- if (Object.keys(staticParsed.searchSchemas).length > 0) {
149
- const filtered: Record<string, Record<string, string>> = {};
150
- for (const name of Object.keys(userRoutes)) {
151
- const schema = staticParsed.searchSchemas[name];
152
- if (schema) filtered[name] = schema;
153
- }
154
- if (Object.keys(filtered).length > 0) {
155
- effectiveSearchSchemas = filtered;
156
- }
157
- }
158
- }
125
+ const effectiveSearchSchemas = resolveSearchSchemas(
126
+ Object.keys(userRoutes),
127
+ routeSearchSchemas,
128
+ sourceFile,
129
+ );
159
130
 
160
131
  const source = generateRouteTypesSource(
161
132
  userRoutes,
@@ -163,14 +134,7 @@ export function writeRouteTypesFiles(state: DiscoveryState): void {
163
134
  ? effectiveSearchSchemas
164
135
  : undefined,
165
136
  );
166
- const existing = existsSync(outPath)
167
- ? readFileSync(outPath, "utf-8")
168
- : null;
169
- if (existing !== source) {
170
- markSelfGenWrite(state, outPath, source);
171
- writeFileSync(outPath, source);
172
- console.log(`[rsc-router] Generated route types -> ${outPath}`);
173
- }
137
+ writeGenFileIfChanged(state, outPath, source, { log: true });
174
138
  }
175
139
  }
176
140
 
@@ -236,22 +200,14 @@ export function supplementGenFilesWithRuntimeRoutes(
236
200
  }
237
201
  }
238
202
 
239
- const routerDir = dirname(sourceFile);
240
- const routerBasename = basename(sourceFile).replace(/\.(tsx?|jsx?)$/, "");
241
- const outPath = join(routerDir, `${routerBasename}.named-routes.gen.ts`);
203
+ const outPath = genFileTsPath(sourceFile);
242
204
  const source = generateRouteTypesSource(
243
205
  mergedRoutes,
244
206
  Object.keys(mergedSearchSchemas).length > 0
245
207
  ? mergedSearchSchemas
246
208
  : undefined,
247
209
  );
248
- const existing = existsSync(outPath)
249
- ? readFileSync(outPath, "utf-8")
250
- : null;
251
- if (existing !== source) {
252
- markSelfGenWrite(state, outPath, source);
253
- writeFileSync(outPath, source);
254
- }
210
+ writeGenFileIfChanged(state, outPath, source);
255
211
  }
256
212
  // No manual manifest update needed: the virtual module imports the gen
257
213
  // file, so Vite's HMR automatically re-evaluates it with fresh data.