@ps-aux/api-client-gen 0.7.0-rc.2 → 0.7.0-rc.3

package/dist/generateApiClient.mjs

@@ -1,12 +1,12 @@
-import Path$1 from 'path';
+import Path from 'path';
 import * as fs from 'fs';
 import fs__default from 'fs';
 import fs$1 from 'fs/promises';
-import Path from 'node:path';
-import { readFile } from 'node:fs/promises';
-import fs$2 from 'node:fs';
 import { generateApi } from 'swagger-typescript-api';
 import { fileURLToPath } from 'node:url';
+import { readFile } from 'node:fs/promises';
+import Path$1 from 'node:path';
+import fs$2 from 'node:fs';
 import { generate } from 'ts-to-zod';
 
 /** A special constant with type `never` */
@@ -551,69 +551,6 @@ function formatError(error, mapper = (issue) => issue.message) {
     processError(error);
     return fieldErrors;
 }
-/** Format a ZodError as a human-readable string in the following form.
- *
- * From
- *
- * ```ts
- * ZodError {
- *   issues: [
- *     {
- *       expected: 'string',
- *       code: 'invalid_type',
- *       path: [ 'username' ],
- *       message: 'Invalid input: expected string'
- *     },
- *     {
- *       expected: 'number',
- *       code: 'invalid_type',
- *       path: [ 'favoriteNumbers', 1 ],
- *       message: 'Invalid input: expected number'
- *     }
- *   ];
- * }
- * ```
- *
- * to
- *
- * ```
- * username
- *   ✖ Expected number, received string at "username
- * favoriteNumbers[0]
- *   ✖ Invalid input: expected number
- * ```
- */
-function toDotPath(_path) {
-    const segs = [];
-    const path = _path.map((seg) => (typeof seg === "object" ? seg.key : seg));
-    for (const seg of path) {
-        if (typeof seg === "number")
-            segs.push(`[${seg}]`);
-        else if (typeof seg === "symbol")
-            segs.push(`[${JSON.stringify(String(seg))}]`);
-        else if (/[^\w$]/.test(seg))
-            segs.push(`[${JSON.stringify(seg)}]`);
-        else {
-            if (segs.length)
-                segs.push(".");
-            segs.push(seg);
-        }
-    }
-    return segs.join("");
-}
-function prettifyError(error) {
-    const lines = [];
-    // sort by path length
-    const issues = [...error.issues].sort((a, b) => (a.path ?? []).length - (b.path ?? []).length);
-    // Process each issue
-    for (const issue of issues) {
-        lines.push(`✖ ${issue.message}`);
-        if (issue.path?.length)
-            lines.push(`  → at ${toDotPath(issue.path)}`);
-    }
-    // Convert Map to formatted string
-    return lines.join("\n");
-}
 
 const _parse = (_Err) => (schema, value, _ctx, _params) => {
     const ctx = _ctx ? Object.assign(_ctx, { async: false }) : { async: false };
@@ -4082,6 +4019,53 @@ function superRefine(fn) {
     return _superRefine(fn);
 }
 
+const vNextOasGeneratorSchema = strictObject({
+  selection: strictObject({
+    ignoreOperationsWithTags: array(string()).default([]),
+    allSchemas: boolean().default(true)
+  }).optional(),
+  codegen: strictObject({
+    unwrap: boolean().default(true),
+    withRequestParams: boolean().default(false),
+    pathParamsStyle: _enum(["object", "positional"]).default("positional"),
+    enumStyle: _enum(["enum", "union"]).default("enum")
+  }),
+  compat: strictObject({
+    uppercaseEnumKeys: boolean(),
+    swaggerTsApiRequiredBooleans: boolean()
+  }).optional()
+});
+const legacyOasGeneratorSchema = strictObject({
+  legacy: strictObject({
+    ignoreOperationsWithTags: array(string()).optional()
+  })
+});
+const configSchema = strictObject({
+  srcSpec: string().trim().min(1),
+  dstDir: string().trim().min(1),
+  apiName: string().trim().min(1),
+  openApiGenerator: union([
+    vNextOasGeneratorSchema,
+    legacyOasGeneratorSchema
+  ]),
+  responseWrapper: strictObject({
+    symbol: string().trim().min(1),
+    import: string().trim().min(1).optional(),
+    unwrapExpr: string().optional()
+  }).optional(),
+  zodSchemas: strictObject({
+    enabled: boolean().optional(),
+    localDateTimes: boolean().optional()
+  }).optional()
+});
+const parseConfig = (userConfig, filePath) => {
+  const parsed = configSchema.safeParse(userConfig);
+  if (parsed.success) return parsed.data;
+  throw new Error(`Invalid config at ${filePath}: ${parsed.error.message}`, {
+    cause: parsed.error
+  });
+};
+
 const downloadSpec = async (path, url) => {
   let response;
   try {
@@ -4101,6 +4085,86 @@ const downloadSpec = async (path, url) => {
   await fs$1.writeFile(path, content);
 };
 
+const toPascalCaseIdentifier = (str) => {
+  const words = str.replace(/([a-z0-9])([A-Z])/g, "$1 $2").split(/[^a-zA-Z0-9]+/).filter(Boolean);
+  const pascalCase = words.map((word) => word[0].toUpperCase() + word.substring(1)).join("");
+  if (!pascalCase.length) return "Api";
+  if (/^[0-9]/.test(pascalCase)) return `Api${pascalCase}`;
+  return pascalCase;
+};
+const groupBy = (values, getKey) => {
+  const groups = /* @__PURE__ */ new Map();
+  for (const value of values) {
+    const key = getKey(value);
+    const existing = groups.get(key);
+    if (existing) {
+      existing.push(value);
+    } else {
+      groups.set(key, [value]);
+    }
+  }
+  return groups;
+};
+
+const generateOpenApiClient = async (inputFile, {
+  name,
+  outputDir,
+  ignoreOperationsWithTags
+}, log) => {
+  log(`Will generate API client name=${name} to ${outputDir}`);
+  const fileName = "index";
+  const dstFile = Path.join(outputDir, `${fileName}.ts`);
+  const prettier = await import('prettier');
+  const prettierConfig = await prettier.resolveConfig(dstFile) ?? {};
+  const prettierConfigForGenerator = {
+    ...prettierConfig,
+    // swagger-typescript-api defaults to printWidth=120; keep Prettier default 80 unless explicitly configured.
+    printWidth: prettierConfig.printWidth ?? 80
+  };
+  const ignoreTags = ignoreOperationsWithTags && new Set(ignoreOperationsWithTags);
+  await generateApi({
+    name: "index",
+    output: outputDir,
+    input: inputFile,
+    // modular: true,
+    httpClientType: "axios",
+    templates: getTemplatesDir(),
+    defaultResponseAsSuccess: true,
+    sortTypes: true,
+    // generateRouteTypes: true,
+    singleHttpClient: true,
+    // extractRequestBody: true,
+    prettier: prettierConfigForGenerator,
+    moduleNameFirstTag: true,
+    apiClassName: toPascalCaseIdentifier(name),
+    hooks: {
+      onCreateRoute: (routeData) => {
+        if (ignoreTags) {
+          const ignore = routeData.raw.tags?.find(
+            (t) => ignoreTags.has(t)
+          );
+          if (ignore) return false;
+        }
+        return routeData;
+      }
+    },
+    // @ts-ignore
+    codeGenConstructs: () => ({
+      Keyword: {}
+    })
+    // extractRequestParams: true,
+  });
+  return { types: dstFile, promiseWrapper: [dstFile] };
+};
+const getThisScriptDirname = () => {
+  return Path.dirname(fileURLToPath(import.meta.url));
+};
+const getTemplatesDir = () => {
+  const currentDir = getThisScriptDirname();
+  const templatesRelativePath = Path.basename(currentDir) === "dist" ? "../templates" : "../../../templates";
+  return Path.resolve(currentDir, templatesRelativePath);
+};
+
 const isRecord = (value) => typeof value === "object" && value !== null && !Array.isArray(value);
 const asRecord = (value) => {
   return isRecord(value) ? value : void 0;
@@ -4526,31 +4590,6 @@ const syntheticOperationId = (method, path) => {
   return `_${compact}`;
 };
 
-const toPascalCaseIdentifier = (str) => {
-  const words = str.replace(/([a-z0-9])([A-Z])/g, "$1 $2").split(/[^a-zA-Z0-9]+/).filter(Boolean);
-  const pascalCase = words.map((word) => word[0].toUpperCase() + word.substring(1)).join("");
-  if (!pascalCase.length) return "Api";
-  if (/^[0-9]/.test(pascalCase)) return `Api${pascalCase}`;
-  return pascalCase;
-};
-const groupBy = (values, getKey) => {
-  const groups = /* @__PURE__ */ new Map();
-  for (const value of values) {
-    const key = getKey(value);
-    const existing = groups.get(key);
-    if (existing) {
-      existing.push(value);
-    } else {
-      groups.set(key, [value]);
-    }
-  }
-  return groups;
-};
-
-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    format?: 'json' | 'document'\n    headers?: Record<string, string>\n    query?: QueryParams\n    body?: any\n    requestContentType?: RequestContentType\n}\n\nexport type QuerySerializer = (params: QueryParams) => string\n";
-
-var httpClientPromiseTypesSource = "import type { Request } from './common-types'\n\nexport type HttpClient<RequestParams = never> = {\n    request: <Data>(req: Request, params?: RequestParams) => Promise<Data>\n}\n";
-
 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);
@@ -4559,10 +4598,14 @@ class TsCodegen {
     this.typeExprCodegen = typeExprCodegen;
     __publicField$8(this, "usedTypeRefs", []);
     __publicField$8(this, "usedTypeRefKeys", /* @__PURE__ */ new Set());
-    __publicField$8(this, "toCode", (typeExpr) => {
+    __publicField$8(this, "typeExpr", (typeExpr) => {
       this.collectTypeRefsFromExpr(typeExpr);
       return this.typeExprCodegen.toCode(typeExpr).code;
     });
+    __publicField$8(this, "declaration", (name, declaration) => {
+      this.collectTypeRefsFromDeclaration(declaration);
+      return this.toDeclarationCode(name, declaration);
+    });
     __publicField$8(this, "toChunk", (name, code, exports$1) => {
       const exportedSymbols = new Set(exports$1);
       const refs = this.getTypeRefs().filter((ref) => {
@@ -4578,6 +4621,26 @@ class TsCodegen {
     __publicField$8(this, "getTypeRefs", () => {
       return this.usedTypeRefs.map((ref) => ({ ...ref }));
     });
+    __publicField$8(this, "toDeclarationCode", (name, declaration) => {
+      switch (declaration.kind) {
+        case "typeAlias":
+          return `type ${name} = ${this.typeExprCodegen.toCode(declaration.typeExpr).code}`;
+        case "enum": {
+          const members = declaration.members.map(
+            (member) => `    ${member.name} = ${JSON.stringify(member.value)}`
+          ).join(",\n");
+          return `enum ${name} {
+${members}
+}`;
+        }
+        default: {
+          const exhaustive = declaration;
+          throw new Error(
+            `Unsupported TypeScript declaration: ${String(exhaustive)}`
+          );
+        }
+      }
+    });
   }
   collectTypeRef(typeRef) {
     if (typeRef.kind === "builtin") return;
@@ -4586,6 +4649,11 @@ class TsCodegen {
     this.usedTypeRefKeys.add(key);
     this.usedTypeRefs.push({ ...typeRef });
   }
+  collectTypeRefsFromDeclaration(declaration) {
+    if (declaration.kind === "typeAlias") {
+      this.collectTypeRefsFromExpr(declaration.typeExpr);
+    }
+  }
   collectTypeRefsFromExpr(typeExpr) {
     if (typeExpr.kind === "reference") {
       this.collectTypeRef(typeExpr.ref);
@@ -4666,9 +4734,33 @@ const RESERVED_WORDS = /* @__PURE__ */ new Set([
   "with",
   "yield"
 ]);
-const TS_IDENTIFIER_PATTERN = /^[$A-Z_][0-9A-Z_$]*$/i;
+const TS_IDENTIFIER_PATTERN$1 = /^[$A-Z_][0-9A-Z_$]*$/i;
 const isTsIdentifier = (value) => {
-  return TS_IDENTIFIER_PATTERN.test(value);
+  return TS_IDENTIFIER_PATTERN$1.test(value);
+};
+const splitIdentifierWords = (value) => {
+  return value.replace(/([a-z0-9])([A-Z])/g, "$1 $2").split(/[^a-zA-Z0-9]+/).filter(Boolean);
+};
+const toTsCamelIdentifier = (value, opts = {}) => {
+  const words = splitIdentifierWords(value);
+  if (!words.length) {
+    throw new Error(
+      `Could not derive a TypeScript identifier from "${value}".`
+    );
+  }
+  const [firstWord, ...restWords] = words;
+  let identifier = [
+    firstWord[0].toLowerCase() + firstWord.substring(1),
+    ...restWords.map((word) => word[0].toUpperCase() + word.substring(1))
+  ].join("");
+  if (/^[0-9]/.test(identifier)) {
+    const prefix = opts.leadingDigitPrefix ?? "value";
+    identifier = `${prefix}${identifier[0].toUpperCase()}${identifier.substring(1)}`;
+  }
+  if (RESERVED_WORDS.has(identifier)) {
+    identifier = `${identifier}_`;
+  }
+  return identifier;
 };
 const toTsPropertyKey = (value) => {
   return isTsIdentifier(value) ? value : JSON.stringify(value);
@@ -4785,1002 +4877,1268 @@ class TsCodegenFactory {
   }
 }
 
+const buildPathParamBindings = (paramNames) => {
+  const usedBindings = /* @__PURE__ */ new Set();
+  return paramNames.reduce((acc, paramName) => {
+    acc[paramName] = toUniqueBindingName(paramName, usedBindings);
+    return acc;
+  }, {});
+};
+const toUniqueBindingName = (paramName, usedBindings) => {
+  let base = toBindingBase(paramName);
+  if (isReservedWord(base)) {
+    base = `${base}_param`;
+  }
+  if (!usedBindings.has(base)) {
+    usedBindings.add(base);
+    return base;
+  }
+  let suffix = 2;
+  let candidate = `${base}_${suffix}`;
+  while (usedBindings.has(candidate)) {
+    suffix += 1;
+    candidate = `${base}_${suffix}`;
+  }
+  usedBindings.add(candidate);
+  return candidate;
+};
+const toBindingBase = (paramName) => {
+  if (isIdentifier(paramName)) {
+    return paramName;
+  }
+  const sanitized = paramName.replace(/[^0-9A-Za-z_$]/g, "_");
+  if (!sanitized.length) {
+    return "pathParam";
+  }
+  if (/^[A-Za-z_$]/.test(sanitized)) {
+    return sanitized;
+  }
+  return `_${sanitized}`;
+};
+const isIdentifier = (value) => {
+  return /^[$A-Z_][0-9A-Z_$]*$/i.test(value);
+};
+const isReservedWord = (value) => {
+  return RESERVED_WORDS.has(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 ToTypeExprConverter {
-  constructor(schemas = {}, options = {}) {
-    this.schemas = schemas;
+class ParamsConstructor {
+  constructor(options) {
     this.options = options;
-    __publicField$5(this, "schemaCache", /* @__PURE__ */ new WeakMap());
-    __publicField$5(this, "refCache", /* @__PURE__ */ new Map());
-    __publicField$5(this, "schemaDefinitions", []);
-    __publicField$5(this, "schemaDefinitionsById", /* @__PURE__ */ new Map());
-    __publicField$5(this, "schemaDefinitionsInProgress", /* @__PURE__ */ new Set());
-    __publicField$5(this, "getSchemaDefinitions", () => {
-      return this.schemaDefinitions.map((definition) => ({
-        ...definition
-      }));
+    __publicField$5(this, "process", (params, httpPath) => {
+      const pathParamSpec = validatePathParams(params, httpPath);
+      const pathParamBindings = pathParamSpec?.bindings;
+      const funParams = params.flatMap(
+        (param) => this.renderOperationParams(param, pathParamSpec)
+      );
+      const hasBody = params.some((p) => p.kind === "body");
+      const hasQuery = params.some((p) => p.kind === "query");
+      const path = this.renderPathTemplateLiteral(
+        httpPath,
+        this.options.paramNames.path,
+        pathParamBindings
+      );
+      return {
+        funParams,
+        path,
+        hasBody,
+        hasQuery
+      };
     });
-    __publicField$5(this, "fromSchema", (schema) => {
-      if (!schema) {
-        return this.scalar("unknown");
+    __publicField$5(this, "renderOperationParams", (param, pathParamSpec) => {
+      if (param.kind !== "path" || !pathParamSpec) {
+        return [
+          {
+            identifier: this.paramName(param),
+            typeExpr: param.typeExpr
+          }
+        ];
       }
-      const bySchema = this.schemaCache.get(schema);
-      if (bySchema) {
-        return bySchema;
+      if (this.options.pathParamsStyle === "positional") {
+        return pathParamSpec.placeholderNames.map((name) => ({
+          identifier: pathParamSpec.bindings[name] ?? name,
+          typeExpr: pathParamSpec.propertiesByName[name].typeExpr
+        }));
       }
-      if (typeof schema.$ref === "string") {
-        const byRef = this.refCache.get(this.refCacheKey(schema));
-        if (byRef) {
-          this.schemaCache.set(schema, byRef);
-          return byRef;
+      return [
+        {
+          identifier: this.renderPathParamDestructuring(
+            pathParamSpec.bindings
+          ),
+          typeExpr: param.typeExpr
         }
-      }
-      const projected = this.fromSchemaCore(schema);
-      const result = schema.nullable === true ? this.withNullable(projected) : projected;
-      this.schemaCache.set(schema, result);
-      if (typeof schema.$ref === "string") {
-        this.refCache.set(this.refCacheKey(schema), result);
-      }
-      return result;
+      ];
     });
-    __publicField$5(this, "scalar", (name) => ({
-      kind: "inline",
-      expr: {
-        node: "scalar",
-        name
-      }
-    }));
-    __publicField$5(this, "union", (members) => {
-      const flatMembers = [];
-      for (const member of members) {
-        if (member.kind === "inline" && member.expr.node === "union") {
-          flatMembers.push(...member.expr.members);
-        } else {
-          flatMembers.push(member);
-        }
-      }
-      if (flatMembers.length === 1) {
-        return flatMembers[0];
-      }
-      return {
-        kind: "inline",
-        expr: {
-          node: "union",
-          members: flatMembers
+    __publicField$5(this, "renderPathTemplateLiteral", (path, pathParamVarName, pathParamBindings) => {
+      const escapedPath = path.replace(/\\/g, "\\\\").replace(/`/g, "\\`").replace(/\$\{/g, "\\${");
+      const pathWithParams = escapedPath.replace(
+        /\{([^}]+)\}/g,
+        (_, paramName) => {
+          const binding = pathParamBindings?.[paramName];
+          if (binding !== void 0) {
+            return `\${${binding}}`;
+          }
+          return `\${${pathParamVarName}[${JSON.stringify(paramName)}]}`;
         }
-      };
+      );
+      return `\`${pathWithParams}\``;
     });
-    __publicField$5(this, "literal", (value) => ({
-      kind: "inline",
-      expr: {
-        node: "literal",
-        value
-      }
-    }));
-    __publicField$5(this, "ref", (id) => {
-      const name = this.refNameFromPath(id);
-      return {
-        kind: "reference",
-        ref: {
-          kind: "internal",
-          name
+    __publicField$5(this, "renderPathParamDestructuring", (pathParamBindings) => {
+      const members = Object.entries(pathParamBindings).map(
+        ([paramName, binding]) => {
+          const key = toTsPropertyKey(paramName);
+          return binding === paramName ? key : `${key}: ${binding}`;
         }
-      };
-    });
-    __publicField$5(this, "builtinRef", (name) => ({
-      kind: "reference",
-      ref: {
-        kind: "builtin",
-        name
-      }
-    }));
-    __publicField$5(this, "refNameFromPath", (ref) => {
-      const parts = ref.split("/");
-      const name = parts[parts.length - 1];
-      if (!name) {
-        throw new Error(`Unsupported schema reference: ${ref}`);
-      }
-      return name;
-    });
-    __publicField$5(this, "refCacheKey", (schema) => {
-      return `${schema.$ref}|nullable:${schema.nullable === true}`;
-    });
-    __publicField$5(this, "isUnconstrainedSchema", (schema) => {
-      const meaningfulKeys = Object.keys(schema).filter(
-        (key) => key !== "nullable"
       );
-      return meaningfulKeys.length === 0;
+      return `{ ${members.join(", ")} }`;
     });
-    __publicField$5(this, "ensureSchemaDefinition", (refId) => {
-      if (this.schemaDefinitionsById.has(refId) || this.schemaDefinitionsInProgress.has(refId)) {
-        return;
-      }
-      const schemaName = this.refNameFromPath(refId);
-      const schema = this.schemas[schemaName];
-      if (!schema) {
-        return;
-      }
-      this.schemaDefinitionsInProgress.add(refId);
-      try {
-        const definition = {
-          name: schemaName,
-          typeExpr: this.fromSchema(schema)
-        };
-        this.schemaDefinitionsById.set(refId, definition);
-        this.schemaDefinitions.push(definition);
-      } finally {
-        this.schemaDefinitionsInProgress.delete(refId);
+    __publicField$5(this, "paramName", (p) => {
+      switch (p.kind) {
+        case "body":
+          return this.options.paramNames.body;
+        case "query":
+          return this.options.paramNames.query;
+        case "path":
+          return this.options.paramNames.path;
+        default: {
+          const exhaustive = p;
+          throw new Error(
+            `Unsupported operation parameter kind: ${String(exhaustive)}`
+          );
+        }
       }
     });
-    __publicField$5(this, "isSchemaNode", (value) => {
-      return Boolean(
-        value && typeof value === "object" && !Array.isArray(value)
+  }
+}
+const extractPathPlaceholderNames = (pathTemplate) => {
+  const seen = /* @__PURE__ */ new Set();
+  const names = [];
+  const matcher = /\{([^}]+)\}/g;
+  let match = matcher.exec(pathTemplate);
+  while (match) {
+    const name = match[1];
+    if (!seen.has(name)) {
+      seen.add(name);
+      names.push(name);
+    }
+    match = matcher.exec(pathTemplate);
+  }
+  return names;
+};
+const isPathParam = (param) => {
+  return param.kind === "path";
+};
+const isInlineObjectType = (typeExpr) => typeExpr.kind === "inline" && typeExpr.expr.node === "object";
+const renderNameList = (items) => {
+  const values = [...items];
+  if (!values.length) {
+    return "(none)";
+  }
+  return values.map((v) => JSON.stringify(v)).join(", ");
+};
+const validatePathParams = (params, httpPath) => {
+  const placeholders = extractPathPlaceholderNames(httpPath);
+  const placeholderSet = new Set(placeholders);
+  const pathParams = params.filter(isPathParam);
+  if (pathParams.length > 1) {
+    throw new Error(
+      `Path "${httpPath}" has ${pathParams.length} path parameter objects; expected at most one.`
+    );
+  }
+  const pathParam = pathParams[0];
+  if (!pathParam) {
+    if (placeholderSet.size > 0) {
+      throw new Error(
+        `Path "${httpPath}" is missing a path parameter object for placeholders: ${renderNameList(
+          placeholderSet
+        )}.`
       );
-    });
-    __publicField$5(this, "toLiteralValue", (value) => {
-      if (value === null || typeof value === "string" || typeof value === "number" || typeof value === "boolean") {
-        return value;
+    }
+    return void 0;
+  }
+  const pathParamExpr = pathParam.typeExpr.expr;
+  if (pathParamExpr.additionalProperties !== void 0 && pathParamExpr.additionalProperties !== false) {
+    throw new Error(
+      `Path "${httpPath}" path parameter object must not declare additionalProperties.`
+    );
+  }
+  const nestedObjectProps = pathParamExpr.properties.filter((prop) => isInlineObjectType(prop.typeExpr)).map((prop) => prop.name);
+  if (nestedObjectProps.length > 0) {
+    throw new Error(
+      `Path "${httpPath}" path parameters must be depth-1. Nested object properties: ${renderNameList(
+        nestedObjectProps
+      )}.`
+    );
+  }
+  const optionalPathProps = pathParamExpr.properties.filter((prop) => !prop.required).map((prop) => prop.name);
+  if (optionalPathProps.length > 0) {
+    throw new Error(
+      `Path "${httpPath}" path parameters must all be required. Optional properties: ${renderNameList(
+        optionalPathProps
+      )}.`
+    );
+  }
+  const declaredNames = pathParamExpr.properties.map((prop) => prop.name);
+  const declaredNameSet = new Set(declaredNames);
+  const missingInObject = [...placeholderSet].filter(
+    (name) => !declaredNameSet.has(name)
+  );
+  const missingInPath = declaredNames.filter(
+    (name) => !placeholderSet.has(name)
+  );
+  if (missingInObject.length > 0 || missingInPath.length > 0) {
+    throw new Error(
+      `Path "${httpPath}" placeholders and path parameter object keys must match exactly. Missing in object: ${renderNameList(
+        missingInObject
+      )}. Missing in path: ${renderNameList(missingInPath)}.`
+    );
+  }
+  const bindings = buildPathParamBindings(placeholders);
+  const propertiesByName = Object.fromEntries(
+    pathParamExpr.properties.map((prop) => [prop.name, prop])
+  );
+  return {
+    placeholderNames: placeholders,
+    bindings,
+    propertiesByName
+  };
+};
+
+const EMPTY_LINE_MARKER = "/*__EMPTY_LINE_MARKER__*/";
+
+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";
+class ApiClientCodegen {
+  constructor(opts, tsCodegenFactory) {
+    this.opts = opts;
+    this.tsCodegenFactory = tsCodegenFactory;
+    __publicField$4(this, "generate", (apiName, operations) => {
+      const tsCodegen = this.tsCodegenFactory.forNewChunk();
+      const httpClientType = tsCodegen.typeExpr(this.opts.httpClient.typeName);
+      let clientType = httpClientType;
+      let classTypeParams = "";
+      if (this.opts.withRequestParams) {
+        clientType = `${httpClientType}<${REQUEST_PARAMS_TYPE}>`;
+        classTypeParams = `<${REQUEST_PARAMS_TYPE} = ${REQUEST_PARAMS_DEFAULT}>`;
       }
-      throw new Error(`Unsupported literal value: ${String(value)}`);
+      const methodsCode = Array.isArray(operations) ? this.opsCode(tsCodegen, operations) : this.groupsOpsCode(tsCodegen, operations);
+      const code = `
+            export class ${apiName}${classTypeParams} {
+                constructor(private readonly client: ${clientType}) {}
+
+                ${methodsCode}
+            }
+        `;
+      return tsCodegen.toChunk("api", code, [apiName]);
     });
-    __publicField$5(this, "isScalarName", (value) => {
-      switch (value) {
-        case "string":
-        case "number":
-        case "boolean":
-        case "integer":
-        case "null":
-        case "unknown":
-        case "any":
-        case "never":
-        case "void":
-          return true;
-        default:
-          return false;
-      }
+    __publicField$4(this, "groupsOpsCode", (codegen, groupedOps) => Object.entries(groupedOps).map(([groupName, ops]) => {
+      const methodsCode = this.opsCode(codegen, ops, "object");
+      return `
+                    ${toTsPropertyKey(groupName)} = {
+                        ${methodsCode}
+                    }
+                `;
+    }).join("\n\n"));
+    __publicField$4(this, "opsCode", (codegen, operations, target = "class") => {
+      const separator = target === "object" ? `,
+${EMPTY_LINE_MARKER}
+` : "\n\n";
+      const methodsCode = operations.map((op) => this.renderOp(op, codegen, target)).join(separator);
+      return methodsCode;
     });
-    __publicField$5(this, "hasNullMember", (expr) => {
-      if (expr.kind !== "inline") return false;
-      if (expr.expr.node === "scalar") {
-        return expr.expr.name === "null";
-      }
-      if (expr.expr.node === "union") {
-        return expr.expr.members.some((member) => this.hasNullMember(member));
-      }
-      return false;
-    });
-    __publicField$5(this, "withNullable", (expr) => {
-      if (this.hasNullMember(expr)) {
-        return expr;
-      }
-      return this.union([expr, this.scalar("null")]);
-    });
-    __publicField$5(this, "projectObjectType", (schema) => {
-      const requiredRaw = schema.required;
-      if (requiredRaw !== void 0 && !Array.isArray(requiredRaw)) {
-        throw new Error(
-          "Unsupported object schema: required must be an array"
-        );
-      }
-      const required = new Set(
-        (requiredRaw ?? []).map((item) => {
-          if (typeof item !== "string") {
-            throw new Error(
-              "Unsupported object schema: required items must be strings"
-            );
-          }
-          return item;
-        })
+    __publicField$4(this, "renderOp", (op, tsCodegen, target) => {
+      const { signature: sig, http } = op;
+      const invocationVars = this.opts.httpClient.invocation.vars;
+      const paramNames = {
+        path: "path",
+        query: invocationVars.query,
+        body: invocationVars.body
+      };
+      const paramsHelper = new ParamsConstructor({
+        paramNames,
+        pathParamsStyle: this.opts.pathParamsStyle
+      });
+      const { path, funParams, hasBody, hasQuery } = paramsHelper.process(
+        sig.parameters,
+        http.path
       );
-      const propertiesRaw = schema.properties;
-      if (propertiesRaw !== void 0 && (!propertiesRaw || typeof propertiesRaw !== "object" || Array.isArray(propertiesRaw))) {
-        throw new Error(
-          "Unsupported object schema: properties must be an object"
-        );
-      }
-      const properties = Object.entries(propertiesRaw ?? {}).map(
-        ([name, propertySchema]) => {
-          if (!this.isSchemaNode(propertySchema)) {
-            throw new Error(
-              `Unsupported object property schema for "${name}"`
-            );
-          }
-          return {
-            name,
-            required: this.isRequiredProperty(
-              name,
-              required,
-              propertySchema
-            ),
-            typeExpr: this.fromSchema(propertySchema)
-          };
-        }
+      const params = funParams.map(
+        (r) => `${r.identifier}: ${tsCodegen.typeExpr(r.typeExpr)}`
       );
-      let additionalProperties;
-      if (schema.additionalProperties !== void 0) {
-        if (typeof schema.additionalProperties === "boolean") {
-          additionalProperties = schema.additionalProperties;
-        } else if (this.isSchemaNode(schema.additionalProperties)) {
-          additionalProperties = this.fromSchema(
-            schema.additionalProperties
-          );
-        } else {
-          throw new Error(
-            "Unsupported object schema: additionalProperties must be boolean or schema object"
-          );
-        }
-      }
-      return {
-        kind: "inline",
-        expr: {
-          node: "object",
-          properties,
-          additionalProperties
-        }
-      };
-    });
-    __publicField$5(this, "isRequiredProperty", (name, required, propertySchema) => {
-      if (required.has(name)) {
-        return true;
-      }
-      if (!this.options.quirks?.swaggerTsApiRequiredBooleans) {
-        return false;
-      }
-      return propertySchema.required === true;
-    });
-    __publicField$5(this, "mapSchemaArrayMembers", (value, kind) => {
-      if (!Array.isArray(value) || !value.length) {
-        throw new Error(
-          `Unsupported schema: ${kind} must be a non-empty array`
-        );
+      if (this.opts.withRequestParams) {
+        params.push(`${REQUEST_PARAMS_ARG}?: ${REQUEST_PARAMS_TYPE}`);
       }
-      return value.map((entry, index) => {
-        if (!this.isSchemaNode(entry)) {
-          throw new Error(
-            `Unsupported schema: ${kind}[${index}] must be a schema object`
-          );
-        }
-        return this.fromSchema(entry);
+      const paramsCode = params.join(", ");
+      const responseType = tsCodegen.typeExpr(sig.returnType);
+      const returnType = this.wrapInResponseWrapper(sig.returnType, tsCodegen);
+      return this.renderFunctionCode({
+        funName: sig.name,
+        responseType,
+        returnType,
+        params: paramsCode,
+        path,
+        method: http.method,
+        hasQuery,
+        hasBody,
+        requestContentType: http.requestContentType,
+        responseFormat: http.responseFormat,
+        requestParamsVar: this.opts.withRequestParams ? REQUEST_PARAMS_ARG : void 0,
+        unwrap: this.opts.unwrap,
+        target
       });
     });
-    __publicField$5(this, "isBinaryFileSchema", (schema) => {
-      return schema.type === "string" && schema.format === "binary";
+    __publicField$4(this, "wrapInResponseWrapper", (typeExpr, tsCodegen) => {
+      return tsCodegen.typeExpr({
+        ...this.opts.httpClient.responseWrapper,
+        typeArgs: [typeExpr]
+      });
     });
-    __publicField$5(this, "fromSchemaCore", (schema) => {
-      if (this.isUnconstrainedSchema(schema)) {
-        return this.scalar("unknown");
-      }
-      if (typeof schema.$ref === "string") {
-        this.ensureSchemaDefinition(schema.$ref);
-        return this.ref(schema.$ref);
-      }
-      if (schema.const !== void 0) {
-        return this.literal(this.toLiteralValue(schema.const));
-      }
-      if (Array.isArray(schema.enum)) {
-        if (!schema.enum.length) {
-          throw new Error(
-            "Unsupported enum schema: enum must be non-empty"
-          );
-        }
-        return this.union(
-          schema.enum.map(
-            (value) => this.literal(this.toLiteralValue(value))
-          )
-        );
-      }
-      if (schema.type === "array") {
-        if (schema.items === void 0) {
-          return {
-            kind: "inline",
-            expr: {
-              node: "array",
-              element: this.scalar("unknown")
-            }
-          };
-        }
-        if (Array.isArray(schema.items)) {
-          throw new Error("Unsupported array schema: tuple-style items");
-        }
-        if (!this.isSchemaNode(schema.items)) {
-          throw new Error(
-            "Unsupported array schema: items must be a schema"
-          );
-        }
-        return {
-          kind: "inline",
-          expr: {
-            node: "array",
-            element: this.fromSchema(schema.items)
-          }
-        };
-      }
-      if (schema.type === "object") {
-        return this.projectObjectType(schema);
-      }
-      if (schema.oneOf !== void 0) {
-        return this.union(this.mapSchemaArrayMembers(schema.oneOf, "oneOf"));
-      }
-      if (schema.anyOf !== void 0) {
-        return this.union(this.mapSchemaArrayMembers(schema.anyOf, "anyOf"));
-      }
-      if (schema.allOf !== void 0) {
-        return {
-          kind: "inline",
-          expr: {
-            node: "intersection",
-            members: this.mapSchemaArrayMembers(schema.allOf, "allOf")
-          }
-        };
-      }
-      if (this.isBinaryFileSchema(schema)) {
-        return this.builtinRef("File");
-      }
-      if (this.isScalarName(schema.type)) {
-        return this.scalar(schema.type);
-      }
-      throw new Error(
-        `Unsupported schema construct: ${JSON.stringify(schema, null, 2)}`
-      );
+    __publicField$4(this, "renderFunctionCode", ({
+      funName,
+      responseType,
+      returnType,
+      params,
+      path,
+      method,
+      hasQuery,
+      hasBody,
+      requestContentType,
+      responseFormat,
+      requestParamsVar,
+      unwrap,
+      target
+    }) => {
+      let invocation = this.opts.httpClient.invocation.expr({
+        funName,
+        returnType,
+        responseType,
+        params,
+        path,
+        method,
+        hasQuery,
+        hasBody,
+        requestContentType,
+        responseFormat,
+        requestParamsVar,
+        unwrap
+      });
+      invocation = invocation.replaceAll("\n", "");
+      const operator = target === "object" ? ":" : "=";
+      const returnTypeCode = this.opts.httpClient.inferMethodReturnType ? "" : `:${returnType}`;
+      return `${funName} ${operator} (${params})${returnTypeCode} => 
+             this.client${invocation}
+        `;
     });
   }
 }
 
-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 pickPreferredMediaType = (mediaTypes) => {
-  if (!mediaTypes.length) return void 0;
-  const exactJson = mediaTypes.find((media) => media === "application/json");
-  if (exactJson) return exactJson;
-  const jsonLike = mediaTypes.find((media) => /\+json$/i.test(media));
-  if (jsonLike) return jsonLike;
-  const wildcardJson = mediaTypes.find(
-    (media) => /application\/\*\+json/i.test(media)
-  );
-  if (wildcardJson) return wildcardJson;
-  return mediaTypes[0];
-};
-const isSuccessStatusCode = (statusCode) => {
-  const upper = statusCode.toUpperCase();
-  if (/^2XX$/.test(upper)) {
-    return true;
-  }
-  const numericCode = Number(statusCode);
-  return Number.isFinite(numericCode) && numericCode >= 200 && numericCode < 300;
-};
-const selectReturnResponses = (responses) => {
-  const entries = Object.entries(responses);
-  if (!entries.length) {
-    return [];
-  }
-  const success = entries.filter(([statusCode]) => isSuccessStatusCode(statusCode)).map(([, response]) => response);
-  if (success.length) {
-    return success;
-  }
-  const defaultResponse = entries.find(
-    ([statusCode]) => statusCode.toLowerCase() === "default"
-  );
-  if (defaultResponse) {
-    return [defaultResponse[1]];
+const promiseHttpClientCodegenSpec = () => ({
+  typeName: {
+    kind: "reference",
+    ref: {
+      kind: "internal",
+      name: "HttpClient"
+    }
+  },
+  responseWrapper: {
+    kind: "reference",
+    ref: {
+      kind: "builtin",
+      name: "Promise"
+    }
+  },
+  inferMethodReturnType: true,
+  invocation: {
+    vars: {
+      body: "body",
+      query: "query"
+    },
+    expr: ({
+      responseType,
+      path,
+      method,
+      hasBody,
+      hasQuery,
+      requestContentType,
+      responseFormat,
+      requestParamsVar,
+      unwrap
+    }) => `.request<${responseType}>({
+                method: '${method}',
+                path: ${path}
+                ${hasQuery ? `,
+query` : ""}
+                ${hasBody ? `,
+body` : ""}
+                ${requestContentType ? `,
+requestContentType: '${requestContentType}'` : ""}
+                ${responseFormat ? `,
+format: '${responseFormat}'` : ""}
+            }${requestParamsVar ? `,
+${requestParamsVar}` : ""})${unwrap ? `.then(res => res.body)` : ""}
+            `
   }
-  return entries.map(([, response]) => response);
-};
-const getPreferredMediaTypeEntry = (content) => {
-  const mediaType = pickPreferredMediaType(Object.keys(content));
-  if (!mediaType) return {};
+});
+
+const mergeChunks = (name, chunks, options = {}) => {
+  if (chunks.length === 0) {
+    if (options.allowEmpty) {
+      return {
+        name,
+        code: "export {}",
+        exports: [],
+        refs: []
+      };
+    }
+    throw new Error("Cannot merge empty chunk list.");
+  }
+  const orderedChunks = options.preserveChunkOrder ? chunks : orderByInternalDependencies(chunks);
+  const mergedCode = orderedChunks.map((chunk) => chunk.code).join("\n\n");
+  const exportedSymbols = /* @__PURE__ */ new Set();
+  const mergedExports = [];
+  for (const chunk of orderedChunks) {
+    for (const symbol of chunk.exports) {
+      if (exportedSymbols.has(symbol)) continue;
+      exportedSymbols.add(symbol);
+      mergedExports.push(symbol);
+    }
+  }
+  const seenRefKeys = /* @__PURE__ */ new Set();
+  const mergedRefs = orderedChunks.flatMap((chunk) => chunk.refs).filter((ref) => {
+    if (ref.kind === "internal" && exportedSymbols.has(ref.name)) {
+      return false;
+    }
+    const key = ref.kind === "internal" ? `internal:${ref.name}` : ref.kind === "external" ? `external:${ref.package}:${ref.name}` : `builtin:${ref.name}`;
+    if (seenRefKeys.has(key)) return false;
+    seenRefKeys.add(key);
+    return true;
+  });
   return {
-    mediaType,
-    media: content[mediaType]
+    name,
+    code: mergedCode,
+    exports: mergedExports,
+    refs: mergedRefs
   };
 };
-const isBinaryFileResponse = (response) => {
-  const { mediaType, media } = getPreferredMediaTypeEntry(response.content);
-  return media?.schema?.type === "string" && media.schema?.format === "binary" && mediaType !== "multipart/form-data";
+const orderByInternalDependencies = (chunks) => {
+  const chunkIndex = /* @__PURE__ */ new Map();
+  const exportOwnerBySymbol = /* @__PURE__ */ new Map();
+  chunks.forEach((chunk, index) => {
+    chunkIndex.set(chunk.name, index);
+    for (const symbol of chunk.exports) {
+      if (exportOwnerBySymbol.has(symbol)) {
+        throw new Error(
+          `Assertion error. Symbol "${symbol}" exported multiple times while ordering chunks.`
+        );
+      }
+      exportOwnerBySymbol.set(symbol, chunk);
+    }
+  });
+  const dependentsByProvider = /* @__PURE__ */ new Map();
+  const inDegreeByChunk = /* @__PURE__ */ new Map();
+  for (const chunk of chunks) {
+    dependentsByProvider.set(chunk, /* @__PURE__ */ new Set());
+    inDegreeByChunk.set(chunk, 0);
+  }
+  for (const chunk of chunks) {
+    const providers = /* @__PURE__ */ new Set();
+    for (const ref of chunk.refs) {
+      if (ref.kind !== "internal") continue;
+      const provider = exportOwnerBySymbol.get(ref.name);
+      if (!provider || provider === chunk) continue;
+      providers.add(provider);
+    }
+    for (const provider of providers) {
+      dependentsByProvider.get(provider).add(chunk);
+      inDegreeByChunk.set(chunk, inDegreeByChunk.get(chunk) + 1);
+    }
+  }
+  const ready = chunks.filter((chunk) => inDegreeByChunk.get(chunk) === 0).sort((a, b) => chunkIndex.get(a.name) - chunkIndex.get(b.name));
+  const ordered = [];
+  while (ready.length > 0) {
+    const provider = ready.shift();
+    ordered.push(provider);
+    for (const dependent of dependentsByProvider.get(provider)) {
+      const nextInDegree = inDegreeByChunk.get(dependent) - 1;
+      inDegreeByChunk.set(dependent, nextInDegree);
+      if (nextInDegree === 0) {
+        ready.push(dependent);
+      }
+    }
+    ready.sort((a, b) => chunkIndex.get(a.name) - chunkIndex.get(b.name));
+  }
+  if (ordered.length !== chunks.length) {
+    const cycleChunkNames = chunks.filter((chunk) => inDegreeByChunk.get(chunk) > 0).map((chunk) => chunk.name).join(", ");
+    throw new Error(
+      `Cannot order chunks with cyclic internal dependencies: ${cycleChunkNames}`
+    );
+  }
+  return ordered;
 };
-const isJsonLikeMediaType = (mediaType) => {
-  return mediaType === "application/json" || typeof mediaType === "string" && /\+json$/i.test(mediaType);
+
+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    format?: 'json' | 'document'\n    headers?: Record<string, string>\n    query?: QueryParams\n    body?: any\n    requestContentType?: 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 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";
+
+const commonTypesCode = httpClientCommonTypesSource;
+const promiseHttpClientCode = httpClientPromiseTypesSource;
+const stripImports = (code) => code.replace(/^import[\s\S]*?from\s+['"][^'"]+['"]\s*;?\n?/gm, "").trim();
+const stripRequestParams = (code) => code.replace(/<RequestParams\s*=\s*never>/g, "").replace(/,\s*params\?:\s*RequestParams/g, "");
+const getHttpClientCode = (opts) => [
+  commonTypesCode,
+  opts.withRequestParams ? promiseHttpClientCode : stripRequestParams(promiseHttpClientCode)
+].map(stripImports).join("\n\n");
+const provideHttpClientCode = (gen, opts) => gen.toChunk(
+  "HttpClient",
+  getHttpClientCode({
+    withRequestParams: opts.withRequestParams
+  }),
+  ["HttpRequest", "HttpResponse", "HttpClient"]
+);
+
+const generateTsCode = (clientName, projectResult, opts) => {
+  const tsCodegenFac = new TsCodegenFactory();
+  const { schemaDefinitions } = projectResult;
+  const types = [...schemaDefinitions].sort((a, b) => a.name.localeCompare(b.name)).map((def) => {
+    const cg = tsCodegenFac.forNewChunk();
+    const code = `export ${cg.declaration(def.name, def.declaration)}`;
+    return cg.toChunk(def.name, code, [def.name]);
+  });
+  const clientCodegen = new ApiClientCodegen(
+    { httpClient: promiseHttpClientCodegenSpec(), ...opts },
+    tsCodegenFac
+  );
+  const generated = clientCodegen.generate(
+    clientName,
+    groupsOpsByTag(projectResult.operations)
+  );
+  const clientChunk = {
+    ...generated,
+    name: `${clientName}.client`
+  };
+  const httpClientChunk = provideHttpClientCode(
+    tsCodegenFac.forNewChunk(),
+    opts
+  );
+  const typesChunk = mergeChunks(`${clientName}.types`, types, {
+    preserveChunkOrder: true,
+    allowEmpty: true
+  });
+  const indexChunk = createIndexChunk(clientName);
+  const all = [typesChunk, httpClientChunk, clientChunk, indexChunk];
+  return {
+    all,
+    typesName: typesChunk.name,
+    promiseWrappersNames: [httpClientChunk.name, clientChunk.name]
+  };
 };
-const toHttpMethodUpper = (method) => {
-  switch (method) {
-    case "get":
-      return "GET";
-    case "post":
-      return "POST";
-    case "put":
-      return "PUT";
-    case "delete":
-      return "DELETE";
-    case "patch":
-      return "PATCH";
-    case "options":
-      return "OPTIONS";
-    case "head":
-      return "HEAD";
-    case "trace":
-      return "TRACE";
-    default: {
-      const exhaustive = method;
-      throw new Error(`Unsupported HTTP method: ${String(exhaustive)}`);
+const createIndexChunk = (clientName) => ({
+  name: "index",
+  code: [
+    `export { ${clientName} } from './${clientName}.client'`,
+    `export * from './${clientName}.types'`,
+    "export * from './HttpClient'"
+  ].join("\n"),
+  exports: [],
+  refs: []
+});
+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;
 };
-class OperationProjector {
-  constructor(options = {}) {
+
+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);
+const TS_IDENTIFIER_PATTERN = /^[$A-Z_][0-9A-Z_$]*$/i;
+class ToTypeExprConverter {
+  constructor(schemas = {}, options) {
+    this.schemas = schemas;
     this.options = options;
-    __publicField$4(this, "seenOperationIds", /* @__PURE__ */ new Set());
-    __publicField$4(this, "typeExprConverter");
-    __publicField$4(this, "project", (openApi) => {
-      this.seenOperationIds.clear();
-      this.typeExprConverter = new ToTypeExprConverter(openApi.schemas, {
-        quirks: this.options.quirks
-      });
-      const operations = openApi.operations.map((operation) => {
-        const operationName = (operation.operationId ?? syntheticOperationId(operation.method, operation.path)).trim();
-        if (!operationName) {
-          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}`);
-        }
-        return this.projectOne(operationName, operation);
+    __publicField$3(this, "schemaCache", /* @__PURE__ */ new WeakMap());
+    __publicField$3(this, "refCache", /* @__PURE__ */ new Map());
+    __publicField$3(this, "schemaDefinitions", []);
+    __publicField$3(this, "schemaDefinitionsById", /* @__PURE__ */ new Map());
+    __publicField$3(this, "schemaDefinitionsInProgress", /* @__PURE__ */ new Set());
+    __publicField$3(this, "getSchemaDefinitions", () => this.schemaDefinitions);
+    __publicField$3(this, "registerAllSchemaDefinitions", () => {
+      Object.keys(this.schemas).forEach((schemaName) => {
+        this.ensureSchemaDefinition(`#/components/schemas/${schemaName}`);
       });
-      return {
-        operations,
-        schemaDefinitions: this.typeExprConverter.getSchemaDefinitions()
-      };
     });
-    __publicField$4(this, "projectOne", (operationName, operation) => {
-      this.seenOperationIds.add(operationName);
-      const parameters = [];
-      const pathParameter = this.projectPathParameter(operation);
-      const queryParameter = this.projectQueryParameter(operation);
-      const bodyParameter = this.projectBodyParameter(operation);
-      if (pathParameter) parameters.push(pathParameter);
-      if (queryParameter) parameters.push(queryParameter);
-      if (bodyParameter) parameters.push(bodyParameter);
-      return {
-        op: {
-          signature: {
-            name: operationName,
-            parameters,
-            returnType: this.projectReturnType(operation)
-          },
-          http: {
-            method: toHttpMethodUpper(operation.method),
-            path: operation.path,
-            requestContentType: this.projectRequestContentType(
-              operation.requestBody
-            ),
-            responseFormat: this.projectResponseFormat(operation)
-          }
-        },
-        tags: [...operation.tags]
-      };
-    });
-    __publicField$4(this, "projectRequestContentType", (requestBody) => {
-      const { mediaType } = getPreferredMediaTypeEntry(
-        requestBody?.content ?? {}
-      );
-      switch (mediaType) {
-        case "application/json":
-        case "multipart/form-data":
-        case "application/x-www-form-urlencoded":
-          return mediaType;
-        default:
-          return void 0;
+    __publicField$3(this, "fromTypeExpr", (schema) => {
+      if (!schema) {
+        return this.scalar("unknown");
       }
-    });
-    __publicField$4(this, "projectResponseFormat", (operation) => {
-      const selectedResponses = selectReturnResponses(operation.responses);
-      if (!selectedResponses.length) {
-        return void 0;
+      const bySchema = this.schemaCache.get(schema);
+      if (bySchema) {
+        return bySchema;
       }
-      if (selectedResponses.some((response) => isBinaryFileResponse(response))) {
-        return "document";
+      if (typeof schema.$ref === "string") {
+        const byRef = this.refCache.get(this.refCacheKey(schema));
+        if (byRef) {
+          this.schemaCache.set(schema, byRef);
+          return byRef;
+        }
       }
-      if (selectedResponses.some(
-        (response) => isJsonLikeMediaType(
-          getPreferredMediaTypeEntry(response.content).mediaType
-        )
-      )) {
-        return "json";
+      const projected = this.fromSchemaCore(schema);
+      const result = schema.nullable === true ? this.withNullable(projected) : projected;
+      this.schemaCache.set(schema, result);
+      if (typeof schema.$ref === "string") {
+        this.refCache.set(this.refCacheKey(schema), result);
       }
-      return void 0;
+      return result;
     });
-    __publicField$4(this, "projectParameterGroupTypeExpr", (params) => {
-      const properties = Object.entries(params).map(([name, parameter]) => ({
-        name,
-        required: parameter.required,
-        typeExpr: this.typeExprConverter.fromSchema(
-          this.selectParameterSchema(parameter)
-        )
-      }));
+    __publicField$3(this, "scalar", (name) => ({
+      kind: "inline",
+      expr: {
+        node: "scalar",
+        name
+      }
+    }));
+    __publicField$3(this, "union", (members) => {
+      const flatMembers = [];
+      for (const member of members) {
+        if (member.kind === "inline" && member.expr.node === "union") {
+          flatMembers.push(...member.expr.members);
+        } else {
+          flatMembers.push(member);
+        }
+      }
+      if (flatMembers.length === 1) {
+        return flatMembers[0];
+      }
       return {
         kind: "inline",
         expr: {
-          node: "object",
-          properties
+          node: "union",
+          members: flatMembers
         }
       };
     });
-    __publicField$4(this, "projectPathParameter", (operation) => {
-      const params = operation.parameters.path;
-      const entries = Object.values(params);
-      if (!entries.length) return null;
-      if (entries.some((parameter) => !parameter.required)) {
-        throw new Error("Unsupported path parameters: all must be required");
+    __publicField$3(this, "literal", (value) => ({
+      kind: "inline",
+      expr: {
+        node: "literal",
+        value
       }
+    }));
+    __publicField$3(this, "ref", (id) => {
+      const name = this.refNameFromPath(id);
       return {
-        kind: "path",
-        optional: false,
-        typeExpr: this.projectParameterGroupTypeExpr(params)
+        kind: "reference",
+        ref: {
+          kind: "internal",
+          name
+        }
       };
     });
-    __publicField$4(this, "projectQueryParameter", (operation) => {
-      const params = operation.parameters.query;
-      const entries = Object.values(params);
-      if (!entries.length) return null;
+    __publicField$3(this, "builtinRef", (name) => ({
+      kind: "reference",
+      ref: {
+        kind: "builtin",
+        name
+      }
+    }));
+    __publicField$3(this, "refNameFromPath", (ref) => {
+      const parts = ref.split("/");
+      const name = parts[parts.length - 1];
+      if (!name) {
+        throw new Error(`Unsupported schema reference: ${ref}`);
+      }
+      return name;
+    });
+    __publicField$3(this, "refCacheKey", (schema) => {
+      return `${schema.$ref}|nullable:${schema.nullable === true}`;
+    });
+    __publicField$3(this, "isUnconstrainedSchema", (schema) => {
+      const meaningfulKeys = Object.keys(schema).filter(
+        (key) => key !== "nullable"
+      );
+      return meaningfulKeys.length === 0;
+    });
+    __publicField$3(this, "ensureSchemaDefinition", (refId) => {
+      if (this.schemaDefinitionsById.has(refId) || this.schemaDefinitionsInProgress.has(refId)) {
+        return;
+      }
+      const schemaName = this.refNameFromPath(refId);
+      const schema = this.schemas[schemaName];
+      if (!schema) {
+        return;
+      }
+      this.schemaDefinitionsInProgress.add(refId);
+      try {
+        const definition = {
+          name: schemaName,
+          declaration: this.toDeclaration(schema)
+        };
+        this.schemaDefinitionsById.set(refId, definition);
+        this.schemaDefinitions.push(definition);
+      } finally {
+        this.schemaDefinitionsInProgress.delete(refId);
+      }
+    });
+    __publicField$3(this, "isSchemaNode", (value) => {
+      return Boolean(
+        value && typeof value === "object" && !Array.isArray(value)
+      );
+    });
+    __publicField$3(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$3(this, "toDeclaration", (schema) => {
+      const enumDeclaration = this.toEnumDeclaration(schema);
+      if (enumDeclaration) {
+        return enumDeclaration;
+      }
       return {
-        kind: "query",
-        optional: !entries.some((parameter) => parameter.required),
-        typeExpr: this.projectParameterGroupTypeExpr(params)
+        kind: "typeAlias",
+        typeExpr: this.fromTypeExpr(schema)
       };
     });
-    __publicField$4(this, "projectBodyParameter", (operation) => {
-      const requestBody = operation.requestBody;
-      if (!requestBody) return null;
+    __publicField$3(this, "toEnumDeclaration", (schema) => {
+      if (this.options.enumStyle !== "enum" || !Array.isArray(schema.enum)) {
+        return void 0;
+      }
+      const valueType = this.getEnumValueType(schema.enum);
+      if (!valueType) {
+        return void 0;
+      }
       return {
-        kind: "body",
-        optional: !requestBody.required,
-        typeExpr: this.typeExprConverter.fromSchema(
-          this.selectRequestBodySchema(requestBody)
-        )
+        kind: "enum",
+        valueType,
+        members: this.toEnumMembers(schema.enum)
       };
     });
-    __publicField$4(this, "projectReturnType", (operation) => {
-      const selectedResponses = selectReturnResponses(operation.responses);
-      if (!selectedResponses.length) {
-        return this.typeExprConverter.scalar("void");
+    __publicField$3(this, "getEnumValueType", (values) => {
+      if (!values.length) {
+        return void 0;
       }
-      const responseTypes = selectedResponses.map((response) => {
-        const schema = this.selectResponseSchema(response);
-        if (!schema) {
-          return this.typeExprConverter.scalar("void");
-        }
-        return this.typeExprConverter.fromSchema(schema);
+      if (values.every((value) => typeof value === "string")) {
+        return "string";
+      }
+      if (values.every((value) => typeof value === "number")) {
+        return "number";
+      }
+      return void 0;
+    });
+    __publicField$3(this, "toEnumMembers", (values) => {
+      const usedNames = /* @__PURE__ */ new Map();
+      return values.map((value, index) => {
+        const enumValue = value;
+        const baseName = this.toEnumMemberBaseName(enumValue, index);
+        const nextCount = (usedNames.get(baseName) ?? 0) + 1;
+        usedNames.set(baseName, nextCount);
+        return {
+          name: nextCount === 1 ? baseName : `${baseName}${nextCount}`,
+          value: enumValue
+        };
       });
-      return this.typeExprConverter.union(responseTypes);
     });
-    __publicField$4(this, "selectParameterSchema", (parameter) => {
-      if (parameter.schema) return parameter.schema;
-      return getPreferredMediaTypeEntry(parameter.content).media?.schema;
+    __publicField$3(this, "toEnumMemberBaseName", (value, index) => {
+      if (typeof value === "string" && this.options.uppercaseEnumKeys) {
+        const compatName = this.toCompatEnumMemberName(value);
+        if (compatName) {
+          return compatName;
+        }
+      }
+      if (typeof value === "string" && TS_IDENTIFIER_PATTERN.test(value) && !RESERVED_WORDS.has(value)) {
+        return value;
+      }
+      if (typeof value === "number" && Number.isInteger(value) && value >= 0) {
+        return `Value${value}`;
+      }
+      const pascalName = toPascalCaseIdentifier(String(value));
+      return pascalName === "Api" ? `Value${index + 1}` : pascalName;
     });
-    __publicField$4(this, "selectRequestBodySchema", (requestBody) => {
-      return getPreferredMediaTypeEntry(requestBody.content).media?.schema;
+    __publicField$3(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, "selectResponseSchema", (response) => {
-      return getPreferredMediaTypeEntry(response.content).media?.schema;
+    __publicField$3(this, "isScalarName", (value) => {
+      switch (value) {
+        case "string":
+        case "number":
+        case "boolean":
+        case "integer":
+        case "null":
+        case "unknown":
+        case "any":
+        case "never":
+        case "void":
+          return true;
+        default:
+          return false;
+      }
     });
-    this.typeExprConverter = new ToTypeExprConverter(void 0, {
-      quirks: this.options.quirks
+    __publicField$3(this, "hasNullMember", (expr) => {
+      if (expr.kind !== "inline") return false;
+      if (expr.expr.node === "scalar") {
+        return expr.expr.name === "null";
+      }
+      if (expr.expr.node === "union") {
+        return expr.expr.members.some((member) => this.hasNullMember(member));
+      }
+      return false;
     });
-  }
-}
-
-const buildPathParamBindings = (paramNames) => {
-  const usedBindings = /* @__PURE__ */ new Set();
-  return paramNames.reduce((acc, paramName) => {
-    acc[paramName] = toUniqueBindingName(paramName, usedBindings);
-    return acc;
-  }, {});
-};
-const toUniqueBindingName = (paramName, usedBindings) => {
-  let base = toBindingBase(paramName);
-  if (isReservedWord(base)) {
-    base = `${base}_param`;
-  }
-  if (!usedBindings.has(base)) {
-    usedBindings.add(base);
-    return base;
-  }
-  let suffix = 2;
-  let candidate = `${base}_${suffix}`;
-  while (usedBindings.has(candidate)) {
-    suffix += 1;
-    candidate = `${base}_${suffix}`;
-  }
-  usedBindings.add(candidate);
-  return candidate;
-};
-const toBindingBase = (paramName) => {
-  if (isIdentifier(paramName)) {
-    return paramName;
-  }
-  const sanitized = paramName.replace(/[^0-9A-Za-z_$]/g, "_");
-  if (!sanitized.length) {
-    return "pathParam";
-  }
-  if (/^[A-Za-z_$]/.test(sanitized)) {
-    return sanitized;
-  }
-  return `_${sanitized}`;
-};
-const isIdentifier = (value) => {
-  return /^[$A-Z_][0-9A-Z_$]*$/i.test(value);
-};
-const isReservedWord = (value) => {
-  return RESERVED_WORDS.has(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 ParamsConstructor {
-  constructor(options) {
-    this.options = options;
-    __publicField$3(this, "process", (params, httpPath) => {
-      const pathParamSpec = validatePathParams(params, httpPath);
-      const pathParamBindings = pathParamSpec?.bindings;
-      const funParams = params.flatMap(
-        (param) => this.renderOperationParams(param, pathParamSpec)
+    __publicField$3(this, "withNullable", (expr) => {
+      if (this.hasNullMember(expr)) {
+        return expr;
+      }
+      return this.union([expr, this.scalar("null")]);
+    });
+    __publicField$3(this, "projectObjectType", (schema) => {
+      const requiredRaw = schema.required;
+      if (requiredRaw !== void 0 && !Array.isArray(requiredRaw)) {
+        throw new Error(
+          "Unsupported object schema: required must be an array"
+        );
+      }
+      const required = new Set(
+        (requiredRaw ?? []).map((item) => {
+          if (typeof item !== "string") {
+            throw new Error(
+              "Unsupported object schema: required items must be strings"
+            );
+          }
+          return item;
+        })
       );
-      const hasBody = params.some((p) => p.kind === "body");
-      const hasQuery = params.some((p) => p.kind === "query");
-      const path = this.renderPathTemplateLiteral(
-        httpPath,
-        this.options.paramNames.path,
-        pathParamBindings
+      const propertiesRaw = schema.properties;
+      if (propertiesRaw !== void 0 && (!propertiesRaw || typeof propertiesRaw !== "object" || Array.isArray(propertiesRaw))) {
+        throw new Error(
+          "Unsupported object schema: properties must be an object"
+        );
+      }
+      const properties = Object.entries(propertiesRaw ?? {}).map(
+        ([name, propertySchema]) => {
+          if (!this.isSchemaNode(propertySchema)) {
+            throw new Error(
+              `Unsupported object property schema for "${name}"`
+            );
+          }
+          return {
+            name,
+            required: this.isRequiredProperty(
+              name,
+              required,
+              propertySchema
+            ),
+            typeExpr: this.fromTypeExpr(propertySchema)
+          };
+        }
       );
+      let additionalProperties;
+      if (schema.additionalProperties !== void 0) {
+        if (typeof schema.additionalProperties === "boolean") {
+          additionalProperties = schema.additionalProperties;
+        } else if (this.isSchemaNode(schema.additionalProperties)) {
+          additionalProperties = this.fromTypeExpr(
+            schema.additionalProperties
+          );
+        } else {
+          throw new Error(
+            "Unsupported object schema: additionalProperties must be boolean or schema object"
+          );
+        }
+      }
       return {
-        funParams,
-        path,
-        hasBody,
-        hasQuery
+        kind: "inline",
+        expr: {
+          node: "object",
+          properties,
+          additionalProperties
+        }
       };
     });
-    __publicField$3(this, "renderOperationParams", (param, pathParamSpec) => {
-      if (param.kind !== "path" || !pathParamSpec) {
-        return [
-          {
-            identifier: this.paramName(param),
-            typeExpr: param.typeExpr
-          }
-        ];
+    __publicField$3(this, "isRequiredProperty", (name, required, propertySchema) => {
+      if (required.has(name)) {
+        return true;
       }
-      if (this.options.pathParamsStyle === "positional") {
-        return pathParamSpec.placeholderNames.map((name) => ({
-          identifier: pathParamSpec.bindings[name] ?? name,
-          typeExpr: pathParamSpec.propertiesByName[name].typeExpr
-        }));
+      if (!this.options.swaggerTsApiRequiredBooleans) {
+        return false;
       }
-      return [
-        {
-          identifier: this.renderPathParamDestructuring(
-            pathParamSpec.bindings
-          ),
-          typeExpr: param.typeExpr
-        }
-      ];
+      return propertySchema.required === true;
     });
-    __publicField$3(this, "renderPathTemplateLiteral", (path, pathParamVarName, pathParamBindings) => {
-      const escapedPath = path.replace(/\\/g, "\\\\").replace(/`/g, "\\`").replace(/\$\{/g, "\\${");
-      const pathWithParams = escapedPath.replace(
-        /\{([^}]+)\}/g,
-        (_, paramName) => {
-          const binding = pathParamBindings?.[paramName];
-          if (binding !== void 0) {
-            return `\${${binding}}`;
-          }
-          return `\${${pathParamVarName}[${JSON.stringify(paramName)}]}`;
+    __publicField$3(this, "mapSchemaArrayMembers", (value, kind) => {
+      if (!Array.isArray(value) || !value.length) {
+        throw new Error(
+          `Unsupported schema: ${kind} must be a non-empty array`
+        );
+      }
+      return value.map((entry, index) => {
+        if (!this.isSchemaNode(entry)) {
+          throw new Error(
+            `Unsupported schema: ${kind}[${index}] must be a schema object`
+          );
         }
-      );
-      return `\`${pathWithParams}\``;
+        return this.fromTypeExpr(entry);
+      });
     });
-    __publicField$3(this, "renderPathParamDestructuring", (pathParamBindings) => {
-      const members = Object.entries(pathParamBindings).map(
-        ([paramName, binding]) => {
-          const key = toTsPropertyKey(paramName);
-          return binding === paramName ? key : `${key}: ${binding}`;
-        }
-      );
-      return `{ ${members.join(", ")} }`;
+    __publicField$3(this, "isBinaryFileSchema", (schema) => {
+      return schema.type === "string" && schema.format === "binary";
     });
-    __publicField$3(this, "paramName", (p) => {
-      switch (p.kind) {
-        case "body":
-          return this.options.paramNames.body;
-        case "query":
-          return this.options.paramNames.query;
-        case "path":
-          return this.options.paramNames.path;
-        default: {
-          const exhaustive = p;
+    __publicField$3(this, "fromSchemaCore", (schema) => {
+      if (this.isUnconstrainedSchema(schema)) {
+        return this.scalar("unknown");
+      }
+      if (typeof schema.$ref === "string") {
+        this.ensureSchemaDefinition(schema.$ref);
+        return this.ref(schema.$ref);
+      }
+      if (schema.const !== void 0) {
+        return this.literal(this.toLiteralValue(schema.const));
+      }
+      if (Array.isArray(schema.enum)) {
+        if (!schema.enum.length) {
           throw new Error(
-            `Unsupported operation parameter kind: ${String(exhaustive)}`
+            "Unsupported enum schema: enum must be non-empty"
+          );
+        }
+        return this.union(
+          schema.enum.map(
+            (value) => this.literal(this.toLiteralValue(value))
+          )
+        );
+      }
+      if (schema.type === "array") {
+        if (schema.items === void 0) {
+          return {
+            kind: "inline",
+            expr: {
+              node: "array",
+              element: this.scalar("unknown")
+            }
+          };
+        }
+        if (Array.isArray(schema.items)) {
+          throw new Error("Unsupported array schema: tuple-style items");
+        }
+        if (!this.isSchemaNode(schema.items)) {
+          throw new Error(
+            "Unsupported array schema: items must be a schema"
           );
         }
+        return {
+          kind: "inline",
+          expr: {
+            node: "array",
+            element: this.fromTypeExpr(schema.items)
+          }
+        };
+      }
+      if (schema.type === "object") {
+        return this.projectObjectType(schema);
+      }
+      if (schema.oneOf !== void 0) {
+        return this.union(this.mapSchemaArrayMembers(schema.oneOf, "oneOf"));
+      }
+      if (schema.anyOf !== void 0) {
+        return this.union(this.mapSchemaArrayMembers(schema.anyOf, "anyOf"));
+      }
+      if (schema.allOf !== void 0) {
+        return {
+          kind: "inline",
+          expr: {
+            node: "intersection",
+            members: this.mapSchemaArrayMembers(schema.allOf, "allOf")
+          }
+        };
+      }
+      if (this.isBinaryFileSchema(schema)) {
+        return this.builtinRef("File");
       }
+      if (this.isScalarName(schema.type)) {
+        return this.scalar(schema.type);
+      }
+      throw new Error(
+        `Unsupported schema construct: ${JSON.stringify(schema, null, 2)}`
+      );
     });
   }
 }
-const extractPathPlaceholderNames = (pathTemplate) => {
-  const seen = /* @__PURE__ */ new Set();
-  const names = [];
-  const matcher = /\{([^}]+)\}/g;
-  let match = matcher.exec(pathTemplate);
-  while (match) {
-    const name = match[1];
-    if (!seen.has(name)) {
-      seen.add(name);
-      names.push(name);
-    }
-    match = matcher.exec(pathTemplate);
-  }
-  return names;
+
+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 pickPreferredMediaType = (mediaTypes) => {
+  if (!mediaTypes.length) return void 0;
+  const exactJson = mediaTypes.find((media) => media === "application/json");
+  if (exactJson) return exactJson;
+  const jsonLike = mediaTypes.find((media) => /\+json$/i.test(media));
+  if (jsonLike) return jsonLike;
+  const wildcardJson = mediaTypes.find(
+    (media) => /application\/\*\+json/i.test(media)
+  );
+  if (wildcardJson) return wildcardJson;
+  return mediaTypes[0];
 };
-const isPathParam = (param) => {
-  return param.kind === "path";
+const isSuccessStatusCode = (statusCode) => {
+  const upper = statusCode.toUpperCase();
+  if (/^2XX$/.test(upper)) {
+    return true;
+  }
+  const numericCode = Number(statusCode);
+  return Number.isFinite(numericCode) && numericCode >= 200 && numericCode < 300;
 };
-const isInlineObjectType = (typeExpr) => typeExpr.kind === "inline" && typeExpr.expr.node === "object";
-const renderNameList = (items) => {
-  const values = [...items];
-  if (!values.length) {
-    return "(none)";
-  }
-  return values.map((v) => JSON.stringify(v)).join(", ");
-};
-const validatePathParams = (params, httpPath) => {
-  const placeholders = extractPathPlaceholderNames(httpPath);
-  const placeholderSet = new Set(placeholders);
-  const pathParams = params.filter(isPathParam);
-  if (pathParams.length > 1) {
-    throw new Error(
-      `Path "${httpPath}" has ${pathParams.length} path parameter objects; expected at most one.`
-    );
-  }
-  const pathParam = pathParams[0];
-  if (!pathParam) {
-    if (placeholderSet.size > 0) {
-      throw new Error(
-        `Path "${httpPath}" is missing a path parameter object for placeholders: ${renderNameList(
-          placeholderSet
-        )}.`
-      );
-    }
-    return void 0;
-  }
-  const pathParamExpr = pathParam.typeExpr.expr;
-  if (pathParamExpr.additionalProperties !== void 0 && pathParamExpr.additionalProperties !== false) {
-    throw new Error(
-      `Path "${httpPath}" path parameter object must not declare additionalProperties.`
-    );
-  }
-  const nestedObjectProps = pathParamExpr.properties.filter((prop) => isInlineObjectType(prop.typeExpr)).map((prop) => prop.name);
-  if (nestedObjectProps.length > 0) {
-    throw new Error(
-      `Path "${httpPath}" path parameters must be depth-1. Nested object properties: ${renderNameList(
-        nestedObjectProps
-      )}.`
-    );
+const selectReturnResponses = (responses) => {
+  const entries = Object.entries(responses);
+  if (!entries.length) {
+    return [];
   }
-  const optionalPathProps = pathParamExpr.properties.filter((prop) => !prop.required).map((prop) => prop.name);
-  if (optionalPathProps.length > 0) {
-    throw new Error(
-      `Path "${httpPath}" path parameters must all be required. Optional properties: ${renderNameList(
-        optionalPathProps
-      )}.`
-    );
+  const success = entries.filter(([statusCode]) => isSuccessStatusCode(statusCode)).map(([, response]) => response);
+  if (success.length) {
+    return success;
   }
-  const declaredNames = pathParamExpr.properties.map((prop) => prop.name);
-  const declaredNameSet = new Set(declaredNames);
-  const missingInObject = [...placeholderSet].filter(
-    (name) => !declaredNameSet.has(name)
-  );
-  const missingInPath = declaredNames.filter(
-    (name) => !placeholderSet.has(name)
+  const defaultResponse = entries.find(
+    ([statusCode]) => statusCode.toLowerCase() === "default"
   );
-  if (missingInObject.length > 0 || missingInPath.length > 0) {
-    throw new Error(
-      `Path "${httpPath}" placeholders and path parameter object keys must match exactly. Missing in object: ${renderNameList(
-        missingInObject
-      )}. Missing in path: ${renderNameList(missingInPath)}.`
-    );
+  if (defaultResponse) {
+    return [defaultResponse[1]];
   }
-  const bindings = buildPathParamBindings(placeholders);
-  const propertiesByName = Object.fromEntries(
-    pathParamExpr.properties.map((prop) => [prop.name, prop])
-  );
+  return entries.map(([, response]) => response);
+};
+const getPreferredMediaTypeEntry = (content) => {
+  const mediaType = pickPreferredMediaType(Object.keys(content));
+  if (!mediaType) return {};
   return {
-    placeholderNames: placeholders,
-    bindings,
-    propertiesByName
+    mediaType,
+    media: content[mediaType]
   };
 };
-
-const EMPTY_LINE_MARKER = "/*__EMPTY_LINE_MARKER__*/";
-
-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 REQUEST_PARAMS_TYPE = "RequestParams";
-const REQUEST_PARAMS_DEFAULT = "never";
-const REQUEST_PARAMS_ARG = "params";
-class ApiClientCodegen {
-  constructor(opts, tsCodegenFactory) {
-    this.opts = opts;
-    this.tsCodegenFactory = tsCodegenFactory;
-    __publicField$2(this, "generate", (apiName, operations) => {
-      const tsCodegen = this.tsCodegenFactory.forNewChunk();
-      const httpClientType = tsCodegen.toCode(this.opts.httpClient.typeName);
-      let clientType = httpClientType;
-      let classTypeParams = "";
-      if (this.opts.requestParams) {
-        clientType = `${httpClientType}<${REQUEST_PARAMS_TYPE}>`;
-        classTypeParams = `<${REQUEST_PARAMS_TYPE} = ${REQUEST_PARAMS_DEFAULT}>`;
+const isBinaryFileResponse = (response) => {
+  const { mediaType, media } = getPreferredMediaTypeEntry(response.content);
+  return media?.schema?.type === "string" && media.schema?.format === "binary" && mediaType !== "multipart/form-data";
+};
+const isJsonLikeMediaType = (mediaType) => {
+  return mediaType === "application/json" || typeof mediaType === "string" && /\+json$/i.test(mediaType);
+};
+const toHttpMethodUpper = (method) => {
+  switch (method) {
+    case "get":
+      return "GET";
+    case "post":
+      return "POST";
+    case "put":
+      return "PUT";
+    case "delete":
+      return "DELETE";
+    case "patch":
+      return "PATCH";
+    case "options":
+      return "OPTIONS";
+    case "head":
+      return "HEAD";
+    case "trace":
+      return "TRACE";
+    default: {
+      const exhaustive = method;
+      throw new Error(`Unsupported HTTP method: ${String(exhaustive)}`);
+    }
+  }
+};
+class OperationProjector {
+  constructor(options) {
+    this.options = options;
+    __publicField$2(this, "seenOperationIds", /* @__PURE__ */ new Set());
+    __publicField$2(this, "typeExprConverter");
+    __publicField$2(this, "project", (openApi) => {
+      this.seenOperationIds.clear();
+      this.typeExprConverter = new ToTypeExprConverter(
+        openApi.schemas,
+        this.options.typeExtraction
+      );
+      if (this.options.includeAllSchema) {
+        this.typeExprConverter.registerAllSchemaDefinitions();
       }
-      const methodsCode = Array.isArray(operations) ? this.opsCode(tsCodegen, operations) : this.groupsOpsCode(tsCodegen, operations);
-      const code = `
-            export class ${apiName}${classTypeParams} {
-                constructor(private readonly client: ${clientType}) {}
-
-                ${methodsCode}
-            }
-        `;
-      return tsCodegen.toChunk("api", code, [apiName]);
-    });
-    __publicField$2(this, "groupsOpsCode", (codegen, groupedOps) => Object.entries(groupedOps).map(([groupName, ops]) => {
-      const methodsCode = this.opsCode(codegen, ops, "object");
-      return `
-                    ${toTsPropertyKey(groupName)} = {
-                        ${methodsCode}
-                    }
-                `;
-    }).join("\n\n"));
-    __publicField$2(this, "opsCode", (codegen, operations, target = "class") => {
-      const separator = target === "object" ? `,
-${EMPTY_LINE_MARKER}
-` : "\n\n";
-      const methodsCode = operations.map((op) => this.renderOp(op, codegen, target)).join(separator);
-      return methodsCode;
+      const operations = openApi.operations.map((operation) => {
+        const operationName = (operation.operationId ?? syntheticOperationId(operation.method, operation.path)).trim();
+        if (!operationName) {
+          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}`);
+        }
+        return this.projectOne(operationName, operation);
+      });
+      return {
+        operations,
+        schemaDefinitions: this.typeExprConverter.getSchemaDefinitions()
+      };
     });
-    __publicField$2(this, "renderOp", (op, tsCodegen, target) => {
-      const { signature: sig, http } = op;
-      const invocationVars = this.opts.httpClient.invocation.vars;
-      const paramNames = {
-        path: "path",
-        query: invocationVars.query,
-        body: invocationVars.body
+    __publicField$2(this, "projectOne", (operationName, operation) => {
+      this.seenOperationIds.add(operationName);
+      const parameters = [];
+      const pathParameter = this.projectPathParameter(operation);
+      const queryParameter = this.projectQueryParameter(operation);
+      const bodyParameter = this.projectBodyParameter(operation);
+      if (pathParameter) parameters.push(pathParameter);
+      if (queryParameter) parameters.push(queryParameter);
+      if (bodyParameter) parameters.push(bodyParameter);
+      return {
+        op: {
+          signature: {
+            name: operationName,
+            parameters,
+            returnType: this.projectReturnType(operation)
+          },
+          http: {
+            method: toHttpMethodUpper(operation.method),
+            path: operation.path,
+            requestContentType: this.projectRequestContentType(
+              operation.requestBody
+            ),
+            responseFormat: this.projectResponseFormat(operation)
+          }
+        },
+        tags: [...operation.tags]
       };
-      const paramsHelper = new ParamsConstructor({
-        paramNames,
-        pathParamsStyle: this.opts.pathParamsStyle
-      });
-      const { path, funParams, hasBody, hasQuery } = paramsHelper.process(
-        sig.parameters,
-        http.path
-      );
-      const params = funParams.map(
-        (r) => `${r.identifier}: ${tsCodegen.toCode(r.typeExpr)}`
+    });
+    __publicField$2(this, "projectRequestContentType", (requestBody) => {
+      const { mediaType } = getPreferredMediaTypeEntry(
+        requestBody?.content ?? {}
       );
-      if (this.opts.requestParams) {
-        params.push(`${REQUEST_PARAMS_ARG}?: ${REQUEST_PARAMS_TYPE}`);
+      switch (mediaType) {
+        case "application/json":
+        case "multipart/form-data":
+        case "application/x-www-form-urlencoded":
+          return mediaType;
+        default:
+          return void 0;
       }
-      const paramsCode = params.join(", ");
-      const responseType = tsCodegen.toCode(sig.returnType);
-      const returnType = this.wrapInResponseWrapper(sig.returnType, tsCodegen);
-      return this.renderFunctionCode({
-        funName: sig.name,
-        responseType,
-        returnType,
-        params: paramsCode,
-        path,
-        method: http.method,
-        hasQuery,
-        hasBody,
-        requestContentType: http.requestContentType,
-        responseFormat: http.responseFormat,
-        requestParamsVar: this.opts.requestParams ? REQUEST_PARAMS_ARG : void 0,
-        unwrap: this.opts.unwrap ?? false,
-        target
-      });
     });
-    __publicField$2(this, "wrapInResponseWrapper", (typeExpr, tsCodegen) => {
-      return tsCodegen.toCode({
-        ...this.opts.httpClient.responseWrapper,
-        typeArgs: [typeExpr]
-      });
+    __publicField$2(this, "projectResponseFormat", (operation) => {
+      const selectedResponses = selectReturnResponses(operation.responses);
+      if (!selectedResponses.length) {
+        return void 0;
+      }
+      if (selectedResponses.some((response) => isBinaryFileResponse(response))) {
+        return "document";
+      }
+      if (selectedResponses.some(
+        (response) => isJsonLikeMediaType(
+          getPreferredMediaTypeEntry(response.content).mediaType
+        )
+      )) {
+        return "json";
+      }
+      return void 0;
     });
-    __publicField$2(this, "renderFunctionCode", ({
-      funName,
-      responseType,
-      returnType,
-      params,
-      path,
-      method,
-      hasQuery,
-      hasBody,
-      requestContentType,
-      responseFormat,
-      requestParamsVar,
-      unwrap,
-      target
-    }) => {
-      let invocation = this.opts.httpClient.invocation.expr({
-        funName,
-        returnType,
-        responseType,
-        params,
-        path,
-        method,
-        hasQuery,
-        hasBody,
-        requestContentType,
-        responseFormat,
-        requestParamsVar,
-        unwrap
-      });
-      invocation = invocation.replaceAll("\n", "");
-      const operator = target === "object" ? ":" : "=";
-      const returnTypeCode = this.opts.httpClient.inferMethodReturnType ? "" : `:${returnType}`;
-      return `${funName} ${operator} (${params})${returnTypeCode} => 
-             this.client${invocation}
-        `;
+    __publicField$2(this, "projectParameterGroupTypeExpr", (params) => {
+      const properties = Object.entries(params).map(([name, parameter]) => ({
+        name,
+        required: parameter.required,
+        typeExpr: this.typeExprConverter.fromTypeExpr(
+          this.selectParameterSchema(parameter)
+        )
+      }));
+      return {
+        kind: "inline",
+        expr: {
+          node: "object",
+          properties
+        }
+      };
+    });
+    __publicField$2(this, "projectPathParameter", (operation) => {
+      const params = operation.parameters.path;
+      const entries = Object.values(params);
+      if (!entries.length) return null;
+      if (entries.some((parameter) => !parameter.required)) {
+        throw new Error("Unsupported path parameters: all must be required");
+      }
+      return {
+        kind: "path",
+        optional: false,
+        typeExpr: this.projectParameterGroupTypeExpr(params)
+      };
+    });
+    __publicField$2(this, "projectQueryParameter", (operation) => {
+      const params = operation.parameters.query;
+      const entries = Object.values(params);
+      if (!entries.length) return null;
+      return {
+        kind: "query",
+        optional: !entries.some((parameter) => parameter.required),
+        typeExpr: this.projectParameterGroupTypeExpr(params)
+      };
+    });
+    __publicField$2(this, "projectBodyParameter", (operation) => {
+      const requestBody = operation.requestBody;
+      if (!requestBody) return null;
+      return {
+        kind: "body",
+        optional: !requestBody.required,
+        typeExpr: this.typeExprConverter.fromTypeExpr(
+          this.selectRequestBodySchema(requestBody)
+        )
+      };
+    });
+    __publicField$2(this, "projectReturnType", (operation) => {
+      const selectedResponses = selectReturnResponses(operation.responses);
+      if (!selectedResponses.length) {
+        return this.typeExprConverter.scalar("void");
+      }
+      const responseTypes = selectedResponses.map((response) => {
+        const schema = this.selectResponseSchema(response);
+        if (!schema) {
+          return this.typeExprConverter.scalar("void");
+        }
+        return this.typeExprConverter.fromTypeExpr(schema);
+      });
+      return this.typeExprConverter.union(responseTypes);
+    });
+    __publicField$2(this, "selectParameterSchema", (parameter) => {
+      if (parameter.schema) return parameter.schema;
+      return getPreferredMediaTypeEntry(parameter.content).media?.schema;
+    });
+    __publicField$2(this, "selectRequestBodySchema", (requestBody) => {
+      return getPreferredMediaTypeEntry(requestBody.content).media?.schema;
+    });
+    __publicField$2(this, "selectResponseSchema", (response) => {
+      return getPreferredMediaTypeEntry(response.content).media?.schema;
     });
   }
-}
-
-const promiseHttpClientCodegenSpec = () => ({
-  typeName: {
-    kind: "reference",
-    ref: {
-      kind: "internal",
-      name: "HttpClient"
-    }
-  },
-  responseWrapper: {
-    kind: "reference",
-    ref: {
-      kind: "builtin",
-      name: "Promise"
-    }
-  },
-  inferMethodReturnType: true,
-  invocation: {
-    vars: {
-      body: "body",
-      query: "query"
-    },
-    expr: ({
-      responseType,
-      path,
-      method,
-      hasBody,
-      hasQuery,
-      requestContentType,
-      responseFormat,
-      requestParamsVar,
-      unwrap
-    }) => `.request<${responseType}>({
-                method: '${method}',
-                path: ${path}
-                ${hasQuery ? `,
-query` : ""}
-                ${hasBody ? `,
-body` : ""}
-                ${requestContentType ? `,
-requestContentType: '${requestContentType}'` : ""}
-                ${responseFormat ? `,
-format: '${responseFormat}'` : ""}
-            }${requestParamsVar ? `,
-${requestParamsVar}` : ""})${unwrap ? `.then(res => res.body)` : ""}
-            `
-  }
-});
+}
 
 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;
@@ -5796,7 +6154,7 @@ class CodeFormatter {
   constructor(opts) {
     this.opts = opts;
     __publicField$1(this, "format", async (code) => {
-      const filePath = Path.resolve(this.opts.resolveConfFrom, "generated.ts");
+      const filePath = Path$1.resolve(this.opts.resolveConfFrom, "generated.ts");
       const prettier = await import('prettier');
       const prettierConfig = await prettier.resolveConfig(filePath) ?? {};
       const formattedCode = await prettier.format(code, {
@@ -5890,185 +6248,76 @@ class CodeWriter {
 }
 const ensureSingleTrailingNewline = (code) => code.replace(/\n+$/u, "\n");
 
-const mergeChunks = (name, chunks) => {
-  if (chunks.length === 0) {
-    throw new Error("Cannot merge empty chunk list.");
-  }
-  const orderedChunks = orderByInternalDependencies(chunks);
-  const mergedCode = orderedChunks.map((chunk) => chunk.code).join("\n\n");
-  const exportedSymbols = /* @__PURE__ */ new Set();
-  const mergedExports = [];
-  for (const chunk of orderedChunks) {
-    for (const symbol of chunk.exports) {
-      if (exportedSymbols.has(symbol)) continue;
-      exportedSymbols.add(symbol);
-      mergedExports.push(symbol);
-    }
-  }
-  const seenRefKeys = /* @__PURE__ */ new Set();
-  const mergedRefs = orderedChunks.flatMap((chunk) => chunk.refs).filter((ref) => {
-    if (ref.kind === "internal" && exportedSymbols.has(ref.name)) {
-      return false;
-    }
-    const key = ref.kind === "internal" ? `internal:${ref.name}` : ref.kind === "external" ? `external:${ref.package}:${ref.name}` : `builtin:${ref.name}`;
-    if (seenRefKeys.has(key)) return false;
-    seenRefKeys.add(key);
-    return true;
-  });
-  return {
-    name,
-    code: mergedCode,
-    exports: mergedExports,
-    refs: mergedRefs
-  };
-};
-const orderByInternalDependencies = (chunks) => {
-  const chunkIndex = /* @__PURE__ */ new Map();
-  const exportOwnerBySymbol = /* @__PURE__ */ new Map();
-  chunks.forEach((chunk, index) => {
-    chunkIndex.set(chunk.name, index);
-    for (const symbol of chunk.exports) {
-      if (exportOwnerBySymbol.has(symbol)) {
-        throw new Error(
-          `Assertion error. Symbol "${symbol}" exported multiple times while ordering chunks.`
-        );
-      }
-      exportOwnerBySymbol.set(symbol, chunk);
-    }
-  });
-  const dependentsByProvider = /* @__PURE__ */ new Map();
-  const inDegreeByChunk = /* @__PURE__ */ new Map();
-  for (const chunk of chunks) {
-    dependentsByProvider.set(chunk, /* @__PURE__ */ new Set());
-    inDegreeByChunk.set(chunk, 0);
-  }
-  for (const chunk of chunks) {
-    const providers = /* @__PURE__ */ new Set();
-    for (const ref of chunk.refs) {
-      if (ref.kind !== "internal") continue;
-      const provider = exportOwnerBySymbol.get(ref.name);
-      if (!provider || provider === chunk) continue;
-      providers.add(provider);
-    }
-    for (const provider of providers) {
-      dependentsByProvider.get(provider).add(chunk);
-      inDegreeByChunk.set(chunk, inDegreeByChunk.get(chunk) + 1);
-    }
+class VNextOasClientGenerator {
+  constructor(options, log) {
+    this.options = options;
+    this.log = log;
   }
-  const ready = chunks.filter((chunk) => inDegreeByChunk.get(chunk) === 0).sort((a, b) => chunkIndex.get(a.name) - chunkIndex.get(b.name));
-  const ordered = [];
-  while (ready.length > 0) {
-    const provider = ready.shift();
-    ordered.push(provider);
-    for (const dependent of dependentsByProvider.get(provider)) {
-      const nextInDegree = inDegreeByChunk.get(dependent) - 1;
-      inDegreeByChunk.set(dependent, nextInDegree);
-      if (nextInDegree === 0) {
-        ready.push(dependent);
+  async generate(cmd) {
+    const { inputFile, outputDir, apiName } = cmd;
+    this.log(`Will generate API client name=${apiName} to ${outputDir}`);
+    const sourceSchema = await loadSourceSchema(inputFile);
+    const normalizedSchema = this.normalizeSchema(sourceSchema, inputFile);
+    const openApiIr = this.filterOperations(normalizedSchema);
+    const projectResult = new OperationProjector({
+      includeAllSchema: this.options.selection?.allSchemas === true,
+      typeExtraction: {
+        enumStyle: this.options.codegen.enumStyle,
+        uppercaseEnumKeys: this.options.compat?.uppercaseEnumKeys,
+        swaggerTsApiRequiredBooleans: this.options.compat?.swaggerTsApiRequiredBooleans
       }
-    }
-    ready.sort((a, b) => chunkIndex.get(a.name) - chunkIndex.get(b.name));
-  }
-  if (ordered.length !== chunks.length) {
-    const cycleChunkNames = chunks.filter((chunk) => inDegreeByChunk.get(chunk) > 0).map((chunk) => chunk.name).join(", ");
-    throw new Error(
-      `Cannot order chunks with cyclic internal dependencies: ${cycleChunkNames}`
+    }).project(openApiIr);
+    const clientName = toPascalCaseIdentifier(apiName);
+    const chunks = generateTsCode(
+      clientName,
+      projectResult,
+      this.options.codegen
     );
+    const codeFormatter = new CodeFormatter({
+      resolveConfFrom: outputDir
+    });
+    const writer = new CodeWriter(codeFormatter);
+    await writer.write(outputDir, chunks.all);
+    const tsFilePath = (name) => Path.join(outputDir, `${name}.ts`);
+    return {
+      promiseWrapper: chunks.promiseWrappersNames.map(tsFilePath),
+      types: tsFilePath(chunks.typesName)
+    };
   }
-  return ordered;
-};
-
-const generateFromIr = async ({
-  openApiIr,
-  clientName,
-  outputDir,
-  outputFilename,
-  codeFormattingConfigDir,
-  quirks,
-  requestParams: withRequestParams
-}) => {
-  const tsCodegenFac = new TsCodegenFactory();
-  const projectResult = new OperationProjector({
-    quirks
-  }).project(openApiIr);
-  const { schemaDefinitions } = projectResult;
-  const requestParams = withRequestParams;
-  const types = schemaDefinitions.map((def) => {
-    const cg = tsCodegenFac.forNewChunk();
-    const typeName = def.name;
-    const code = `export type ${typeName} = ${cg.toCode(def.typeExpr)}`;
-    return cg.toChunk(typeName, code, [typeName]);
-  });
-  const clientCodegen = new ApiClientCodegen(
-    {
-      httpClient: promiseHttpClientCodegenSpec(),
-      requestParams,
-      // TODO make configurable
-      pathParamsStyle: "positional"
-    },
-    tsCodegenFac
-  );
-  const generated = clientCodegen.generate(
-    clientName,
-    groupsOpsByTag(projectResult.operations)
-  );
-  const httpClientChunk = tsCodegenFac.forNewChunk().toChunk(
-    "HttpClient",
-    getHttpClientCode(),
-    ["HttpRequest", "HttpResponse", "HttpClient"]
-  );
-  const codeFormatter = new CodeFormatter({
-    resolveConfFrom: codeFormattingConfigDir
-  });
-  const writer = new CodeWriter(codeFormatter);
-  let chunks = [...types, httpClientChunk, generated];
-  chunks = [mergeChunks(outputFilename, chunks)];
-  await writer.write(outputDir, chunks);
-};
-const groupsOpsByTag = (operations) => {
-  const groupedOps = {};
-  operations.forEach((operation) => {
-    const groupName = operation.tags[0]?.trim() || "root";
-    const bucket = groupedOps[groupName] ?? [];
-    bucket.push(operation.op);
-    groupedOps[groupName] = bucket;
-  });
-  return groupedOps;
-};
-const commonTypesCode = httpClientCommonTypesSource;
-const promiseHttpClientCode = httpClientPromiseTypesSource;
-const stripImports = (code) => code.replace(/^import[\s\S]*?from\s+['"][^'"]+['"]\s*;?\n?/gm, "").trim();
-const getHttpClientCode = (opts) => [
-  commonTypesCode,
-  promiseHttpClientCode 
-].map(stripImports).join("\n\n");
-
-const generateOpenApiClient$1 = async ({ input, name, outputDir, quirks, ignoreOperationsWithTags }, log) => {
-  log(`Will generate API client name=${name} to ${outputDir}`);
-  const sourceSchema = await loadSourceSchema(input);
-  const { result, problems } = new OpenApiNormalizer(sourceSchema).load();
-  problems.forEach((problem) => {
-    log(`[open-api:${problem.level}] ${problem.path}: ${problem.message}`);
-  });
-  const errors = problems.filter((problem) => problem.level === "error");
-  if (errors.length) {
-    throw new Error(
-      `Failed to load OpenAPI IR from ${input}: ${errors.length} error(s).`
+  filterOperations(openApiIr) {
+    const ignoreTags = new Set(
+      this.options.selection?.ignoreOperationsWithTags || []
     );
+    return {
+      ...openApiIr,
+      operations: openApiIr.operations.filter((operation) => {
+        const hasUsableTags = operation.tags.some((tag) => tag.trim());
+        if (!hasUsableTags) {
+          this.log(
+            `[open-api:warning] Ignoring operation ${operation.method.toUpperCase()} ${operation.path} (${operation.operationId ?? "<missing operationId>"}): no tags`
+          );
+          return false;
+        }
+        return !operation.tags.some((tag) => ignoreTags.has(tag));
+      })
+    };
   }
-  const openApiIr = filterOperations(result, log, ignoreOperationsWithTags);
-  const outputFilename = "index";
-  await generateFromIr({
-    openApiIr,
-    clientName: toPascalCaseIdentifier(name),
-    outputDir,
-    outputFilename,
-    codeFormattingConfigDir: outputDir,
-    quirks,
-    requestParams: true
-  });
-  return Path.join(outputDir, `${outputFilename}.ts`);
-};
+  normalizeSchema(rawSchema, inputFile) {
+    const { result, problems } = new OpenApiNormalizer(rawSchema).load();
+    problems.forEach((problem) => {
+      this.log(
+        `[open-api:${problem.level}] ${problem.path}: ${problem.message}`
+      );
+    });
+    const errors = problems.filter((problem) => problem.level === "error");
+    if (errors.length) {
+      throw new Error(
+        `Failed to load OpenAPI IR from ${inputFile}: ${errors.length} error(s).`
+      );
+    }
+    return result;
+  }
+}
 const loadSourceSchema = async (input) => {
   let rawContent;
   try {
@@ -6091,109 +6340,60 @@ const loadSourceSchema = async (input) => {
   }
   return parsed;
 };
-const filterOperations = (openApiIr, log, ignoreOperationsWithTags) => {
-  const ignoreTags = new Set(ignoreOperationsWithTags);
-  return {
-    ...openApiIr,
-    operations: openApiIr.operations.filter((operation) => {
-      const hasUsableTags = operation.tags.some((tag) => tag.trim());
-      if (!hasUsableTags) {
-        log(
-          `[open-api:warning] Ignoring operation ${operation.method.toUpperCase()} ${operation.path} (${operation.operationId ?? "<missing operationId>"}): no tags`
-        );
-        return false;
-      }
-      return !operation.tags.some((tag) => ignoreTags.has(tag));
-    })
-  };
-};
 const toErrorMessage = (error) => {
   return error instanceof Error ? error.message : String(error);
 };
 
-const generateOpenApiClient = async ({ input, name, outputDir, ignoreOperationsWithTags }, log) => {
-  log(`Will generate API client name=${name} to ${outputDir}`);
-  const fileName = "index";
-  const dstFile = Path$1.join(outputDir, `${fileName}.ts`);
-  const prettier = await import('prettier');
-  const prettierConfig = await prettier.resolveConfig(dstFile) ?? {};
-  const prettierConfigForGenerator = {
-    ...prettierConfig,
-    // swagger-typescript-api defaults to printWidth=120; keep Prettier default 80 unless explicitly configured.
-    printWidth: prettierConfig.printWidth ?? 80
-  };
-  const ignoreTags = ignoreOperationsWithTags && new Set(ignoreOperationsWithTags);
-  await generateApi({
-    name: "index",
-    output: outputDir,
-    input,
-    // modular: true,
-    httpClientType: "axios",
-    templates: getTemplatesDir(),
-    defaultResponseAsSuccess: true,
-    sortTypes: true,
-    // generateRouteTypes: true,
-    singleHttpClient: true,
-    // extractRequestBody: true,
-    prettier: prettierConfigForGenerator,
-    moduleNameFirstTag: true,
-    apiClassName: toPascalCaseIdentifier(name),
-    hooks: {
-      onCreateRoute: (routeData) => {
-        if (ignoreTags) {
-          const ignore = routeData.raw.tags?.find(
-            (t) => ignoreTags.has(t)
-          );
-          if (ignore) return false;
-        }
-        return routeData;
-      }
-    },
-    // @ts-ignore
-    codeGenConstructs: () => ({
-      Keyword: {}
-    })
-    // extractRequestParams: true,
-  });
-  return dstFile;
-};
-const getThisScriptDirname = () => {
-  return Path$1.dirname(fileURLToPath(import.meta.url));
-};
-const getTemplatesDir = () => {
-  const currentDir = getThisScriptDirname();
-  const templatesRelativePath = Path$1.basename(currentDir) === "dist" ? "../templates" : "../../../templates";
-  return Path$1.resolve(currentDir, templatesRelativePath);
-};
-
-const SUPPORTED_GENERATORS = [
-  "swagger-ts-api",
-  "api-client-generator"
-];
-const OPEN_API_MODEL_GENERATORS = {
-  "swagger-ts-api": generateOpenApiClient,
-  "api-client-generator": generateOpenApiClient$1
-};
-const generateOpenApiModel = async (generator, cmd, log) => {
-  const generatorFun = OPEN_API_MODEL_GENERATORS[generator];
-  const outputPath = await generatorFun(cmd, log);
-  const outputModifiers = getOutputModifiers(cmd, log);
-  log(`Will modify the outputs ${JSON.stringify(outputModifiers)}`);
-  await modifyOutput(outputPath, outputModifiers);
-  return outputPath;
+const generateOpenApiModel = async (spectPath, config, log) => {
+  let outFiles;
+  const { openApiGenerator, responseWrapper } = config;
+  if ("legacy" in openApiGenerator) {
+    outFiles = await generateOpenApiClient(
+      spectPath,
+      {
+        ignoreOperationsWithTags: openApiGenerator.legacy.ignoreOperationsWithTags,
+        name: config.apiName,
+        outputDir: config.dstDir
+      },
+      log
+    );
+  } else {
+    outFiles = await new VNextOasClientGenerator(
+      openApiGenerator,
+      log
+    ).generate({
+      inputFile: spectPath,
+      apiName: config.apiName,
+      outputDir: config.dstDir
+    });
+  }
+  if (responseWrapper) {
+    await modifyHttpClientAsyncWrapper(
+      outFiles.promiseWrapper,
+      responseWrapper,
+      log
+    );
+  }
+  return { typesFilePath: outFiles.types };
 };
-const getOutputModifiers = ({ responseWrapper }, log) => {
+const modifyHttpClientAsyncWrapper = async (filePaths, responseWrapper, log) => {
+  log(
+    `Will use response wrapper '${JSON.stringify(responseWrapper)}' on file ${filePaths.join(", ")}`
+  );
   const addImports = [];
-  const replaces = [];
-  if (responseWrapper) {
-    log(`Will use response wrapper '${JSON.stringify(responseWrapper)}'`);
-    if (responseWrapper.import) addImports.push(responseWrapper.import);
-    replaces.push(["Promise", responseWrapper.symbol]);
+  if (responseWrapper.import) {
+    addImports.push(responseWrapper.import);
+  }
+  const replaces = [["Promise", responseWrapper.symbol]];
+  if (responseWrapper.unwrapExpr) {
+    replaces.push([".then(res => res.body)", responseWrapper.unwrapExpr]);
+  }
+  for (const filePath of filePaths) {
+    await modifyOutput(filePath, {
+      addImports,
+      replaces
+    });
   }
-  return {
-    addImports,
-    replaces
-  };
 };
 const modifyOutput = async (path, cmd) => {
   let content = await fs$1.readFile(path).then((r) => r.toString());
@@ -6259,9 +6459,7 @@ const generateSchemas = async (inputFile, outputFile, opts = {}) => {
   const { getZodSchemasFile } = generate({
     sourceText: removeGenericTypes(code)
   });
-  const fileName = Path$1.basename(inputFile);
-  let f = getZodSchemasFile(`./${fileName.replace(".ts", "")}`);
-  f = f.replaceAll('"./index";', '"./client"');
+  let f = getZodSchemasFile(getModuleImportPath(inputFile, outputFile));
   f = f.replaceAll(".optional()", ".nullable()");
   if (opts.localDateTimes) {
     f = f.replaceAll(
@@ -6277,50 +6475,25 @@ const generateSchemas = async (inputFile, outputFile, opts = {}) => {
   });
   fs__default.writeFileSync(outputFile, formatted);
 };
-
-const DEFAULT_GENERATOR = "api-client-generator";
-const generateApiClientParamsSchema = strictObject({
-  srcSpec: string().trim().min(1),
-  dstDir: string().trim().min(1),
-  apiName: string().trim().min(1),
-  generator: _enum(SUPPORTED_GENERATORS).default(DEFAULT_GENERATOR),
-  quirks: strictObject({
-    swaggerTsApiRequiredBooleans: boolean().optional()
-  }).optional(),
-  responseWrapper: strictObject({
-    symbol: string().trim().min(1),
-    import: string().trim().min(1).optional()
-  }).optional(),
-  ignoreOperationsWithTags: array(string()).optional(),
-  zodSchemas: strictObject({
-    enabled: boolean().optional(),
-    localDateTimes: boolean().optional()
-  }).optional()
-});
-const parseGenerateApiClientParams = (params) => {
-  const parsed = generateApiClientParamsSchema.safeParse(params);
-  if (parsed.success) return parsed.data;
-  throw new Error(prettifyError(parsed.error));
+const getModuleImportPath = (inputFile, outputFile) => {
+  const sourceDir = Path.dirname(outputFile);
+  const relativePath = Path.relative(sourceDir, inputFile);
+  const withoutExtension = relativePath.replace(/\.ts$/u, "");
+  const normalizedPath = withoutExtension.split(Path.sep).join("/");
+  return normalizedPath.startsWith(".") ? normalizedPath : `./${normalizedPath}`;
 };
-const generateApiClient = async (params, log = console.log) => {
-  const {
-    dstDir,
-    apiName,
-    srcSpec,
-    quirks,
-    responseWrapper,
-    ignoreOperationsWithTags,
-    zodSchemas,
-    generator
-  } = parseGenerateApiClientParams(params);
-  const dir = Path$1.resolve(dstDir, apiName);
+
+const generateApiClient = async (params, configFilePath, log = console.log) => {
+  const config = parseConfig(params, configFilePath);
+  const { dstDir, apiName, srcSpec, zodSchemas } = config;
+  const dir = Path.resolve(dstDir, apiName);
   if (!fs.existsSync(dir)) {
     log(`Creating dir ${dir}`);
     fs.mkdirSync(dir, {
       recursive: true
     });
   }
-  const clientDir = Path$1.resolve(dir, "client");
+  const clientDir = Path.resolve(dir, "client");
   const specPath = await getSpecPath(srcSpec, dir, log);
   log(`Cleaning client output dir ${clientDir}`);
   fs.rmSync(clientDir, {
@@ -6330,23 +6503,19 @@ const generateApiClient = async (params, log = console.log) => {
   fs.mkdirSync(clientDir, {
     recursive: true
   });
-  const clientFile = await generateOpenApiModel(
-    generator,
+  const { typesFilePath } = await generateOpenApiModel(
+    specPath,
     {
-      name: apiName,
-      input: specPath,
-      outputDir: clientDir,
-      quirks,
-      ignoreOperationsWithTags,
-      responseWrapper
+      ...config,
+      dstDir: clientDir
     },
     log
   );
   if (zodSchemas?.enabled === false) return;
   log("Generating Zod schemas");
   await generateSchemas(
-    Path$1.resolve(dir, clientFile),
-    Path$1.resolve(dir, "./zod.ts"),
+    typesFilePath,
+    Path.resolve(dir, "./zod.ts"),
     zodSchemas
   );
 };
@@ -6356,7 +6525,7 @@ const getSpecPath = async (urlOrPath, dir, log) => {
       throw new Error(`Spec file ${urlOrPath} does not exists`);
     return urlOrPath;
   }
-  const specPath = Path$1.resolve(dir, `spec.json`);
+  const specPath = Path.resolve(dir, `spec.json`);
   log(`Will download the API spec from ${urlOrPath} to ${specPath}`);
   await downloadSpec(specPath, urlOrPath);
   return specPath;