@tanstack/router-generator 1.141.6 → 1.141.8

package/dist/cjs/generator.cjs

@@ -82,6 +82,8 @@ const _Generator = class _Generator {
     this.targetTemplate = template.getTargetTemplate(this.config);
     this.routesDirectoryPath = this.getRoutesDirectoryPath();
     this.plugins.push(...opts.config.plugins || []);
+    this.indexTokenRegex = new RegExp(`[./]${this.config.indexToken}[.]`);
+    this.routeTokenRegex = new RegExp(`[./]${this.config.routeToken}[.]`);
     for (const plugin of this.plugins) {
       plugin.init?.({ generator: this });
     }
@@ -194,11 +196,9 @@ Add the file in: "${this.config.routesDirectory}/${rootPathId.rootPathId}.${this
     const preRouteNodes = utils.multiSortBy(beforeRouteNodes, [
       (d) => d.routePath === "/" ? -1 : 1,
       (d) => d.routePath?.split("/").length,
-      (d) => d.filePath.match(new RegExp(`[./]${this.config.indexToken}[.]`)) ? 1 : -1,
-      (d) => d.filePath.match(
-        /[./](component|errorComponent|notFoundComponent|pendingComponent|loader|lazy)[.]/
-      ) ? 1 : -1,
-      (d) => d.filePath.match(new RegExp(`[./]${this.config.routeToken}[.]`)) ? -1 : 1,
+      (d) => d.filePath.match(this.indexTokenRegex) ? 1 : -1,
+      (d) => d.filePath.match(_Generator.componentPieceRegex) ? 1 : -1,
+      (d) => d.filePath.match(this.routeTokenRegex) ? -1 : 1,
       (d) => d.routePath?.endsWith("/") ? -1 : 1,
       (d) => d.routePath
     ]).filter((d) => {
@@ -239,8 +239,9 @@ Add the file in: "${this.config.routesDirectory}/${rootPathId.rootPathId}.${this
       routePiecesByPath: {},
       routeNodesByPath: /* @__PURE__ */ new Map()
     };
+    const prefixMap = new utils.RoutePrefixMap(routeFileResult);
     for (const node of routeFileResult) {
-      _Generator.handleNode(node, acc, this.config);
+      _Generator.handleNode(node, acc, prefixMap, this.config);
     }
     this.crawlingResult = { rootRouteNode, routeFileResult, acc };
     if (!this.routeTreeFileCache) {
@@ -348,30 +349,45 @@ Add the file in: "${this.config.routesDirectory}/${rootPathId.rootPathId}.${this
       (d) => d.routePath?.endsWith(config.indexToken) ? -1 : 1,
       (d) => d
     ]);
-    const routeImports = sortedRouteNodes.filter((d) => !d.isVirtual).flatMap(
-      (node) => utils.getImportForRouteNode(
-        node,
-        config,
-        this.generatedRouteTreePath,
-        this.root
-      )
-    );
-    const virtualRouteNodes = sortedRouteNodes.filter((d) => d.isVirtual).map((node) => {
-      return `const ${node.variableName}RouteImport = createFileRoute('${node.routePath}')()`;
-    });
+    const routeImports = [];
+    const virtualRouteNodes = [];
+    for (const node of sortedRouteNodes) {
+      if (node.isVirtual) {
+        virtualRouteNodes.push(
+          `const ${node.variableName}RouteImport = createFileRoute('${node.routePath}')()`
+        );
+      } else {
+        routeImports.push(
+          utils.getImportForRouteNode(
+            node,
+            config,
+            this.generatedRouteTreePath,
+            this.root
+          )
+        );
+      }
+    }
     const imports = [];
-    if (acc.routeNodes.some((n) => n.isVirtual)) {
+    if (virtualRouteNodes.length > 0) {
       imports.push({
         specifiers: [{ imported: "createFileRoute" }],
         source: this.targetTemplate.fullPkg
       });
     }
-    const hasComponentPieces = sortedRouteNodes.some(
-      (node) => acc.routePiecesByPath[node.routePath]?.component || acc.routePiecesByPath[node.routePath]?.errorComponent || acc.routePiecesByPath[node.routePath]?.notFoundComponent || acc.routePiecesByPath[node.routePath]?.pendingComponent
-    );
-    const hasLoaderPieces = sortedRouteNodes.some(
-      (node) => acc.routePiecesByPath[node.routePath]?.loader
-    );
+    let hasComponentPieces = false;
+    let hasLoaderPieces = false;
+    for (const node of sortedRouteNodes) {
+      const pieces = acc.routePiecesByPath[node.routePath];
+      if (pieces) {
+        if (pieces.component || pieces.errorComponent || pieces.notFoundComponent || pieces.pendingComponent) {
+          hasComponentPieces = true;
+        }
+        if (pieces.loader) {
+          hasLoaderPieces = true;
+        }
+        if (hasComponentPieces && hasLoaderPieces) break;
+      }
+    }
     if (hasComponentPieces || hasLoaderPieces) {
       const runtimeImport = {
         specifiers: [],
@@ -391,14 +407,23 @@ Add the file in: "${this.config.routesDirectory}/${rootPathId.rootPathId}.${this
         source: this.targetTemplate.fullPkg,
         importKind: "type"
       };
-      if (sortedRouteNodes.some(
-        (d) => utils.isRouteNodeValidForAugmentation(d) && d._fsRouteType !== "lazy"
-      )) {
+      let needsCreateFileRoute = false;
+      let needsCreateLazyFileRoute = false;
+      for (const node of sortedRouteNodes) {
+        if (utils.isRouteNodeValidForAugmentation(node)) {
+          if (node._fsRouteType !== "lazy") {
+            needsCreateFileRoute = true;
+          }
+          if (acc.routePiecesByPath[node.routePath]?.lazy) {
+            needsCreateLazyFileRoute = true;
+          }
+        }
+        if (needsCreateFileRoute && needsCreateLazyFileRoute) break;
+      }
+      if (needsCreateFileRoute) {
         typeImport.specifiers.push({ imported: "CreateFileRoute" });
       }
-      if (sortedRouteNodes.some(
-        (node) => acc.routePiecesByPath[node.routePath]?.lazy && utils.isRouteNodeValidForAugmentation(node)
-      )) {
+      if (needsCreateLazyFileRoute) {
         typeImport.specifiers.push({ imported: "CreateLazyFileRoute" });
       }
       if (typeImport.specifiers.length > 0) {
@@ -411,12 +436,13 @@ Add the file in: "${this.config.routesDirectory}/${rootPathId.rootPathId}.${this
       config.disableTypes
     );
     const createUpdateRoutes = sortedRouteNodes.map((node) => {
-      const loaderNode = acc.routePiecesByPath[node.routePath]?.loader;
-      const componentNode = acc.routePiecesByPath[node.routePath]?.component;
-      const errorComponentNode = acc.routePiecesByPath[node.routePath]?.errorComponent;
-      const notFoundComponentNode = acc.routePiecesByPath[node.routePath]?.notFoundComponent;
-      const pendingComponentNode = acc.routePiecesByPath[node.routePath]?.pendingComponent;
-      const lazyComponentNode = acc.routePiecesByPath[node.routePath]?.lazy;
+      const pieces = acc.routePiecesByPath[node.routePath];
+      const loaderNode = pieces?.loader;
+      const componentNode = pieces?.component;
+      const errorComponentNode = pieces?.errorComponent;
+      const notFoundComponentNode = pieces?.notFoundComponent;
+      const pendingComponentNode = pieces?.pendingComponent;
+      const lazyComponentNode = pieces?.lazy;
       return [
         [
           `const ${node.variableName}Route = ${node.variableName}RouteImport.update({
@@ -492,10 +518,11 @@ Add the file in: "${this.config.routesDirectory}/${rootPathId.rootPathId}.${this
       ].join("\n\n");
     });
     const rootRoutePath = `/${rootPathId.rootPathId}`;
-    const rootComponentNode = acc.routePiecesByPath[rootRoutePath]?.component;
-    const rootErrorComponentNode = acc.routePiecesByPath[rootRoutePath]?.errorComponent;
-    const rootNotFoundComponentNode = acc.routePiecesByPath[rootRoutePath]?.notFoundComponent;
-    const rootPendingComponentNode = acc.routePiecesByPath[rootRoutePath]?.pendingComponent;
+    const rootPieces = acc.routePiecesByPath[rootRoutePath];
+    const rootComponentNode = rootPieces?.component;
+    const rootErrorComponentNode = rootPieces?.errorComponent;
+    const rootNotFoundComponentNode = rootPieces?.notFoundComponent;
+    const rootPendingComponentNode = rootPieces?.pendingComponent;
     let rootRouteUpdate = "";
     if (rootComponentNode || rootErrorComponentNode || rootNotFoundComponentNode || rootPendingComponentNode) {
       rootRouteUpdate = `const rootRouteWithChildren = rootRouteImport${rootComponentNode || rootErrorComponentNode || rootNotFoundComponentNode || rootPendingComponentNode ? `.update({
@@ -529,29 +556,35 @@ Add the file in: "${this.config.routesDirectory}/${rootPathId.rootPathId}.${this
     let fileRoutesByPathInterface = "";
     let fileRoutesByFullPath = "";
     if (!config.disableTypes) {
+      const routeNodesByFullPath = utils.createRouteNodesByFullPath(
+        acc.routeNodes,
+        config
+      );
+      const routeNodesByTo = utils.createRouteNodesByTo(acc.routeNodes, config);
+      const routeNodesById = utils.createRouteNodesById(acc.routeNodes);
       fileRoutesByFullPath = [
         `export interface FileRoutesByFullPath {
-${[...utils.createRouteNodesByFullPath(acc.routeNodes, config).entries()].filter(([fullPath]) => fullPath).map(([fullPath, routeNode]) => {
+${[...routeNodesByFullPath.entries()].filter(([fullPath]) => fullPath).map(([fullPath, routeNode]) => {
           return `'${fullPath}': typeof ${utils.getResolvedRouteNodeVariableName(routeNode)}`;
         })}
 }`,
         `export interface FileRoutesByTo {
-${[...utils.createRouteNodesByTo(acc.routeNodes, config).entries()].filter(([to]) => to).map(([to, routeNode]) => {
+${[...routeNodesByTo.entries()].filter(([to]) => to).map(([to, routeNode]) => {
           return `'${to}': typeof ${utils.getResolvedRouteNodeVariableName(routeNode)}`;
         })}
 }`,
         `export interface FileRoutesById {
 '${routerCore.rootRouteId}': typeof rootRouteImport,
-${[...utils.createRouteNodesById(acc.routeNodes).entries()].map(([id, routeNode]) => {
+${[...routeNodesById.entries()].map(([id, routeNode]) => {
           return `'${id}': typeof ${utils.getResolvedRouteNodeVariableName(routeNode)}`;
         })}
 }`,
         `export interface FileRouteTypes {
 fileRoutesByFullPath: FileRoutesByFullPath
-fullPaths: ${acc.routeNodes.length > 0 ? [...utils.createRouteNodesByFullPath(acc.routeNodes, config).keys()].filter((fullPath) => fullPath).map((fullPath) => `'${fullPath}'`).join("|") : "never"}
+fullPaths: ${acc.routeNodes.length > 0 ? [...routeNodesByFullPath.keys()].filter((fullPath) => fullPath).map((fullPath) => `'${fullPath}'`).join("|") : "never"}
 fileRoutesByTo: FileRoutesByTo
-to: ${acc.routeNodes.length > 0 ? [...utils.createRouteNodesByTo(acc.routeNodes, config).keys()].filter((to) => to).map((to) => `'${to}'`).join("|") : "never"}
-id: ${[`'${routerCore.rootRouteId}'`, ...[...utils.createRouteNodesById(acc.routeNodes).keys()].map((id) => `'${id}'`)].join("|")}
+to: ${acc.routeNodes.length > 0 ? [...routeNodesByTo.keys()].filter((to) => to).map((to) => `'${to}'`).join("|") : "never"}
+id: ${[`'${routerCore.rootRouteId}'`, ...[...routeNodesById.keys()].map((id) => `'${id}'`)].join("|")}
 fileRoutesById: FileRoutesById
 }`,
         `export interface RootRouteChildren {
@@ -915,11 +948,10 @@ ${acc.routeTree.map((child) => `${child.variableName}Route: typeof ${utils.getRe
     await this.runPromise;
     return this.crawlingResult;
   }
-  static handleNode(node, acc, config) {
+  static handleNode(node, acc, prefixMap, config) {
     const useExperimentalNonNestedRoutes = config?.experimental?.nonNestedRoutes ?? false;
-    utils.resetRegex(this.routeGroupPatternRegex);
     const parentRoute = utils.hasParentRoute(
-      acc.routeNodes,
+      prefixMap,
       node,
       node.routePath,
       node.originalRoutePath
@@ -959,6 +991,7 @@ ${acc.routeTree.map((child) => `${child.variableName}Route: typeof ${utils.getRe
             _fsRouteType: "static"
           },
           acc,
+          prefixMap,
           config
         );
       }
@@ -972,9 +1005,10 @@ ${acc.routeTree.map((child) => `${child.variableName}Route: typeof ${utils.getRe
         const candidate = acc.routeNodesByPath.get(searchPath);
         if (candidate && !candidate.isVirtual && candidate.path !== "/") {
           node.parent = candidate;
-          node.path = node.routePath;
+          node.path = node.routePath?.replace(candidate.routePath ?? "", "") || "/";
+          const pathRelativeToParent = immediateParentPath.replace(candidate.routePath ?? "", "") || "/";
           node.cleanedPath = utils.removeGroups(
-            utils.removeUnderscores(utils.removeLayoutSegments(immediateParentPath)) ?? ""
+            utils.removeUnderscores(utils.removeLayoutSegments(pathRelativeToParent)) ?? ""
           );
           break;
         }
@@ -1016,7 +1050,8 @@ ${acc.routeTree.map((child) => `${child.variableName}Route: typeof ${utils.getRe
     return false;
   }
 };
-_Generator.routeGroupPatternRegex = /\(.+\)/g;
+_Generator.routeGroupPatternRegex = /\(.+\)/;
+_Generator.componentPieceRegex = /[./](component|errorComponent|notFoundComponent|pendingComponent|loader|lazy)[.]/;
 let Generator = _Generator;
 exports.Generator = Generator;
 //# sourceMappingURL=generator.cjs.map