@7nohe/openapi-react-query-codegen 3.0.0-beta.5 → 3.0.1

package/dist/generate.d.mts

@@ -1,2 +1,3 @@
 import type { LimitedUserConfig } from "./cli.mjs";
+export declare function findNearestTsConfigPath(startDir: string): string | undefined;
 export declare function generate(options: LimitedUserConfig, version: string): Promise<void>;

package/dist/generate.mjs

@@ -1,10 +1,30 @@
-import { writeFile } from "node:fs/promises";
+import { readdirSync } from "node:fs";
+import { readFile, writeFile } from "node:fs/promises";
 import path from "node:path";
 import { createClient } from "@hey-api/openapi-ts";
 import { buildQueriesOutputPath, buildRequestsOutputPath, formatOptions, } from "./common.mjs";
 import { createSource } from "./createSource.mjs";
 import { formatOutput, processOutput } from "./format.mjs";
 import { print } from "./print.mjs";
+// openapi-ts's own tsconfig auto-detection walks up from its *install*
+// location, which in this monorepo reaches this repo's own root tsconfig
+// (NodeNext) instead of the caller's project config. Anchoring the search
+// at cwd instead finds the tsconfig that actually applies to the generated
+// output, matching the resolution the caller's own `tsc` will use.
+export function findNearestTsConfigPath(startDir) {
+    let dir = startDir;
+    while (true) {
+        const candidates = readdirSync(dir).filter((file) => file.startsWith("tsconfig") && file.endsWith(".json"));
+        if (candidates.length > 0) {
+            candidates.sort((a) => (a === "tsconfig.json" ? -1 : 1));
+            return path.join(dir, candidates[0]);
+        }
+        const parent = path.dirname(dir);
+        if (parent === dir)
+            return undefined;
+        dir = parent;
+    }
+}
 export async function generate(options, version) {
     const openApiOutputPath = buildRequestsOutputPath(options.output);
     const formattedOptions = formatOptions(options);
@@ -55,13 +75,20 @@ export async function generate(options, version) {
     const config = {
         dryRun: false,
         input: formattedOptions.input,
-        output: openApiOutputPath,
+        output: {
+            path: openApiOutputPath,
+            tsConfigPath: findNearestTsConfigPath(process.cwd()) ?? null,
+        },
         plugins,
     };
     await createClient(config);
     // Generate backward-compatible services.gen.ts shim
-    // client.gen.ts has the `client` instance; sdk.gen.ts has SDK functions
-    const shimContent = `// This file is auto-generated for backward compatibility\nexport * from './client.gen.js';\nexport * from './sdk.gen.js';\n`;
+    // client.gen.ts has the `client` instance; sdk.gen.ts has SDK functions.
+    // Mirror whatever extension convention openapi-ts used for its own
+    // cross-file imports (e.g. `.js` for NodeNext, none for bundler resolution).
+    const sdkGenContent = await readFile(path.join(openApiOutputPath, "sdk.gen.ts"), "utf-8");
+    const importExtension = sdkGenContent.match(/from ['"]\.\/client\.gen(\.\S*)?['"]/)?.[1] ?? "";
+    const shimContent = `// This file is auto-generated for backward compatibility\nexport * from './client.gen${importExtension}';\nexport * from './sdk.gen${importExtension}';\n`;
     await writeFile(path.join(openApiOutputPath, "services.gen.ts"), shimContent);
     const source = await createSource({
         outputPath: openApiOutputPath,

package/dist/tsmorph/projectFactory.d.mts

@@ -25,6 +25,8 @@ export declare function buildQueryOptionsImport(): ImportDeclarationStructure;
 export declare function buildServiceImport(ctx: GenerationContext): ImportDeclarationStructure;
 /**
  * Build import structure for models.
+ * Emitted as a type-only import so generated code compiles under
+ * `verbatimModuleSyntax` (enabled by default in recent Vite templates).
  */
 export declare function buildModelImport(ctx: GenerationContext): ImportDeclarationStructure | null;
 /**

package/dist/tsmorph/projectFactory.mjs

@@ -43,14 +43,14 @@ export function buildQueryImport() {
             { name: "useInfiniteQuery" },
             { name: "useSuspenseInfiniteQuery" },
             { name: "useMutation" },
-            { name: "UseQueryResult" },
-            { name: "UseQueryOptions" },
-            { name: "UseInfiniteQueryOptions" },
-            { name: "UseSuspenseInfiniteQueryOptions" },
-            { name: "UseMutationOptions" },
-            { name: "UseMutationResult" },
-            { name: "UseSuspenseQueryOptions" },
-            { name: "InfiniteData" },
+            { name: "UseQueryResult", isTypeOnly: true },
+            { name: "UseQueryOptions", isTypeOnly: true },
+            { name: "UseInfiniteQueryOptions", isTypeOnly: true },
+            { name: "UseSuspenseInfiniteQueryOptions", isTypeOnly: true },
+            { name: "UseMutationOptions", isTypeOnly: true },
+            { name: "UseMutationResult", isTypeOnly: true },
+            { name: "UseSuspenseQueryOptions", isTypeOnly: true },
+            { name: "InfiniteData", isTypeOnly: true },
             { name: "FetchQueryOptions", isTypeOnly: true },
             { name: "FetchInfiniteQueryOptions", isTypeOnly: true },
             { name: "EnsureQueryDataOptions", isTypeOnly: true },
@@ -79,6 +79,8 @@ export function buildServiceImport(ctx) {
 }
 /**
  * Build import structure for models.
+ * Emitted as a type-only import so generated code compiles under
+ * `verbatimModuleSyntax` (enabled by default in recent Vite templates).
  */
 export function buildModelImport(ctx) {
     if (ctx.modelNames.length === 0) {
@@ -87,6 +89,7 @@ export function buildModelImport(ctx) {
     return {
         kind: StructureKind.ImportDeclaration,
         moduleSpecifier: "../requests/types.gen",
+        isTypeOnly: true,
         namedImports: ctx.modelNames.map((name) => ({ name })),
     };
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@7nohe/openapi-react-query-codegen",
-  "version": "3.0.0-beta.5",
+  "version": "3.0.1",
   "description": "OpenAPI React Query Codegen",
   "bin": {
     "openapi-rq": "dist/cli.mjs"