fix: import proto response types in v2 codegen when no Orval counterpart exists

The code generator only added request types to proto imports, so when a
new API had no legacy Orval V1 types (e.g. ProjectStorage in #9203),
the response type was referenced but never imported — failing TypeScript.

Also cleaned up the import generation section for readability: colocated
variables with their usage, improved comments, consistent naming
(protoImports/orvalImports), and resequenced the collection loop next to
the emission code it feeds.

Author: ericpgreen2

web-common/src/runtime-client/v2/codegen/generator.spec.ts

@@ -398,6 +398,28 @@ describe("generateServiceFile", () => {
       expect(code).not.toContain("createMutation");
       expect(code).not.toContain("CreateMutationOptions");
     });
+
+    it("imports proto response types when no Orval counterpart exists", () => {
+      // With no Orval types, response types must be imported from _pb.ts
+      // so PartialMessage<FakeResponse> resolves in TypeScript
+      expect(output).toContain("FakeResponse,");
+      expect(output).toContain("FakePaginatedResponse,");
+      expect(output).toContain("PartialMessage");
+    });
+
+    it("does not import proto response types when Orval counterpart exists", () => {
+      const orvalTypes = new Set([
+        "V1FakeRequestWithInstanceId",
+        "V1FakeRequestWithoutInstanceId",
+        "V1FakeResponse",
+        "V1FakePaginatedRequest",
+        "V1FakePaginatedResponse",
+      ]);
+      const { code } = generateServiceFile(mockService, orvalTypes);
+      // Response types should come from Orval, not proto
+      expect(code).toContain("V1FakeResponse");
+      expect(code).not.toContain("PartialMessage");
+    });
   });
 });
 

web-common/src/runtime-client/v2/codegen/generator.ts

@@ -376,44 +376,20 @@ function generateServiceFile(
     (m) => m.hasPageToken && m.hasNextPageToken,
   );
 
-  // Collect proto types (value imports; needed for fromJson/toJson calls)
-  const protoTypes = new Set<string>();
-  // Collect Orval types (type-only imports; used in public API signatures)
-  const orvalTypeImports = new Set<string>();
-  // Track whether PartialMessage is needed (for request types without V1 counterparts)
-  let needsPartialMessage = false;
-  const needsInfiniteQuery = infiniteQueryMethods.length > 0;
-
-  for (const m of methods) {
-    protoTypes.add(m.inputType);
-
-    if (hasOrvalType(availableOrvalTypes, m.inputType)) {
-      orvalTypeImports.add(orvalTypeName(m.inputType));
-    } else {
-      needsPartialMessage = true;
-    }
-
-    if (hasOrvalType(availableOrvalTypes, m.outputType)) {
-      orvalTypeImports.add(orvalTypeName(m.outputType));
-    }
-  }
-
   const lines: string[] = [];
 
   // Header
   lines.push(`// Generated by codegen/run.ts — DO NOT EDIT`);
   lines.push(``);
 
-  // Imports are sorted to match VS Code's "Organize Imports" order:
-  // package imports first (alphabetical), then relative imports (alphabetical).
-  // Specifiers within each import: values first, then types, each alphabetical.
-
-  const hasQueries = queryMethods.length > 0;
-  const hasMutations = mutationMethods.length > 0;
-
-  // --- Package imports (sorted by module path) ---
+  // --- Package imports ---
 
   // @bufbuild/protobuf
+  const needsPartialMessage = methods.some(
+    (m) =>
+      !hasOrvalType(availableOrvalTypes, m.inputType) ||
+      !hasOrvalType(availableOrvalTypes, m.outputType),
+  );
   const bufSpecs: string[] = ["JsonValue"];
   if (needsPartialMessage) bufSpecs.push("PartialMessage");
   bufSpecs.sort();
@@ -424,7 +400,10 @@ function generateServiceFile(
   // @connectrpc/connect
   lines.push(`import type { ConnectError } from "@connectrpc/connect";`);
 
-  // @tanstack/svelte-query (mixed import: values first, then inline types)
+  // @tanstack/svelte-query
+  const hasQueries = queryMethods.length > 0;
+  const hasMutations = mutationMethods.length > 0;
+  const needsInfiniteQuery = infiniteQueryMethods.length > 0;
   const tanstackValues: string[] = [];
   const tanstackTypes: string[] = [];
   if (hasQueries) {
@@ -461,19 +440,35 @@ function generateServiceFile(
     );
   }
 
-  // --- Relative imports (sorted by module path) ---
+  // --- Relative imports ---
+
+  // Use legacy Orval types (from index.schemas.ts) for methods that still
+  // have them; use proto types (from _pb.ts) for new and migrated methods.
+  const protoImports = new Set<string>();
+  const orvalImports = new Set<string>();
+
+  for (const m of methods) {
+    protoImports.add(m.inputType); // always needed for serialization
+    if (hasOrvalType(availableOrvalTypes, m.inputType)) {
+      orvalImports.add(orvalTypeName(m.inputType));
+    }
+
+    if (hasOrvalType(availableOrvalTypes, m.outputType)) {
+      orvalImports.add(orvalTypeName(m.outputType));
+    } else {
+      protoImports.add(m.outputType);
+    }
+  }
 
-  // Proto type imports (value; needed for fromJson calls)
-  const sortedProto = [...protoTypes].sort();
+  const sortedProto = [...protoImports].sort();
   lines.push(
     `import {`,
     ...sortedProto.map((t) => `  ${t},`),
     `} from "${protoImportPath}";`,
   );
 
-  // Orval type imports (type-only; for public API signatures)
-  if (orvalTypeImports.size > 0) {
-    const sortedOrval = [...orvalTypeImports].sort();
+  if (orvalImports.size > 0) {
+    const sortedOrval = [...orvalImports].sort();
     lines.push(
       `import type {`,
       ...sortedOrval.map((t) => `  ${t},`),