@vertz/codegen 0.2.13 → 0.2.15

package/dist/index.js

@@ -116,7 +116,7 @@ async function formatWithBiome(files) {
 }
 // src/generate.ts
 import { mkdir as mkdir3, readFile as readFile3, writeFile as writeFile3 } from "node:fs/promises";
-import { dirname as dirname3, join as join3, resolve as resolve3 } from "node:path";
+import { dirname as dirname4, join as join4, resolve as resolve4 } from "node:path";
 
 // src/generators/client-generator.ts
 import { posix } from "node:path";
@@ -666,9 +666,119 @@ ${props};
   }
 }
 
+// src/generators/router-augmentation-generator.ts
+import { existsSync, readdirSync, readFileSync } from "node:fs";
+import { dirname as dirname2, extname, join as join2, relative, resolve as resolve2, sep } from "node:path";
+var FILE_HEADER5 = `// Generated by @vertz/codegen — do not edit
+
+`;
+var CANDIDATE_ROUTE_FILES = [
+  ["src", "router.ts"],
+  ["src", "router.tsx"],
+  ["src", "ui", "router.ts"],
+  ["src", "ui", "router.tsx"]
+];
+var SOURCE_EXTENSIONS = new Set([".ts", ".tsx"]);
+var EXPORTED_ROUTES_PATTERN = /export\s+const\s+routes\b/m;
+var REEXPORTED_ROUTES_PATTERN = /const\s+routes\b[\s\S]*?export\s*\{\s*routes\b/m;
+
+class RouterAugmentationGenerator {
+  name = "router-augmentation";
+  generate(_ir, config) {
+    const projectRoot = findProjectRoot(config.outputDir);
+    if (!projectRoot)
+      return [];
+    const routeModulePath = findRouteModule(projectRoot);
+    if (!routeModulePath)
+      return [];
+    return [
+      {
+        path: "router.d.ts",
+        content: renderRouterAugmentation(routeModulePath, config.outputDir)
+      }
+    ];
+  }
+}
+function findProjectRoot(outputDir) {
+  let current = resolve2(outputDir);
+  while (true) {
+    if (existsSync(join2(current, "package.json"))) {
+      return current;
+    }
+    const parent = dirname2(current);
+    if (parent === current) {
+      return null;
+    }
+    current = parent;
+  }
+}
+function findRouteModule(projectRoot) {
+  for (const candidate of CANDIDATE_ROUTE_FILES) {
+    const candidatePath = join2(projectRoot, ...candidate);
+    if (existsSync(candidatePath) && fileExportsRoutes(candidatePath)) {
+      return candidatePath;
+    }
+  }
+  return scanForRouteModule(join2(projectRoot, "src"));
+}
+function scanForRouteModule(dir) {
+  if (!existsSync(dir))
+    return null;
+  for (const entry of readdirSync(dir, { withFileTypes: true })) {
+    const fullPath = join2(dir, entry.name);
+    if (entry.isDirectory()) {
+      const nested = scanForRouteModule(fullPath);
+      if (nested) {
+        return nested;
+      }
+      continue;
+    }
+    if (!entry.isFile())
+      continue;
+    const extension = extname(entry.name);
+    if (extension === ".d.ts" || !SOURCE_EXTENSIONS.has(extension))
+      continue;
+    if (fileExportsRoutes(fullPath)) {
+      return fullPath;
+    }
+  }
+  return null;
+}
+function fileExportsRoutes(filePath) {
+  const source = readFileSync(filePath, "utf-8");
+  if (!source.includes("defineRoutes("))
+    return false;
+  return EXPORTED_ROUTES_PATTERN.test(source) || REEXPORTED_ROUTES_PATTERN.test(source);
+}
+function renderRouterAugmentation(routeModulePath, outputDir) {
+  const importPath = toImportPath(relative(resolve2(outputDir), routeModulePath));
+  return [
+    FILE_HEADER5,
+    "import type { InferRouteMap, TypedRouter, UnwrapSignals } from '@vertz/ui';",
+    `import type { routes } from '${importPath}';`,
+    "",
+    "type AppRouteMap = InferRouteMap<typeof routes>;",
+    "",
+    "declare module '@vertz/ui' {",
+    "  export function useRouter(): UnwrapSignals<TypedRouter<AppRouteMap>>;",
+    "}",
+    "",
+    "declare module '@vertz/ui/router' {",
+    "  export function useRouter(): UnwrapSignals<TypedRouter<AppRouteMap>>;",
+    "}",
+    ""
+  ].join(`
+`);
+}
+function toImportPath(pathToModule) {
+  const normalized = pathToModule.split(sep).join("/");
+  const withoutExtension = normalized.replace(/\.[^.]+$/, "");
+  return withoutExtension.startsWith(".") ? withoutExtension : `./${withoutExtension}`;
+}
+
 // src/incremental.ts
 import { mkdir as mkdir2, readdir, readFile as readFile2, rm as rm2, writeFile as writeFile2 } from "node:fs/promises";
-import { dirname as dirname2, join as join2, relative, resolve as resolve2 } from "node:path";
+import { dirname as dirname3, join as join3, relative as relative2, resolve as resolve3 } from "node:path";
 
 // src/hasher.ts
 import { createHash } from "node:crypto";
@@ -686,11 +796,11 @@ async function collectFiles(dir, baseDir) {
     return results;
   }
   for (const entry of entries) {
-    const fullPath = join2(dir, entry.name);
+    const fullPath = join3(dir, entry.name);
     if (entry.isDirectory()) {
       results.push(...await collectFiles(fullPath, baseDir));
     } else if (entry.isFile()) {
-      results.push(relative(baseDir, fullPath));
+      results.push(relative2(baseDir, fullPath));
     }
   }
   return results;
@@ -702,12 +812,12 @@ async function writeIncremental(files, outputDir, options) {
   await mkdir2(outputDir, { recursive: true });
   const generatedPaths = new Set(files.map((f) => f.path));
   for (const file of files) {
-    const filePath = join2(outputDir, file.path);
-    const resolvedPath = resolve2(filePath);
-    if (!resolvedPath.startsWith(resolve2(outputDir))) {
+    const filePath = join3(outputDir, file.path);
+    const resolvedPath = resolve3(filePath);
+    if (!resolvedPath.startsWith(resolve3(outputDir))) {
       throw new Error(`Generated file path "${file.path}" escapes output directory`);
     }
-    const dir = dirname2(filePath);
+    const dir = dirname3(filePath);
     await mkdir2(dir, { recursive: true });
     let existingContent;
     try {
@@ -724,7 +834,7 @@ async function writeIncremental(files, outputDir, options) {
     const existingFiles = await collectFiles(outputDir, outputDir);
     for (const existing of existingFiles) {
       if (!generatedPaths.has(existing)) {
-        await rm2(join2(outputDir, existing), { force: true });
+        await rm2(join3(outputDir, existing), { force: true });
         removed.push(existing);
       }
     }
@@ -863,6 +973,8 @@ function runTypescriptGenerator(ir, _config) {
   files.push(...entitySdkGen.generate(ir, generatorConfig));
   const clientGen = new ClientGenerator;
   files.push(...clientGen.generate(ir, generatorConfig));
+  const routerAugmentationGen = new RouterAugmentationGenerator;
+  files.push(...routerAugmentationGen.generate(ir, generatorConfig));
   return files;
 }
 function generateSync(ir, config) {
@@ -889,10 +1001,10 @@ async function mergeImportsToPackageJson(files, outputDir) {
   const imports = generated.imports;
   if (!imports || Object.keys(imports).length === 0)
     return false;
-  const projectRoot = await findProjectRoot(resolve3(outputDir));
+  const projectRoot = await findProjectRoot2(resolve4(outputDir));
   if (!projectRoot)
     return false;
-  const pkgPath = join3(projectRoot, "package.json");
+  const pkgPath = join4(projectRoot, "package.json");
   const raw = await readFile3(pkgPath, "utf-8");
   const pkg = JSON.parse(raw);
   const existing = pkg.imports;
@@ -904,15 +1016,15 @@ async function mergeImportsToPackageJson(files, outputDir) {
 `, "utf-8");
   return true;
 }
-async function findProjectRoot(startDir) {
+async function findProjectRoot2(startDir) {
   let dir = startDir;
-  const root = dirname3(dir);
+  const root = dirname4(dir);
   while (dir !== root) {
     try {
-      await readFile3(join3(dir, "package.json"), "utf-8");
+      await readFile3(join4(dir, "package.json"), "utf-8");
       return dir;
     } catch {
-      dir = dirname3(dir);
+      dir = dirname4(dir);
     }
   }
   return null;
@@ -932,12 +1044,12 @@ async function generate(appIR, config) {
   } else {
     await mkdir3(config.outputDir, { recursive: true });
     for (const file of files) {
-      const filePath = join3(config.outputDir, file.path);
-      const resolvedPath = resolve3(filePath);
-      if (!resolvedPath.startsWith(resolve3(config.outputDir))) {
+      const filePath = join4(config.outputDir, file.path);
+      const resolvedPath = resolve4(filePath);
+      if (!resolvedPath.startsWith(resolve4(config.outputDir))) {
         throw new Error(`Generated file path "${file.path}" escapes output directory`);
       }
-      const dir = dirname3(filePath);
+      const dir = dirname4(filePath);
       await mkdir3(dir, { recursive: true });
       await writeFile3(filePath, file.content, "utf-8");
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vertz/codegen",
-  "version": "0.2.13",
+  "version": "0.2.15",
   "type": "module",
   "license": "MIT",
   "description": "Vertz code generation — internal, no stability guarantee",
@@ -27,7 +27,7 @@
     "typecheck": "tsc --noEmit -p tsconfig.typecheck.json"
   },
   "dependencies": {
-    "@vertz/compiler": "^0.2.12"
+    "@vertz/compiler": "^0.2.14"
   },
   "devDependencies": {
     "@types/node": "^25.3.1",