apigen-ts 0.1.1 → 0.2.0

package/dist/_template.ts

@@ -1,11 +1,11 @@
 // Note: Use uppercase for names in ApiClient to avoid conflict with the generated code
 
-interface ApigenConfig {
+export interface ApigenConfig {
   baseUrl: string
   headers: Record<string, string>
 }
 
-interface ApigenRequest extends Omit<RequestInit, "body"> {
+export interface ApigenRequest extends Omit<RequestInit, "body"> {
   search?: Record<string, unknown>
   body?: unknown
 }
@@ -40,7 +40,7 @@ export class ApiClient {
     }
   }
 
-  async Fetch<T>(method: string, path: string, opts: ApigenRequest = {}): Promise<T> {
+  PrepareFetchUrl(path: string): URL {
     let base = this.Config.baseUrl
     if ("location" in globalThis && (base === "" || base.startsWith("/"))) {
       // make ts happy in pure nodejs environment, should never pass here
@@ -48,7 +48,12 @@ export class ApiClient {
       base = `${location.origin}${base.endsWith("/") ? base : `/${base}`}`
     }
 
-    const url = new URL(path, base)
+    return new URL(path, base)
+  }
+
+  async Fetch<T>(method: string, path: string, opts: ApigenRequest = {}): Promise<T> {
+    const url = this.PrepareFetchUrl(path)
+
     for (const [k, v] of Object.entries(opts?.search ?? {})) {
       url.searchParams.append(k, Array.isArray(v) ? v.join(",") : (v as string))
     }

package/dist/cli.cjs

@@ -1,6 +1,6 @@
 'use strict';
 
-var main$1 = require('./main-c2426ec2.cjs');
+var main$1 = require('./main-Dkcn3PTN.cjs');
 require('fs/promises');
 require('path');
 require('url');

package/dist/cli.js

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-import { a as apigen, g as getCliConfig } from './main-bbe33f1b.js';
+import { a as apigen, g as getCliConfig } from './main-byN_-fkF.js';
 import 'fs/promises';
 import 'path';
 import 'url';

package/dist/cli.mjs

@@ -1,4 +1,4 @@
-import { a as apigen, g as getCliConfig } from './main-bbe33f1b.mjs';
+import { a as apigen, g as getCliConfig } from './main-byN_-fkF.mjs';
 import 'fs/promises';
 import 'path';
 import 'url';

package/dist/{main-c2426ec2.cjs → main-Dkcn3PTN.cjs}

@@ -12,6 +12,9 @@ var ts = require('typescript');
 var path = require('node:path');
 
 var _documentCurrentScript = typeof document !== 'undefined' ? document.currentScript : null;
+var name = "apigen-ts";
+var version = "0.2.0";
+
 const initCtx = (config) => {
   return {
     source: "",
@@ -26,8 +29,8 @@ const initCtx = (config) => {
 };
 const getCliConfig = () => {
   const argv = cleye.cli({
-    name: "apigen",
-    version: "0.1.1",
+    name,
+    version,
     parameters: ["<source>", "[output]"],
     flags: {
       name: {
@@ -52,8 +55,7 @@ const getCliConfig = () => {
 };
 
 const unref = (ctx, s) => {
-  if (!s)
-    return void 0;
+  if (!s) return void 0;
   if ("$ref" in s && s.$ref) {
     const parts = s.$ref.replace("#/", "").split("/");
     const obj = parts.reduce(
@@ -61,8 +63,7 @@ const unref = (ctx, s) => {
       (acc, x) => lodashEs.get(acc, x, lodashEs.get(acc, decodeURIComponent(x).replaceAll("~1", "/"))),
       ctx.doc
     );
-    if (obj)
-      return obj;
+    if (obj) return obj;
     console.warn(`${ctx.logTag} ref ${s.$ref} not found`);
     return void 0;
   }
@@ -70,11 +71,9 @@ const unref = (ctx, s) => {
 };
 const getReqSchema = (ctx, config) => {
   const req = unref(ctx, config.requestBody);
-  if (!req)
-    return void 0;
+  if (!req) return void 0;
   const cts = Object.entries(req.content ?? {}).map((x) => [x[0].split(";")[0], x[1].schema]).filter((x) => x[1]);
-  if (cts.length === 0)
-    return void 0;
+  if (cts.length === 0) return void 0;
   const pretenders = [
     "application/json",
     "text/",
@@ -83,8 +82,7 @@ const getReqSchema = (ctx, config) => {
   ];
   for (const p of pretenders) {
     const ct = cts.find((x) => x[0].startsWith(p));
-    if (ct)
-      return ct;
+    if (ct) return ct;
   }
   cts.map((x) => x[0]);
   return void 0;
@@ -92,14 +90,11 @@ const getReqSchema = (ctx, config) => {
 const getRepSchema = (ctx, config) => {
   const successCodes = Object.keys(config.responses ?? {}).filter((x) => x.startsWith("2")).filter((x) => lodashEs.get(config, ["responses", x, "content"]));
   const cts = Object.entries(lodashEs.get(config, ["responses", successCodes[0], "content"], {})).filter((x) => x[1].schema);
-  if (cts.length === 0)
-    return void 0;
+  if (cts.length === 0) return void 0;
   const ctJson = cts.find((x) => x[0].startsWith("application/json"));
-  if (ctJson)
-    return ctJson[1].schema;
+  if (ctJson) return ctJson[1].schema;
   const ctText = cts.find((x) => x[0].startsWith("text/"));
-  if (ctText)
-    return { type: "string" };
+  if (ctText) return { type: "string" };
   cts.map((x) => x[0]).join(", ");
   return void 0;
 };
@@ -172,25 +167,18 @@ const Keywords = /* @__PURE__ */ new Set([
 ]);
 const normalizeIdentifier = (val, asVar = false) => {
   let name = val.replace("#/components/schemas/", "").replaceAll("'", "").replace(/[^a-zA-Z0-9]/g, "_");
-  if (name.match(/^\d/))
-    name = `$${name}`;
-  if (asVar && Keywords.has(name))
-    name = `$${name}`;
+  if (name.match(/^\d/)) name = `$${name}`;
+  if (asVar && Keywords.has(name)) name = `$${name}`;
   return name;
 };
 const makeInlineEnum = (s) => {
-  if (!s.enum)
-    return void 0;
+  if (!s.enum) return void 0;
   const values = arrayUtilsTs.filterEmpty(s.enum);
-  if (!values.length)
-    return void 0;
+  if (!values.length) return void 0;
   if (!s.type) {
-    if (values.every((x) => typeof x === "string"))
-      s.type = "string";
-    if (values.every((x) => typeof x === "number"))
-      s.type = "number";
-    if (values.every((x) => typeof x === "boolean"))
-      s.type = "boolean";
+    if (values.every((x) => typeof x === "string")) s.type = "string";
+    if (values.every((x) => typeof x === "number")) s.type = "number";
+    if (values.every((x) => typeof x === "boolean")) s.type = "boolean";
   }
   if (s.type === "string") {
     const tokens = lodashEs.uniq(values).map((x) => f$2.createStringLiteral(x.toString()));
@@ -202,10 +190,8 @@ const makeInlineEnum = (s) => {
   }
   if (s.type === "boolean") {
     const tokens = [];
-    if (values.includes(true))
-      tokens.push(f$2.createToken(ts.SyntaxKind.TrueKeyword));
-    if (values.includes(false))
-      tokens.push(f$2.createToken(ts.SyntaxKind.FalseKeyword));
+    if (values.includes(true)) tokens.push(f$2.createToken(ts.SyntaxKind.TrueKeyword));
+    if (values.includes(false)) tokens.push(f$2.createToken(ts.SyntaxKind.FalseKeyword));
     return f$2.createUnionTypeNode(tokens.map((x) => f$2.createLiteralTypeNode(x)));
   }
   console.warn(`enum with unknown type "${s.type}" in`, s);
@@ -213,33 +199,25 @@ const makeInlineEnum = (s) => {
 };
 const makeType = (ctx, s) => {
   const mk = makeType.bind(null, ctx);
-  if (s === void 0)
-    return f$2.createKeywordTypeNode(ts.SyntaxKind.VoidKeyword);
-  if (s === null)
-    return f$2.createLiteralTypeNode(f$2.createNull());
+  if (s === void 0) return f$2.createKeywordTypeNode(ts.SyntaxKind.VoidKeyword);
+  if (s === null) return f$2.createLiteralTypeNode(f$2.createNull());
   if ("$ref" in s && s.$ref) {
     const parts = s.$ref.replace("#/", "").split("/");
     if (parts.length === 3 && parts[0] === "components" && parts[1] === "schemas") {
       return f$2.createTypeReferenceNode(normalizeIdentifier(parts[2], true));
     }
     const t = unref(ctx, s);
-    if (!t)
-      throw new Error(`makeTypeRef: ref not found ${JSON.stringify(s)}`);
+    if (!t) throw new Error(`makeTypeRef: ref not found ${JSON.stringify(s)}`);
     return makeType(ctx, t);
   }
-  if ("oneOf" in s && s.oneOf)
-    return f$2.createUnionTypeNode(s.oneOf.map(mk));
-  if ("anyOf" in s && s.anyOf)
-    return f$2.createUnionTypeNode(s.anyOf.map(mk));
-  if ("allOf" in s && s.allOf)
-    return f$2.createIntersectionTypeNode(s.allOf.map(mk));
-  if ("type" in s && s.type === "integer")
-    s.type = "number";
+  if ("oneOf" in s && s.oneOf) return f$2.createUnionTypeNode(s.oneOf.map(mk));
+  if ("anyOf" in s && s.anyOf) return f$2.createUnionTypeNode(s.anyOf.map(mk));
+  if ("allOf" in s && s.allOf) return f$2.createIntersectionTypeNode(s.allOf.map(mk));
+  if ("type" in s && s.type === "integer") s.type = "number";
   if ("enum" in s && s.enum && !Array.isArray(s.type)) {
     const isArray2 = s.type === "array";
     const t = makeInlineEnum(isArray2 ? { ...s, type: s.items?.type } : s);
-    if (t)
-      return isArray2 ? f$2.createArrayTypeNode(t) : t;
+    if (t) return isArray2 ? f$2.createArrayTypeNode(t) : t;
   }
   if ("properties" in s && s.properties) {
     return f$2.createTypeLiteralNode(
@@ -254,37 +232,26 @@ const makeType = (ctx, s) => {
     if (Array.isArray(s.type)) {
       const types = [];
       for (const type of s.type) {
-        if (type === "null")
-          types.push({ type: "null" });
-        else
-          types.push({ ...s, type });
+        if (type === "null") types.push({ type: "null" });
+        else types.push({ ...s, type });
       }
       return mk({ oneOf: types });
     }
     let t;
-    if (s.type === "object")
-      t = f$2.createKeywordTypeNode(ts.SyntaxKind.ObjectKeyword);
-    else if (s.type === "boolean")
-      t = f$2.createKeywordTypeNode(ts.SyntaxKind.BooleanKeyword);
-    else if (s.type === "number")
-      t = f$2.createKeywordTypeNode(ts.SyntaxKind.NumberKeyword);
-    else if (s.type === "string")
-      t = f$2.createKeywordTypeNode(ts.SyntaxKind.StringKeyword);
-    else if (s.type === "array")
-      t = f$2.createArrayTypeNode(mk(s.items));
-    else if (s.type === "null")
-      t = f$2.createLiteralTypeNode(f$2.createNull());
-    else if (lodashEs.isArray(s.type))
-      t = f$2.createUnionTypeNode(s.type.map((x) => mk({ type: x })));
+    if (s.type === "object") t = f$2.createKeywordTypeNode(ts.SyntaxKind.ObjectKeyword);
+    else if (s.type === "boolean") t = f$2.createKeywordTypeNode(ts.SyntaxKind.BooleanKeyword);
+    else if (s.type === "number") t = f$2.createKeywordTypeNode(ts.SyntaxKind.NumberKeyword);
+    else if (s.type === "string") t = f$2.createKeywordTypeNode(ts.SyntaxKind.StringKeyword);
+    else if (s.type === "array") t = f$2.createArrayTypeNode(mk(s.items));
+    else if (s.type === "null") t = f$2.createLiteralTypeNode(f$2.createNull());
+    else if (lodashEs.isArray(s.type)) t = f$2.createUnionTypeNode(s.type.map((x) => mk({ type: x })));
     else {
       console.warn(`makeType: unknown type "${s.type}"`);
       return f$2.createKeywordTypeNode(ts.SyntaxKind.UnknownKeyword);
     }
     if (s.type === "string") {
-      if (s.format === "binary")
-        t = f$2.createTypeReferenceNode("File");
-      if (s.format === "date-time" && ctx.parseDates)
-        t = f$2.createTypeReferenceNode("Date");
+      if (s.format === "binary") t = f$2.createTypeReferenceNode("File");
+      if (s.format === "date-time" && ctx.parseDates) t = f$2.createTypeReferenceNode("Date");
     }
     return s.nullable ? f$2.createUnionTypeNode([t, f$2.createLiteralTypeNode(f$2.createNull())]) : t;
   }
@@ -336,15 +303,13 @@ const getOpName = (ctx, op) => {
   }
   fn = normalizeOpName(fn);
   let nsr = ns.split("").map((x) => `[${x.toUpperCase()}${x.toLowerCase()}]`).join("");
-  if (nsr.endsWith("[Ss]"))
-    nsr += "?";
+  if (nsr.endsWith("[Ss]")) nsr += "?";
   fn = fn.replace(new RegExp(`^${nsr}([Cc]ontroller|[Ss]ervice)?([A-Z].*)$`), "$2");
   fn = lodashEs.lowerFirst(fn);
   const proposal = [ns, fn];
   if (ctx.resolveName) {
     const res = ctx.resolveName(ctx, op, proposal);
-    if (Array.isArray(res) && res.length === 2)
-      return res;
+    if (Array.isArray(res) && res.length === 2) return res;
     if (res !== void 0) {
       console.warn(`${ctx.logTag} resolveName should return [ns, fn] or undefined (skipping)`);
     }
@@ -352,11 +317,9 @@ const getOpName = (ctx, op) => {
   return proposal;
 };
 const prepareUrl = (url, rename) => {
-  for (const [k, v] of Object.entries(rename))
-    url = url.replaceAll(`{${k}}`, "${" + v + "}");
+  for (const [k, v] of Object.entries(rename)) url = url.replaceAll(`{${k}}`, "${" + v + "}");
   const parts = url.split("${");
-  if (parts.length === 1)
-    return f$1.createStringLiteral(url);
+  if (parts.length === 1) return f$1.createStringLiteral(url);
   return f$1.createTemplateExpression(
     f$1.createTemplateHead(parts[0]),
     parts.slice(1).map((x, i) => {
@@ -376,13 +339,11 @@ const prepareOp = (ctx, cfg, opName) => {
   const repSchema = getRepSchema(ctx, cfg);
   const allParams = arrayUtilsTs.filterNullable(cfg.parameters.map((x) => unref(ctx, x)));
   const params = lodashEs.uniqBy(allParams.filter((x) => x.in === "path"), "name");
-  if (reqSchema)
-    params.push({ name: "body", schema: reqSchema[1] });
+  if (reqSchema) params.push({ name: "body", schema: reqSchema[1] });
   const search = allParams.filter((x) => x.in === "query");
   allParams.filter((x) => x.in === "header");
   for (const [name, v] of Object.entries({ search })) {
-    if (!v.length)
-      continue;
+    if (!v.length) continue;
     const properties = v.reduce((acc, x) => ({ ...acc, [x.name]: x.schema }), {});
     params.push({ name, schema: { type: "object", properties } });
   }
@@ -446,8 +407,7 @@ const prepareRoutes = async (ctx) => {
   const routes = {};
   for (const [path, pathConfig] of Object.entries(ctx.doc.paths ?? {})) {
     ctx.logTag = `${"[ALL]".toUpperCase().padEnd(6, " ")} ${path}`;
-    if (!lodashEs.isObject(pathConfig))
-      continue;
+    if (!lodashEs.isObject(pathConfig)) continue;
     if ("$ref" in pathConfig) {
       console.warn(`${ctx.logTag} $ref should be resolved before (skipping)`);
       continue;
@@ -455,14 +415,12 @@ const prepareRoutes = async (ctx) => {
     for (const method of HttpMethods) {
       ctx.logTag = `${method.toUpperCase().padEnd(6, " ")} ${path}`;
       const config = pathConfig[method];
-      if (!config)
-        continue;
+      if (!config) continue;
       if (pathConfig.parameters) {
         config.parameters = [...config.parameters ?? [], ...pathConfig.parameters];
       }
       const [ns, op] = getOpName(ctx, { ...config, method, path });
-      if (!routes[ns])
-        routes[ns] = [];
+      if (!routes[ns]) routes[ns] = [];
       const joined = [ns, op].join(".");
       if (ctx.usedNames.has(joined)) {
         continue;
@@ -502,8 +460,7 @@ const generateAst = async (ctx) => {
   return { modules, types };
 };
 const loadSchema = async (url, upgrade = true) => {
-  if (url.startsWith("file://"))
-    url = url.substring(7);
+  if (url.startsWith("file://")) url = url.substring(7);
   const { bundle } = await redocly.bundle({
     ref: url,
     config: await redocly.createConfig({}),
@@ -548,7 +505,7 @@ const apigen = async (config) => {
   const doc = await loadSchema(config.source);
   const ctx = initCtx({ ...config, doc });
   const { modules, types } = await generateAst(ctx);
-  const filepath = path$1.join(path$1.dirname(url.fileURLToPath((typeof document === 'undefined' ? require('u' + 'rl').pathToFileURL(__filename).href : (_documentCurrentScript && _documentCurrentScript.src || new URL('main-c2426ec2.cjs', document.baseURI).href)))), "_template.ts");
+  const filepath = path$1.join(path$1.dirname(url.fileURLToPath((typeof document === 'undefined' ? require('u' + 'rl').pathToFileURL(__filename).href : (_documentCurrentScript && _documentCurrentScript.src || new URL('main-Dkcn3PTN.cjs', document.baseURI).href)))), "_template.ts");
   const file = await fs.readFile(filepath, "utf-8");
   let code = [
     `// Auto-generated by https://github.com/vladkens/apigen-ts`,

package/dist/{main-bbe33f1b.js → main-byN_-fkF.js}

@@ -9,6 +9,9 @@ import { convertObj } from 'swagger2openapi';
 import ts from 'typescript';
 import path from 'node:path';
 
+var name = "apigen-ts";
+var version = "0.2.0";
+
 const initCtx = (config) => {
   return {
     source: "",
@@ -23,8 +26,8 @@ const initCtx = (config) => {
 };
 const getCliConfig = () => {
   const argv = cli({
-    name: "apigen",
-    version: "0.1.1",
+    name,
+    version,
     parameters: ["<source>", "[output]"],
     flags: {
       name: {
@@ -49,8 +52,7 @@ const getCliConfig = () => {
 };
 
 const unref = (ctx, s) => {
-  if (!s)
-    return void 0;
+  if (!s) return void 0;
   if ("$ref" in s && s.$ref) {
     const parts = s.$ref.replace("#/", "").split("/");
     const obj = parts.reduce(
@@ -58,8 +60,7 @@ const unref = (ctx, s) => {
       (acc, x) => get(acc, x, get(acc, decodeURIComponent(x).replaceAll("~1", "/"))),
       ctx.doc
     );
-    if (obj)
-      return obj;
+    if (obj) return obj;
     console.warn(`${ctx.logTag} ref ${s.$ref} not found`);
     return void 0;
   }
@@ -67,11 +68,9 @@ const unref = (ctx, s) => {
 };
 const getReqSchema = (ctx, config) => {
   const req = unref(ctx, config.requestBody);
-  if (!req)
-    return void 0;
+  if (!req) return void 0;
   const cts = Object.entries(req.content ?? {}).map((x) => [x[0].split(";")[0], x[1].schema]).filter((x) => x[1]);
-  if (cts.length === 0)
-    return void 0;
+  if (cts.length === 0) return void 0;
   const pretenders = [
     "application/json",
     "text/",
@@ -80,8 +79,7 @@ const getReqSchema = (ctx, config) => {
   ];
   for (const p of pretenders) {
     const ct = cts.find((x) => x[0].startsWith(p));
-    if (ct)
-      return ct;
+    if (ct) return ct;
   }
   cts.map((x) => x[0]);
   return void 0;
@@ -89,14 +87,11 @@ const getReqSchema = (ctx, config) => {
 const getRepSchema = (ctx, config) => {
   const successCodes = Object.keys(config.responses ?? {}).filter((x) => x.startsWith("2")).filter((x) => get(config, ["responses", x, "content"]));
   const cts = Object.entries(get(config, ["responses", successCodes[0], "content"], {})).filter((x) => x[1].schema);
-  if (cts.length === 0)
-    return void 0;
+  if (cts.length === 0) return void 0;
   const ctJson = cts.find((x) => x[0].startsWith("application/json"));
-  if (ctJson)
-    return ctJson[1].schema;
+  if (ctJson) return ctJson[1].schema;
   const ctText = cts.find((x) => x[0].startsWith("text/"));
-  if (ctText)
-    return { type: "string" };
+  if (ctText) return { type: "string" };
   cts.map((x) => x[0]).join(", ");
   return void 0;
 };
@@ -169,25 +164,18 @@ const Keywords = /* @__PURE__ */ new Set([
 ]);
 const normalizeIdentifier = (val, asVar = false) => {
   let name = val.replace("#/components/schemas/", "").replaceAll("'", "").replace(/[^a-zA-Z0-9]/g, "_");
-  if (name.match(/^\d/))
-    name = `$${name}`;
-  if (asVar && Keywords.has(name))
-    name = `$${name}`;
+  if (name.match(/^\d/)) name = `$${name}`;
+  if (asVar && Keywords.has(name)) name = `$${name}`;
   return name;
 };
 const makeInlineEnum = (s) => {
-  if (!s.enum)
-    return void 0;
+  if (!s.enum) return void 0;
   const values = filterEmpty(s.enum);
-  if (!values.length)
-    return void 0;
+  if (!values.length) return void 0;
   if (!s.type) {
-    if (values.every((x) => typeof x === "string"))
-      s.type = "string";
-    if (values.every((x) => typeof x === "number"))
-      s.type = "number";
-    if (values.every((x) => typeof x === "boolean"))
-      s.type = "boolean";
+    if (values.every((x) => typeof x === "string")) s.type = "string";
+    if (values.every((x) => typeof x === "number")) s.type = "number";
+    if (values.every((x) => typeof x === "boolean")) s.type = "boolean";
   }
   if (s.type === "string") {
     const tokens = uniq(values).map((x) => f$2.createStringLiteral(x.toString()));
@@ -199,10 +187,8 @@ const makeInlineEnum = (s) => {
   }
   if (s.type === "boolean") {
     const tokens = [];
-    if (values.includes(true))
-      tokens.push(f$2.createToken(ts.SyntaxKind.TrueKeyword));
-    if (values.includes(false))
-      tokens.push(f$2.createToken(ts.SyntaxKind.FalseKeyword));
+    if (values.includes(true)) tokens.push(f$2.createToken(ts.SyntaxKind.TrueKeyword));
+    if (values.includes(false)) tokens.push(f$2.createToken(ts.SyntaxKind.FalseKeyword));
     return f$2.createUnionTypeNode(tokens.map((x) => f$2.createLiteralTypeNode(x)));
   }
   console.warn(`enum with unknown type "${s.type}" in`, s);
@@ -210,33 +196,25 @@ const makeInlineEnum = (s) => {
 };
 const makeType = (ctx, s) => {
   const mk = makeType.bind(null, ctx);
-  if (s === void 0)
-    return f$2.createKeywordTypeNode(ts.SyntaxKind.VoidKeyword);
-  if (s === null)
-    return f$2.createLiteralTypeNode(f$2.createNull());
+  if (s === void 0) return f$2.createKeywordTypeNode(ts.SyntaxKind.VoidKeyword);
+  if (s === null) return f$2.createLiteralTypeNode(f$2.createNull());
   if ("$ref" in s && s.$ref) {
     const parts = s.$ref.replace("#/", "").split("/");
     if (parts.length === 3 && parts[0] === "components" && parts[1] === "schemas") {
       return f$2.createTypeReferenceNode(normalizeIdentifier(parts[2], true));
     }
     const t = unref(ctx, s);
-    if (!t)
-      throw new Error(`makeTypeRef: ref not found ${JSON.stringify(s)}`);
+    if (!t) throw new Error(`makeTypeRef: ref not found ${JSON.stringify(s)}`);
     return makeType(ctx, t);
   }
-  if ("oneOf" in s && s.oneOf)
-    return f$2.createUnionTypeNode(s.oneOf.map(mk));
-  if ("anyOf" in s && s.anyOf)
-    return f$2.createUnionTypeNode(s.anyOf.map(mk));
-  if ("allOf" in s && s.allOf)
-    return f$2.createIntersectionTypeNode(s.allOf.map(mk));
-  if ("type" in s && s.type === "integer")
-    s.type = "number";
+  if ("oneOf" in s && s.oneOf) return f$2.createUnionTypeNode(s.oneOf.map(mk));
+  if ("anyOf" in s && s.anyOf) return f$2.createUnionTypeNode(s.anyOf.map(mk));
+  if ("allOf" in s && s.allOf) return f$2.createIntersectionTypeNode(s.allOf.map(mk));
+  if ("type" in s && s.type === "integer") s.type = "number";
   if ("enum" in s && s.enum && !Array.isArray(s.type)) {
     const isArray2 = s.type === "array";
     const t = makeInlineEnum(isArray2 ? { ...s, type: s.items?.type } : s);
-    if (t)
-      return isArray2 ? f$2.createArrayTypeNode(t) : t;
+    if (t) return isArray2 ? f$2.createArrayTypeNode(t) : t;
   }
   if ("properties" in s && s.properties) {
     return f$2.createTypeLiteralNode(
@@ -251,37 +229,26 @@ const makeType = (ctx, s) => {
     if (Array.isArray(s.type)) {
       const types = [];
       for (const type of s.type) {
-        if (type === "null")
-          types.push({ type: "null" });
-        else
-          types.push({ ...s, type });
+        if (type === "null") types.push({ type: "null" });
+        else types.push({ ...s, type });
       }
       return mk({ oneOf: types });
     }
     let t;
-    if (s.type === "object")
-      t = f$2.createKeywordTypeNode(ts.SyntaxKind.ObjectKeyword);
-    else if (s.type === "boolean")
-      t = f$2.createKeywordTypeNode(ts.SyntaxKind.BooleanKeyword);
-    else if (s.type === "number")
-      t = f$2.createKeywordTypeNode(ts.SyntaxKind.NumberKeyword);
-    else if (s.type === "string")
-      t = f$2.createKeywordTypeNode(ts.SyntaxKind.StringKeyword);
-    else if (s.type === "array")
-      t = f$2.createArrayTypeNode(mk(s.items));
-    else if (s.type === "null")
-      t = f$2.createLiteralTypeNode(f$2.createNull());
-    else if (isArray(s.type))
-      t = f$2.createUnionTypeNode(s.type.map((x) => mk({ type: x })));
+    if (s.type === "object") t = f$2.createKeywordTypeNode(ts.SyntaxKind.ObjectKeyword);
+    else if (s.type === "boolean") t = f$2.createKeywordTypeNode(ts.SyntaxKind.BooleanKeyword);
+    else if (s.type === "number") t = f$2.createKeywordTypeNode(ts.SyntaxKind.NumberKeyword);
+    else if (s.type === "string") t = f$2.createKeywordTypeNode(ts.SyntaxKind.StringKeyword);
+    else if (s.type === "array") t = f$2.createArrayTypeNode(mk(s.items));
+    else if (s.type === "null") t = f$2.createLiteralTypeNode(f$2.createNull());
+    else if (isArray(s.type)) t = f$2.createUnionTypeNode(s.type.map((x) => mk({ type: x })));
     else {
       console.warn(`makeType: unknown type "${s.type}"`);
       return f$2.createKeywordTypeNode(ts.SyntaxKind.UnknownKeyword);
     }
     if (s.type === "string") {
-      if (s.format === "binary")
-        t = f$2.createTypeReferenceNode("File");
-      if (s.format === "date-time" && ctx.parseDates)
-        t = f$2.createTypeReferenceNode("Date");
+      if (s.format === "binary") t = f$2.createTypeReferenceNode("File");
+      if (s.format === "date-time" && ctx.parseDates) t = f$2.createTypeReferenceNode("Date");
     }
     return s.nullable ? f$2.createUnionTypeNode([t, f$2.createLiteralTypeNode(f$2.createNull())]) : t;
   }
@@ -333,15 +300,13 @@ const getOpName = (ctx, op) => {
   }
   fn = normalizeOpName(fn);
   let nsr = ns.split("").map((x) => `[${x.toUpperCase()}${x.toLowerCase()}]`).join("");
-  if (nsr.endsWith("[Ss]"))
-    nsr += "?";
+  if (nsr.endsWith("[Ss]")) nsr += "?";
   fn = fn.replace(new RegExp(`^${nsr}([Cc]ontroller|[Ss]ervice)?([A-Z].*)$`), "$2");
   fn = lowerFirst(fn);
   const proposal = [ns, fn];
   if (ctx.resolveName) {
     const res = ctx.resolveName(ctx, op, proposal);
-    if (Array.isArray(res) && res.length === 2)
-      return res;
+    if (Array.isArray(res) && res.length === 2) return res;
     if (res !== void 0) {
       console.warn(`${ctx.logTag} resolveName should return [ns, fn] or undefined (skipping)`);
     }
@@ -349,11 +314,9 @@ const getOpName = (ctx, op) => {
   return proposal;
 };
 const prepareUrl = (url, rename) => {
-  for (const [k, v] of Object.entries(rename))
-    url = url.replaceAll(`{${k}}`, "${" + v + "}");
+  for (const [k, v] of Object.entries(rename)) url = url.replaceAll(`{${k}}`, "${" + v + "}");
   const parts = url.split("${");
-  if (parts.length === 1)
-    return f$1.createStringLiteral(url);
+  if (parts.length === 1) return f$1.createStringLiteral(url);
   return f$1.createTemplateExpression(
     f$1.createTemplateHead(parts[0]),
     parts.slice(1).map((x, i) => {
@@ -373,13 +336,11 @@ const prepareOp = (ctx, cfg, opName) => {
   const repSchema = getRepSchema(ctx, cfg);
   const allParams = filterNullable(cfg.parameters.map((x) => unref(ctx, x)));
   const params = uniqBy(allParams.filter((x) => x.in === "path"), "name");
-  if (reqSchema)
-    params.push({ name: "body", schema: reqSchema[1] });
+  if (reqSchema) params.push({ name: "body", schema: reqSchema[1] });
   const search = allParams.filter((x) => x.in === "query");
   allParams.filter((x) => x.in === "header");
   for (const [name, v] of Object.entries({ search })) {
-    if (!v.length)
-      continue;
+    if (!v.length) continue;
     const properties = v.reduce((acc, x) => ({ ...acc, [x.name]: x.schema }), {});
     params.push({ name, schema: { type: "object", properties } });
   }
@@ -443,8 +404,7 @@ const prepareRoutes = async (ctx) => {
   const routes = {};
   for (const [path, pathConfig] of Object.entries(ctx.doc.paths ?? {})) {
     ctx.logTag = `${"[ALL]".toUpperCase().padEnd(6, " ")} ${path}`;
-    if (!isObject(pathConfig))
-      continue;
+    if (!isObject(pathConfig)) continue;
     if ("$ref" in pathConfig) {
       console.warn(`${ctx.logTag} $ref should be resolved before (skipping)`);
       continue;
@@ -452,14 +412,12 @@ const prepareRoutes = async (ctx) => {
     for (const method of HttpMethods) {
       ctx.logTag = `${method.toUpperCase().padEnd(6, " ")} ${path}`;
       const config = pathConfig[method];
-      if (!config)
-        continue;
+      if (!config) continue;
       if (pathConfig.parameters) {
         config.parameters = [...config.parameters ?? [], ...pathConfig.parameters];
       }
       const [ns, op] = getOpName(ctx, { ...config, method, path });
-      if (!routes[ns])
-        routes[ns] = [];
+      if (!routes[ns]) routes[ns] = [];
       const joined = [ns, op].join(".");
       if (ctx.usedNames.has(joined)) {
         continue;
@@ -499,8 +457,7 @@ const generateAst = async (ctx) => {
   return { modules, types };
 };
 const loadSchema = async (url, upgrade = true) => {
-  if (url.startsWith("file://"))
-    url = url.substring(7);
+  if (url.startsWith("file://")) url = url.substring(7);
   const { bundle } = await redocly.bundle({
     ref: url,
     config: await redocly.createConfig({}),

package/dist/{main-bbe33f1b.mjs → main-byN_-fkF.mjs}

@@ -9,6 +9,9 @@ import { convertObj } from 'swagger2openapi';
 import ts from 'typescript';
 import path from 'node:path';
 
+var name = "apigen-ts";
+var version = "0.2.0";
+
 const initCtx = (config) => {
   return {
     source: "",
@@ -23,8 +26,8 @@ const initCtx = (config) => {
 };
 const getCliConfig = () => {
   const argv = cli({
-    name: "apigen",
-    version: "0.1.1",
+    name,
+    version,
     parameters: ["<source>", "[output]"],
     flags: {
       name: {
@@ -49,8 +52,7 @@ const getCliConfig = () => {
 };
 
 const unref = (ctx, s) => {
-  if (!s)
-    return void 0;
+  if (!s) return void 0;
   if ("$ref" in s && s.$ref) {
     const parts = s.$ref.replace("#/", "").split("/");
     const obj = parts.reduce(
@@ -58,8 +60,7 @@ const unref = (ctx, s) => {
       (acc, x) => get(acc, x, get(acc, decodeURIComponent(x).replaceAll("~1", "/"))),
       ctx.doc
     );
-    if (obj)
-      return obj;
+    if (obj) return obj;
     console.warn(`${ctx.logTag} ref ${s.$ref} not found`);
     return void 0;
   }
@@ -67,11 +68,9 @@ const unref = (ctx, s) => {
 };
 const getReqSchema = (ctx, config) => {
   const req = unref(ctx, config.requestBody);
-  if (!req)
-    return void 0;
+  if (!req) return void 0;
   const cts = Object.entries(req.content ?? {}).map((x) => [x[0].split(";")[0], x[1].schema]).filter((x) => x[1]);
-  if (cts.length === 0)
-    return void 0;
+  if (cts.length === 0) return void 0;
   const pretenders = [
     "application/json",
     "text/",
@@ -80,8 +79,7 @@ const getReqSchema = (ctx, config) => {
   ];
   for (const p of pretenders) {
     const ct = cts.find((x) => x[0].startsWith(p));
-    if (ct)
-      return ct;
+    if (ct) return ct;
   }
   cts.map((x) => x[0]);
   return void 0;
@@ -89,14 +87,11 @@ const getReqSchema = (ctx, config) => {
 const getRepSchema = (ctx, config) => {
   const successCodes = Object.keys(config.responses ?? {}).filter((x) => x.startsWith("2")).filter((x) => get(config, ["responses", x, "content"]));
   const cts = Object.entries(get(config, ["responses", successCodes[0], "content"], {})).filter((x) => x[1].schema);
-  if (cts.length === 0)
-    return void 0;
+  if (cts.length === 0) return void 0;
   const ctJson = cts.find((x) => x[0].startsWith("application/json"));
-  if (ctJson)
-    return ctJson[1].schema;
+  if (ctJson) return ctJson[1].schema;
   const ctText = cts.find((x) => x[0].startsWith("text/"));
-  if (ctText)
-    return { type: "string" };
+  if (ctText) return { type: "string" };
   cts.map((x) => x[0]).join(", ");
   return void 0;
 };
@@ -169,25 +164,18 @@ const Keywords = /* @__PURE__ */ new Set([
 ]);
 const normalizeIdentifier = (val, asVar = false) => {
   let name = val.replace("#/components/schemas/", "").replaceAll("'", "").replace(/[^a-zA-Z0-9]/g, "_");
-  if (name.match(/^\d/))
-    name = `$${name}`;
-  if (asVar && Keywords.has(name))
-    name = `$${name}`;
+  if (name.match(/^\d/)) name = `$${name}`;
+  if (asVar && Keywords.has(name)) name = `$${name}`;
   return name;
 };
 const makeInlineEnum = (s) => {
-  if (!s.enum)
-    return void 0;
+  if (!s.enum) return void 0;
   const values = filterEmpty(s.enum);
-  if (!values.length)
-    return void 0;
+  if (!values.length) return void 0;
   if (!s.type) {
-    if (values.every((x) => typeof x === "string"))
-      s.type = "string";
-    if (values.every((x) => typeof x === "number"))
-      s.type = "number";
-    if (values.every((x) => typeof x === "boolean"))
-      s.type = "boolean";
+    if (values.every((x) => typeof x === "string")) s.type = "string";
+    if (values.every((x) => typeof x === "number")) s.type = "number";
+    if (values.every((x) => typeof x === "boolean")) s.type = "boolean";
   }
   if (s.type === "string") {
     const tokens = uniq(values).map((x) => f$2.createStringLiteral(x.toString()));
@@ -199,10 +187,8 @@ const makeInlineEnum = (s) => {
   }
   if (s.type === "boolean") {
     const tokens = [];
-    if (values.includes(true))
-      tokens.push(f$2.createToken(ts.SyntaxKind.TrueKeyword));
-    if (values.includes(false))
-      tokens.push(f$2.createToken(ts.SyntaxKind.FalseKeyword));
+    if (values.includes(true)) tokens.push(f$2.createToken(ts.SyntaxKind.TrueKeyword));
+    if (values.includes(false)) tokens.push(f$2.createToken(ts.SyntaxKind.FalseKeyword));
     return f$2.createUnionTypeNode(tokens.map((x) => f$2.createLiteralTypeNode(x)));
   }
   console.warn(`enum with unknown type "${s.type}" in`, s);
@@ -210,33 +196,25 @@ const makeInlineEnum = (s) => {
 };
 const makeType = (ctx, s) => {
   const mk = makeType.bind(null, ctx);
-  if (s === void 0)
-    return f$2.createKeywordTypeNode(ts.SyntaxKind.VoidKeyword);
-  if (s === null)
-    return f$2.createLiteralTypeNode(f$2.createNull());
+  if (s === void 0) return f$2.createKeywordTypeNode(ts.SyntaxKind.VoidKeyword);
+  if (s === null) return f$2.createLiteralTypeNode(f$2.createNull());
   if ("$ref" in s && s.$ref) {
     const parts = s.$ref.replace("#/", "").split("/");
     if (parts.length === 3 && parts[0] === "components" && parts[1] === "schemas") {
       return f$2.createTypeReferenceNode(normalizeIdentifier(parts[2], true));
     }
     const t = unref(ctx, s);
-    if (!t)
-      throw new Error(`makeTypeRef: ref not found ${JSON.stringify(s)}`);
+    if (!t) throw new Error(`makeTypeRef: ref not found ${JSON.stringify(s)}`);
     return makeType(ctx, t);
   }
-  if ("oneOf" in s && s.oneOf)
-    return f$2.createUnionTypeNode(s.oneOf.map(mk));
-  if ("anyOf" in s && s.anyOf)
-    return f$2.createUnionTypeNode(s.anyOf.map(mk));
-  if ("allOf" in s && s.allOf)
-    return f$2.createIntersectionTypeNode(s.allOf.map(mk));
-  if ("type" in s && s.type === "integer")
-    s.type = "number";
+  if ("oneOf" in s && s.oneOf) return f$2.createUnionTypeNode(s.oneOf.map(mk));
+  if ("anyOf" in s && s.anyOf) return f$2.createUnionTypeNode(s.anyOf.map(mk));
+  if ("allOf" in s && s.allOf) return f$2.createIntersectionTypeNode(s.allOf.map(mk));
+  if ("type" in s && s.type === "integer") s.type = "number";
   if ("enum" in s && s.enum && !Array.isArray(s.type)) {
     const isArray2 = s.type === "array";
     const t = makeInlineEnum(isArray2 ? { ...s, type: s.items?.type } : s);
-    if (t)
-      return isArray2 ? f$2.createArrayTypeNode(t) : t;
+    if (t) return isArray2 ? f$2.createArrayTypeNode(t) : t;
   }
   if ("properties" in s && s.properties) {
     return f$2.createTypeLiteralNode(
@@ -251,37 +229,26 @@ const makeType = (ctx, s) => {
     if (Array.isArray(s.type)) {
       const types = [];
       for (const type of s.type) {
-        if (type === "null")
-          types.push({ type: "null" });
-        else
-          types.push({ ...s, type });
+        if (type === "null") types.push({ type: "null" });
+        else types.push({ ...s, type });
       }
       return mk({ oneOf: types });
     }
     let t;
-    if (s.type === "object")
-      t = f$2.createKeywordTypeNode(ts.SyntaxKind.ObjectKeyword);
-    else if (s.type === "boolean")
-      t = f$2.createKeywordTypeNode(ts.SyntaxKind.BooleanKeyword);
-    else if (s.type === "number")
-      t = f$2.createKeywordTypeNode(ts.SyntaxKind.NumberKeyword);
-    else if (s.type === "string")
-      t = f$2.createKeywordTypeNode(ts.SyntaxKind.StringKeyword);
-    else if (s.type === "array")
-      t = f$2.createArrayTypeNode(mk(s.items));
-    else if (s.type === "null")
-      t = f$2.createLiteralTypeNode(f$2.createNull());
-    else if (isArray(s.type))
-      t = f$2.createUnionTypeNode(s.type.map((x) => mk({ type: x })));
+    if (s.type === "object") t = f$2.createKeywordTypeNode(ts.SyntaxKind.ObjectKeyword);
+    else if (s.type === "boolean") t = f$2.createKeywordTypeNode(ts.SyntaxKind.BooleanKeyword);
+    else if (s.type === "number") t = f$2.createKeywordTypeNode(ts.SyntaxKind.NumberKeyword);
+    else if (s.type === "string") t = f$2.createKeywordTypeNode(ts.SyntaxKind.StringKeyword);
+    else if (s.type === "array") t = f$2.createArrayTypeNode(mk(s.items));
+    else if (s.type === "null") t = f$2.createLiteralTypeNode(f$2.createNull());
+    else if (isArray(s.type)) t = f$2.createUnionTypeNode(s.type.map((x) => mk({ type: x })));
     else {
       console.warn(`makeType: unknown type "${s.type}"`);
       return f$2.createKeywordTypeNode(ts.SyntaxKind.UnknownKeyword);
     }
     if (s.type === "string") {
-      if (s.format === "binary")
-        t = f$2.createTypeReferenceNode("File");
-      if (s.format === "date-time" && ctx.parseDates)
-        t = f$2.createTypeReferenceNode("Date");
+      if (s.format === "binary") t = f$2.createTypeReferenceNode("File");
+      if (s.format === "date-time" && ctx.parseDates) t = f$2.createTypeReferenceNode("Date");
     }
     return s.nullable ? f$2.createUnionTypeNode([t, f$2.createLiteralTypeNode(f$2.createNull())]) : t;
   }
@@ -333,15 +300,13 @@ const getOpName = (ctx, op) => {
   }
   fn = normalizeOpName(fn);
   let nsr = ns.split("").map((x) => `[${x.toUpperCase()}${x.toLowerCase()}]`).join("");
-  if (nsr.endsWith("[Ss]"))
-    nsr += "?";
+  if (nsr.endsWith("[Ss]")) nsr += "?";
   fn = fn.replace(new RegExp(`^${nsr}([Cc]ontroller|[Ss]ervice)?([A-Z].*)$`), "$2");
   fn = lowerFirst(fn);
   const proposal = [ns, fn];
   if (ctx.resolveName) {
     const res = ctx.resolveName(ctx, op, proposal);
-    if (Array.isArray(res) && res.length === 2)
-      return res;
+    if (Array.isArray(res) && res.length === 2) return res;
     if (res !== void 0) {
       console.warn(`${ctx.logTag} resolveName should return [ns, fn] or undefined (skipping)`);
     }
@@ -349,11 +314,9 @@ const getOpName = (ctx, op) => {
   return proposal;
 };
 const prepareUrl = (url, rename) => {
-  for (const [k, v] of Object.entries(rename))
-    url = url.replaceAll(`{${k}}`, "${" + v + "}");
+  for (const [k, v] of Object.entries(rename)) url = url.replaceAll(`{${k}}`, "${" + v + "}");
   const parts = url.split("${");
-  if (parts.length === 1)
-    return f$1.createStringLiteral(url);
+  if (parts.length === 1) return f$1.createStringLiteral(url);
   return f$1.createTemplateExpression(
     f$1.createTemplateHead(parts[0]),
     parts.slice(1).map((x, i) => {
@@ -373,13 +336,11 @@ const prepareOp = (ctx, cfg, opName) => {
   const repSchema = getRepSchema(ctx, cfg);
   const allParams = filterNullable(cfg.parameters.map((x) => unref(ctx, x)));
   const params = uniqBy(allParams.filter((x) => x.in === "path"), "name");
-  if (reqSchema)
-    params.push({ name: "body", schema: reqSchema[1] });
+  if (reqSchema) params.push({ name: "body", schema: reqSchema[1] });
   const search = allParams.filter((x) => x.in === "query");
   allParams.filter((x) => x.in === "header");
   for (const [name, v] of Object.entries({ search })) {
-    if (!v.length)
-      continue;
+    if (!v.length) continue;
     const properties = v.reduce((acc, x) => ({ ...acc, [x.name]: x.schema }), {});
     params.push({ name, schema: { type: "object", properties } });
   }
@@ -443,8 +404,7 @@ const prepareRoutes = async (ctx) => {
   const routes = {};
   for (const [path, pathConfig] of Object.entries(ctx.doc.paths ?? {})) {
     ctx.logTag = `${"[ALL]".toUpperCase().padEnd(6, " ")} ${path}`;
-    if (!isObject(pathConfig))
-      continue;
+    if (!isObject(pathConfig)) continue;
     if ("$ref" in pathConfig) {
       console.warn(`${ctx.logTag} $ref should be resolved before (skipping)`);
       continue;
@@ -452,14 +412,12 @@ const prepareRoutes = async (ctx) => {
     for (const method of HttpMethods) {
       ctx.logTag = `${method.toUpperCase().padEnd(6, " ")} ${path}`;
       const config = pathConfig[method];
-      if (!config)
-        continue;
+      if (!config) continue;
       if (pathConfig.parameters) {
         config.parameters = [...config.parameters ?? [], ...pathConfig.parameters];
       }
       const [ns, op] = getOpName(ctx, { ...config, method, path });
-      if (!routes[ns])
-        routes[ns] = [];
+      if (!routes[ns]) routes[ns] = [];
       const joined = [ns, op].join(".");
       if (ctx.usedNames.has(joined)) {
         continue;
@@ -499,8 +457,7 @@ const generateAst = async (ctx) => {
   return { modules, types };
 };
 const loadSchema = async (url, upgrade = true) => {
-  if (url.startsWith("file://"))
-    url = url.substring(7);
+  if (url.startsWith("file://")) url = url.substring(7);
   const { bundle } = await redocly.bundle({
     ref: url,
     config: await redocly.createConfig({}),

package/dist/main.cjs

@@ -3,7 +3,7 @@
 require('fs/promises');
 require('path');
 require('url');
-var main = require('./main-c2426ec2.cjs');
+var main = require('./main-Dkcn3PTN.cjs');
 require('cleye');
 require('@redocly/openapi-core');
 require('array-utils-ts');

package/dist/main.js

@@ -1,7 +1,7 @@
 import 'fs/promises';
 import 'path';
 import 'url';
-export { a as apigen } from './main-bbe33f1b.js';
+export { a as apigen } from './main-byN_-fkF.js';
 import 'cleye';
 import '@redocly/openapi-core';
 import 'array-utils-ts';

package/dist/main.mjs

@@ -1,7 +1,7 @@
 import 'fs/promises';
 import 'path';
 import 'url';
-export { a as apigen } from './main-bbe33f1b.mjs';
+export { a as apigen } from './main-byN_-fkF.mjs';
 import 'cleye';
 import '@redocly/openapi-core';
 import 'array-utils-ts';

package/package.json

@@ -1,9 +1,9 @@
 {
   "type": "module",
   "name": "apigen-ts",
-  "version": "0.1.1",
+  "version": "0.2.0",
   "license": "MIT",
-  "author": "Vlad Pronsky <v.pronsky@gmail.com>",
+  "author": "vladkens <v.pronsky@gmail.com>",
   "repository": "vladkens/apigen-ts",
   "description": "OpenAPI TypeScript client generator",
   "keywords": [
@@ -22,7 +22,7 @@
     "ci": "tsc --noEmit && yarn test-cov && yarn build"
   },
   "dependencies": {
-    "@redocly/openapi-core": "^1.6.0",
+    "@redocly/openapi-core": "^1.22.1",
     "@types/lodash-es": "^4.17.12",
     "@types/swagger2openapi": "^7.0.4",
     "array-utils-ts": "^0.1.2",
@@ -31,14 +31,14 @@
     "swagger2openapi": "^7.0.8"
   },
   "devDependencies": {
-    "@types/node": "^20.10.8",
-    "c8": "^9.0.0",
-    "fetch-mock": "^9.11.0",
-    "pkgroll": "^2.0.1",
-    "prettier": "^3.1.0",
-    "prettier-plugin-organize-imports": "^3.2.4",
+    "@types/node": "^22.5.2",
+    "c8": "^10.1.2",
+    "fetch-mock": "^11.1.3",
+    "pkgroll": "^2.4.2",
+    "prettier": "^3.3.3",
+    "prettier-plugin-organize-imports": "^4.0.0",
     "tsm": "^2.3.0",
-    "typescript": "^5.3.2",
+    "typescript": "^5.5.4",
     "uvu": "^0.5.6"
   },
   "peerDependencies": {

package/readme.md

@@ -115,13 +115,34 @@ class MyClient extends ApiClient {
 }
 
 try {
-  const api = MyClient()
+  const api = new MyClient()
   const pet = await api.pet.getPetById(404)
 } catch (e) {
   console.log(e) // e is { code: "API_ERROR" }
 }
 ```
 
+### Base url resolving
+
+You can modify how the endpoint url is created. By default [URL constructor](https://developer.mozilla.org/en-US/docs/Web/API/URL/URL) used to resolve endpoint url like: `new URL(path, baseUrl)` which has specific resolving [rules](https://developer.mozilla.org/en-US/docs/Web/API/URL_API/Resolving_relative_references). E.g.:
+
+- `new URL("/v2/cats", "https://example.com/v1/") // -> https://example.com/v2/cats`
+- `new URL("v2/cats", "https://example.com/v1/") // -> https://example.com/v1/v2/cats`
+
+If you want to have custom endpoint url resolving rules, you can override `PrepareFetchUrl` method. For more details see [issue](https://github.com/vladkens/apigen-ts/issues/2).
+
+```ts
+class MyClient extends ApiClient {
+  PrepareFetchUrl(path: string) {
+    return new URL(`${this.Config.baseUrl}/${path}`.replace(/\/{2,}/g, "/"))
+  }
+}
+
+const api = new MyClient({ baseUrl: "https://example.com/v1" })
+// will call: https://example.com/v1/pet/ instead of https://example.com/pet/
+const pet = await api.pet.getPetById(404)
+```
+
 ### Node.js API
 
 Create file like `apigen.mjs` with content: