@dudousxd/nestjs-inertia-codegen 1.3.0 → 1.4.0

package/dist/index.d.cts

@@ -127,6 +127,9 @@ declare function watch(config: ResolvedConfig, onChange?: () => void): Promise<W
 /**
  * Try to acquire an exclusive lock for a watcher in `outDir`.
  *
+ * Uses O_CREAT | O_EXCL (via 'wx' flag) for atomic file creation to prevent
+ * TOCTOU race conditions between concurrent processes.
+ *
  * Returns `{ release }` on success.
  * Returns `null` if another live process already holds the lock.
  */
@@ -134,6 +137,6 @@ declare function acquireLock(outDir: string): Promise<{
     release: () => Promise<void>;
 } | null>;
 
-declare const VERSION = "1.3.0";
+declare const VERSION = "1.4.0";
 
 export { CodegenError, ConfigError, type ResolvedConfig, type ScopeConfig, type UserConfig, VERSION, type Watcher, acquireLock, defineConfig, generate, loadConfig, watch };

package/dist/index.d.ts

@@ -127,6 +127,9 @@ declare function watch(config: ResolvedConfig, onChange?: () => void): Promise<W
 /**
  * Try to acquire an exclusive lock for a watcher in `outDir`.
  *
+ * Uses O_CREAT | O_EXCL (via 'wx' flag) for atomic file creation to prevent
+ * TOCTOU race conditions between concurrent processes.
+ *
  * Returns `{ release }` on success.
  * Returns `null` if another live process already holds the lock.
  */
@@ -134,6 +137,6 @@ declare function acquireLock(outDir: string): Promise<{
     release: () => Promise<void>;
 } | null>;
 
-declare const VERSION = "1.3.0";
+declare const VERSION = "1.4.0";
 
 export { CodegenError, ConfigError, type ResolvedConfig, type ScopeConfig, type UserConfig, VERSION, type Watcher, acquireLock, defineConfig, generate, loadConfig, watch };

package/dist/index.js

@@ -228,16 +228,6 @@ function validateNameSegment(seg, fullName) {
   }
 }
 __name(validateNameSegment, "validateNameSegment");
-function detectCollisions(tree, name) {
-  for (const [key, node] of tree) {
-    if (node.kind === "leaf") {
-    } else {
-      void key;
-    }
-  }
-  void name;
-}
-__name(detectCollisions, "detectCollisions");
 function insertIntoTree(tree, segments, leaf, fullName) {
   const head = segments[0];
   const rest = segments.slice(1);
@@ -267,6 +257,16 @@ function insertIntoTree(tree, segments, leaf, fullName) {
   }
 }
 __name(insertIntoTree, "insertIntoTree");
