@tanstack/router-generator 1.121.0-alpha.26 → 1.121.0-alpha.27

package/dist/esm/transform/utils.d.ts

@@ -1,2 +1,2 @@
 import { types } from 'recast';
-export declare function ensureStringArgument(callExpression: types.namedTypes.CallExpression, value: string, preferredQuote?: "'" | '"' | '`'): boolean;
+export declare function ensureStringArgument(callExpression: types.namedTypes.CallExpression, value: string, preferredQuote?: "'" | '"'): boolean;

package/dist/esm/transform/utils.js.map

@@ -1 +1 @@
-{"version":3,"file":"utils.js","sources":["../../../src/transform/utils.ts"],"sourcesContent":["import { types } from 'recast'\n\nconst b = types.builders\n\nexport function ensureStringArgument(\n  callExpression: types.namedTypes.CallExpression,\n  value: string,\n  preferredQuote?: \"'\" | '\"' | '`',\n) {\n  const argument = callExpression.arguments[0]\n  if (!argument) {\n    let stringLiteral: types.namedTypes.StringLiteral\n    if (!preferredQuote) {\n      stringLiteral = b.stringLiteral.from({ value })\n    } else {\n      stringLiteral = b.stringLiteral.from({\n        value,\n        extra: {\n          rawValue: value,\n          raw: `${preferredQuote}${value}${preferredQuote}`,\n        },\n      })\n    }\n    callExpression.arguments.push(stringLiteral)\n    return true\n  } else if (argument.type === 'StringLiteral') {\n    if (argument.value !== value) {\n      argument.value = value\n      return true\n    }\n  } else if (argument.type === 'TemplateLiteral') {\n    if (\n      argument.quasis.length === 1 &&\n      argument.quasis[0] &&\n      argument.quasis[0].value.raw !== value\n    ) {\n      argument.quasis[0].value.raw = value\n      return true\n    }\n  }\n  return false\n}\n"],"names":[],"mappings":";AAEA,MAAM,IAAI,MAAM;AAEA,SAAA,qBACd,gBACA,OACA,gBACA;AACM,QAAA,WAAW,eAAe,UAAU,CAAC;AAC3C,MAAI,CAAC,UAAU;AACT,QAAA;AACJ,QAAI,CAAC,gBAAgB;AACnB,sBAAgB,EAAE,cAAc,KAAK,EAAE,OAAO;AAAA,IAAA,OACzC;AACW,sBAAA,EAAE,cAAc,KAAK;AAAA,QACnC;AAAA,QACA,OAAO;AAAA,UACL,UAAU;AAAA,UACV,KAAK,GAAG,cAAc,GAAG,KAAK,GAAG,cAAc;AAAA,QAAA;AAAA,MACjD,CACD;AAAA,IAAA;AAEY,mBAAA,UAAU,KAAK,aAAa;AACpC,WAAA;AAAA,EAAA,WACE,SAAS,SAAS,iBAAiB;AACxC,QAAA,SAAS,UAAU,OAAO;AAC5B,eAAS,QAAQ;AACV,aAAA;AAAA,IAAA;AAAA,EACT,WACS,SAAS,SAAS,mBAAmB;AAC9C,QACE,SAAS,OAAO,WAAW,KAC3B,SAAS,OAAO,CAAC,KACjB,SAAS,OAAO,CAAC,EAAE,MAAM,QAAQ,OACjC;AACA,eAAS,OAAO,CAAC,EAAE,MAAM,MAAM;AACxB,aAAA;AAAA,IAAA;AAAA,EACT;AAEK,SAAA;AACT;"}
+{"version":3,"file":"utils.js","sources":["../../../src/transform/utils.ts"],"sourcesContent":["import { types } from 'recast'\n\nconst b = types.builders\n\nexport function ensureStringArgument(\n  callExpression: types.namedTypes.CallExpression,\n  value: string,\n  preferredQuote?: \"'\" | '\"',\n) {\n  const argument = callExpression.arguments[0]\n  if (!argument) {\n    let stringLiteral: types.namedTypes.StringLiteral\n    if (!preferredQuote) {\n      stringLiteral = b.stringLiteral.from({ value })\n    } else {\n      stringLiteral = b.stringLiteral.from({\n        value,\n        extra: {\n          rawValue: value,\n          raw: `${preferredQuote}${value}${preferredQuote}`,\n        },\n      })\n    }\n    callExpression.arguments.push(stringLiteral)\n    return true\n  } else if (argument.type === 'StringLiteral') {\n    if (argument.value !== value) {\n      argument.value = value\n      return true\n    }\n  } else if (argument.type === 'TemplateLiteral') {\n    if (\n      argument.quasis.length === 1 &&\n      argument.quasis[0] &&\n      argument.quasis[0].value.raw !== value\n    ) {\n      argument.quasis[0].value.raw = value\n      return true\n    }\n  }\n  return false\n}\n"],"names":[],"mappings":";AAEA,MAAM,IAAI,MAAM;AAEA,SAAA,qBACd,gBACA,OACA,gBACA;AACM,QAAA,WAAW,eAAe,UAAU,CAAC;AAC3C,MAAI,CAAC,UAAU;AACT,QAAA;AACJ,QAAI,CAAC,gBAAgB;AACnB,sBAAgB,EAAE,cAAc,KAAK,EAAE,OAAO;AAAA,IAAA,OACzC;AACW,sBAAA,EAAE,cAAc,KAAK;AAAA,QACnC;AAAA,QACA,OAAO;AAAA,UACL,UAAU;AAAA,UACV,KAAK,GAAG,cAAc,GAAG,KAAK,GAAG,cAAc;AAAA,QAAA;AAAA,MACjD,CACD;AAAA,IAAA;AAEY,mBAAA,UAAU,KAAK,aAAa;AACpC,WAAA;AAAA,EAAA,WACE,SAAS,SAAS,iBAAiB;AACxC,QAAA,SAAS,UAAU,OAAO;AAC5B,eAAS,QAAQ;AACV,aAAA;AAAA,IAAA;AAAA,EACT,WACS,SAAS,SAAS,mBAAmB;AAC9C,QACE,SAAS,OAAO,WAAW,KAC3B,SAAS,OAAO,CAAC,KACjB,SAAS,OAAO,CAAC,EAAE,MAAM,QAAQ,OACjC;AACA,eAAS,OAAO,CAAC,EAAE,MAAM,MAAM;AACxB,aAAA;AAAA,IAAA;AAAA,EACT;AAEK,SAAA;AACT;"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tanstack/router-generator",
-  "version": "1.121.0-alpha.26",
+  "version": "1.121.0-alpha.27",
   "description": "Modern and scalable routing for React applications",
   "author": "Tanner Linsley",
   "license": "MIT",
@@ -54,12 +54,12 @@
     "source-map": "^0.7.4",
     "tsx": "^4.19.2",
     "zod": "^3.24.2",
-    "@tanstack/router-core": "^1.121.0-alpha.22",
     "@tanstack/router-utils": "^1.121.0-alpha.26",
-    "@tanstack/virtual-file-routes": "^1.121.0-alpha.1"
+    "@tanstack/virtual-file-routes": "^1.121.0-alpha.1",
+    "@tanstack/router-core": "^1.121.0-alpha.27"
   },
   "devDependencies": {
-    "@tanstack/react-router": "^1.121.0-alpha.22"
+    "@tanstack/react-router": "^1.121.0-alpha.27"
   },
   "scripts": {}
 }

