@bleedingdev/modern-js-plugin-tanstack 3.2.0-ultramodern.12 → 3.2.0-ultramodern.121

package/dist/esm/cli/index.mjs

@@ -1,10 +1,11 @@
 import node_path from "node:path";
 import { NESTED_ROUTE_SPEC_FILE, filterRoutesForServer, fs } from "@modern-js/utils";
-import { generateTanstackRouterTypesSourceForEntry, isTanstackRouterFrameworkEnabled } from "./tanstackTypes.mjs";
+import { createTanstackRsbuildRouteSplittingProfile, resolveTanstackRouteCodeSplittingEnabled } from "./routeSplitting.mjs";
+import { collectCanonicalRoutesForEntry, generateTanstackRouterTypesSourceForEntry } from "./tanstackTypes.mjs";
 import { __webpack_require__ } from "../rslib-runtime.mjs";
 import * as __rspack_external__modern_js_runtime_cli_401ee077 from "@modern-js/runtime/cli";
 __webpack_require__.add({
-    "@modern-js/runtime/cli" (module) {
+    "@modern-js/runtime/cli?9b14" (module) {
         module.exports = __rspack_external__modern_js_runtime_cli_401ee077;
     }
 });
@@ -14,8 +15,8 @@ const ENTRYPOINTS_KEY = '@modern-js/plugin-tanstack';
 let runtimeRouterCli;
 function getRuntimeRouterCli() {
     if (runtimeRouterCli) return runtimeRouterCli;
-    const cli = __webpack_require__("@modern-js/runtime/cli");
-    if (cli.handleGeneratorEntryCode && cli.getEntrypointRoutesDir) {
+    const cli = __webpack_require__("@modern-js/runtime/cli?9b14");
+    if (cli.handleGeneratorEntryCode && cli.getEntrypointRoutesDir && cli.getEntrypointRoutesOwner) {
         runtimeRouterCli = cli;
         return runtimeRouterCli;
     }
@@ -31,6 +32,14 @@ async function writeFileIfChanged(filePath, content) {
 function createRegisterDtsContent(opts) {
     const importStatements = opts.entries.map((entryName, index)=>`import type { router as router${index} } from './${entryName}/router.gen';`).join('\n');
     const routerUnionType = opts.entries.map((_, index)=>`typeof router${index}`).join(' | ');
+    const canonicalEntries = Object.entries(opts.canonicalRoutes ?? {});
+    const canonicalRoutesAugmentation = canonicalEntries.length > 0 ? `
+declare module '${opts.i18nRuntimeModule || '@modern-js/plugin-i18n/runtime'}' {
+  interface UltramodernCanonicalRoutes {
+${canonicalEntries.map(([routePath, paramsType])=>`    '${routePath}': ${paramsType};`).join('\n')}
+  }
+}
+` : '';
     return `// This file is auto-generated by Modern.js. Do not edit manually.
 
 ${importStatements}
@@ -40,19 +49,21 @@ declare module '${opts.runtimeModule}' {
     router: ${routerUnionType};
   }
 }
-`;
+${canonicalRoutesAugmentation}`;
 }
 async function writeTanstackRegisterFile(opts) {
-    const { entries, generatedDirName = DEFAULT_GENERATED_DIR_NAME, runtimeModule = '@modern-js/plugin-tanstack/runtime', srcDirectory } = opts;
+    const { entries, generatedDirName = DEFAULT_GENERATED_DIR_NAME, runtimeModule = '@modern-js/plugin-tanstack/runtime', srcDirectory, canonicalRoutes, i18nRuntimeModule } = opts;
     if (0 === entries.length) return;
     const registerDtsPath = node_path.join(srcDirectory, generatedDirName, 'register.gen.d.ts');
     await writeFileIfChanged(registerDtsPath, createRegisterDtsContent({
         entries,
-        runtimeModule
+        runtimeModule,
+        canonicalRoutes,
+        i18nRuntimeModule
     }));
 }
 async function writeTanstackRouterTypesForEntries(opts) {
-    const { appContext, generatedDirName = DEFAULT_GENERATED_DIR_NAME, routesByEntry } = opts;
+    const { appContext, generatedDirName = DEFAULT_GENERATED_DIR_NAME, routesByEntry, i18nPluginInstalled = false } = opts;
     const entryNames = Object.keys(routesByEntry);
     await Promise.all(entryNames.map(async (entryName)=>{
         const { routerGenTs } = await generateTanstackRouterTypesSourceForEntry({
@@ -69,15 +80,27 @@ async function writeTanstackRouterTypesForEntries(opts) {
         if (mainEntryName && b === mainEntryName) return 1;
         return a.localeCompare(b);
     });
+    let canonicalRoutes = null;
+    if (i18nPluginInstalled) for (const entryName of registerEntries){
+        const entryCanonicalRoutes = collectCanonicalRoutesForEntry(routesByEntry[entryName], {
+            localeParamHeuristic: true
+        });
+        if (entryCanonicalRoutes) canonicalRoutes = {
+            ...entryCanonicalRoutes,
+            ...canonicalRoutes ?? {}
+        };
+    }
     await writeTanstackRegisterFile({
         entries: registerEntries,
         generatedDirName,
-        srcDirectory: appContext.srcDirectory
+        srcDirectory: appContext.srcDirectory,
+        canonicalRoutes
     });
 }
 function tanstackRouterPlugin(options = {}) {
     const routesDir = options.routesDir || DEFAULT_ROUTES_DIR;
     const generatedDirName = options.generatedDirName || DEFAULT_GENERATED_DIR_NAME;
+    const routeSplittingProfile = createTanstackRsbuildRouteSplittingProfile(options);
     return {
         name: '@modern-js/plugin-tanstack',
         required: [
@@ -89,16 +112,42 @@ function tanstackRouterPlugin(options = {}) {
                 const { getEntrypointRoutesDir } = getRuntimeRouterCli();
                 return getEntrypointRoutesDir(entrypoint) === routesDir;
             };
+            const isForeignRouteEntrypoint = (entrypoint)=>{
+                const { getEntrypointRoutesDir, getEntrypointRoutesOwner } = getRuntimeRouterCli();
+                if (getEntrypointRoutesOwner(entrypoint)) return true;
+                if (entrypoint.pageRoutesEntry) return true;
+                return null !== getEntrypointRoutesDir(entrypoint);
+            };
+            const isI18nPluginInstalled = ()=>{
+                const { plugins } = api.getAppContext();
+                return Boolean(plugins?.some((plugin)=>plugin?.name === '@modern-js/plugin-i18n'));
+            };
             api._internalRuntimePlugins(({ entrypoint, plugins })=>{
-                if (!isTanstackEntrypoint(entrypoint)) return {
+                const { metaName, serverRoutes } = api.getAppContext();
+                const serverBase = serverRoutes.filter((route)=>route.entryName === entrypoint.entryName).map((route)=>route.urlPath).sort((a, b)=>a.length - b.length > 0 ? -1 : 1);
+                if (isTanstackEntrypoint(entrypoint)) {
+                    plugins.push({
+                        name: 'tanstackRouter',
+                        path: `@${metaName}/plugin-tanstack/runtime`,
+                        config: {
+                            serverBase
+                        }
+                    });
+                    return {
+                        entrypoint,
+                        plugins
+                    };
+                }
+                if (isForeignRouteEntrypoint(entrypoint)) return {
                     entrypoint,
                     plugins
                 };
-                const { metaName, serverRoutes } = api.getAppContext();
-                const serverBase = serverRoutes.filter((route)=>route.entryName === entrypoint.entryName).map((route)=>route.urlPath).sort((a, b)=>a.length - b.length > 0 ? -1 : 1);
-                plugins.push({
-                    name: 'tanstackRouter',
-                    path: `@${metaName}/plugin-tanstack/runtime`,
+                const routerWrapperPath = `@${metaName}/plugin-tanstack/runtime/router`;
+                const existingRouterPlugin = plugins.find((plugin)=>'router' === plugin.name);
+                if (existingRouterPlugin) existingRouterPlugin.path = routerWrapperPath;
+                else plugins.push({
+                    name: 'router',
+                    path: routerWrapperPath,
                     config: {
                         serverBase
                     }
@@ -113,10 +162,13 @@ function tanstackRouterPlugin(options = {}) {
                     entry: entry || getRuntimeRouterCli().isRouteEntry(entryPath, routesDir)
                 }));
             api.config(()=>({
+                    ...routeSplittingProfile.defaultConfig,
                     source: {
                         include: [
                             /[\\/]node_modules[\\/]@tanstack[\\/]react-router[\\/]/,
-                            node_path.resolve(__dirname, '../runtime').replace('cjs', 'esm')
+                            /[\\/]node_modules[\\/]@tanstack[\\/]router-core[\\/]/,
+                            /[\\/]node_modules[\\/]@tanstack[\\/]react-store[\\/]/,
+                            node_path.resolve(__dirname, '..', '..')
                         ]
                     }
                 }));
@@ -133,15 +185,13 @@ function tanstackRouterPlugin(options = {}) {
                 if (0 === tanstackEntrypoints.length) return;
                 const { handleGeneratorEntryCode } = getRuntimeRouterCli();
                 const routesByEntry = await handleGeneratorEntryCode(api, tanstackEntrypoints, {
-                    entrypointsKey: ENTRYPOINTS_KEY,
-                    generateCodeOptions: {
-                        enableTanstackTypes: false
-                    }
+                    entrypointsKey: ENTRYPOINTS_KEY
                 });
                 await writeTanstackRouterTypesForEntries({
                     appContext: api.getAppContext(),
                     generatedDirName,
-                    routesByEntry
+                    routesByEntry,
+                    i18nPluginInstalled: isI18nPluginInstalled()
                 });
             });
             api.onFileChanged(async (event)=>{
@@ -155,15 +205,13 @@ function tanstackRouterPlugin(options = {}) {
                     regenerate: async ({ api, entrypoints })=>{
                         const { handleGeneratorEntryCode } = getRuntimeRouterCli();
                         const routesByEntry = await handleGeneratorEntryCode(api, entrypoints, {
-                            entrypointsKey: ENTRYPOINTS_KEY,
-                            generateCodeOptions: {
-                                enableTanstackTypes: false
-                            }
+                            entrypointsKey: ENTRYPOINTS_KEY
                         });
                         await writeTanstackRouterTypesForEntries({
                             appContext: api.getAppContext(),
                             generatedDirName,
-                            routesByEntry
+                            routesByEntry,
+                            i18nPluginInstalled: isI18nPluginInstalled()
                         });
                     }
                 });
@@ -195,4 +243,4 @@ function tanstackRouterPlugin(options = {}) {
 }
 const src_cli = tanstackRouterPlugin;
 export default src_cli;
-export { generateTanstackRouterTypesSourceForEntry, isTanstackRouterFrameworkEnabled, tanstackRouterPlugin, writeTanstackRegisterFile, writeTanstackRouterTypesForEntries };
+export { collectCanonicalRoutesForEntry, createTanstackRsbuildRouteSplittingProfile, generateTanstackRouterTypesSourceForEntry, resolveTanstackRouteCodeSplittingEnabled, tanstackRouterPlugin, writeTanstackRegisterFile, writeTanstackRouterTypesForEntries };

package/dist/esm/cli/routeSplitting.mjs

@@ -0,0 +1,14 @@
+function resolveTanstackRouteCodeSplittingEnabled(option) {
+    if ('boolean' == typeof option) return option;
+    return option?.enabled ?? true;
+}
+function createTanstackRsbuildRouteSplittingProfile(opts) {
+    return {
+        defaultConfig: {
+            output: {
+                splitRouteChunks: resolveTanstackRouteCodeSplittingEnabled(opts.routeCodeSplitting)
+            }
+        }
+    };
+}
+export { createTanstackRsbuildRouteSplittingProfile, resolveTanstackRouteCodeSplittingEnabled };

package/dist/esm/cli/tanstackTypes.mjs

@@ -1,17 +1,6 @@
-import { findExists, formatImportPath, fs, slash } from "@modern-js/utils";
+import { getPathWithoutExt, makeLegalIdentifier } from "@modern-js/runtime/cli";
+import { findExists, formatImportPath, slash } from "@modern-js/utils";
 import path from "path";
-const reservedWords = 'break case class catch const continue debugger default delete do else export extends finally for function if import in instanceof let new return super switch this throw try typeof var void while with yield enum await implements package protected static interface private public';
-const builtins = 'arguments Infinity NaN undefined null true false eval uneval isFinite isNaN parseFloat parseInt decodeURI decodeURIComponent encodeURI encodeURIComponent escape unescape Object Function Boolean Symbol Error EvalError InternalError RangeError ReferenceError SyntaxError TypeError URIError Number Math Date String RegExp Array Int8Array Uint8Array Uint8ClampedArray Int16Array Uint16Array Int32Array Float32Array Float64Array Map Set WeakMap WeakSet SIMD ArrayBuffer DataView JSON Promise Generator GeneratorFunction Reflect Proxy Intl';
-const forbidList = new Set(`${reservedWords} ${builtins}`.split(' '));
-function makeLegalIdentifier(str) {
-    const identifier = str.replace(/-(\w)/g, (_, letter)=>letter.toUpperCase()).replace(/[^$_a-zA-Z0-9]/g, '_');
-    if (/\d/.test(identifier[0]) || forbidList.has(identifier)) return `_${identifier}`;
-    return identifier || '_';
-}
-function getPathWithoutExt(filename) {
-    const extname = path.extname(filename);
-    return extname ? filename.slice(0, -extname.length) : filename;
-}
 const JS_OR_TS_EXTS = [
     '.js',
     '.jsx',
@@ -55,6 +44,14 @@ function pickModernLoaderModule(route) {
         inline
     };
 }
+function pickRouteSearchContractModules(route) {
+    const validateSearchPath = route.validateSearch;
+    const loaderDepsPath = route.loaderDeps;
+    return {
+        validateSearchPath: 'string' == typeof validateSearchPath ? validateSearchPath : null,
+        loaderDepsPath: 'string' == typeof loaderDepsPath ? loaderDepsPath : null
+    };
+}
 function isPathlessLayout(route) {
     return 'nested' === route.type && 'boolean' != typeof route.index && void 0 === route.path;
 }
@@ -69,16 +66,78 @@ function createRouteStaticDataSnippet(opts) {
     if (!staticDataLines.length) return null;
     return `staticData: createRouteStaticData({\n    ${staticDataLines.join('\n    ')}\n  }),`;
 }
-async function isTanstackRouterFrameworkEnabled(appContext) {
-    const runtimeConfigBase = path.join(appContext.srcDirectory, appContext.runtimeConfigFile);
-    const runtimeConfigFile = findExists(JS_OR_TS_EXTS.map((ext)=>`${runtimeConfigBase}${ext}`));
-    if (!runtimeConfigFile) return false;
-    try {
-        const content = await fs.readFile(runtimeConfigFile, 'utf-8');
-        return /framework\s*:\s*['"]tanstack['"]/.test(content);
-    } catch  {
-        return false;
+const LOCALE_PARAM_SEGMENTS = new Set([
+    ':lang',
+    ':locale',
+    ':language',
+    '$lang',
+    '$locale',
+    '$language'
+]);
+function paramsTypeForCanonicalPath(canonicalPath) {
+    const fields = [];
+    for (const segment of canonicalPath.split('/'))if (segment) {
+        if ('*' === segment || '$' === segment) {
+            fields.push("'_splat'?: string");
+            continue;
+        }
+        if (segment.startsWith('{-$') && segment.endsWith('}')) {
+            fields.push(`${JSON.stringify(segment.slice(3, -1))}?: string`);
+            continue;
+        }
+        if (segment.startsWith('$')) {
+            fields.push(`${JSON.stringify(segment.slice(1))}: string`);
+            continue;
+        }
+        if (segment.startsWith(':')) {
+            const optional = segment.endsWith('?');
+            const name = segment.slice(1, optional ? void 0 : segment.length);
+            fields.push(`${JSON.stringify(optional ? name.slice(0, -1) : name)}${optional ? '?' : ''}: string`);
+        }
     }
+    return fields.length > 0 ? `{ ${fields.join('; ')} }` : 'Record<string, never>';
+}
+function collectCanonicalRoutesForEntry(routes, options = {}) {
+    const { localeParamHeuristic = true } = options;
+    const canonicalParams = new Map();
+    let hasI18nSurface = false;
+    const normalizeJoined = (joined)=>{
+        const collapsed = joined.replace(/\/+/g, '/');
+        const withLeading = collapsed.startsWith('/') ? collapsed : `/${collapsed}`;
+        return withLeading.length > 1 ? withLeading.replace(/\/+$/, '') : withLeading;
+    };
+    const record = (canonicalPath)=>{
+        const normalized = normalizeJoined(canonicalPath || '/');
+        const key = toTanstackPath(normalized);
+        if (!canonicalParams.has(key)) canonicalParams.set(key, paramsTypeForCanonicalPath(normalized));
+    };
+    const visit = (route, parentPath)=>{
+        let currentPath = parentPath;
+        if ('string' == typeof route.modernCanonicalPath) {
+            hasI18nSurface = true;
+            currentPath = normalizeJoined(route.modernCanonicalPath);
+        } else if ('string' == typeof route.path && route.path.length > 0) {
+            const segments = route.path.replace(/\[(.+?)\]/g, ':$1').split('/').filter(Boolean);
+            if (localeParamHeuristic && '' === parentPath && LOCALE_PARAM_SEGMENTS.has(segments[0])) {
+                hasI18nSurface = true;
+                segments.shift();
+            }
+            currentPath = segments.length ? normalizeJoined(`${parentPath}/${segments.join('/')}`) : parentPath;
+        }
+        const children = route.children;
+        if (children && children.length > 0) {
+            for (const child of children)visit(child, currentPath);
+            return;
+        }
+        record(currentPath || '/');
+    };
+    const rootModern = routes.find((route)=>route.isRoot);
+    const topLevel = rootModern ? rootModern.children ?? [] : routes;
+    for (const route of topLevel)visit(route, '');
+    if (!hasI18nSurface || 0 === canonicalParams.size) return null;
+    return Object.fromEntries([
+        ...canonicalParams.entries()
+    ].sort(([a], [b])=>a.localeCompare(b)));
 }
 async function generateTanstackRouterTypesSourceForEntry(opts) {
     const { appContext, entryName, generatedDirName = 'modern-tanstack', routes } = opts;
@@ -88,8 +147,39 @@ async function generateTanstackRouterTypesSourceForEntry(opts) {
     const imports = [];
     const statements = [];
     const loaderImportMap = new Map();
+    const componentImportMap = new Map();
+    const searchContractImportMap = new Map();
+    const usedRouteVarNames = new Set();
     let loaderIndex = 0;
+    let componentIndex = 0;
+    let validateSearchIndex = 0;
+    let loaderDepsIndex = 0;
     let routeIndex = 0;
+    const getImportNameForComponent = (componentPath)=>{
+        if ('string' != typeof componentPath || 0 === componentPath.length) return Promise.resolve(null);
+        let pendingImportName = componentImportMap.get(componentPath);
+        if (!pendingImportName) {
+            pendingImportName = (async ()=>{
+                const resolvedNoExt = await resolveRouteModuleNoExt(componentPath);
+                if (!resolvedNoExt) return null;
+                const relImport = normalizeRelativeImport(path.relative(outDir, resolvedNoExt));
+                const componentName = `component_${componentIndex++}`;
+                imports.push(`import ${componentName} from ${quote(relImport)};`);
+                return componentName;
+            })();
+            componentImportMap.set(componentPath, pendingImportName);
+        }
+        return pendingImportName;
+    };
+    const resolveRouteModuleNoExt = async (aliasedNoExtPath)=>{
+        const prefix = `${appContext.internalSrcAlias}/`;
+        let absNoExt;
+        if (aliasedNoExtPath.startsWith(prefix)) {
+            const rel = aliasedNoExtPath.slice(prefix.length);
+            absNoExt = path.join(appContext.srcDirectory, rel);
+        } else absNoExt = path.isAbsolute(aliasedNoExtPath) ? aliasedNoExtPath : path.join(appContext.srcDirectory, aliasedNoExtPath);
+        return resolveFileNoExt(absNoExt);
+    };
     const getImportNamesForLoader = async (aliasedNoExtPath, inline, hasAction)=>{
         const key = `${inline ? 'inline' : 'default'}:${hasAction ? 'action' : 'loader'}:${aliasedNoExtPath}`;
         const existing = loaderImportMap.get(key);
@@ -97,13 +187,7 @@ async function generateTanstackRouterTypesSourceForEntry(opts) {
             loaderName: existing,
             actionName: hasAction ? existing.replace(/^loader_/, 'action_') : null
         };
-        const prefix = `${appContext.internalSrcAlias}/`;
-        let absNoExt;
-        if (aliasedNoExtPath.startsWith(prefix)) {
-            const rel = aliasedNoExtPath.slice(prefix.length);
-            absNoExt = path.join(appContext.srcDirectory, rel);
-        } else absNoExt = path.isAbsolute(aliasedNoExtPath) ? aliasedNoExtPath : path.join(appContext.srcDirectory, aliasedNoExtPath);
-        const resolvedNoExt = await resolveFileNoExt(absNoExt);
+        const resolvedNoExt = await resolveRouteModuleNoExt(aliasedNoExtPath);
         if (!resolvedNoExt) return null;
         const relImport = normalizeRelativeImport(path.relative(outDir, resolvedNoExt));
         const importName = `loader_${loaderIndex++}`;
@@ -121,10 +205,29 @@ async function generateTanstackRouterTypesSourceForEntry(opts) {
             actionName
         };
     };
+    const getImportNameForSearchContract = async (aliasedNoExtPath, exportName)=>{
+        const key = `${exportName}:${aliasedNoExtPath}`;
+        const existing = searchContractImportMap.get(key);
+        if (existing) return existing;
+        const resolvedNoExt = await resolveRouteModuleNoExt(aliasedNoExtPath);
+        if (!resolvedNoExt) return null;
+        const relImport = normalizeRelativeImport(path.relative(outDir, resolvedNoExt));
+        const importName = 'validateSearch' === exportName ? `validateSearch_${validateSearchIndex++}` : `loaderDeps_${loaderDepsIndex++}`;
+        imports.push(`import { ${exportName} as ${importName} } from ${quote(relImport)};`);
+        searchContractImportMap.set(key, importName);
+        return importName;
+    };
+    const reserveRouteVarName = (preferred)=>{
+        let candidate = preferred;
+        let suffix = 1;
+        while(usedRouteVarNames.has(candidate))candidate = `${preferred}_${suffix++}`;
+        usedRouteVarNames.add(candidate);
+        return candidate;
+    };
     const createRouteVarName = (route)=>{
         const id = route.id;
         const base = id ? makeLegalIdentifier(id) : `r_${routeIndex++}`;
-        return `route_${base}`;
+        return reserveRouteVarName(`route_${base}`);
     };
     const buildRoute = async (opts)=>{
         const { parentVar, route } = opts;
@@ -134,11 +237,16 @@ async function generateTanstackRouterTypesSourceForEntry(opts) {
         const loaderImports = loaderInfo ? await getImportNamesForLoader(loaderInfo.loaderPath, loaderInfo.inline, Boolean(loaderInfo.inline && routeAction === loaderInfo.loaderPath)) : null;
         const loaderName = loaderImports?.loaderName || null;
         const actionName = loaderImports?.actionName || null;
+        const searchContractInfo = pickRouteSearchContractModules(route);
+        const validateSearchName = searchContractInfo.validateSearchPath ? await getImportNameForSearchContract(searchContractInfo.validateSearchPath, 'validateSearch') : null;
+        const loaderDepsName = searchContractInfo.loaderDepsPath ? await getImportNameForSearchContract(searchContractInfo.loaderDepsPath, 'loaderDeps') : null;
         const rawPath = route.path;
         const hasSplat = 'string' == typeof rawPath && rawPath.includes('*');
         const routeOpts = [
             `getParentRoute: () => ${parentVar},`
         ];
+        const componentName = await getImportNameForComponent(route._component);
+        if (componentName) routeOpts.push(`component: ${componentName},`);
         if (isPathlessLayout(route)) {
             const id = route.id;
             routeOpts.push(`id: ${quote(id || 'pathless')},`);
@@ -147,20 +255,24 @@ async function generateTanstackRouterTypesSourceForEntry(opts) {
             routeOpts.push(`path: ${quote(p)},`);
         }
         if (loaderName) routeOpts.push(`loader: modernLoaderToTanstack({ hasSplat: ${hasSplat} }, ${loaderName}),`);
+        if (validateSearchName) routeOpts.push(`validateSearch: ${validateSearchName},`);
+        if (loaderDepsName) routeOpts.push(`loaderDeps: ${loaderDepsName},`);
         const staticDataSnippet = createRouteStaticDataSnippet({
             modernRouteId: route.id,
             loaderName,
             actionName
         });
         if (staticDataSnippet) routeOpts.push(staticDataSnippet);
-        statements.push(`const ${varName} = createRoute({\n  ${routeOpts.join('\n  ')}\n});`);
         const children = route.children;
+        const hasChildren = Boolean(children && children.length > 0);
+        const routeCtorVarName = hasChildren ? reserveRouteVarName(`${varName}__base`) : varName;
+        statements.push(`const ${routeCtorVarName} = createRoute({\n  ${routeOpts.join('\n  ')}\n});`);
         if (children && children.length > 0) {
             const childVars = await Promise.all(children.map((child)=>buildRoute({
-                    parentVar: varName,
+                    parentVar: routeCtorVarName,
                     route: child
                 })));
-            statements.push(`${varName}.addChildren([${childVars.join(', ')}]);`);
+            statements.push(`const ${varName} = ${routeCtorVarName}.addChildren([${childVars.join(', ')}]);`);
         }
         return varName;
     };
@@ -169,12 +281,19 @@ async function generateTanstackRouterTypesSourceForEntry(opts) {
     const rootLoaderImports = rootLoaderInfo?.loaderPath ? await getImportNamesForLoader(rootLoaderInfo.loaderPath, rootLoaderInfo.inline, Boolean(rootLoaderInfo.inline && rootAction === rootLoaderInfo.loaderPath)) : null;
     const rootLoaderName = rootLoaderImports?.loaderName || null;
     const rootActionName = rootLoaderImports?.actionName || null;
+    const rootSearchContractInfo = rootModern ? pickRouteSearchContractModules(rootModern) : null;
+    const rootValidateSearchName = rootSearchContractInfo?.validateSearchPath ? await getImportNameForSearchContract(rootSearchContractInfo.validateSearchPath, 'validateSearch') : null;
+    const rootLoaderDepsName = rootSearchContractInfo?.loaderDepsPath ? await getImportNameForSearchContract(rootSearchContractInfo.loaderDepsPath, 'loaderDeps') : null;
     const topLevelVars = await Promise.all(topLevel.map((route)=>buildRoute({
             parentVar: 'rootRoute',
             route
         })));
     const rootOpts = [];
+    const rootComponentName = await getImportNameForComponent(rootModern?._component);
+    if (rootComponentName) rootOpts.push(`component: ${rootComponentName},`);
     if (rootLoaderName) rootOpts.push(`loader: modernLoaderToTanstack({ hasSplat: false }, ${rootLoaderName}),`);
+    if (rootValidateSearchName) rootOpts.push(`validateSearch: ${rootValidateSearchName},`);
+    if (rootLoaderDepsName) rootOpts.push(`loaderDeps: ${rootLoaderDepsName},`);
     const routerGenTs = `/* eslint-disable */
 // This file is auto-generated by Modern.js. Do not edit manually.
 
@@ -183,134 +302,12 @@ import {
   createRootRouteWithContext,
   createRoute,
   createRouter,
-  notFound,
-  redirect,
+  createRouteStaticData,
+  type ModernRouterContext,
+  modernLoaderToTanstack,
+  modernTanstackRouterFastDefaults,
 } from '@modern-js/plugin-tanstack/runtime';
 
-type ModernRouterContext = {
-  request?: Request;
-  requestContext?: unknown;
-};
-
-function isResponse(value: unknown): value is Response {
-  return (
-    value != null &&
-    typeof value === 'object' &&
-    typeof (value as any).status === 'number' &&
-    typeof (value as any).headers === 'object'
-  );
-}
-
-const redirectStatusCodes = new Set([301, 302, 303, 307, 308]);
-function isRedirectResponse(res: Response) {
-  return redirectStatusCodes.has(res.status);
-}
-
-function throwTanstackRedirect(location: string) {
-  const target = location || '/';
-  try {
-    void new URL(target);
-    throw redirect({ href: target });
-  } catch {
-    throw redirect({ to: target });
-  }
-}
-
-function mapParamsForModernLoader(params: Record<string, string>, hasSplat: boolean) {
-  if (!hasSplat) {
-    return params;
-  }
-
-  const { _splat, ...rest } = params as any;
-  if (typeof _splat !== 'undefined') {
-    return { ...rest, '*': _splat };
-  }
-  return rest;
-}
-
-function createRouteStaticData(opts: {
-  modernRouteId?: string;
-  modernRouteAction?: unknown;
-  modernRouteLoader?: unknown;
-}) {
-  const staticData: Record<string, unknown> = {};
-
-  if (opts.modernRouteId) {
-    staticData.modernRouteId = opts.modernRouteId;
-  }
-
-  if (opts.modernRouteLoader) {
-    staticData.modernRouteLoader = opts.modernRouteLoader;
-  }
-
-  if (opts.modernRouteAction) {
-    staticData.modernRouteAction = opts.modernRouteAction;
-  }
-
-  return Object.keys(staticData).length > 0 ? staticData : undefined;
-}
-
-function modernLoaderToTanstack<TLoader extends (args: any) => any>(
-  opts: { hasSplat: boolean },
-  modernLoader: TLoader,
-) {
-  type LoaderResult = Awaited<ReturnType<TLoader>>;
-
-  return async (ctx: any): Promise<LoaderResult> => {
-    try {
-      const signal: AbortSignal =
-        ctx?.abortController?.signal ||
-        ctx?.signal ||
-        new AbortController().signal;
-      const baseRequest: Request | undefined =
-        ctx?.context?.request instanceof Request ? ctx.context.request : undefined;
-
-      const href =
-        typeof ctx?.location === 'string'
-          ? ctx.location
-          : ctx?.location?.publicHref ||
-            ctx?.location?.href ||
-            ctx?.location?.url?.href ||
-            '';
-
-      const request = baseRequest
-        ? new Request(baseRequest, { signal })
-        : new Request(href, { signal });
-
-      const params = mapParamsForModernLoader(ctx?.params || {}, opts.hasSplat);
-
-      const result = await (modernLoader as any)({
-        request,
-        params,
-        context: ctx?.context?.requestContext,
-      });
-
-      if (isResponse(result)) {
-        if (isRedirectResponse(result)) {
-          const location = result.headers.get('Location') || '/';
-          throwTanstackRedirect(location);
-        }
-        if (result.status === 404) {
-          throw notFound();
-        }
-      }
-
-      return result as LoaderResult;
-    } catch (err) {
-      if (isResponse(err)) {
-        if (isRedirectResponse(err)) {
-          const location = err.headers.get('Location') || '/';
-          throwTanstackRedirect(location);
-        }
-        if (err.status === 404) {
-          throw notFound();
-        }
-      }
-      throw err;
-    }
-  };
-}
-
 ${imports.join('\n')}
 
 export const rootRoute = createRootRouteWithContext<ModernRouterContext>()({
@@ -327,6 +324,7 @@ ${statements.join('\n\n')}
 export const routeTree = rootRoute.addChildren([${topLevelVars.join(', ')}]);
 
 export const router = createRouter({
+  ...modernTanstackRouterFastDefaults,
   routeTree,
   history: createMemoryHistory({
     initialEntries: ['/'],
@@ -338,4 +336,4 @@ export const router = createRouter({
         routerGenTs
     };
 }
-export { generateTanstackRouterTypesSourceForEntry, isTanstackRouterFrameworkEnabled };
+export { collectCanonicalRoutesForEntry, generateTanstackRouterTypesSourceForEntry };

package/dist/esm/runtime/hooks.mjs

@@ -1,8 +1 @@
-import { createSyncHook } from "@modern-js/plugin";
-const modifyRoutes = createSyncHook();
-const onBeforeCreateRoutes = createSyncHook();
-const onBeforeCreateRouter = createSyncHook();
-const onAfterCreateRouter = createSyncHook();
-const onBeforeHydrateRouter = createSyncHook();
-const onAfterHydrateRouter = createSyncHook();
-export { modifyRoutes, onAfterCreateRouter, onAfterHydrateRouter, onBeforeCreateRouter, onBeforeCreateRoutes, onBeforeHydrateRouter };
+export { modifyRoutes, onAfterCreateRouter, onAfterHydrateRouter, onBeforeCreateRouter, onBeforeCreateRoutes, onBeforeHydrateRouter, routerProviderRegistryHooks } from "@modern-js/runtime/context";

package/dist/esm/runtime/hydrationBoundary.mjs

@@ -0,0 +1,10 @@
+import { jsx } from "react/jsx-runtime";
+import { Suspense } from "react";
+function wrapTanstackSsrHydrationBoundary(routerContent, shouldWrap) {
+    if (shouldWrap) return /*#__PURE__*/ jsx(Suspense, {
+        fallback: null,
+        children: routerContent
+    });
+    return routerContent;
+}
+export { wrapTanstackSsrHydrationBoundary };