one 1.1.540 → 1.1.541

package/src/cli/generateRoutes.ts

@@ -0,0 +1,23 @@
+import { existsSync } from 'node:fs'
+import { join } from 'node:path'
+import { generateRouteTypes } from '../typed-routes/generateRouteTypes'
+
+export async function run(args: { appDir?: string } = {}) {
+  const cwd = process.cwd()
+
+  // Use provided appDir or default to 'app'
+  const routerRoot = args.appDir || 'app'
+  const appDir = join(cwd, routerRoot)
+
+  if (!existsSync(appDir)) {
+    console.error(`Error: App directory not found at ${appDir}`)
+    console.error(
+      'You can specify a custom directory with: yarn one generate-routes --appDir=<path>'
+    )
+    process.exit(1)
+  }
+
+  const outFile = join(appDir, 'routes.d.ts')
+
+  await generateRouteTypes(outFile, routerRoot, undefined)
+}

package/src/cli.ts

@@ -240,6 +240,24 @@ const patch = defineCommand({
   },
 })
 
+const generateRoutes = defineCommand({
+  meta: {
+    name: 'generate-routes',
+    version: version,
+    description: 'Generate route type definitions',
+  },
+  args: {
+    appDir: {
+      type: 'string',
+      description: 'Path to app directory (default: "app")',
+    },
+  },
+  async run({ args }) {
+    const { run } = await import('./cli/generateRoutes')
+    await run(args)
+  },
+})
+
 const subCommands = {
   dev,
   clean,
@@ -249,6 +267,7 @@ const subCommands = {
   'run:android': runAndroid,
   patch,
   serve: serveCommand,
+  'generate-routes': generateRoutes,
 }
 
 // workaround for having sub-commands but also positional arg for naming in the create flow

package/src/router/getRoutes.ts

@@ -67,7 +67,10 @@ export function getRoutes(
 function getDirectoryTree(contextModule: One.RouteContext, options: Options) {
   const importMode = options.importMode || process.env.One_ROUTER_IMPORT_MODE
 
-  const ignoreList: RegExp[] = [/^\.\/\+html\.[tj]sx?$/] // Ignore the top level ./+html file
+  const ignoreList: RegExp[] = [
+    /^\.\/\+html\.[tj]sx?$/, // Ignore the top level ./+html file
+    /\.d\.ts$/, // Ignore TypeScript declaration files
+  ]
 
   if (options.ignore) {
     ignoreList.push(...options.ignore)

package/src/router/matchers.ts

@@ -69,7 +69,12 @@ export function stripInvisibleSegmentsFromPath(path: string): string {
  * Match:
  *  - _layout files, +html, +not-found, string+api, etc
  *  - Routes can still use `+`, but it cannot be in the last segment.
+ *  - .d.ts files (type definition files)
  */
 export function isTypedRoute(name: string) {
-  return !name.startsWith('+') && name.match(/(_layout|[^/]*?\+[^/]*?)\.[tj]sx?$/) === null
+  return (
+    !name.startsWith('+') &&
+    !name.endsWith('.d.ts') &&
+    name.match(/(_layout|[^/]*?\+[^/]*?)\.[tj]sx?$/) === null
+  )
 }

package/src/typed-routes/generateRouteTypes.ts

@@ -1,6 +1,6 @@
 import FSExtra from 'fs-extra'
-import { writeFile, readFile } from 'node:fs/promises'
-import { dirname, join } from 'node:path'
+import { writeFile } from 'node:fs/promises'
+import { dirname } from 'node:path'
 import micromatch from 'micromatch'
 import { globbedRoutesToRouteContext } from '../router/useViteRoutes'
 import { globDir } from '../utils/globDir'
@@ -27,39 +27,4 @@ export async function generateRouteTypes(
   const outDir = dirname(outFile)
   await FSExtra.ensureDir(outDir)
   await writeFile(outFile, declarations)
-
-  // If generating in node_modules/@types/one-routes, create package.json and update tsconfig
-  if (outFile.includes('node_modules/@types/one-routes')) {
-    const packageJsonPath = join(outDir, 'package.json')
-    const packageJson = {
-      name: '@types/one-routes',
-      version: '1.0.0',
-      private: true,
-      types: 'index.d.ts',
-    }
-    await writeFile(packageJsonPath, JSON.stringify(packageJson, null, 2))
-    await ensureTsconfigIncludesOneRoutes(outDir)
-  }
-}
-
-async function ensureTsconfigIncludesOneRoutes(typesDir: string) {
-  const projectRoot = join(typesDir, '../../..')
-  const tsconfigPath = join(projectRoot, 'tsconfig.json')
-
-  try {
-    const tsconfigContent = await readFile(tsconfigPath, 'utf-8')
-    const tsconfig = JSON.parse(tsconfigContent)
-
-    // Add one-routes to the types array if it exists
-    // This ensures TypeScript picks up the types even when types array is specified
-    if (tsconfig.compilerOptions?.types && Array.isArray(tsconfig.compilerOptions.types)) {
-      if (!tsconfig.compilerOptions.types.includes('one-routes')) {
-        tsconfig.compilerOptions.types.push('one-routes')
-        await writeFile(tsconfigPath, JSON.stringify(tsconfig, null, 2) + '\n')
-      }
-    }
-  } catch (error) {
-    // Ignore errors - tsconfig might not exist or might be malformed
-    console.warn('Could not update tsconfig.json:', error)
-  }
 }

package/src/utils/getPathnameFromFilePath.ts

@@ -4,7 +4,7 @@ export function getPathnameFromFilePath(
   inputPath: string,
   params = {},
   strict = false,
-  options: { preserveExtensions?: boolean, includeIndex?: boolean } = {}
+  options: { preserveExtensions?: boolean; includeIndex?: boolean } = {}
 ) {
   const path = inputPath.replace(/\+(spa|ssg|ssr|api)\.tsx?$/, '')
   const dirname = Path.dirname(path).replace(/\([^\/]+\)/gi, '')

package/src/vercel/build/buildVercelOutputDirectory.ts

@@ -26,8 +26,15 @@ async function moveAllFiles(src: string, dest: string) {
 function getMiddlewaresByNamedRegex(buildInfoForWriting: One.BuildInfo) {
   return buildInfoForWriting.manifest.allRoutes
     .filter((r) => r.middlewares && r.middlewares.length > 0)
-    .map((r) => [r.namedRegex, r.middlewares!.map((m) => m.contextKey.startsWith('dist/middlewares/') ? m.contextKey.substring('dist/middlewares/'.length) : m.contextKey)])
-    .sort((a, b) => b[0].length - a[0].length);
+    .map((r) => [
+      r.namedRegex,
+      r.middlewares!.map((m) =>
+        m.contextKey.startsWith('dist/middlewares/')
+          ? m.contextKey.substring('dist/middlewares/'.length)
+          : m.contextKey
+      ),
+    ])
+    .sort((a, b) => b[0].length - a[0].length)
 }
 
 export const buildVercelOutputDirectory = async ({
@@ -113,22 +120,29 @@ export const buildVercelOutputDirectory = async ({
       join(vercelMiddlewareDir, wrappedMiddlewareEntryPointFilename)
     )
     const middlewaresByNamedRegex = getMiddlewaresByNamedRegex(buildInfoForWriting)
-    const middlewaresToVariableNameMap = middlewaresByNamedRegex.reduce((acc, [namedRegex, middlewares]) => {
-      (Array.isArray(middlewares) ? middlewares : [middlewares]).forEach(middleware => {
-        const middlewareVariableName = middleware.replace(/\.[a-z]+$/, '').replaceAll('/', '_');
-        acc[middleware] = middlewareVariableName
-      })
-      return acc
-    }, {})
+    const middlewaresToVariableNameMap = middlewaresByNamedRegex.reduce(
+      (acc, [namedRegex, middlewares]) => {
+        ;(Array.isArray(middlewares) ? middlewares : [middlewares]).forEach((middleware) => {
+          const middlewareVariableName = middleware.replace(/\.[a-z]+$/, '').replaceAll('/', '_')
+          acc[middleware] = middlewareVariableName
+        })
+        return acc
+      },
+      {}
+    )
     await FSExtra.writeFile(
       wrappedMiddlewareEntryPointPath,
       `
 const middlewaresByNamedRegex = ${JSON.stringify(middlewaresByNamedRegex)}
-${Object.entries(middlewaresToVariableNameMap).map(([path, variableName]) => `import ${variableName} from './${path}'`).join('\n')}
+${Object.entries(middlewaresToVariableNameMap)
+  .map(([path, variableName]) => `import ${variableName} from './${path}'`)
+  .join('\n')}
 
 function getMiddleware(path) {
   switch (path){
-      ${Object.entries(middlewaresToVariableNameMap).map(([path, variableName]) => `case '${path}': return ${variableName}`).join('\n')}
+      ${Object.entries(middlewaresToVariableNameMap)
+        .map(([path, variableName]) => `case '${path}': return ${variableName}`)
+        .join('\n')}
       default: return null
   }
 }

package/src/vercel/build/getPathFromRoute.ts

@@ -1,8 +1,11 @@
 import { getPathnameFromFilePath } from '../../utils/getPathnameFromFilePath'
 import type { RouteInfo } from '../../vite/types'
 
-export function getPathFromRoute(route: RouteInfo<string>,  options: { includeIndex?: boolean } = {}) {
-  return getPathnameFromFilePath(route.file, {}, false, {...options, preserveExtensions: true})
+export function getPathFromRoute(
+  route: RouteInfo<string>,
+  options: { includeIndex?: boolean } = {}
+) {
+  return getPathnameFromFilePath(route.file, {}, false, { ...options, preserveExtensions: true })
     .replace(/^\.\//, '/')
     .replace(/\/+$/, '')
 }

package/src/vite/plugins/generateFileSystemRouteTypesPlugin.tsx

@@ -13,8 +13,8 @@ export function generateFileSystemRouteTypesPlugin(options: One.PluginOptions):
 
     configureServer(server) {
       const appDir = join(process.cwd(), getRouterRootFromOneOptions(options))
-      // Generate types in node_modules/@types/one-routes to keep them out of the source tree
-      const outFile = join(process.cwd(), 'node_modules', '@types', 'one-routes', 'index.d.ts')
+      // Generate routes.d.ts inside the app directory to keep it organized
+      const outFile = join(appDir, 'routes.d.ts')
 
       const routerRoot = getRouterRootFromOneOptions(options)
 

package/types/cli/generateRoutes.d.ts

@@ -0,0 +1,4 @@
+export declare function run(args?: {
+    appDir?: string;
+}): Promise<void>;
+//# sourceMappingURL=generateRoutes.d.ts.map

package/types/cli/generateRoutes.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"generateRoutes.d.ts","sourceRoot":"","sources":["../../src/cli/generateRoutes.ts"],"names":[],"mappings":"AAIA,wBAAsB,GAAG,CAAC,IAAI,GAAE;IAAE,MAAM,CAAC,EAAE,MAAM,CAAA;CAAO,iBAkBvD"}

package/types/router/getRoutes.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"getRoutes.d.ts","sourceRoot":"","sources":["../../src/router/getRoutes.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,eAAe,CAAA;AAQxC,OAAO,KAAK,EAAE,iBAAiB,EAAE,SAAS,EAAE,MAAM,SAAS,CAAA;AAE3D,MAAM,MAAM,OAAO,GAAG;IACpB,MAAM,CAAC,EAAE,MAAM,EAAE,CAAA;IACjB,iBAAiB,CAAC,EAAE,OAAO,CAAA;IAC3B,mBAAmB,CAAC,EAAE,OAAO,CAAA;IAC7B,iBAAiB,CAAC,EAAE,OAAO,CAAA;IAC3B,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,cAAc,CAAC,EAAE,OAAO,CAAA;IACxB,QAAQ,CAAC,EAAE,MAAM,CAAA;CAClB,CAAA;AAWD;;;;;;;;;;;GAWG;AACH,wBAAgB,SAAS,CACvB,aAAa,EAAE,GAAG,CAAC,YAAY,EAC/B,OAAO,GAAE,OAAY,GACpB,SAAS,GAAG,IAAI,CAelB;AA8WD,wBAAgB,aAAa,CAAC,OAAO,CAAC,EAAE,OAAO,YAM9C;AAED;;;;GAIG;AACH,wBAAgB,iBAAiB,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,GAAE,GAAG,CAAC,MAAM,CAAa,GAAG,GAAG,CAAC,MAAM,CAAC,CAwBzF;AAED,wBAAgB,eAAe,CAAC,IAAI,EAAE,MAAM,GAAG,iBAAiB,EAAE,GAAG,IAAI,CAqBxE"}
+{"version":3,"file":"getRoutes.d.ts","sourceRoot":"","sources":["../../src/router/getRoutes.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,eAAe,CAAA;AAQxC,OAAO,KAAK,EAAE,iBAAiB,EAAE,SAAS,EAAE,MAAM,SAAS,CAAA;AAE3D,MAAM,MAAM,OAAO,GAAG;IACpB,MAAM,CAAC,EAAE,MAAM,EAAE,CAAA;IACjB,iBAAiB,CAAC,EAAE,OAAO,CAAA;IAC3B,mBAAmB,CAAC,EAAE,OAAO,CAAA;IAC7B,iBAAiB,CAAC,EAAE,OAAO,CAAA;IAC3B,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,cAAc,CAAC,EAAE,OAAO,CAAA;IACxB,QAAQ,CAAC,EAAE,MAAM,CAAA;CAClB,CAAA;AAWD;;;;;;;;;;;GAWG;AACH,wBAAgB,SAAS,CACvB,aAAa,EAAE,GAAG,CAAC,YAAY,EAC/B,OAAO,GAAE,OAAY,GACpB,SAAS,GAAG,IAAI,CAelB;AAiXD,wBAAgB,aAAa,CAAC,OAAO,CAAC,EAAE,OAAO,YAM9C;AAED;;;;GAIG;AACH,wBAAgB,iBAAiB,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,GAAE,GAAG,CAAC,MAAM,CAAa,GAAG,GAAG,CAAC,MAAM,CAAC,CAwBzF;AAED,wBAAgB,eAAe,CAAC,IAAI,EAAE,MAAM,GAAG,iBAAiB,EAAE,GAAG,IAAI,CAqBxE"}

package/types/router/matchers.d.ts

@@ -19,6 +19,7 @@ export declare function stripInvisibleSegmentsFromPath(path: string): string;
  * Match:
  *  - _layout files, +html, +not-found, string+api, etc
  *  - Routes can still use `+`, but it cannot be in the last segment.
+ *  - .d.ts files (type definition files)
  */
 export declare function isTypedRoute(name: string): boolean;
 //# sourceMappingURL=matchers.d.ts.map

package/types/router/matchers.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"matchers.d.ts","sourceRoot":"","sources":["../../src/router/matchers.ts"],"names":[],"mappings":"AAAA,+BAA+B;AAC/B,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAIjE;AAED,kCAAkC;AAClC,wBAAgB,yBAAyB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAE1E;AAED,yBAAyB;AACzB,wBAAgB,YAAY,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAElD;AAED,+BAA+B;AAC/B,wBAAgB,cAAc,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAE/D;AAED,oEAAoE;AACpE,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,MAAM,sBAE/C;AAED,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAExD;AAED,wBAAgB,aAAa,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAQlD;AAED,0CAA0C;AAC1C,wBAAgB,yBAAyB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAE9D;AAGD,wBAAgB,oBAAoB,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,CAE7D;AAED,wBAAgB,0BAA0B,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAU/D;AAED,wBAAgB,8BAA8B,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAEnE;AAED;;;;GAIG;AACH,wBAAgB,YAAY,CAAC,IAAI,EAAE,MAAM,WAExC"}
+{"version":3,"file":"matchers.d.ts","sourceRoot":"","sources":["../../src/router/matchers.ts"],"names":[],"mappings":"AAAA,+BAA+B;AAC/B,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAIjE;AAED,kCAAkC;AAClC,wBAAgB,yBAAyB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAE1E;AAED,yBAAyB;AACzB,wBAAgB,YAAY,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAElD;AAED,+BAA+B;AAC/B,wBAAgB,cAAc,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAE/D;AAED,oEAAoE;AACpE,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,MAAM,sBAE/C;AAED,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAExD;AAED,wBAAgB,aAAa,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAQlD;AAED,0CAA0C;AAC1C,wBAAgB,yBAAyB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAE9D;AAGD,wBAAgB,oBAAoB,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,CAE7D;AAED,wBAAgB,0BAA0B,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAU/D;AAED,wBAAgB,8BAA8B,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAEnE;AAED;;;;;GAKG;AACH,wBAAgB,YAAY,CAAC,IAAI,EAAE,MAAM,WAMxC"}

package/types/typed-routes/generateRouteTypes.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"generateRouteTypes.d.ts","sourceRoot":"","sources":["../../src/typed-routes/generateRouteTypes.ts"],"names":[],"mappings":"AAQA,wBAAsB,kBAAkB,CACtC,OAAO,EAAE,MAAM,EACf,UAAU,EAAE,MAAM,EAClB,iBAAiB,CAAC,EAAE,MAAM,EAAE,iBA+B7B"}
+{"version":3,"file":"generateRouteTypes.d.ts","sourceRoot":"","sources":["../../src/typed-routes/generateRouteTypes.ts"],"names":[],"mappings":"AAQA,wBAAsB,kBAAkB,CACtC,OAAO,EAAE,MAAM,EACf,UAAU,EAAE,MAAM,EAClB,iBAAiB,CAAC,EAAE,MAAM,EAAE,iBAkB7B"}

package/types/vercel/build/buildVercelOutputDirectory.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"buildVercelOutputDirectory.d.ts","sourceRoot":"","sources":["../../../src/vercel/build/buildVercelOutputDirectory.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,QAAQ,CAAA;AAS1C,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,kBAAkB,CAAA;AAoB3C,eAAO,MAAM,0BAA0B,GAAU,+EAM9C;IACD,SAAS,EAAE,YAAY,GAAG,IAAI,CAAA;IAC9B,mBAAmB,EAAE,GAAG,CAAC,SAAS,CAAA;IAClC,SAAS,EAAE,MAAM,CAAA;IACjB,cAAc,EAAE,MAAM,CAAA;IACtB,aAAa,EAAE,MAAM,EAAE,CAAA;CACxB,kBAyKA,CAAA"}
+{"version":3,"file":"buildVercelOutputDirectory.d.ts","sourceRoot":"","sources":["../../../src/vercel/build/buildVercelOutputDirectory.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,QAAQ,CAAA;AAS1C,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,kBAAkB,CAAA;AA2B3C,eAAO,MAAM,0BAA0B,GAAU,+EAM9C;IACD,SAAS,EAAE,YAAY,GAAG,IAAI,CAAA;IAC9B,mBAAmB,EAAE,GAAG,CAAC,SAAS,CAAA;IAClC,SAAS,EAAE,MAAM,CAAA;IACjB,cAAc,EAAE,MAAM,CAAA;IACtB,aAAa,EAAE,MAAM,EAAE,CAAA;CACxB,kBAgLA,CAAA"}

package/types/vercel/build/getPathFromRoute.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"getPathFromRoute.d.ts","sourceRoot":"","sources":["../../../src/vercel/build/getPathFromRoute.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAA;AAEjD,wBAAgB,gBAAgB,CAAC,KAAK,EAAE,SAAS,CAAC,MAAM,CAAC,EAAG,OAAO,GAAE;IAAE,YAAY,CAAC,EAAE,OAAO,CAAA;CAAO,UAInG"}
+{"version":3,"file":"getPathFromRoute.d.ts","sourceRoot":"","sources":["../../../src/vercel/build/getPathFromRoute.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAA;AAEjD,wBAAgB,gBAAgB,CAC9B,KAAK,EAAE,SAAS,CAAC,MAAM,CAAC,EACxB,OAAO,GAAE;IAAE,YAAY,CAAC,EAAE,OAAO,CAAA;CAAO,UAKzC"}