+function buildParamsType(params) {
+  const pathParams = params.filter((p) => p.source === "path");
+  if (pathParams.length === 0) return "never";
+  return `{ ${pathParams.map((p) => `${p.name}: string`).join("; ")} }`;
+}
+__name(buildParamsType, "buildParamsType");
+function hasPathParams(params) {
+  return params.some((p) => p.source === "path");
+}
+__name(hasPathParams, "hasPathParams");
 function buildResponseType(c, outDir) {
   if (c.controllerRef) {
     let relPath = relative3(outDir, c.controllerRef.filePath).replace(/\.ts$/, "");
@@ -293,9 +293,10 @@ function emitRouterTypeBlock(tree, indent, outDir) {
       const bodyRef = c.contractSource.bodyRef;
       const body = method === "GET" ? "never" : bodyRef ? bodyRef.isArray ? `Array<${bodyRef.name}>` : bodyRef.name : c.contractSource.body ?? "never";
       const response = buildResponseType(c, outDir);
+      const params = buildParamsType(c.params);
       const safeMethod = JSON.stringify(method);
       const safeUrl = JSON.stringify(c.path);
-      lines.push(`${pad}${objKey}: { method: ${safeMethod}; url: ${safeUrl}; query: ${query}; body: ${body}; response: ${response} };`);
+      lines.push(`${pad}${objKey}: { method: ${safeMethod}; url: ${safeUrl}; params: ${params}; query: ${query}; body: ${body}; response: ${response} };`);
     } else {
       lines.push(`${pad}${objKey}: {`);
       lines.push(...emitRouterTypeBlock(node.children, indent + 2, outDir));
@@ -318,21 +319,60 @@ function emitApiObjectBlock(tree, indent) {
       const fetcherMethod = method.toLowerCase();
       if (method === "GET") {
         const typeAccess = buildRouterTypeAccess(c.name);
+        const withParams = hasPathParams(c.params);
         lines.push(`${pad}${objKey}: {`);
-        lines.push(`${pad}  queryKey: (query?: ${typeAccess}['query']) => query !== undefined ? [${flatName}, query] as const : [${flatName}] as const,`);
-        lines.push(`${pad}  queryOptions: (query?: ${typeAccess}['query']) =>`);
-        lines.push(`${pad}    _queryOptions({`);
-        lines.push(`${pad}      queryKey: query !== undefined ? [${flatName}, query] as const : [${flatName}] as const,`);
-        lines.push(`${pad}      queryFn: () => fetcher.get<${typeAccess}['response']>(route(${flatName} as never) || ${safePath}, { query }),`);
-        lines.push(`${pad}    }),`);
+        if (withParams) {
+          lines.push(`${pad}  queryKey: (params: ${typeAccess}['params'], query?: ${typeAccess}['query']) => query !== undefined ? [${flatName}, params, query] as const : [${flatName}, params] as const,`);
+          lines.push(`${pad}  queryOptions: (params: ${typeAccess}['params'], query?: ${typeAccess}['query']) =>`);
+          lines.push(`${pad}    _queryOptions({`);
+          lines.push(`${pad}      queryKey: query !== undefined ? [${flatName}, params, query] as const : [${flatName}, params] as const,`);
+          lines.push(`${pad}      queryFn: () => fetcher.get<${typeAccess}['response']>(route(${flatName} as never, params as never) || ${safePath}, { query }),`);
+          lines.push(`${pad}    }),`);
+          lines.push(`${pad}  infiniteQueryOptions: (params: ${typeAccess}['params'], query?: ${typeAccess}['query']) => ({`);
+          lines.push(`${pad}    queryKey: query !== undefined ? [${flatName}, params, query] as const : [${flatName}, params] as const,`);
+          lines.push(`${pad}    queryFn: ({ pageParam }: { pageParam: number }) => fetcher.get<${typeAccess}['response']>(route(${flatName} as never, params as never) || ${safePath}, { query: { ...query, page: pageParam } }),`);
+          lines.push(`${pad}    initialPageParam: 1,`);
+          lines.push(`${pad}    getNextPageParam: (lastPage: ${typeAccess}['response']) => {`);
+          lines.push(`${pad}      const meta = (lastPage as any)?.meta;`);
+          lines.push(`${pad}      if (meta?.page != null && meta?.lastPage != null) {`);
+          lines.push(`${pad}        return meta.page < meta.lastPage ? meta.page + 1 : undefined;`);
+          lines.push(`${pad}      }`);
+          lines.push(`${pad}      return undefined;`);
+          lines.push(`${pad}    },`);
+          lines.push(`${pad}  }),`);
+        } else {
+          lines.push(`${pad}  queryKey: (query?: ${typeAccess}['query']) => query !== undefined ? [${flatName}, query] as const : [${flatName}] as const,`);
+          lines.push(`${pad}  queryOptions: (query?: ${typeAccess}['query']) =>`);
+          lines.push(`${pad}    _queryOptions({`);
+          lines.push(`${pad}      queryKey: query !== undefined ? [${flatName}, query] as const : [${flatName}] as const,`);
+          lines.push(`${pad}      queryFn: () => fetcher.get<${typeAccess}['response']>(route(${flatName} as never) || ${safePath}, { query }),`);
+          lines.push(`${pad}    }),`);
+          lines.push(`${pad}  infiniteQueryOptions: (query?: ${typeAccess}['query']) => ({`);
+          lines.push(`${pad}    queryKey: query !== undefined ? [${flatName}, query] as const : [${flatName}] as const,`);
+          lines.push(`${pad}    queryFn: ({ pageParam }: { pageParam: number }) => fetcher.get<${typeAccess}['response']>(route(${flatName} as never) || ${safePath}, { query: { ...query, page: pageParam } }),`);
+          lines.push(`${pad}    initialPageParam: 1,`);
+          lines.push(`${pad}    getNextPageParam: (lastPage: ${typeAccess}['response']) => {`);
+          lines.push(`${pad}      const meta = (lastPage as any)?.meta;`);
+          lines.push(`${pad}      if (meta?.page != null && meta?.lastPage != null) {`);
+          lines.push(`${pad}        return meta.page < meta.lastPage ? meta.page + 1 : undefined;`);
+          lines.push(`${pad}      }`);
+          lines.push(`${pad}      return undefined;`);
+          lines.push(`${pad}    },`);
+          lines.push(`${pad}  }),`);
+        }
         lines.push(`${pad}},`);
       } else {
         const typeAccess = buildRouterTypeAccess(c.name);
+        const withParams = hasPathParams(c.params);
         lines.push(`${pad}${objKey}: {`);
         lines.push(`${pad}  queryKey: () => [${flatName}] as const,`);
         lines.push(`${pad}  mutationOptions: () =>`);
         lines.push(`${pad}    _mutationOptions({`);
-        lines.push(`${pad}      mutationFn: (body: ${typeAccess}['body']) => fetcher.${fetcherMethod}<${typeAccess}['response']>(route(${flatName} as never) || ${safePath}, { body }),`);
+        if (withParams) {
+          lines.push(`${pad}      mutationFn: (input: { params: ${typeAccess}['params']; body: ${typeAccess}['body'] }) => fetcher.${fetcherMethod}<${typeAccess}['response']>(route(${flatName} as never, input.params as never) || ${safePath}, { body: input.body }),`);
+        } else {
+          lines.push(`${pad}      mutationFn: (body: ${typeAccess}['body']) => fetcher.${fetcherMethod}<${typeAccess}['response']>(route(${flatName} as never) || ${safePath}, { body }),`);
+        }
         lines.push(`${pad}    }),`);
         lines.push(`${pad}},`);
       }
@@ -439,12 +479,12 @@ function buildApiFile(routes, outDir) {
       method: r.method,
       name,
       path: r.path,
+      params: r.params,
       controllerRef: r.controllerRef,
       contractSource: c.contractSource
     };
     insertIntoTree(tree, segments, leaf, name);
   }
-  void detectCollisions;
   lines.push("export type ApiRouter = {");
   lines.push(...emitRouterTypeBlock(tree, 2, outDir ?? ""));
   lines.push("};");
@@ -542,8 +582,9 @@ __name(emitIndex, "emitIndex");
 
 // src/emit/emit-pages.ts
 import { mkdir as mkdir4, writeFile as writeFile4 } from "fs/promises";
-import { join as join5 } from "path";
-async function emitPages(pages, outDir) {
+import { join as join5, relative as relative4 } from "path";
+async function emitPages(pages, outDir, options = {}) {
+  const propsExport = options.propsExport ?? "ComponentProps";
   await mkdir4(outDir, {
     recursive: true
   });
@@ -552,14 +593,40 @@ async function emitPages(pages, outDir) {
     const key = needsQuotes(p.name) ? JSON.stringify(p.name) : p.name;
     return `  ${key}: ${propType};`;
   }).join("\n");
+  const pageNameUnion = pages.length > 0 ? pages.map((p) => JSON.stringify(p.name)).join(" | ") : "never";
+  const augBody = pages.map((p) => {
+    const key = needsQuotes(p.name) ? JSON.stringify(p.name) : p.name;
+    const valueType = buildAugmentationType(p, outDir, propsExport);
+    return `    ${key}: ${valueType};`;
+  }).join("\n");
+  const propsHelper = "\nexport type InertiaProps<K extends InertiaPageName> = import('@dudousxd/nestjs-inertia').InertiaPages[K];\n";
   const content = `// Generated by @dudousxd/nestjs-inertia-codegen. Do not edit.
 export interface InertiaPages {
 ${body}
 }
+
+export type InertiaPageName = ${pageNameUnion};
+` + propsHelper + `
+declare module '@dudousxd/nestjs-inertia' {
+  interface InertiaPages {
+${augBody}
+  }
+}
 `;
   await writeFile4(join5(outDir, "pages.d.ts"), content, "utf8");
 }
 __name(emitPages, "emitPages");
+function buildAugmentationType(page, outDir, propsExport) {
+  if (!page.propsSource) {
+    return "Record<string, unknown>";
+  }
+  let importPath = relative4(outDir, page.absolutePath).replace(/\.(tsx?|vue|svelte)$/, "");
+  if (!importPath.startsWith(".")) {
+    importPath = `./${importPath}`;
+  }
+  return `import('${importPath}').${propsExport}`;
+}
+__name(buildAugmentationType, "buildAugmentationType");
 function needsQuotes(name) {
   return !/^[A-Za-z_$][A-Za-z0-9_$]*$/.test(name);
 }
@@ -696,7 +763,9 @@ async function generate(config, routes = []) {
     propsExport: config.pages.propsExport,
     componentNameStrategy: config.pages.componentNameStrategy
   });
-  await emitPages(pages, config.codegen.outDir);
+  await emitPages(pages, config.codegen.outDir, {
+    propsExport: config.pages.propsExport
+  });
   await emitCache(pages, config.codegen.outDir);
   const hasRoutes = routes.length > 0;
   const hasContracts = routes.some((r) => r.contract);
@@ -720,8 +789,18 @@ import { readFileSync } from "fs";
 import { dirname, join as join7, resolve as resolve2 } from "path";
 import fg2 from "fast-glob";
 import { Node, Project, SyntaxKind } from "ts-morph";
-var _projectRoot = "";
-var _tsconfigPaths = null;
+var _ctx = {
+  projectRoot: "",
+  tsconfigPaths: null
+};
+function _projectRoot() {
+  return _ctx.projectRoot;
+}
+__name(_projectRoot, "_projectRoot");
+function _tsconfigPaths() {
+  return _ctx.tsconfigPaths;
+}
+__name(_tsconfigPaths, "_tsconfigPaths");
 var _debug = process.env.NESTJS_INERTIA_DEBUG === "1";
 function dbg(...args) {
   if (_debug) console.log("[codegen:debug]", ...args);
@@ -770,10 +849,17 @@ async function discoverContractsFast(opts) {
     project.addSourceFileAtPath(f);
   }
   const routes = [];
-  _projectRoot = cwd;
-  _tsconfigPaths = loadTsconfigPaths(tsconfigPath);
-  for (const sourceFile of project.getSourceFiles()) {
-    routes.push(...extractFromSourceFile(sourceFile, project));
+  const prevCtx = _ctx;
+  _ctx = {
+    projectRoot: cwd,
+    tsconfigPaths: loadTsconfigPaths(tsconfigPath)
+  };
+  try {
+    for (const sourceFile of project.getSourceFiles()) {
+      routes.push(...extractFromSourceFile(sourceFile, project));
+    }
+  } finally {
+    _ctx = prevCtx;
   }
   return routes;
 }
@@ -981,10 +1067,11 @@ function resolveModuleSpecifier(moduleSpecifier, sourceFile, project) {
       resolve2(dir, moduleSpecifier, "index.ts")
     ];
   }
-  const baseUrl = _projectRoot;
-  dbg("resolveModuleSpecifier", moduleSpecifier, "paths:", JSON.stringify(_tsconfigPaths), "baseUrl:", baseUrl);
-  if (_tsconfigPaths) {
-    for (const [pattern, mappings] of Object.entries(_tsconfigPaths)) {
+  const baseUrl = _projectRoot();
+  const tsconfigPaths = _tsconfigPaths();
+  dbg("resolveModuleSpecifier", moduleSpecifier, "paths:", JSON.stringify(tsconfigPaths), "baseUrl:", baseUrl);
+  if (tsconfigPaths) {
+    for (const [pattern, mappings] of Object.entries(tsconfigPaths)) {
       const prefix = pattern.replace("*", "");
       if (moduleSpecifier.startsWith(prefix)) {
         const rest = moduleSpecifier.slice(prefix.length);
@@ -1470,18 +1557,16 @@ function extractFromSourceFile(sourceFile, project) {
             methodName,
             filePath: sourceFile.getFilePath()
           },
-          ...dtoContract ? {
-            contract: {
-              contractSource: {
-                query: dtoContract.query,
-                body: dtoContract.body,
-                response: dtoContract.response,
-                queryRef: dtoContract.queryRef,
-                bodyRef: dtoContract.bodyRef,
-                responseRef: dtoContract.responseRef
-              }
+          contract: {
+            contractSource: {
+              query: dtoContract?.query ?? null,
+              body: dtoContract?.body ?? null,
+              response: dtoContract?.response ?? "unknown",
+              queryRef: dtoContract?.queryRef,
+              bodyRef: dtoContract?.bodyRef,
+              responseRef: dtoContract?.responseRef
             }
-          } : {}
+          }
         });
       }
     }
@@ -1491,7 +1576,8 @@ function extractFromSourceFile(sourceFile, project) {
 __name(extractFromSourceFile, "extractFromSourceFile");
 
 // src/watch/lock-file.ts
-import { mkdir as mkdir6, readFile as readFile2, unlink, writeFile as writeFile6 } from "fs/promises";
+import { open } from "fs/promises";
+import { mkdir as mkdir6, readFile as readFile2, unlink } from "fs/promises";
 import { join as join8 } from "path";
 var LOCK_FILE = ".watcher.lock";
 function isProcessAlive(pid) {
@@ -1508,20 +1594,29 @@ async function acquireLock(outDir) {
     recursive: true
   });
   const lockPath = join8(outDir, LOCK_FILE);
-  try {
-    const raw = await readFile2(lockPath, "utf8");
-    const existing = JSON.parse(raw);
-    if (isProcessAlive(existing.pid)) {
-      return null;
-    }
-  } catch {
-  }
   const lockData = {
     pid: process.pid,
     startedAt: (/* @__PURE__ */ new Date()).toISOString()
   };
-  await writeFile6(lockPath, `${JSON.stringify(lockData, null, 2)}
+  try {
+    const fd = await open(lockPath, "wx");
+    await fd.writeFile(`${JSON.stringify(lockData, null, 2)}
 `, "utf8");
+    await fd.close();
+  } catch (err) {
+    if (err.code === "EEXIST") {
+      try {
+        const raw = await readFile2(lockPath, "utf8");
+        const existing = JSON.parse(raw);
+        if (isProcessAlive(existing.pid)) return null;
+        await unlink(lockPath);
+        return acquireLock(outDir);
+      } catch {
+        return null;
+      }
+    }
+    return null;
+  }
   return {
     release: /* @__PURE__ */ __name(async () => {
       try {
@@ -1585,7 +1680,8 @@ async function watch(config, onChange) {
       pagesDebounceTimer = void 0;
       try {
         await generate(config);
-      } catch {
+      } catch (err) {
+        console.error("[nestjs-inertia-codegen] Pages generation failed:", err instanceof Error ? err.message : err);
       }
       onChange?.();
     }, PAGES_DEBOUNCE_MS);
@@ -1623,7 +1719,8 @@ async function watch(config, onChange) {
         if (hasContracts) {
           await emitApi(routes, config.codegen.outDir);
         }
-      } catch {
+      } catch (err) {
+        console.error("[nestjs-inertia-codegen] Contracts generation failed:", err instanceof Error ? err.message : err);
       }
       onChange?.();
     }, config.contracts.debounceMs);
@@ -1651,7 +1748,7 @@ async function watch(config, onChange) {
 __name(watch, "watch");
 
 // src/index.ts
-var VERSION = "1.3.0";
+var VERSION = "1.4.0";
 export {
   CodegenError,
   ConfigError,