package/src/config.ts

@@ -1,5 +1,4 @@
 import path from 'node:path'
-import { tmpdir } from 'node:os'
 import { existsSync, mkdirSync, readFileSync } from 'node:fs'
 import { z } from 'zod'
 import { virtualRootRouteSchema } from './filesystem/virtual/config'
@@ -121,7 +120,10 @@ export function getConfig(
     }
   }
 
-  const resolveTmpDir = (dir: string) => {
+  const resolveTmpDir = (dir: string | Array<string>) => {
+    if (Array.isArray(dir)) {
+      dir = path.join(...dir)
+    }
     if (!path.isAbsolute(dir)) {
       dir = path.resolve(process.cwd(), dir)
     }
@@ -134,7 +136,7 @@ export function getConfig(
   } else if (process.env.TSR_TMP_DIR) {
     config.tmpDir = resolveTmpDir(process.env.TSR_TMP_DIR)
   } else {
-    config.tmpDir = tmpdir()
+    config.tmpDir = resolveTmpDir(['.tanstack', 'tmp'])
   }
 
   validateConfig(config)

package/src/generator.ts

@@ -178,7 +178,7 @@ export class Generator {
     this.root = opts.root
     this.fs = opts.fs || DefaultFileSystem
     this.tmpDir = this.fs.mkdtempSync(
-      path.join(this.config.tmpDir, 'tanstack-router-'),
+      path.join(this.config.tmpDir, 'router-generator-'),
     )
     this.generatedRouteTreePath = path.resolve(this.config.generatedRouteTree)
     this.targetTemplate = getTargetTemplate(this.config)
@@ -1050,7 +1050,9 @@ ${acc.routeTree.map((child) => `${child.variableName}${exportName}: typeof ${get
     const result = await this.isRouteFileCacheFresh(node)
 
     if (result.status === 'fresh') {
-      return false
+      node.exports = result.cacheEntry.exports
+      this.routeNodeShadowCache.set(node.fullPath, result.cacheEntry)
+      return result.exportsChanged
     }
     const rootNodeFile = await this.fs.readFile(node.fullPath)
     if (rootNodeFile === 'file-not-existing') {

package/src/transform/transform.ts

@@ -290,7 +290,7 @@ async function fixTransformedOutputText({
   originalCode: string
   transformedCode: string
   sourceMap: RawSourceMap
-  preferredQuote: '"' | "'" | '`'
+  preferredQuote: '"' | "'"
 }) {
   const originalLines = originalCode.split('\n')
   const transformedLines = transformedCode.split('\n')
@@ -302,11 +302,10 @@ async function fixTransformedOutputText({
   const fixedLines = transformedLines.map((line, i) => {
     const transformedLineNum = i + 1
 
-    let mapped = null
-    let origLineText = null
+    let origLineText: string | undefined = undefined
 
     for (let col = 0; col < line.length; col++) {
-      mapped = consumer.originalPositionFor({
+      const mapped = consumer.originalPositionFor({
         line: transformedLineNum,
         column: col,
       })
@@ -316,7 +315,7 @@ async function fixTransformedOutputText({
       }
     }
 
-    if (origLineText != null) {
+    if (origLineText !== undefined) {
       if (origLineText === line) {
         return origLineText
       }
@@ -409,10 +408,9 @@ function detectSemicolonUsage(code: string) {
   return withSemis > total / 2
 }
 
-export function detectPreferredQuoteStyle(ast: types.ASTNode): "'" | '"' | '`' {
+export function detectPreferredQuoteStyle(ast: types.ASTNode): "'" | '"' {
   let single = 0
   let double = 0
-  let backtick = 0
 
   visit(ast, {
     visitStringLiteral(path) {
@@ -423,17 +421,10 @@ export function detectPreferredQuoteStyle(ast: types.ASTNode): "'" | '"' | '`' {
       }
       return false
     },
-    visitTemplateLiteral(path) {
-      if (path.parent.type !== 'JSXAttribute') {
-        backtick++
-      }
-      return false
-    },
   })
 
-  return single >= double && single >= backtick
-    ? "'"
-    : double >= single && double >= backtick
-      ? '"'
-      : '`'
+  if (single >= double) {
+    return "'"
+  }
+  return '"'
 }

package/src/transform/types.ts

@@ -46,5 +46,5 @@ export interface TransformContext {
   routeId: string
   lazy: boolean
   verboseFileRoutes: boolean
-  preferredQuote?: '"' | "'" | '`'
+  preferredQuote?: '"' | "'"
 }

package/src/transform/utils.ts

@@ -5,7 +5,7 @@ const b = types.builders
 export function ensureStringArgument(
   callExpression: types.namedTypes.CallExpression,
   value: string,
-  preferredQuote?: "'" | '"' | '`',
+  preferredQuote?: "'" | '"',
 ) {
   const argument = callExpression.arguments[0]
   if (!argument) {