@ps-aux/api-client-gen 0.7.0-rc.6 → 0.7.0-rc.8

package/dist/{generateApiClient.mjs → generate.mjs}

@@ -1,10 +1,12 @@
 import Path$1 from 'path';
 import * as fs from 'fs';
+import { existsSync } from 'node:fs';
 import Path from 'node:path';
+import 'c12';
+import { generate } from 'ts-to-zod';
+import fs$1, { mkdir, writeFile, readFile } from 'node:fs/promises';
 import { generateApi } from 'swagger-typescript-api';
 import { fileURLToPath } from 'node:url';
-import fs$1, { readFile, mkdir, writeFile } from 'node:fs/promises';
-import { generate } from 'ts-to-zod';
 
 /** A special constant with type `never` */
 function $constructor(name, initializer, params) {
@@ -4216,7 +4218,7 @@ const vNextOasGeneratorSchema = strictObject({
   }).prefault({}),
   codegen: strictObject({
     unwrap: boolean().default(true),
-    withRequestParams: boolean().default(false),
+    withRequestParams: boolean().default(true),
     pathParamsStyle: _enum(["object", "positional"]).default("positional"),
     enumStyle: _enum(["enum", "union"]).default("enum"),
     comments: strictObject({
@@ -11261,9 +11263,82 @@ class CodeFormatter {
   }
 }
 
-const splitIdentifierWords$1 = (str) => str.replace(/([a-z0-9])([A-Z])/g, "$1 $2").split(/[^a-zA-Z0-9]+/).filter(Boolean);
-const toPascalCaseIdentifier = (str) => splitIdentifierWords$1(str).map((word) => word[0].toUpperCase() + word.substring(1)).join("");
-const toKebabCaseIdentifier = (str) => splitIdentifierWords$1(str).map((word) => word.toLowerCase()).join("-");
+const removeGenericTypes = (code) => {
+  const declarations = [];
+  const declarationStartRegex = /^export\s+(interface|enum|type)\s+[A-Za-z0-9_]+(?:<[^>\n]+>)?/gm;
+  let match;
+  while ((match = declarationStartRegex.exec(code)) !== null) {
+    const declaration = extractDeclaration(code, match);
+    if (!declaration) continue;
+    declarations.push(declaration);
+    declarationStartRegex.lastIndex = match.index + declaration.length;
+  }
+  return declarations.join("\n\n");
+};
+const extractDeclaration = (code, match) => {
+  const header = match[0];
+  if (header.includes("<")) return null;
+  const kind = match[1];
+  let cursor = match.index + header.length;
+  if (kind === "type") {
+    cursor = skipWhitespace(code, cursor);
+    if (code[cursor] !== "=") return null;
+    cursor = skipWhitespace(code, cursor + 1);
+    if (code[cursor] !== "{") return null;
+  } else {
+    cursor = code.indexOf("{", cursor);
+    if (cursor === -1) return null;
+  }
+  const end = findMatchingBrace(code, cursor);
+  if (end === -1) return null;
+  return code.slice(match.index, end + 1);
+};
+const skipWhitespace = (code, cursor) => {
+  while (/\s/.test(code[cursor] ?? "")) {
+    cursor += 1;
+  }
+  return cursor;
+};
+const findMatchingBrace = (code, openBraceIndex) => {
+  let depth = 0;
+  for (let i = openBraceIndex; i < code.length; i += 1) {
+    if (code[i] === "{") depth += 1;
+    if (code[i] === "}") {
+      depth -= 1;
+      if (depth === 0) return i;
+    }
+  }
+  return -1;
+};
+
+var __defProp$b = Object.defineProperty;
+var __defNormalProp$b = (obj, key, value) => key in obj ? __defProp$b(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __publicField$b = (obj, key, value) => __defNormalProp$b(obj, key + "" , value);
+class ZodSchemaGenerator {
+  constructor(codeFormatter) {
+    this.codeFormatter = codeFormatter;
+    __publicField$b(this, "generate", async ({
+      sourceText,
+      moduleImportPath,
+      options = {}
+    }) => {
+      const { getZodSchemasFile } = generate({
+        sourceText: removeGenericTypes(sourceText)
+      });
+      let generated = getZodSchemasFile(moduleImportPath);
+      generated = generated.replaceAll(".optional()", ".nullable()");
+      generated = generated.replaceAll(".int64()", ".int()");
+      if (options.localDateTimes) {
+        generated = generated.replaceAll(
+          "z.string().datetime()",
+          "z.string().datetime({local: true})"
+        );
+      }
+      return this.codeFormatter.format(generated);
+    });
+  }
+}
+
 const findRelativePath = (src, dst) => {
   const relativePath = Path$1.relative(Path$1.dirname(src), dst);
   const withoutExtension = relativePath.replace(/\.ts$/u, "");
@@ -11271,6 +11346,62 @@ const findRelativePath = (src, dst) => {
   return normalizedPath.startsWith(".") ? normalizedPath : `./${normalizedPath}`;
 };
 
+const splitIdentifierWords$1 = (str) => str.replace(/([a-z0-9])([A-Z])/g, "$1 $2").split(/[^a-zA-Z0-9]+/).filter(Boolean);
+const toPascalCaseIdentifier = (str) => splitIdentifierWords$1(str).map((word) => word[0].toUpperCase() + word.substring(1)).join("");
+const toKebabCaseIdentifier = (str) => splitIdentifierWords$1(str).map((word) => word.toLowerCase()).join("-");
+
+var __defProp$a = Object.defineProperty;
+var __defNormalProp$a = (obj, key, value) => key in obj ? __defProp$a(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __publicField$a = (obj, key, value) => __defNormalProp$a(obj, typeof key !== "symbol" ? key + "" : key, value);
+class FileWriter {
+  constructor(outputDir, opts = {}) {
+    this.outputDir = outputDir;
+    this.opts = opts;
+    __publicField$a(this, "resolveName", (req, opts) => {
+      let name = opts?.preserveCase ? req.name : this.setNameCase(req.name);
+      if (this.opts.suffix && opts?.noSuffix !== true) {
+        name = name + "." + this.opts.suffix;
+      }
+      if (this.opts.mapFileName)
+        name = this.opts.mapFileName({
+          name,
+          ext: req.ext
+        });
+      return name;
+    });
+    __publicField$a(this, "resolvePath", (req, opts) => this.getResolvedPath(req, opts));
+    __publicField$a(this, "write", async ({ content, ...req }, opts) => {
+      const resolvedPath = this.getResolvedPath(req, opts);
+      await mkdir(Path.dirname(resolvedPath), { recursive: true });
+      await writeFile(resolvedPath, content, "utf8");
+      return resolvedPath;
+    });
+    __publicField$a(this, "getResolvedPath", ({ path, ext, ...req }, opts) => Path.resolve(
+      this.outputDir,
+      ...path ?? [],
+      `${this.resolveName(
+        {
+          ext,
+          ...req
+        },
+        opts
+      )}.${ext}`
+    ));
+    __publicField$a(this, "setNameCase", (name) => {
+      const [first, ...rest] = name.split(".");
+      const converted = this.transformCase(first);
+      return [converted, ...rest].join(".");
+    });
+    __publicField$a(this, "transformCase", (value) => {
+      const nameCase = this.opts.case ?? "pascal";
+      if (nameCase === "kebab") {
+        return toKebabCaseIdentifier(value);
+      }
+      return toPascalCaseIdentifier(value);
+    });
+  }
+}
+
 const generateOpenApiClient = async (inputFile, {
   name,
   outputDir,
@@ -11323,7 +11454,7 @@ const generateOpenApiClient = async (inputFile, {
   if (responseWrapper) {
     await modifyHttpClientAsyncWrapper([dstFile], responseWrapper, log);
   }
-  return { types: dstFile, promiseWrapper: [dstFile] };
+  return dstFile;
 };
 const modifyHttpClientAsyncWrapper = async (filePaths, responseWrapper, log) => {
   log(
@@ -11359,8 +11490,17 @@ const getThisScriptDirname = () => {
 };
 const getTemplatesDir = () => {
   const currentDir = getThisScriptDirname();
-  const templatesRelativePath = Path$1.basename(currentDir) === "dist" ? "../templates" : "../../../templates";
-  return Path$1.resolve(currentDir, templatesRelativePath);
+  const templateDirCandidates = [
+    Path$1.resolve(currentDir, "../../templates/legacy"),
+    Path$1.resolve(currentDir, "../templates/legacy")
+  ];
+  const templateDir = templateDirCandidates.find(existsSync);
+  if (!templateDir) {
+    throw new Error(
+      `Legacy swagger-ts-api templates not found. Tried: ${templateDirCandidates.join(", ")}`
+    );
+  }
+  return templateDir;
 };
 
 const isRecord = (value) => typeof value === "object" && value !== null && !Array.isArray(value);
@@ -11417,9 +11557,9 @@ const resolveLocalRef = (root, ref) => {
   return current;
 };
 
-var __defProp$b = Object.defineProperty;
-var __defNormalProp$b = (obj, key, value) => key in obj ? __defProp$b(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __publicField$b = (obj, key, value) => __defNormalProp$b(obj, key + "" , value);
+var __defProp$9 = Object.defineProperty;
+var __defNormalProp$9 = (obj, key, value) => key in obj ? __defProp$9(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __publicField$9 = (obj, key, value) => __defNormalProp$9(obj, key + "" , value);
 const PARAMETER_LOCATIONS = [
   "path",
   "query",
@@ -11445,7 +11585,7 @@ const mergeParameters = (base, override) => {
 class OpenApiNormalizer {
   constructor(doc) {
     this.doc = doc;
-    __publicField$b(this, "problems", []);
+    __publicField$9(this, "problems", []);
   }
   load() {
     const info = readRecord(this.doc, "info");
@@ -11788,24 +11928,24 @@ const syntheticOperationId = (method, path) => {
   return `_${compact}`;
 };
 
-var __defProp$a = Object.defineProperty;
-var __defNormalProp$a = (obj, key, value) => key in obj ? __defProp$a(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __publicField$a = (obj, key, value) => __defNormalProp$a(obj, typeof key !== "symbol" ? key + "" : key, value);
+var __defProp$8 = Object.defineProperty;
+var __defNormalProp$8 = (obj, key, value) => key in obj ? __defProp$8(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __publicField$8 = (obj, key, value) => __defNormalProp$8(obj, typeof key !== "symbol" ? key + "" : key, value);
 class TsCodegen {
   constructor(typeExprCodegen, docRenderer) {
     this.typeExprCodegen = typeExprCodegen;
-    __publicField$a(this, "usedTypeRefs", []);
-    __publicField$a(this, "usedTypeRefKeys", /* @__PURE__ */ new Set());
-    __publicField$a(this, "docRenderer");
-    __publicField$a(this, "typeExpr", (typeExpr) => {
+    __publicField$8(this, "usedTypeRefs", []);
+    __publicField$8(this, "usedTypeRefKeys", /* @__PURE__ */ new Set());
+    __publicField$8(this, "docRenderer");
+    __publicField$8(this, "typeExpr", (typeExpr) => {
       this.collectTypeRefsFromExpr(typeExpr);
       return this.typeExprCodegen.toCode(typeExpr).code;
     });
-    __publicField$a(this, "declaration", (name, declaration, options = {}) => {
+    __publicField$8(this, "declaration", (name, declaration, options = {}) => {
       this.collectTypeRefsFromDeclaration(declaration);
       return this.toDeclarationCode(name, declaration, options);
     });
-    __publicField$a(this, "toChunk", (name, code, exports$1, imports = []) => {
+    __publicField$8(this, "toChunk", (name, code, exports$1, imports = []) => {
       const exportedSymbols = new Set(exports$1);
       const refs = this.getTypeRefs().filter((ref) => {
         return ref.kind !== "internal" || !exportedSymbols.has(ref.name);
@@ -11818,17 +11958,17 @@ class TsCodegen {
         imports
       };
     });
-    __publicField$a(this, "getTypeRefs", () => {
+    __publicField$8(this, "getTypeRefs", () => {
       return this.usedTypeRefs.map((ref) => ({ ...ref }));
     });
-    __publicField$a(this, "toDeclarationCode", (name, d, o) => {
+    __publicField$8(this, "toDeclarationCode", (name, d, o) => {
       let code = this.toDeclarationBodyCode(name, d);
       if (o.exported) {
         code = `export ${code}`;
       }
       return this.addDoc(code, d.doc);
     });
-    __publicField$a(this, "toDeclarationBodyCode", (name, declaration) => {
+    __publicField$8(this, "toDeclarationBodyCode", (name, declaration) => {
       switch (declaration.kind) {
         case "typeAlias":
           return `type ${name} = ${this.typeExprCodegen.toCode(declaration.typeExpr).code}`;
@@ -11849,7 +11989,7 @@ ${members}
         }
       }
     });
-    __publicField$a(this, "addDoc", (code, doc) => {
+    __publicField$8(this, "addDoc", (code, doc) => {
       if (!doc) return code;
       const rendered = this.docRenderer.render(doc);
       return rendered ? `${rendered}
@@ -11981,13 +12121,13 @@ const toTsPropertyKey = (value) => {
   return isTsIdentifier(value) ? value : JSON.stringify(value);
 };
 
-var __defProp$9 = Object.defineProperty;
-var __defNormalProp$9 = (obj, key, value) => key in obj ? __defProp$9(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __publicField$9 = (obj, key, value) => __defNormalProp$9(obj, typeof key !== "symbol" ? key + "" : key, value);
+var __defProp$7 = Object.defineProperty;
+var __defNormalProp$7 = (obj, key, value) => key in obj ? __defProp$7(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __publicField$7 = (obj, key, value) => __defNormalProp$7(obj, typeof key !== "symbol" ? key + "" : key, value);
 class TypeExprCodegen {
   constructor(docRenderer) {
-    __publicField$9(this, "docRenderer");
-    __publicField$9(this, "toCode", (typeExpr) => {
+    __publicField$7(this, "docRenderer");
+    __publicField$7(this, "toCode", (typeExpr) => {
       switch (typeExpr.kind) {
         case "reference":
           return this.toReferenceCode(typeExpr);
@@ -12003,7 +12143,7 @@ class TypeExprCodegen {
         }
       }
     });
-    __publicField$9(this, "toReferenceCode", (typeExpr) => {
+    __publicField$7(this, "toReferenceCode", (typeExpr) => {
       if (!typeExpr.typeArgs?.length) {
         return {
           code: typeExpr.ref.name,
@@ -12016,7 +12156,7 @@ class TypeExprCodegen {
         ref: typeExpr.ref
       };
     });
-    __publicField$9(this, "toInlineCode", (expr) => {
+    __publicField$7(this, "toInlineCode", (expr) => {
       switch (expr.node) {
         case "scalar":
           return expr.name === "integer" ? "number" : expr.name;
@@ -12041,25 +12181,25 @@ class TypeExprCodegen {
         }
       }
     });
-    __publicField$9(this, "toIntersectionMemberCode", (typeExpr) => {
+    __publicField$7(this, "toIntersectionMemberCode", (typeExpr) => {
       const rendered = this.toCode(typeExpr).code;
       return this.isUnion(typeExpr) ? `(${rendered})` : rendered;
     });
-    __publicField$9(this, "toArrayElementCode", (typeExpr) => {
+    __publicField$7(this, "toArrayElementCode", (typeExpr) => {
       const rendered = this.toCode(typeExpr).code;
       return this.needsGroupingForArrayElement(typeExpr) ? `(${rendered})` : rendered;
     });
-    __publicField$9(this, "isUnion", (typeExpr) => {
+    __publicField$7(this, "isUnion", (typeExpr) => {
       return typeExpr.kind === "inline" && typeExpr.expr.node === "union";
     });
-    __publicField$9(this, "needsGroupingForArrayElement", (typeExpr) => {
+    __publicField$7(this, "needsGroupingForArrayElement", (typeExpr) => {
       return typeExpr.kind === "inline" && (typeExpr.expr.node === "union" || typeExpr.expr.node === "intersection");
     });
-    __publicField$9(this, "toLiteralCode", (value) => {
+    __publicField$7(this, "toLiteralCode", (value) => {
       if (value === null) return "null";
       return JSON.stringify(value);
     });
-    __publicField$9(this, "toObjectCode", (properties, additionalProperties) => {
+    __publicField$7(this, "toObjectCode", (properties, additionalProperties) => {
       const members = properties.map(
         (property) => this.toPropertyCode(property)
       );
@@ -12074,7 +12214,7 @@ class TypeExprCodegen {
 ${members.join("\n")}
 }`;
     });
-    __publicField$9(this, "toPropertyCode", (property) => {
+    __publicField$7(this, "toPropertyCode", (property) => {
       const name = toTsPropertyKey(property.name);
       const optional = property.required ? "" : "?";
       const propertyCode = `${name}${optional}: ${this.toCode(property.typeExpr).code}`;
@@ -12089,14 +12229,14 @@ ${renderedProperty}` : renderedProperty;
   }
 }
 
-var __defProp$8 = Object.defineProperty;
-var __defNormalProp$8 = (obj, key, value) => key in obj ? __defProp$8(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __publicField$8 = (obj, key, value) => __defNormalProp$8(obj, typeof key !== "symbol" ? key + "" : key, value);
+var __defProp$6 = Object.defineProperty;
+var __defNormalProp$6 = (obj, key, value) => key in obj ? __defProp$6(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __publicField$6 = (obj, key, value) => __defNormalProp$6(obj, typeof key !== "symbol" ? key + "" : key, value);
 class TsCodegenFactory {
   constructor(docRenderer) {
-    __publicField$8(this, "typeExprCodegen");
-    __publicField$8(this, "docRenderer");
-    __publicField$8(this, "forNewChunk", () => {
+    __publicField$6(this, "typeExprCodegen");
+    __publicField$6(this, "docRenderer");
+    __publicField$6(this, "forNewChunk", () => {
       return new TsCodegen(this.typeExprCodegen, this.docRenderer);
     });
     this.docRenderer = docRenderer;
@@ -12149,13 +12289,13 @@ const isReservedWord = (value) => {
   return RESERVED_WORDS.has(value);
 };
 
-var __defProp$7 = Object.defineProperty;
-var __defNormalProp$7 = (obj, key, value) => key in obj ? __defProp$7(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __publicField$7 = (obj, key, value) => __defNormalProp$7(obj, typeof key !== "symbol" ? key + "" : key, value);
+var __defProp$5 = Object.defineProperty;
+var __defNormalProp$5 = (obj, key, value) => key in obj ? __defProp$5(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __publicField$5 = (obj, key, value) => __defNormalProp$5(obj, typeof key !== "symbol" ? key + "" : key, value);
 class ParamsConstructor {
   constructor(options) {
     this.options = options;
-    __publicField$7(this, "process", (params, httpPath) => {
+    __publicField$5(this, "process", (params, httpPath) => {
       const pathParamSpec = validatePathParams(params, httpPath);
       const pathParamBindings = pathParamSpec?.bindings;
       const funParams = params.flatMap(
@@ -12175,7 +12315,7 @@ class ParamsConstructor {
         hasQuery
       };
     });
-    __publicField$7(this, "renderOperationParams", (param, pathParamSpec) => {
+    __publicField$5(this, "renderOperationParams", (param, pathParamSpec) => {
       if (param.kind !== "path" || !pathParamSpec) {
         return [
           {
@@ -12199,7 +12339,7 @@ class ParamsConstructor {
         }
       ];
     });
-    __publicField$7(this, "renderPathTemplateLiteral", (path, pathParamVarName, pathParamBindings) => {
+    __publicField$5(this, "renderPathTemplateLiteral", (path, pathParamVarName, pathParamBindings) => {
       const escapedPath = path.replace(/\\/g, "\\\\").replace(/`/g, "\\`").replace(/\$\{/g, "\\${");
       const pathWithParams = escapedPath.replace(
         /\{([^}]+)\}/g,
@@ -12213,7 +12353,7 @@ class ParamsConstructor {
       );
       return `\`${pathWithParams}\``;
     });
-    __publicField$7(this, "renderPathParamDestructuring", (pathParamBindings) => {
+    __publicField$5(this, "renderPathParamDestructuring", (pathParamBindings) => {
       const members = Object.entries(pathParamBindings).map(
         ([paramName, binding]) => {
           const key = toTsPropertyKey(paramName);
@@ -12222,7 +12362,7 @@ class ParamsConstructor {
       );
       return `{ ${members.join(", ")} }`;
     });
-    __publicField$7(this, "paramName", (p) => {
+    __publicField$5(this, "paramName", (p) => {
       switch (p.kind) {
         case "body":
           return this.options.paramNames.body;
@@ -12343,9 +12483,9 @@ const indentBlock = (value, indent) => {
 
 const consolidateObjectShorthandProperties = (code) => code.replace(/\b([A-Za-z_$][A-Za-z0-9_$]*)\s*:\s*\1\b/g, "$1");
 
-var __defProp$6 = Object.defineProperty;
-var __defNormalProp$6 = (obj, key, value) => key in obj ? __defProp$6(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __publicField$6 = (obj, key, value) => __defNormalProp$6(obj, typeof key !== "symbol" ? key + "" : key, value);
+var __defProp$4 = Object.defineProperty;
+var __defNormalProp$4 = (obj, key, value) => key in obj ? __defProp$4(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __publicField$4 = (obj, key, value) => __defNormalProp$4(obj, typeof key !== "symbol" ? key + "" : key, value);
 const REQUEST_PARAMS_TYPE = "RequestParams";
 const REQUEST_PARAMS_DEFAULT = "never";
 const REQUEST_PARAMS_ARG = "params";
@@ -12356,7 +12496,7 @@ class ApiClientCodegen {
     this.opts = opts;
     this.tsCodegenFactory = tsCodegenFactory;
     this.docRenderer = docRenderer;
-    __publicField$6(this, "generate", (apiName, operations, doc) => {
+    __publicField$4(this, "generate", (apiName, operations, doc) => {
       const tsCodegen = this.tsCodegenFactory.forNewChunk();
       let httpClientType = tsCodegen.typeExpr({
         kind: "reference",
@@ -12381,7 +12521,7 @@ ${code}`;
       }
       return tsCodegen.toChunk("api", code, [apiName], methodsCode.imports);
     });
-    __publicField$6(this, "groupsOpsCode", (codegen, groupedOps) => combineRenderedCode(
+    __publicField$4(this, "groupsOpsCode", (codegen, groupedOps) => combineRenderedCode(
       Object.entries(groupedOps).map(([groupName, ops]) => {
         const methodsCode = this.opsCode(codegen, ops, "object");
         return {
@@ -12395,7 +12535,7 @@ ${code}`;
       }),
       "\n\n"
     ));
-    __publicField$6(this, "opsCode", (codegen, operations, target = "class") => {
+    __publicField$4(this, "opsCode", (codegen, operations, target = "class") => {
       const separator = target === "object" ? `,
 ${EMPTY_LINE_MARKER}
 ` : "\n\n";
@@ -12404,7 +12544,7 @@ ${EMPTY_LINE_MARKER}
         separator
       );
     });
-    __publicField$6(this, "renderOp", (op, tsCodegen, target) => {
+    __publicField$4(this, "renderOp", (op, tsCodegen, target) => {
       const { signature: sig, http } = op;
       const paramNames = {
         path: "path",
@@ -12446,14 +12586,14 @@ ${EMPTY_LINE_MARKER}
         target
       });
     });
-    __publicField$6(this, "wrapInResponseWrapper", (typeExpr, tsCodegen) => {
+    __publicField$4(this, "wrapInResponseWrapper", (typeExpr, tsCodegen) => {
       return tsCodegen.typeExpr({
         kind: "reference",
         ref: this.opts.httpClient.responseWrapper,
         typeArgs: [typeExpr]
       });
     });
-    __publicField$6(this, "renderFunctionCode", ({
+    __publicField$4(this, "renderFunctionCode", ({
       doc,
       funName,
       responseType,
@@ -12502,11 +12642,11 @@ ${functionCode}` : functionCode,
         imports
       };
     });
-    __publicField$6(this, "renderOperationDoc", (doc, indent = "") => {
+    __publicField$4(this, "renderOperationDoc", (doc, indent = "") => {
       if (!doc) return null;
       return indentBlock(this.docRenderer.render(this.toTsDoc(doc)), indent);
     });
-    __publicField$6(this, "renderApiClientDoc", (doc) => {
+    __publicField$4(this, "renderApiClientDoc", (doc) => {
       if (!doc) return null;
       return this.docRenderer.render({
         nodes: [
@@ -12522,7 +12662,7 @@ ${functionCode}` : functionCode,
         ]
       });
     });
-    __publicField$6(this, "toTsDoc", (doc) => {
+    __publicField$4(this, "toTsDoc", (doc) => {
       const nodes = [
         {
           key: "id",
@@ -12564,7 +12704,7 @@ const combineRenderedCode = (fragments, separator) => ({
   imports: fragments.flatMap((fragment) => fragment.imports)
 });
 
-var httpClientPromiseTypesSource = "import type { HttpResponse, Request } from './common-types'\n\nexport type HttpClient<RequestParams = never> = {\n    request: <Data>(\n        req: Request,\n        params?: RequestParams\n    ) => Promise<HttpResponse<Data>>\n}\n";
+var httpClientPromiseTypesSource = "import type { HttpRequest, HttpResponse } from './common-types'\n\nexport type HttpClient<RequestParams = never> = {\n    request: <Data>(\n        req: HttpRequest,\n        params?: RequestParams\n    ) => Promise<HttpResponse<Data>>\n}\n";
 
 const promiseHttpClientRenderSpec = () => ({
   typeName: {
@@ -12606,7 +12746,7 @@ ${requestParamsVar}` : ""})${unwrap ? `.then(res => res.body)` : ""}
   }
 });
 
-var httpClientObservableTypesSource = "import { Observable } from 'rxjs'\nimport type { HttpResponse, Request } from './common-types'\n\nexport type HttpClient<RequestParams = never> = {\n    request: <Data>(\n        req: Request,\n        params?: RequestParams\n    ) => Observable<HttpResponse<Data>>\n}\n";
+var httpClientObservableTypesSource = "import { Observable } from 'rxjs'\nimport type { HttpRequest, HttpResponse } from './common-types'\n\nexport type HttpClient<RequestParams = never> = {\n    request: <Data>(\n        req: HttpRequest,\n        params?: RequestParams\n    ) => Observable<HttpResponse<Data>>\n}\n";
 
 const rxJsHttpClientRenderSpec = () => ({
   typeName: {
@@ -12779,7 +12919,7 @@ const runtimeImportKey = (runtimeImport) => [
   runtimeImport.typeOnly === true ? "type" : "value"
 ].join("|");
 
-var httpClientCommonTypesSource = "export type KnownRequestContentType =\n    | 'application/json'\n    | 'multipart/form-data'\n    | 'application/x-www-form-urlencoded'\n\nexport type RequestContentType = KnownRequestContentType | string\n\nexport type QueryValue =\n    | string\n    | number\n    | boolean\n    | null\n    | undefined\n    | QueryValue[]\n    | Record<string, any>\n    // Empty schema support\n    | unknown\n\nexport type QueryParams = Record<string, QueryValue>\n\nexport type Request = {\n    path: string\n    method: 'GET' | 'POST' | 'PUT' | 'DELETE'\n    responseFormat?: 'json' | 'document'\n    headers?: Record<string, string>\n    query?: QueryParams\n    body?: any\n    contentType?: RequestContentType\n}\n\nexport type HttpResponse<Data> = {\n    body: Data\n    headers: Record<string, string | string[]>\n    status: number\n}\n\nexport type QuerySerializer = (params: QueryParams) => string\n";
+var httpClientCommonTypesSource = "export type KnownRequestContentType =\n    | 'application/json'\n    | 'multipart/form-data'\n    | 'application/x-www-form-urlencoded'\n\nexport type RequestContentType = KnownRequestContentType | string\n\nexport type QueryValue =\n    | string\n    | number\n    | boolean\n    | null\n    | undefined\n    | QueryValue[]\n    | Record<string, any>\n    // Empty schema support\n    | unknown\n\nexport type QueryParams = Record<string, QueryValue>\n\nexport type HttpRequest = {\n    path: string\n    method: 'GET' | 'POST' | 'PUT' | 'DELETE'\n    responseFormat?: 'json' | 'document'\n    headers?: Record<string, string>\n    query?: QueryParams\n    body?: any\n    contentType?: RequestContentType\n}\n\nexport type HttpResponse<Data> = {\n    body: Data\n    headers: Record<string, string | string[]>\n    status: number\n}\n\nexport type QuerySerializer = (params: QueryParams) => string\n";
 
 const commonTypesCode = httpClientCommonTypesSource;
 const stripImports = (code) => code.replace(/^import[\s\S]*?from\s+['"][^'"]+['"]\s*;?\n?/gm, "").trim();
@@ -12801,13 +12941,13 @@ const provideHttpClientCode = (gen, opts) => {
   );
 };
 
-var __defProp$5 = Object.defineProperty;
-var __defNormalProp$5 = (obj, key, value) => key in obj ? __defProp$5(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __publicField$5 = (obj, key, value) => __defNormalProp$5(obj, typeof key !== "symbol" ? key + "" : key, value);
+var __defProp$3 = Object.defineProperty;
+var __defNormalProp$3 = (obj, key, value) => key in obj ? __defProp$3(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __publicField$3 = (obj, key, value) => __defNormalProp$3(obj, typeof key !== "symbol" ? key + "" : key, value);
 class TsDocRenderer {
   constructor(options) {
     this.options = options;
-    __publicField$5(this, "render", (doc, options = {}) => {
+    __publicField$3(this, "render", (doc, options = {}) => {
       if (!this.options.enabled) return "";
       const lines = [];
       this.appendNodes(lines, doc.nodes, options);
@@ -12816,7 +12956,7 @@ class TsDocRenderer {
       }
       return this.renderComment(lines);
     });
-    __publicField$5(this, "renderComment", (lines) => {
+    __publicField$3(this, "renderComment", (lines) => {
       if (!this.options.enabled) return "";
       if (!lines.length) return "";
       if (lines.length === 1) {
@@ -12827,7 +12967,7 @@ class TsDocRenderer {
 ${body}
  */`;
     });
-    __publicField$5(this, "appendDocText", (lines, value) => {
+    __publicField$3(this, "appendDocText", (lines, value) => {
       const normalized = this.normalizeLines(value);
       if (!normalized.length) return;
       if (lines.length > 0) {
@@ -12835,19 +12975,19 @@ ${body}
       }
       lines.push(...normalized);
     });
-    __publicField$5(this, "appendField", (lines, key, value) => {
+    __publicField$3(this, "appendField", (lines, key, value) => {
       const normalized = this.normalizeLines(value);
       if (!normalized.length) return;
       lines.push(`@${key} ${normalized[0]}`.trimEnd());
       lines.push(...normalized.slice(1));
     });
-    __publicField$5(this, "appendDeprecated", (lines, options) => {
+    __publicField$3(this, "appendDeprecated", (lines, options) => {
       if (options.separate) {
         lines.push("");
       }
       lines.push("@deprecated");
     });
-    __publicField$5(this, "appendNodes", (lines, nodes = [], options = {}) => {
+    __publicField$3(this, "appendNodes", (lines, nodes = [], options = {}) => {
       nodes.forEach((node) => {
         if (typeof node === "string") {
           if (options.compactText) {
@@ -12860,21 +13000,21 @@ ${body}
         this.appendField(lines, node.key, node.value);
       });
     });
-    __publicField$5(this, "normalizeLines", (value) => {
+    __publicField$3(this, "normalizeLines", (value) => {
       const trimmed = value?.trim();
       if (!trimmed) return [];
       return trimmed.split(/\r?\n/u).map((line) => line.trimEnd().replaceAll("*/", "*\\/"));
     });
-    __publicField$5(this, "normalizeNonEmptyLines", (value) => this.normalizeLines(value).filter((line) => line.length > 0));
+    __publicField$3(this, "normalizeNonEmptyLines", (value) => this.normalizeLines(value).filter((line) => line.length > 0));
   }
 }
 
-const generateTsCode = (clientName, projectResult, opts) => {
+const generateOpenApiClientFiles = (clientName, input, opts) => {
   const docRenderer = new TsDocRenderer({
     enabled: opts.comments.enabled
   });
   const tsCodegenFac = new TsCodegenFactory(docRenderer);
-  const { schemaDefinitions } = projectResult;
+  const { schemaDefinitions } = input;
   const types = [...schemaDefinitions].sort((a, b) => a.name.localeCompare(b.name)).map((def) => {
     const cg = tsCodegenFac.forNewChunk();
     const code = cg.declaration(def.name, def.declaration, {
@@ -12897,8 +13037,8 @@ const generateTsCode = (clientName, projectResult, opts) => {
   );
   const generated = clientCodegen.generate(
     clientName,
-    groupsOpsByTag(projectResult.operations),
-    projectResult.api
+    input.operations,
+    input.api
   );
   const clientModuleName = `${clientName}.client`;
   const typesModuleName = `${clientName}.types`;
@@ -12925,8 +13065,7 @@ const generateTsCode = (clientName, projectResult, opts) => {
   const all = [typesChunk, httpClientChunk, clientChunk, indexChunk];
   return {
     all,
-    typesName: typesChunk.name,
-    promiseWrappersNames: [httpClientChunk.name, clientChunk.name]
+    typesName: typesChunk.name
   };
 };
 const createIndexFile = (moduleNames) => ({
@@ -12948,55 +13087,27 @@ const createIndexFile = (moduleNames) => ({
     }
   ]
 });
-const groupsOpsByTag = (operations) => {
-  const groupedOps = {};
-  const rawTagsByNormalizedName = /* @__PURE__ */ new Map();
-  operations.forEach((operation) => {
-    const rawTag = operation.tags.find((tag) => tag.trim())?.trim() || "root";
-    let groupName;
-    try {
-      groupName = toTsCamelIdentifier(rawTag, {
-        leadingDigitPrefix: "tag"
-      });
-    } catch {
-      throw new Error(
-        `Invalid OpenAPI tag "${rawTag}": could not derive a client group name.`
-      );
-    }
-    const existingRawTag = rawTagsByNormalizedName.get(groupName);
-    if (existingRawTag && existingRawTag !== rawTag) {
-      throw new Error(
-        `Tag naming collision: "${existingRawTag}" and "${rawTag}" both normalize to "${groupName}". Rename one of these OpenAPI tags to continue.`
-      );
-    }
-    rawTagsByNormalizedName.set(groupName, rawTag);
-    const bucket = groupedOps[groupName] ?? [];
-    bucket.push(operation.op);
-    groupedOps[groupName] = bucket;
-  });
-  return groupedOps;
-};
 
-var __defProp$4 = Object.defineProperty;
-var __defNormalProp$4 = (obj, key, value) => key in obj ? __defProp$4(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __publicField$4 = (obj, key, value) => __defNormalProp$4(obj, typeof key !== "symbol" ? key + "" : key, value);
+var __defProp$2 = Object.defineProperty;
+var __defNormalProp$2 = (obj, key, value) => key in obj ? __defProp$2(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __publicField$2 = (obj, key, value) => __defNormalProp$2(obj, typeof key !== "symbol" ? key + "" : key, value);
 const TS_IDENTIFIER_PATTERN = /^[$A-Z_][0-9A-Z_$]*$/i;
 class ToTypeExprConverter {
   constructor(schemas = {}, options) {
     this.schemas = schemas;
     this.options = options;
-    __publicField$4(this, "schemaCache", /* @__PURE__ */ new WeakMap());
-    __publicField$4(this, "refCache", /* @__PURE__ */ new Map());
-    __publicField$4(this, "schemaDefinitions", []);
-    __publicField$4(this, "schemaDefinitionsById", /* @__PURE__ */ new Map());
-    __publicField$4(this, "schemaDefinitionsInProgress", /* @__PURE__ */ new Set());
-    __publicField$4(this, "getSchemaDefinitions", () => this.schemaDefinitions);
-    __publicField$4(this, "registerAllSchemaDefinitions", () => {
+    __publicField$2(this, "schemaCache", /* @__PURE__ */ new WeakMap());
+    __publicField$2(this, "refCache", /* @__PURE__ */ new Map());
+    __publicField$2(this, "schemaDefinitions", []);
+    __publicField$2(this, "schemaDefinitionsById", /* @__PURE__ */ new Map());
+    __publicField$2(this, "schemaDefinitionsInProgress", /* @__PURE__ */ new Set());
+    __publicField$2(this, "getSchemaDefinitions", () => this.schemaDefinitions);
+    __publicField$2(this, "registerAllSchemaDefinitions", () => {
       Object.keys(this.schemas).forEach((schemaName) => {
         this.ensureSchemaDefinition(`#/components/schemas/${schemaName}`);
       });
     });
-    __publicField$4(this, "fromTypeExpr", (schema) => {
+    __publicField$2(this, "fromTypeExpr", (schema) => {
       if (!schema) {
         return this.scalar("unknown");
       }
@@ -13019,14 +13130,14 @@ class ToTypeExprConverter {
       }
       return result;
     });
-    __publicField$4(this, "scalar", (name) => ({
+    __publicField$2(this, "scalar", (name) => ({
       kind: "inline",
       expr: {
         node: "scalar",
         name
       }
     }));
-    __publicField$4(this, "union", (members) => {
+    __publicField$2(this, "union", (members) => {
       const flatMembers = [];
       for (const member of members) {
         if (member.kind === "inline" && member.expr.node === "union") {
@@ -13046,14 +13157,14 @@ class ToTypeExprConverter {
         }
       };
     });
-    __publicField$4(this, "literal", (value) => ({
+    __publicField$2(this, "literal", (value) => ({
       kind: "inline",
       expr: {
         node: "literal",
         value
       }
     }));
-    __publicField$4(this, "ref", (id) => {
+    __publicField$2(this, "ref", (id) => {
       const name = this.refNameFromPath(id);
       return {
         kind: "reference",
@@ -13063,14 +13174,14 @@ class ToTypeExprConverter {
         }
       };
     });
-    __publicField$4(this, "builtinRef", (name) => ({
+    __publicField$2(this, "builtinRef", (name) => ({
       kind: "reference",
       ref: {
         kind: "builtin",
         name
       }
     }));
-    __publicField$4(this, "refNameFromPath", (ref) => {
+    __publicField$2(this, "refNameFromPath", (ref) => {
       const parts = ref.split("/");
       const name = parts[parts.length - 1];
       if (!name) {
@@ -13078,16 +13189,16 @@ class ToTypeExprConverter {
       }
       return name;
     });
-    __publicField$4(this, "refCacheKey", (schema) => {
+    __publicField$2(this, "refCacheKey", (schema) => {
       return `${schema.$ref}|nullable:${schema.nullable === true}`;
     });
-    __publicField$4(this, "isUnconstrainedSchema", (schema) => {
+    __publicField$2(this, "isUnconstrainedSchema", (schema) => {
       const meaningfulKeys = Object.keys(schema).filter(
         (key) => key !== "nullable"
       );
       return meaningfulKeys.length === 0;
     });
-    __publicField$4(this, "ensureSchemaDefinition", (refId) => {
+    __publicField$2(this, "ensureSchemaDefinition", (refId) => {
       if (this.schemaDefinitionsById.has(refId) || this.schemaDefinitionsInProgress.has(refId)) {
         return;
       }
@@ -13108,18 +13219,18 @@ class ToTypeExprConverter {
         this.schemaDefinitionsInProgress.delete(refId);
       }
     });
-    __publicField$4(this, "isSchemaNode", (value) => {
+    __publicField$2(this, "isSchemaNode", (value) => {
       return Boolean(
         value && typeof value === "object" && !Array.isArray(value)
       );
     });
-    __publicField$4(this, "toLiteralValue", (value) => {
+    __publicField$2(this, "toLiteralValue", (value) => {
       if (value === null || typeof value === "string" || typeof value === "number" || typeof value === "boolean") {
         return value;
       }
       throw new Error(`Unsupported literal value: ${String(value)}`);
     });
-    __publicField$4(this, "toDeclaration", (schema) => {
+    __publicField$2(this, "toDeclaration", (schema) => {
       const enumDeclaration = this.toEnumDeclaration(schema);
       if (enumDeclaration) {
         return enumDeclaration;
@@ -13130,7 +13241,7 @@ class ToTypeExprConverter {
         typeExpr: this.fromTypeExpr(schema)
       };
     });
-    __publicField$4(this, "toEnumDeclaration", (schema) => {
+    __publicField$2(this, "toEnumDeclaration", (schema) => {
       if (this.options.enumStyle !== "enum" || !Array.isArray(schema.enum)) {
         return void 0;
       }
@@ -13145,7 +13256,7 @@ class ToTypeExprConverter {
         members: this.toEnumMembers(schema.enum)
       };
     });
-    __publicField$4(this, "getEnumValueType", (values) => {
+    __publicField$2(this, "getEnumValueType", (values) => {
       if (!values.length) {
         return void 0;
       }
@@ -13157,7 +13268,7 @@ class ToTypeExprConverter {
       }
       return void 0;
     });
-    __publicField$4(this, "toEnumMembers", (values) => {
+    __publicField$2(this, "toEnumMembers", (values) => {
       const usedNames = /* @__PURE__ */ new Map();
       return values.map((value, index) => {
         const enumValue = value;
@@ -13170,7 +13281,7 @@ class ToTypeExprConverter {
         };
       });
     });
-    __publicField$4(this, "toEnumMemberBaseName", (value, index) => {
+    __publicField$2(this, "toEnumMemberBaseName", (value, index) => {
       if (typeof value === "string" && this.options.uppercaseEnumKeys) {
         const compatName = this.toCompatEnumMemberName(value);
         if (compatName) {
@@ -13186,14 +13297,14 @@ class ToTypeExprConverter {
       const pascalName = toPascalCaseIdentifier(String(value));
       return pascalName === "Api" ? `Value${index + 1}` : pascalName;
     });
-    __publicField$4(this, "toCompatEnumMemberName", (value) => {
+    __publicField$2(this, "toCompatEnumMemberName", (value) => {
       if (/^([A-Z_]{1,})$/g.test(value)) {
         return value;
       }
       const pascalName = toPascalCaseIdentifier(value);
       return pascalName === "Api" ? void 0 : pascalName;
     });
-    __publicField$4(this, "isScalarName", (value) => {
+    __publicField$2(this, "isScalarName", (value) => {
       switch (value) {
         case "string":
         case "number":
@@ -13209,7 +13320,7 @@ class ToTypeExprConverter {
           return false;
       }
     });
-    __publicField$4(this, "hasNullMember", (expr) => {
+    __publicField$2(this, "hasNullMember", (expr) => {
       if (expr.kind !== "inline") return false;
       if (expr.expr.node === "scalar") {
         return expr.expr.name === "null";
@@ -13219,13 +13330,13 @@ class ToTypeExprConverter {
       }
       return false;
     });
-    __publicField$4(this, "withNullable", (expr) => {
+    __publicField$2(this, "withNullable", (expr) => {
       if (this.hasNullMember(expr)) {
         return expr;
       }
       return this.union([expr, this.scalar("null")]);
     });
-    __publicField$4(this, "projectObjectType", (schema) => {
+    __publicField$2(this, "projectObjectType", (schema) => {
       const requiredRaw = schema.required;
       if (requiredRaw !== void 0 && !Array.isArray(requiredRaw)) {
         throw new Error(
@@ -13290,7 +13401,7 @@ class ToTypeExprConverter {
         }
       };
     });
-    __publicField$4(this, "isRequiredProperty", (name, required, propertySchema) => {
+    __publicField$2(this, "isRequiredProperty", (name, required, propertySchema) => {
       if (required.has(name)) {
         return true;
       }
@@ -13299,7 +13410,7 @@ class ToTypeExprConverter {
       }
       return propertySchema.required === true;
     });
-    __publicField$4(this, "mapSchemaArrayMembers", (value, kind) => {
+    __publicField$2(this, "mapSchemaArrayMembers", (value, kind) => {
       if (!Array.isArray(value) || !value.length) {
         throw new Error(
           `Unsupported schema: ${kind} must be a non-empty array`
@@ -13314,10 +13425,10 @@ class ToTypeExprConverter {
         return this.fromTypeExpr(entry);
       });
     });
-    __publicField$4(this, "isBinaryFileSchema", (schema) => {
+    __publicField$2(this, "isBinaryFileSchema", (schema) => {
       return schema.type === "string" && schema.format === "binary";
     });
-    __publicField$4(this, "getSchemaDoc", (schema) => {
+    __publicField$2(this, "getSchemaDoc", (schema) => {
       const summary = typeof schema.summary === "string" ? schema.summary : void 0;
       const description = typeof schema.description === "string" ? schema.description : void 0;
       const deprecated = typeof schema.deprecated === "boolean" ? schema.deprecated : void 0;
@@ -13338,7 +13449,7 @@ class ToTypeExprConverter {
         nodes
       };
     });
-    __publicField$4(this, "getSchemaAnnotations", (schema) => {
+    __publicField$2(this, "getSchemaAnnotations", (schema) => {
       if (this.options.comments?.metadata === false) return [];
       return [
         this.annotationNode("format", schema.format),
@@ -13365,14 +13476,14 @@ class ToTypeExprConverter {
         (value) => value !== void 0
       );
     });
-    __publicField$4(this, "annotationNode", (name, value) => {
+    __publicField$2(this, "annotationNode", (name, value) => {
       if (value === void 0) return void 0;
       return {
         key: name,
         value: String(value)
       };
     });
-    __publicField$4(this, "stringifyAnnotationValue", (value) => {
+    __publicField$2(this, "stringifyAnnotationValue", (value) => {
       if (value === void 0) return void 0;
       if (value && typeof value === "object") {
         return JSON.stringify(value);
@@ -13382,7 +13493,7 @@ class ToTypeExprConverter {
       }
       return String(value);
     });
-    __publicField$4(this, "fromSchemaCore", (schema) => {
+    __publicField$2(this, "fromSchemaCore", (schema) => {
       if (this.isUnconstrainedSchema(schema)) {
         return this.scalar("unknown");
       }
@@ -13462,9 +13573,9 @@ class ToTypeExprConverter {
   }
 }
 
-var __defProp$3 = Object.defineProperty;
-var __defNormalProp$3 = (obj, key, value) => key in obj ? __defProp$3(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __publicField$3 = (obj, key, value) => __defNormalProp$3(obj, typeof key !== "symbol" ? key + "" : key, value);
+var __defProp$1 = Object.defineProperty;
+var __defNormalProp$1 = (obj, key, value) => key in obj ? __defProp$1(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __publicField$1 = (obj, key, value) => __defNormalProp$1(obj, typeof key !== "symbol" ? key + "" : key, value);
 const pickPreferredMediaType = (mediaTypes) => {
   if (!mediaTypes.length) return void 0;
   const exactJson = mediaTypes.find((media) => media === "application/json");
@@ -13544,10 +13655,10 @@ const toHttpMethodUpper = (method) => {
 class OperationProjector {
   constructor(options) {
     this.options = options;
-    __publicField$3(this, "seenOperationIds", /* @__PURE__ */ new Set());
-    __publicField$3(this, "typeExprConverter");
-    __publicField$3(this, "project", (openApi) => {
-      this.seenOperationIds.clear();
+    __publicField$1(this, "rawOperationIdsByName", /* @__PURE__ */ new Map());
+    __publicField$1(this, "typeExprConverter");
+    __publicField$1(this, "project", (openApi) => {
+      this.rawOperationIdsByName.clear();
       this.typeExprConverter = new ToTypeExprConverter(
         openApi.schemas,
         this.options.typeExtraction
@@ -13556,16 +13667,32 @@ class OperationProjector {
         this.typeExprConverter.registerAllSchemaDefinitions();
       }
       const operations = openApi.operations.map((operation) => {
-        const operationName = (operation.operationId ?? syntheticOperationId(operation.method, operation.path)).trim();
-        if (!operationName) {
+        const operationId = (operation.operationId ?? syntheticOperationId(operation.method, operation.path)).trim();
+        if (!operationId) {
           throw new Error(
             `Operation id is empty for ${operation.method.toUpperCase()} ${operation.path}`
           );
         }
-        if (this.seenOperationIds.has(operationName)) {
-          throw new Error(`Duplicate operation id: ${operationName}`);
+        let operationName;
+        try {
+          operationName = toTsCamelIdentifier(operationId, {
+            leadingDigitPrefix: "operation"
+          });
+        } catch {
+          throw new Error(
+            `Invalid operation id "${operationId}": could not derive a client method name.`
+          );
         }
-        return this.projectOne(operationName, operation);
+        const existingRawOperationId = this.rawOperationIdsByName.get(operationName);
+        if (existingRawOperationId) {
+          if (existingRawOperationId === operationId) {
+            throw new Error(`Duplicate operation id: ${operationId}`);
+          }
+          throw new Error(
+            `Operation naming collision: "${existingRawOperationId}" and "${operationId}" both normalize to "${operationName}". Rename one of these OpenAPI operation ids to continue.`
+          );
+        }
+        return this.projectOne(operationId, operationName, operation);
       });
       return {
         api: {
@@ -13577,8 +13704,8 @@ class OperationProjector {
         schemaDefinitions: this.typeExprConverter.getSchemaDefinitions()
       };
     });
-    __publicField$3(this, "projectOne", (operationName, operation) => {
-      this.seenOperationIds.add(operationName);
+    __publicField$1(this, "projectOne", (operationId, operationName, operation) => {
+      this.rawOperationIdsByName.set(operationName, operationId);
       const parameters = [];
       const pathParameter = this.projectPathParameter(operation);
       const queryParameter = this.projectQueryParameter(operation);
@@ -13589,7 +13716,7 @@ class OperationProjector {
       return {
         op: {
           signature: {
-            doc: this.toOperationDoc(operationName, operation),
+            doc: this.toOperationDoc(operationId, operation),
             name: operationName,
             parameters,
             returnType: this.projectReturnType(operation)
@@ -13606,7 +13733,7 @@ class OperationProjector {
         tags: [...operation.tags]
       };
     });
-    __publicField$3(this, "projectRequestContentType", (requestBody) => {
+    __publicField$1(this, "projectRequestContentType", (requestBody) => {
       const { mediaType } = getPreferredMediaTypeEntry(
         requestBody?.content ?? {}
       );
@@ -13619,7 +13746,7 @@ class OperationProjector {
           return void 0;
       }
     });
-    __publicField$3(this, "projectResponseFormat", (operation) => {
+    __publicField$1(this, "projectResponseFormat", (operation) => {
       const selectedResponses = selectReturnResponses(operation.responses);
       if (!selectedResponses.length) {
         return void 0;
@@ -13636,7 +13763,7 @@ class OperationProjector {
       }
       return void 0;
     });
-    __publicField$3(this, "projectParameterGroupTypeExpr", (params) => {
+    __publicField$1(this, "projectParameterGroupTypeExpr", (params) => {
       const properties = Object.entries(params).map(([name, parameter]) => ({
         doc: this.toParameterDoc(parameter),
         name,
@@ -13653,7 +13780,7 @@ class OperationProjector {
         }
       };
     });
-    __publicField$3(this, "projectPathParameter", (operation) => {
+    __publicField$1(this, "projectPathParameter", (operation) => {
       const params = operation.parameters.path;
       const entries = Object.values(params);
       if (!entries.length) return null;
@@ -13666,7 +13793,7 @@ class OperationProjector {
         typeExpr: this.projectParameterGroupTypeExpr(params)
       };
     });
-    __publicField$3(this, "projectQueryParameter", (operation) => {
+    __publicField$1(this, "projectQueryParameter", (operation) => {
       const params = operation.parameters.query;
       const entries = Object.values(params);
       if (!entries.length) return null;
@@ -13676,7 +13803,7 @@ class OperationProjector {
         typeExpr: this.projectParameterGroupTypeExpr(params)
       };
     });
-    __publicField$3(this, "projectBodyParameter", (operation) => {
+    __publicField$1(this, "projectBodyParameter", (operation) => {
       const requestBody = operation.requestBody;
       if (!requestBody) return null;
       return {
@@ -13687,7 +13814,7 @@ class OperationProjector {
         )
       };
     });
-    __publicField$3(this, "projectReturnType", (operation) => {
+    __publicField$1(this, "projectReturnType", (operation) => {
       const selectedResponses = selectReturnResponses(operation.responses);
       if (!selectedResponses.length) {
         return this.typeExprConverter.scalar("void");
@@ -13701,17 +13828,17 @@ class OperationProjector {
       });
       return this.typeExprConverter.union(responseTypes);
     });
-    __publicField$3(this, "selectParameterSchema", (parameter) => {
+    __publicField$1(this, "selectParameterSchema", (parameter) => {
       if (parameter.schema) return parameter.schema;
       return getPreferredMediaTypeEntry(parameter.content).media?.schema;
     });
-    __publicField$3(this, "selectRequestBodySchema", (requestBody) => {
+    __publicField$1(this, "selectRequestBodySchema", (requestBody) => {
       return getPreferredMediaTypeEntry(requestBody.content).media?.schema;
     });
-    __publicField$3(this, "selectResponseSchema", (response) => {
+    __publicField$1(this, "selectResponseSchema", (response) => {
       return getPreferredMediaTypeEntry(response.content).media?.schema;
     });
-    __publicField$3(this, "toParameterDoc", (parameter) => {
+    __publicField$1(this, "toParameterDoc", (parameter) => {
       if (!parameter.description && !parameter.deprecated) {
         return void 0;
       }
@@ -13720,7 +13847,7 @@ class OperationProjector {
         nodes: parameter.description ? [parameter.description] : []
       };
     });
-    __publicField$3(this, "toOperationDoc", (operationName, operation) => {
+    __publicField$1(this, "toOperationDoc", (operationName, operation) => {
       return {
         id: operationName,
         request: `${toHttpMethodUpper(operation.method)}:${operation.path}`,
@@ -13780,21 +13907,21 @@ const renderImportedSymbol = (importedSymbol, importKind) => [
   importedSymbol.alias ? `as ${importedSymbol.alias}` : void 0
 ].filter(Boolean).join(" ");
 
-var __defProp$2 = Object.defineProperty;
-var __defNormalProp$2 = (obj, key, value) => key in obj ? __defProp$2(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __publicField$2 = (obj, key, value) => __defNormalProp$2(obj, typeof key !== "symbol" ? key + "" : key, value);
+var __defProp = Object.defineProperty;
+var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
 class CodeWriter {
   constructor(formatter, fw) {
     this.formatter = formatter;
     this.fw = fw;
-    __publicField$2(this, "symbolChunkMap", /* @__PURE__ */ new Map());
-    __publicField$2(this, "resolveModuleName", (chunkName) => {
+    __publicField(this, "symbolChunkMap", /* @__PURE__ */ new Map());
+    __publicField(this, "resolveModuleName", (chunkName) => {
       return this.fw.resolveName({
         name: chunkName,
         ext: "ts"
       });
     });
-    __publicField$2(this, "write", async (files) => {
+    __publicField(this, "write", async (files) => {
       this.symbolChunkMap = this.createSymbolChunkMap(files);
       const writtenPaths = {};
       for (const file of files) {
@@ -13812,7 +13939,7 @@ class CodeWriter {
       }
       return writtenPaths;
     });
-    __publicField$2(this, "createSymbolChunkMap", (files) => {
+    __publicField(this, "createSymbolChunkMap", (files) => {
       const map = /* @__PURE__ */ new Map();
       for (const chunk of files) {
         if (isTsBarrelFile(chunk)) continue;
@@ -13827,7 +13954,7 @@ class CodeWriter {
       }
       return map;
     });
-    __publicField$2(this, "renderCodeChunk", (chunk) => {
+    __publicField(this, "renderCodeChunk", (chunk) => {
       const imports = this.collectImports(chunk).map(
         this.toImportStatementSymbol
       );
@@ -13837,10 +13964,10 @@ class CodeWriter {
 ` : "";
       return importCode + chunk.code;
     });
-    __publicField$2(this, "renderBarrelFile", (file) => file.exports.map(
+    __publicField(this, "renderBarrelFile", (file) => file.exports.map(
       (exportStatement) => this.renderBarrelExportStatement(exportStatement)
     ).join("\n"));
-    __publicField$2(this, "renderBarrelExportStatement", (exportStatement) => {
+    __publicField(this, "renderBarrelExportStatement", (exportStatement) => {
       const from = `./${this.resolveModuleName(exportStatement.from)}`;
       if (exportStatement.kind === "all") {
         return exportStatement.typeOnly ? `export type * from '${from}'` : `export * from '${from}'`;
@@ -13851,7 +13978,7 @@ class CodeWriter {
       }).join(", ");
       return `export { ${names} } from '${from}'`;
     });
-    __publicField$2(this, "collectImports", (chunk) => {
+    __publicField(this, "collectImports", (chunk) => {
       const imports = [];
       for (const ref of chunk.refs) {
         if (ref.kind === "builtin") continue;
@@ -13884,13 +14011,13 @@ class CodeWriter {
       }
       return imports;
     });
-    __publicField$2(this, "toImportStatementSymbol", (importedSymbol) => ({
+    __publicField(this, "toImportStatementSymbol", (importedSymbol) => ({
       name: importedSymbol.name,
       alias: importedSymbol.alias,
       source: this.importSourceToString(importedSymbol.source),
       typeOnly: importedSymbol.typeOnly
     }));
-    __publicField$2(this, "importSourceToString", (src) => {
+    __publicField(this, "importSourceToString", (src) => {
       return "module" in src ? src.module : (
         // TODO generalize later when we have different paths
         `./${this.resolveModuleName(src.name)}`
@@ -13905,7 +14032,7 @@ const getWriteOpts = (file) => ({
   noSuffix: isTsBarrelFile(file)
 });
 
-class VNextOasClientGenerator {
+class OpenApiClientGenerator {
   constructor(options, log) {
     this.options = options;
     this.log = log;
@@ -13927,17 +14054,17 @@ class VNextOasClientGenerator {
     }).project(openApiIr);
     const writer = new CodeWriter(formatter, fw);
     const clientName = toPascalCaseIdentifier(apiName);
-    const chunks = generateTsCode(clientName, projectResult, {
+    const input = {
+      api: projectResult.api,
+      operations: this.groupOpsByTag(projectResult.operations),
+      schemaDefinitions: projectResult.schemaDefinitions
+    };
+    const chunks = generateOpenApiClientFiles(clientName, input, {
       ...this.options.codegen,
       httpClient: this.options.httpClient
     });
     const writtenPaths = await writer.write(chunks.all);
-    return {
-      promiseWrapper: chunks.promiseWrappersNames.map(
-        (name) => writtenPaths[name]
-      ),
-      types: writtenPaths[chunks.typesName]
-    };
+    return writtenPaths[chunks.typesName];
   }
   filterOperations(openApiIr) {
     const ignoreTags = new Set(
@@ -13957,6 +14084,34 @@ class VNextOasClientGenerator {
       })
     };
   }
+  groupOpsByTag(operations) {
+    const groupedOps = {};
+    const rawTagsByNormalizedName = /* @__PURE__ */ new Map();
+    operations.forEach((operation) => {
+      const rawTag = operation.tags.find((tag) => tag.trim())?.trim() || "root";
+      let groupName;
+      try {
+        groupName = toTsCamelIdentifier(rawTag, {
+          leadingDigitPrefix: "tag"
+        });
+      } catch {
+        throw new Error(
+          `Invalid OpenAPI tag "${rawTag}": could not derive a client group name.`
+        );
+      }
+      const existingRawTag = rawTagsByNormalizedName.get(groupName);
+      if (existingRawTag && existingRawTag !== rawTag) {
+        throw new Error(
+          `Tag naming collision: "${existingRawTag}" and "${rawTag}" both normalize to "${groupName}". Rename one of these OpenAPI tags to continue.`
+        );
+      }
+      rawTagsByNormalizedName.set(groupName, rawTag);
+      const bucket = groupedOps[groupName] ?? [];
+      bucket.push(operation.op);
+      groupedOps[groupName] = bucket;
+    });
+    return groupedOps;
+  }
   normalizeSchema(rawSchema, inputFile) {
     const { result, problems } = new OpenApiNormalizer(rawSchema).load();
     problems.forEach((problem) => {
@@ -13999,11 +14154,11 @@ const toErrorMessage = (error) => {
   return error instanceof Error ? error.message : String(error);
 };
 
-const generateOpenApiModel = async (spectPath, config, log, codeFormatter, fw) => {
-  let outFiles;
+const generateOasModel = async (spectPath, config, log, codeFormatter, fw) => {
+  let typesFilePath;
   const { openApiGenerator } = config;
   if ("legacy" in openApiGenerator) {
-    outFiles = await generateOpenApiClient(
+    typesFilePath = await generateOpenApiClient(
       spectPath,
       {
         ...openApiGenerator.legacy,
@@ -14013,7 +14168,7 @@ const generateOpenApiModel = async (spectPath, config, log, codeFormatter, fw) =
       log
     );
   } else {
-    outFiles = await new VNextOasClientGenerator(
+    typesFilePath = await new OpenApiClientGenerator(
       openApiGenerator,
       log
     ).generate(
@@ -14026,137 +14181,9 @@ const generateOpenApiModel = async (spectPath, config, log, codeFormatter, fw) =
       fw
     );
   }
-  return { typesFilePath: outFiles.types };
-};
-
-const removeGenericTypes = (code) => {
-  const declarations = [];
-  const declarationStartRegex = /^export\s+(interface|enum|type)\s+[A-Za-z0-9_]+(?:<[^>\n]+>)?/gm;
-  let match;
-  while ((match = declarationStartRegex.exec(code)) !== null) {
-    const declaration = extractDeclaration(code, match);
-    if (!declaration) continue;
-    declarations.push(declaration);
-    declarationStartRegex.lastIndex = match.index + declaration.length;
-  }
-  return declarations.join("\n\n");
-};
-const extractDeclaration = (code, match) => {
-  const header = match[0];
-  if (header.includes("<")) return null;
-  const kind = match[1];
-  let cursor = match.index + header.length;
-  if (kind === "type") {
-    cursor = skipWhitespace(code, cursor);
-    if (code[cursor] !== "=") return null;
-    cursor = skipWhitespace(code, cursor + 1);
-    if (code[cursor] !== "{") return null;
-  } else {
-    cursor = code.indexOf("{", cursor);
-    if (cursor === -1) return null;
-  }
-  const end = findMatchingBrace(code, cursor);
-  if (end === -1) return null;
-  return code.slice(match.index, end + 1);
-};
-const skipWhitespace = (code, cursor) => {
-  while (/\s/.test(code[cursor] ?? "")) {
-    cursor += 1;
-  }
-  return cursor;
-};
-const findMatchingBrace = (code, openBraceIndex) => {
-  let depth = 0;
-  for (let i = openBraceIndex; i < code.length; i += 1) {
-    if (code[i] === "{") depth += 1;
-    if (code[i] === "}") {
-      depth -= 1;
-      if (depth === 0) return i;
-    }
-  }
-  return -1;
+  return { typesFilePath };
 };
 
-var __defProp$1 = Object.defineProperty;
-var __defNormalProp$1 = (obj, key, value) => key in obj ? __defProp$1(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __publicField$1 = (obj, key, value) => __defNormalProp$1(obj, key + "" , value);
-class ZodSchemaGenerator {
-  constructor(codeFormatter) {
-    this.codeFormatter = codeFormatter;
-    __publicField$1(this, "generate", async ({
-      sourceText,
-      moduleImportPath,
-      options = {}
-    }) => {
-      const { getZodSchemasFile } = generate({
-        sourceText: removeGenericTypes(sourceText)
-      });
-      let generated = getZodSchemasFile(moduleImportPath);
-      generated = generated.replaceAll(".optional()", ".nullable()");
-      generated = generated.replaceAll(".int64()", ".int()");
-      if (options.localDateTimes) {
-        generated = generated.replaceAll(
-          "z.string().datetime()",
-          "z.string().datetime({local: true})"
-        );
-      }
-      return this.codeFormatter.format(generated);
-    });
-  }
-}
-
-var __defProp = Object.defineProperty;
-var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
-class FileWriter {
-  constructor(outputDir, opts = {}) {
-    this.outputDir = outputDir;
-    this.opts = opts;
-    __publicField(this, "resolveName", (req, opts) => {
-      let name = opts?.preserveCase ? req.name : this.setNameCase(req.name);
-      if (this.opts.suffix && opts?.noSuffix !== true) {
-        name = name + "." + this.opts.suffix;
-      }
-      if (this.opts.mapFileName)
-        name = this.opts.mapFileName({
-          name,
-          ext: req.ext
-        });
-      return name;
-    });
-    __publicField(this, "resolvePath", (req, opts) => this.getResolvedPath(req, opts));
-    __publicField(this, "write", async ({ content, ...req }, opts) => {
-      const resolvedPath = this.getResolvedPath(req, opts);
-      await mkdir(Path.dirname(resolvedPath), { recursive: true });
-      await writeFile(resolvedPath, content, "utf8");
-      return resolvedPath;
-    });
-    __publicField(this, "getResolvedPath", ({ path, ext, ...req }, opts) => Path.resolve(
-      this.outputDir,
-      ...path ?? [],
-      `${this.resolveName(
-        {
-          ext,
-          ...req
-        },
-        opts
-      )}.${ext}`
-    ));
-    __publicField(this, "setNameCase", (name) => {
-      const [first, ...rest] = name.split(".");
-      const converted = this.transformCase(first);
-      return [converted, ...rest].join(".");
-    });
-    __publicField(this, "transformCase", (value) => {
-      const nameCase = this.opts.case ?? "pascal";
-      if (nameCase === "kebab") {
-        return toKebabCaseIdentifier(value);
-      }
-      return toPascalCaseIdentifier(value);
-    });
-  }
-}
-
 const generateApiClient = async (params, configFilePath, log = console.log) => {
   const config = parseProfileConfig(params, configFilePath);
   return generateApiClientFromConfig(config, log);
@@ -14190,7 +14217,7 @@ const generateApiClientFromConfig = async (config, log = console.log) => {
   fs.mkdirSync(clientDir, {
     recursive: true
   });
-  const { typesFilePath } = await generateOpenApiModel(
+  const { typesFilePath } = await generateOasModel(
     specPath,
     {
       ...config,