apigen-ts 1.3.1 → 1.4.0

package/dist/cli.js

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

package/dist/{main-BiX2OIVV.js → main-BkWtFDlL.js}

@@ -4,13 +4,13 @@ import { fileURLToPath } from 'url';
 import { cli } from 'cleye';
 import { bundle, BaseResolver, createConfig } from '@redocly/openapi-core';
 import { filterEmpty, filterNullable } from 'array-utils-ts';
-import { get, uniq, upperFirst, isArray, isBoolean, sortBy, isObject, lowerFirst, uniqBy } from 'lodash-es';
+import { get, uniq, upperFirst, isBoolean, isArray, sortBy, isObject, lowerFirst, uniqBy } from 'lodash-es';
 import { convertObj } from 'swagger2openapi';
 import ts from 'typescript';
 import path from 'node:path';
 
 var name = "apigen-ts";
-var version = "1.3.1";
+var version = "1.4.0";
 
 const initCtx = (config) => {
   return {
@@ -106,7 +106,8 @@ const getCliConfig = () => {
 };
 
 const unref = (ctx, s) => {
-  if (!s) return void 0;
+  if (s === void 0) return void 0;
+  if (typeof s !== "object" || s === null) return s;
   if ("$ref" in s && s.$ref) {
     const parts = s.$ref.replace("#/", "").split("/");
     const obj = parts.reduce(
@@ -114,16 +115,24 @@ const unref = (ctx, s) => {
       (acc, x) => get(acc, x, get(acc, decodeURIComponent(x).replaceAll("~1", "/"))),
       ctx.doc
     );
-    if (obj) return obj;
+    if (obj !== void 0) return obj;
     console.warn(`${ctx.logTag} ref ${s.$ref} not found`);
     return void 0;
   }
   return s;
 };
+const getContent = (ctx, content) => {
+  const result = [];
+  for (const [cType, value] of Object.entries(content ?? {})) {
+    const mType = unref(ctx, value);
+    if (mType) result.push([cType.split(";")[0], mType]);
+  }
+  return result;
+};
 const getReqSchema = (ctx, config) => {
   const req = unref(ctx, config.requestBody);
   if (!req) return void 0;
-  const cts = Object.entries(req.content ?? {}).map((x) => [x[0].split(";")[0], x[1].schema]).filter((x) => x[1]);
+  const cts = getContent(ctx, req.content).map((x) => [x[0], x[1].schema]).filter((x) => x[1] !== void 0);
   if (cts.length === 0) return void 0;
   const pretenders = [
     "application/json",
@@ -138,12 +147,15 @@ const getReqSchema = (ctx, config) => {
   cts.map((x) => x[0]);
   return void 0;
 };
-const getRepSchema = (ctx, config) => {
+const getRepContent = (ctx, config) => {
   const successCodes = Object.keys(config.responses ?? {}).filter((x) => x.startsWith("2")).filter((x) => get(config, ["responses", x]));
   const firstSuccess = unref(ctx, get(config, ["responses", successCodes[0]], {}));
-  if (!firstSuccess || !("content" in firstSuccess)) return void 0;
-  const cts = Object.entries(firstSuccess.content ?? {}).filter((x) => x[1].schema);
-  if (cts.length === 0) return void 0;
+  if (!firstSuccess || !("content" in firstSuccess)) return [];
+  return getContent(ctx, firstSuccess.content);
+};
+const getRepSchema = (ctx, config) => {
+  const cts = getRepContent(ctx, config).filter((x) => x[1].schema !== void 0);
+  if (!cts.length) return void 0;
   const ctJson = cts.find((x) => x[0].startsWith("application/json"));
   if (ctJson) return ctJson[1].schema;
   const ctText = cts.find((x) => x[0].startsWith("text/"));
@@ -213,10 +225,22 @@ const Keywords = /* @__PURE__ */ new Set([
   "Exclude",
   "Extract",
   // ts keywords
+  "Array",
   "Date",
-  "object",
-  "Response"
-  // ts type names
+  "File",
+  "FormData",
+  "Headers",
+  "JSON",
+  "Object",
+  "Promise",
+  "RequestInit",
+  "Response",
+  "URL",
+  "URLSearchParams",
+  "fetch",
+  "globalThis",
+  "object"
+  // runtime names
 ]);
 const normalizeIdentifier = (val, asVar = false) => {
   let name = val.replace("#/components/schemas/", "").replaceAll("'", "").replace(/[^a-zA-Z0-9]/g, "_");
@@ -225,7 +249,7 @@ const normalizeIdentifier = (val, asVar = false) => {
   return name;
 };
 const makeInlineEnum = (s) => {
-  if (!s.enum) return void 0;
+  if (isBoolean(s) || !s.enum) return void 0;
   const values = filterEmpty(s.enum);
   if (!values.length) return void 0;
   if (!s.type) {
@@ -258,8 +282,16 @@ const makeInlineEnum = (s) => {
   console.warn(`enum with unknown type "${s.type}" in`, s);
   return void 0;
 };
+const makeConst = (s) => {
+  if (isBoolean(s) || !("const" in s)) return void 0;
+  const value = s.const;
+  if (!["string", "number", "boolean"].includes(typeof value)) return void 0;
+  const t = makeInlineEnum({ ...s, enum: [value] });
+  return t && ts.isUnionTypeNode(t) ? t.types[0] : t;
+};
 const makeObject = (ctx, s) => {
-  if (s.type !== "object") throw new Error(`makeObject: not an object ${JSON.stringify(s)}`);
+  if (isBoolean(s) || s.type !== "object")
+    throw new Error(`makeObject: not an object ${JSON.stringify(s)}`);
   if (s.additionalProperties && !isBoolean(s.additionalProperties)) {
     return f$2.createTypeReferenceNode("Record", [
       f$2.createKeywordTypeNode(ts.SyntaxKind.StringKeyword),
@@ -278,19 +310,24 @@ 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 (isBoolean(s)) {
+    return f$2.createKeywordTypeNode(s ? ts.SyntaxKind.UnknownKeyword : ts.SyntaxKind.NeverKeyword);
+  }
   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 === void 0) 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";
+  const constant = makeConst(s);
+  if (constant) return constant;
   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);
@@ -314,7 +351,6 @@ const makeType = (ctx, s) => {
     if (s.type === "object") t = makeObject(ctx, s);
     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 (isConstantString(s)) t = f$2.createLiteralTypeNode(f$2.createStringLiteral(s.const));
     else if (s.type === "string") t = f$2.createKeywordTypeNode(ts.SyntaxKind.StringKeyword);
     else if (s.type === "null") t = f$2.createLiteralTypeNode(f$2.createNull());
     else if (isArray(s.type)) t = makeLiteralUnion(ctx, s.type);
@@ -337,16 +373,14 @@ const makeType = (ctx, s) => {
   return f$2.createKeywordTypeNode(ts.SyntaxKind.UnknownKeyword);
 };
 const isStringEnum = (s) => {
+  if (isBoolean(s)) return false;
   if ("enum" in s && s.enum) {
     return s.enum.every((x) => typeof x === "string");
   }
   return false;
 };
 const isPrefixItems = (s) => {
-  return s.prefixItems !== void 0;
-};
-const isConstantString = (s) => {
-  return s.type === "string" && s.const !== void 0;
+  return !isBoolean(s) && s.prefixItems !== void 0;
 };
 const makeTypeAlias = (ctx, name, s) => {
   if (isStringEnum(s) && !ctx.inlineEnums) {
@@ -372,7 +406,17 @@ const makeTypeAlias = (ctx, name, s) => {
 };
 
 const f$1 = ts.factory;
-const HttpMethods = ["get", "post", "put", "patch", "delete", "head", "options", "trace"];
+const HttpMethods = [
+  "get",
+  "post",
+  "put",
+  "patch",
+  "delete",
+  "head",
+  "options",
+  "trace",
+  "query"
+];
 const normalizeOpName = (val) => {
   const articles = /* @__PURE__ */ new Set(["a", "an", "the"]);
   const tmp = val.replace(/'/, "").replace(/[^a-zA-Z0-9]/g, "_").split("_").filter((x) => x !== "" && !articles.has(x)).map((x) => upperFirst(x));
@@ -418,7 +462,7 @@ const prepareUrl = (url, rename) => {
     })
   );
 };
-const prepareOp = (ctx, cfg, opName) => {
+const prepareOp = (ctx, cfg, opName, httpMethod) => {
   cfg.parameters = cfg.parameters ?? [];
   const reqSchema = getReqSchema(ctx, cfg);
   const repSchema = getRepSchema(ctx, cfg);
@@ -478,7 +522,7 @@ const prepareOp = (ctx, cfg, opName) => {
             f$1.createIdentifier("this.Fetch"),
             [makeType(ctx, repSchema)],
             [
-              f$1.createStringLiteral(cfg.method),
+              f$1.createStringLiteral(httpMethod),
               // method
               prepareUrl(cfg.path, urlReplacements),
               // path
@@ -500,43 +544,49 @@ const prepareNs = (ctx, name, handlers) => {
     f$1.createObjectLiteralExpression(handlers)
   );
 };
+const addOp = (ctx, routes, pathConfig, cfg, httpMethod) => {
+  ctx.logTag = `${httpMethod.padEnd(6, " ")} ${cfg.path}`;
+  if (pathConfig.parameters) {
+    cfg.parameters = [...cfg.parameters ?? [], ...pathConfig.parameters];
+  }
+  const opTags = cfg.tags ?? [];
+  if (ctx.includeTags?.length && !opTags.some((t) => ctx.includeTags.includes(t))) return;
+  if (ctx.excludeTags?.length && opTags.some((t) => ctx.excludeTags.includes(t))) return;
+  const [ns, op] = getOpName(ctx, cfg);
+  if (!routes[ns]) routes[ns] = [];
+  const joined = [ns, op].join(".");
+  if (ctx.usedNames.has(joined)) {
+    return;
+  } else {
+    ctx.usedNames.add(joined);
+  }
+  try {
+    routes[ns].push(prepareOp(ctx, cfg, op, httpMethod));
+  } catch (e) {
+    console.error(`${ctx.logTag} - ${e}`, cfg);
+    throw e;
+  }
+};
 const prepareRoutes = async (ctx) => {
   const routes = {};
-  for (const [path, pathConfig] of Object.entries(ctx.doc.paths ?? {})) {
+  for (const [path, value] of Object.entries(ctx.doc.paths ?? {})) {
     ctx.logTag = `${"[ALL]".toUpperCase().padEnd(6, " ")} ${path}`;
-    if (!isObject(pathConfig)) continue;
+    if (!isObject(value)) continue;
     if (ctx.filterPaths) {
       const match = ctx.filterPaths instanceof RegExp ? ctx.filterPaths.test(path) : ctx.filterPaths(path);
       if (!match) continue;
     }
-    if ("$ref" in pathConfig) {
-      console.warn(`${ctx.logTag} $ref should be resolved before (skipping)`);
-      continue;
-    }
+    const pathConfig = unref(ctx, value);
+    if (!pathConfig) continue;
     for (const method of HttpMethods) {
-      ctx.logTag = `${method.toUpperCase().padEnd(6, " ")} ${path}`;
       const config = pathConfig[method];
       if (!config) continue;
-      if (pathConfig.parameters) {
-        config.parameters = [...config.parameters ?? [], ...pathConfig.parameters];
-      }
-      const opTags = config.tags ?? [];
-      if (ctx.includeTags?.length && !opTags.some((t) => ctx.includeTags.includes(t))) continue;
-      if (ctx.excludeTags?.length && opTags.some((t) => ctx.excludeTags.includes(t))) continue;
-      const [ns, op] = getOpName(ctx, { ...config, method, path });
-      if (!routes[ns]) routes[ns] = [];
-      const joined = [ns, op].join(".");
-      if (ctx.usedNames.has(joined)) {
-        continue;
-      } else {
-        ctx.usedNames.add(joined);
-      }
-      try {
-        routes[ns].push(prepareOp(ctx, { ...config, method, path }, op));
-      } catch (e) {
-        console.error(`${ctx.logTag} - ${e}`, config);
-        throw e;
-      }
+      addOp(ctx, routes, pathConfig, { ...config, method, path }, method.toUpperCase());
+    }
+    for (const [method, value2] of Object.entries(pathConfig.additionalOperations ?? {})) {
+      const config = unref(ctx, value2);
+      if (!config) continue;
+      addOp(ctx, routes, pathConfig, { ...config, method, path }, method);
     }
   }
   return routes;

package/dist/main.cjs

@@ -29,7 +29,8 @@ const initCtx = (config) => {
 };
 
 const unref = (ctx, s) => {
-  if (!s) return void 0;
+  if (s === void 0) return void 0;
+  if (typeof s !== "object" || s === null) return s;
   if ("$ref" in s && s.$ref) {
     const parts = s.$ref.replace("#/", "").split("/");
     const obj = parts.reduce(
@@ -37,16 +38,24 @@ 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 !== void 0) return obj;
     console.warn(`${ctx.logTag} ref ${s.$ref} not found`);
     return void 0;
   }
   return s;
 };
+const getContent = (ctx, content) => {
+  const result = [];
+  for (const [cType, value] of Object.entries(content ?? {})) {
+    const mType = unref(ctx, value);
+    if (mType) result.push([cType.split(";")[0], mType]);
+  }
+  return result;
+};
 const getReqSchema = (ctx, config) => {
   const req = unref(ctx, config.requestBody);
   if (!req) return void 0;
-  const cts = Object.entries(req.content ?? {}).map((x) => [x[0].split(";")[0], x[1].schema]).filter((x) => x[1]);
+  const cts = getContent(ctx, req.content).map((x) => [x[0], x[1].schema]).filter((x) => x[1] !== void 0);
   if (cts.length === 0) return void 0;
   const pretenders = [
     "application/json",
@@ -61,12 +70,15 @@ const getReqSchema = (ctx, config) => {
   cts.map((x) => x[0]);
   return void 0;
 };
-const getRepSchema = (ctx, config) => {
+const getRepContent = (ctx, config) => {
   const successCodes = Object.keys(config.responses ?? {}).filter((x) => x.startsWith("2")).filter((x) => lodashEs.get(config, ["responses", x]));
   const firstSuccess = unref(ctx, lodashEs.get(config, ["responses", successCodes[0]], {}));
-  if (!firstSuccess || !("content" in firstSuccess)) return void 0;
-  const cts = Object.entries(firstSuccess.content ?? {}).filter((x) => x[1].schema);
-  if (cts.length === 0) return void 0;
+  if (!firstSuccess || !("content" in firstSuccess)) return [];
+  return getContent(ctx, firstSuccess.content);
+};
+const getRepSchema = (ctx, config) => {
+  const cts = getRepContent(ctx, config).filter((x) => x[1].schema !== void 0);
+  if (!cts.length) return void 0;
   const ctJson = cts.find((x) => x[0].startsWith("application/json"));
   if (ctJson) return ctJson[1].schema;
   const ctText = cts.find((x) => x[0].startsWith("text/"));
@@ -136,10 +148,22 @@ const Keywords = /* @__PURE__ */ new Set([
   "Exclude",
   "Extract",
   // ts keywords
+  "Array",
   "Date",
-  "object",
-  "Response"
-  // ts type names
+  "File",
+  "FormData",
+  "Headers",
+  "JSON",
+  "Object",
+  "Promise",
+  "RequestInit",
+  "Response",
+  "URL",
+  "URLSearchParams",
+  "fetch",
+  "globalThis",
+  "object"
+  // runtime names
 ]);
 const normalizeIdentifier = (val, asVar = false) => {
   let name = val.replace("#/components/schemas/", "").replaceAll("'", "").replace(/[^a-zA-Z0-9]/g, "_");
@@ -148,7 +172,7 @@ const normalizeIdentifier = (val, asVar = false) => {
   return name;
 };
 const makeInlineEnum = (s) => {
-  if (!s.enum) return void 0;
+  if (lodashEs.isBoolean(s) || !s.enum) return void 0;
   const values = arrayUtilsTs.filterEmpty(s.enum);
   if (!values.length) return void 0;
   if (!s.type) {
@@ -181,8 +205,16 @@ const makeInlineEnum = (s) => {
   console.warn(`enum with unknown type "${s.type}" in`, s);
   return void 0;
 };
+const makeConst = (s) => {
+  if (lodashEs.isBoolean(s) || !("const" in s)) return void 0;
+  const value = s.const;
+  if (!["string", "number", "boolean"].includes(typeof value)) return void 0;
+  const t = makeInlineEnum({ ...s, enum: [value] });
+  return t && ts.isUnionTypeNode(t) ? t.types[0] : t;
+};
 const makeObject = (ctx, s) => {
-  if (s.type !== "object") throw new Error(`makeObject: not an object ${JSON.stringify(s)}`);
+  if (lodashEs.isBoolean(s) || s.type !== "object")
+    throw new Error(`makeObject: not an object ${JSON.stringify(s)}`);
   if (s.additionalProperties && !lodashEs.isBoolean(s.additionalProperties)) {
     return f$2.createTypeReferenceNode("Record", [
       f$2.createKeywordTypeNode(ts.SyntaxKind.StringKeyword),
@@ -201,19 +233,24 @@ 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 (lodashEs.isBoolean(s)) {
+    return f$2.createKeywordTypeNode(s ? ts.SyntaxKind.UnknownKeyword : ts.SyntaxKind.NeverKeyword);
+  }
   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 === void 0) 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";
+  const constant = makeConst(s);
+  if (constant) return constant;
   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);
@@ -237,7 +274,6 @@ const makeType = (ctx, s) => {
     if (s.type === "object") t = makeObject(ctx, s);
     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 (isConstantString(s)) t = f$2.createLiteralTypeNode(f$2.createStringLiteral(s.const));
     else if (s.type === "string") t = f$2.createKeywordTypeNode(ts.SyntaxKind.StringKeyword);
     else if (s.type === "null") t = f$2.createLiteralTypeNode(f$2.createNull());
     else if (lodashEs.isArray(s.type)) t = makeLiteralUnion(ctx, s.type);
@@ -260,16 +296,14 @@ const makeType = (ctx, s) => {
   return f$2.createKeywordTypeNode(ts.SyntaxKind.UnknownKeyword);
 };
 const isStringEnum = (s) => {
+  if (lodashEs.isBoolean(s)) return false;
   if ("enum" in s && s.enum) {
     return s.enum.every((x) => typeof x === "string");
   }
   return false;
 };
 const isPrefixItems = (s) => {
-  return s.prefixItems !== void 0;
-};
-const isConstantString = (s) => {
-  return s.type === "string" && s.const !== void 0;
+  return !lodashEs.isBoolean(s) && s.prefixItems !== void 0;
 };
 const makeTypeAlias = (ctx, name, s) => {
   if (isStringEnum(s) && !ctx.inlineEnums) {
@@ -295,7 +329,17 @@ const makeTypeAlias = (ctx, name, s) => {
 };
 
 const f$1 = ts.factory;
-const HttpMethods = ["get", "post", "put", "patch", "delete", "head", "options", "trace"];
+const HttpMethods = [
+  "get",
+  "post",
+  "put",
+  "patch",
+  "delete",
+  "head",
+  "options",
+  "trace",
+  "query"
+];
 const normalizeOpName = (val) => {
   const articles = /* @__PURE__ */ new Set(["a", "an", "the"]);
   const tmp = val.replace(/'/, "").replace(/[^a-zA-Z0-9]/g, "_").split("_").filter((x) => x !== "" && !articles.has(x)).map((x) => lodashEs.upperFirst(x));
@@ -341,7 +385,7 @@ const prepareUrl = (url, rename) => {
     })
   );
 };
-const prepareOp = (ctx, cfg, opName) => {
+const prepareOp = (ctx, cfg, opName, httpMethod) => {
   cfg.parameters = cfg.parameters ?? [];
   const reqSchema = getReqSchema(ctx, cfg);
   const repSchema = getRepSchema(ctx, cfg);
@@ -401,7 +445,7 @@ const prepareOp = (ctx, cfg, opName) => {
             f$1.createIdentifier("this.Fetch"),
             [makeType(ctx, repSchema)],
             [
-              f$1.createStringLiteral(cfg.method),
+              f$1.createStringLiteral(httpMethod),
               // method
               prepareUrl(cfg.path, urlReplacements),
               // path
@@ -423,43 +467,49 @@ const prepareNs = (ctx, name, handlers) => {
     f$1.createObjectLiteralExpression(handlers)
   );
 };
+const addOp = (ctx, routes, pathConfig, cfg, httpMethod) => {
+  ctx.logTag = `${httpMethod.padEnd(6, " ")} ${cfg.path}`;
+  if (pathConfig.parameters) {
+    cfg.parameters = [...cfg.parameters ?? [], ...pathConfig.parameters];
+  }
+  const opTags = cfg.tags ?? [];
+  if (ctx.includeTags?.length && !opTags.some((t) => ctx.includeTags.includes(t))) return;
+  if (ctx.excludeTags?.length && opTags.some((t) => ctx.excludeTags.includes(t))) return;
+  const [ns, op] = getOpName(ctx, cfg);
+  if (!routes[ns]) routes[ns] = [];
+  const joined = [ns, op].join(".");
+  if (ctx.usedNames.has(joined)) {
+    return;
+  } else {
+    ctx.usedNames.add(joined);
+  }
+  try {
+    routes[ns].push(prepareOp(ctx, cfg, op, httpMethod));
+  } catch (e) {
+    console.error(`${ctx.logTag} - ${e}`, cfg);
+    throw e;
+  }
+};
 const prepareRoutes = async (ctx) => {
   const routes = {};
-  for (const [path, pathConfig] of Object.entries(ctx.doc.paths ?? {})) {
+  for (const [path, value] of Object.entries(ctx.doc.paths ?? {})) {
     ctx.logTag = `${"[ALL]".toUpperCase().padEnd(6, " ")} ${path}`;
-    if (!lodashEs.isObject(pathConfig)) continue;
+    if (!lodashEs.isObject(value)) continue;
     if (ctx.filterPaths) {
       const match = ctx.filterPaths instanceof RegExp ? ctx.filterPaths.test(path) : ctx.filterPaths(path);
       if (!match) continue;
     }
-    if ("$ref" in pathConfig) {
-      console.warn(`${ctx.logTag} $ref should be resolved before (skipping)`);
-      continue;
-    }
+    const pathConfig = unref(ctx, value);
+    if (!pathConfig) continue;
     for (const method of HttpMethods) {
-      ctx.logTag = `${method.toUpperCase().padEnd(6, " ")} ${path}`;
       const config = pathConfig[method];
       if (!config) continue;
-      if (pathConfig.parameters) {
-        config.parameters = [...config.parameters ?? [], ...pathConfig.parameters];
-      }
-      const opTags = config.tags ?? [];
-      if (ctx.includeTags?.length && !opTags.some((t) => ctx.includeTags.includes(t))) continue;
-      if (ctx.excludeTags?.length && opTags.some((t) => ctx.excludeTags.includes(t))) continue;
-      const [ns, op] = getOpName(ctx, { ...config, method, path });
-      if (!routes[ns]) routes[ns] = [];
-      const joined = [ns, op].join(".");
-      if (ctx.usedNames.has(joined)) {
-        continue;
-      } else {
-        ctx.usedNames.add(joined);
-      }
-      try {
-        routes[ns].push(prepareOp(ctx, { ...config, method, path }, op));
-      } catch (e) {
-        console.error(`${ctx.logTag} - ${e}`, config);
-        throw e;
-      }
+      addOp(ctx, routes, pathConfig, { ...config, method, path }, method.toUpperCase());
+    }
+    for (const [method, value2] of Object.entries(pathConfig.additionalOperations ?? {})) {
+      const config = unref(ctx, value2);
+      if (!config) continue;
+      addOp(ctx, routes, pathConfig, { ...config, method, path }, method);
     }
   }
   return routes;

package/dist/main.js

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

package/dist/main.mjs

@@ -4,7 +4,7 @@ import { fileURLToPath } from 'url';
 import 'cleye';
 import { bundle, BaseResolver, createConfig } from '@redocly/openapi-core';
 import { filterEmpty, filterNullable } from 'array-utils-ts';
-import { get, uniq, upperFirst, isArray, isBoolean, sortBy, isObject, lowerFirst, uniqBy } from 'lodash-es';
+import { get, uniq, upperFirst, isBoolean, isArray, sortBy, isObject, lowerFirst, uniqBy } from 'lodash-es';
 import { convertObj } from 'swagger2openapi';
 import ts from 'typescript';
 import path from 'node:path';
@@ -26,7 +26,8 @@ const initCtx = (config) => {
 };
 
 const unref = (ctx, s) => {
-  if (!s) return void 0;
+  if (s === void 0) return void 0;
+  if (typeof s !== "object" || s === null) return s;
   if ("$ref" in s && s.$ref) {
     const parts = s.$ref.replace("#/", "").split("/");
     const obj = parts.reduce(
@@ -34,16 +35,24 @@ const unref = (ctx, s) => {
       (acc, x) => get(acc, x, get(acc, decodeURIComponent(x).replaceAll("~1", "/"))),
       ctx.doc
     );
-    if (obj) return obj;
+    if (obj !== void 0) return obj;
     console.warn(`${ctx.logTag} ref ${s.$ref} not found`);
     return void 0;
   }
   return s;
 };
+const getContent = (ctx, content) => {
+  const result = [];
+  for (const [cType, value] of Object.entries(content ?? {})) {
+    const mType = unref(ctx, value);
+    if (mType) result.push([cType.split(";")[0], mType]);
+  }
+  return result;
+};
 const getReqSchema = (ctx, config) => {
   const req = unref(ctx, config.requestBody);
   if (!req) return void 0;
-  const cts = Object.entries(req.content ?? {}).map((x) => [x[0].split(";")[0], x[1].schema]).filter((x) => x[1]);
+  const cts = getContent(ctx, req.content).map((x) => [x[0], x[1].schema]).filter((x) => x[1] !== void 0);
   if (cts.length === 0) return void 0;
   const pretenders = [
     "application/json",
@@ -58,12 +67,15 @@ const getReqSchema = (ctx, config) => {
   cts.map((x) => x[0]);
   return void 0;
 };
-const getRepSchema = (ctx, config) => {
+const getRepContent = (ctx, config) => {
   const successCodes = Object.keys(config.responses ?? {}).filter((x) => x.startsWith("2")).filter((x) => get(config, ["responses", x]));
   const firstSuccess = unref(ctx, get(config, ["responses", successCodes[0]], {}));
-  if (!firstSuccess || !("content" in firstSuccess)) return void 0;
-  const cts = Object.entries(firstSuccess.content ?? {}).filter((x) => x[1].schema);
-  if (cts.length === 0) return void 0;
+  if (!firstSuccess || !("content" in firstSuccess)) return [];
+  return getContent(ctx, firstSuccess.content);
+};
+const getRepSchema = (ctx, config) => {
+  const cts = getRepContent(ctx, config).filter((x) => x[1].schema !== void 0);
+  if (!cts.length) return void 0;
   const ctJson = cts.find((x) => x[0].startsWith("application/json"));
   if (ctJson) return ctJson[1].schema;
   const ctText = cts.find((x) => x[0].startsWith("text/"));
@@ -133,10 +145,22 @@ const Keywords = /* @__PURE__ */ new Set([
   "Exclude",
   "Extract",
   // ts keywords
+  "Array",
   "Date",
-  "object",
-  "Response"
-  // ts type names
+  "File",
+  "FormData",
+  "Headers",
+  "JSON",
+  "Object",
+  "Promise",
+  "RequestInit",
+  "Response",
+  "URL",
+  "URLSearchParams",
+  "fetch",
+  "globalThis",
+  "object"
+  // runtime names
 ]);
 const normalizeIdentifier = (val, asVar = false) => {
   let name = val.replace("#/components/schemas/", "").replaceAll("'", "").replace(/[^a-zA-Z0-9]/g, "_");
@@ -145,7 +169,7 @@ const normalizeIdentifier = (val, asVar = false) => {
   return name;
 };
 const makeInlineEnum = (s) => {
-  if (!s.enum) return void 0;
+  if (isBoolean(s) || !s.enum) return void 0;
   const values = filterEmpty(s.enum);
   if (!values.length) return void 0;
   if (!s.type) {
@@ -178,8 +202,16 @@ const makeInlineEnum = (s) => {
   console.warn(`enum with unknown type "${s.type}" in`, s);
   return void 0;
 };
+const makeConst = (s) => {
+  if (isBoolean(s) || !("const" in s)) return void 0;
+  const value = s.const;
+  if (!["string", "number", "boolean"].includes(typeof value)) return void 0;
+  const t = makeInlineEnum({ ...s, enum: [value] });
+  return t && ts.isUnionTypeNode(t) ? t.types[0] : t;
+};
 const makeObject = (ctx, s) => {
-  if (s.type !== "object") throw new Error(`makeObject: not an object ${JSON.stringify(s)}`);
+  if (isBoolean(s) || s.type !== "object")
+    throw new Error(`makeObject: not an object ${JSON.stringify(s)}`);
   if (s.additionalProperties && !isBoolean(s.additionalProperties)) {
     return f$2.createTypeReferenceNode("Record", [
       f$2.createKeywordTypeNode(ts.SyntaxKind.StringKeyword),
@@ -198,19 +230,24 @@ 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 (isBoolean(s)) {
+    return f$2.createKeywordTypeNode(s ? ts.SyntaxKind.UnknownKeyword : ts.SyntaxKind.NeverKeyword);
+  }
   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 === void 0) 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";
+  const constant = makeConst(s);
+  if (constant) return constant;
   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);
@@ -234,7 +271,6 @@ const makeType = (ctx, s) => {
     if (s.type === "object") t = makeObject(ctx, s);
     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 (isConstantString(s)) t = f$2.createLiteralTypeNode(f$2.createStringLiteral(s.const));
     else if (s.type === "string") t = f$2.createKeywordTypeNode(ts.SyntaxKind.StringKeyword);
     else if (s.type === "null") t = f$2.createLiteralTypeNode(f$2.createNull());
     else if (isArray(s.type)) t = makeLiteralUnion(ctx, s.type);
@@ -257,16 +293,14 @@ const makeType = (ctx, s) => {
   return f$2.createKeywordTypeNode(ts.SyntaxKind.UnknownKeyword);
 };
 const isStringEnum = (s) => {
+  if (isBoolean(s)) return false;
   if ("enum" in s && s.enum) {
     return s.enum.every((x) => typeof x === "string");
   }
   return false;
 };
 const isPrefixItems = (s) => {
-  return s.prefixItems !== void 0;
-};
-const isConstantString = (s) => {
-  return s.type === "string" && s.const !== void 0;
+  return !isBoolean(s) && s.prefixItems !== void 0;
 };
 const makeTypeAlias = (ctx, name, s) => {
   if (isStringEnum(s) && !ctx.inlineEnums) {
@@ -292,7 +326,17 @@ const makeTypeAlias = (ctx, name, s) => {
 };
 
 const f$1 = ts.factory;
-const HttpMethods = ["get", "post", "put", "patch", "delete", "head", "options", "trace"];
+const HttpMethods = [
+  "get",
+  "post",
+  "put",
+  "patch",
+  "delete",
+  "head",
+  "options",
+  "trace",
+  "query"
+];
 const normalizeOpName = (val) => {
   const articles = /* @__PURE__ */ new Set(["a", "an", "the"]);
   const tmp = val.replace(/'/, "").replace(/[^a-zA-Z0-9]/g, "_").split("_").filter((x) => x !== "" && !articles.has(x)).map((x) => upperFirst(x));
@@ -338,7 +382,7 @@ const prepareUrl = (url, rename) => {
     })
   );
 };
-const prepareOp = (ctx, cfg, opName) => {
+const prepareOp = (ctx, cfg, opName, httpMethod) => {
   cfg.parameters = cfg.parameters ?? [];
   const reqSchema = getReqSchema(ctx, cfg);
   const repSchema = getRepSchema(ctx, cfg);
@@ -398,7 +442,7 @@ const prepareOp = (ctx, cfg, opName) => {
             f$1.createIdentifier("this.Fetch"),
             [makeType(ctx, repSchema)],
             [
-              f$1.createStringLiteral(cfg.method),
+              f$1.createStringLiteral(httpMethod),
               // method
               prepareUrl(cfg.path, urlReplacements),
               // path
@@ -420,43 +464,49 @@ const prepareNs = (ctx, name, handlers) => {
     f$1.createObjectLiteralExpression(handlers)
   );
 };
+const addOp = (ctx, routes, pathConfig, cfg, httpMethod) => {
+  ctx.logTag = `${httpMethod.padEnd(6, " ")} ${cfg.path}`;
+  if (pathConfig.parameters) {
+    cfg.parameters = [...cfg.parameters ?? [], ...pathConfig.parameters];
+  }
+  const opTags = cfg.tags ?? [];
+  if (ctx.includeTags?.length && !opTags.some((t) => ctx.includeTags.includes(t))) return;
+  if (ctx.excludeTags?.length && opTags.some((t) => ctx.excludeTags.includes(t))) return;
+  const [ns, op] = getOpName(ctx, cfg);
+  if (!routes[ns]) routes[ns] = [];
+  const joined = [ns, op].join(".");
+  if (ctx.usedNames.has(joined)) {
+    return;
+  } else {
+    ctx.usedNames.add(joined);
+  }
+  try {
+    routes[ns].push(prepareOp(ctx, cfg, op, httpMethod));
+  } catch (e) {
+    console.error(`${ctx.logTag} - ${e}`, cfg);
+    throw e;
+  }
+};
 const prepareRoutes = async (ctx) => {
   const routes = {};
-  for (const [path, pathConfig] of Object.entries(ctx.doc.paths ?? {})) {
+  for (const [path, value] of Object.entries(ctx.doc.paths ?? {})) {
     ctx.logTag = `${"[ALL]".toUpperCase().padEnd(6, " ")} ${path}`;
-    if (!isObject(pathConfig)) continue;
+    if (!isObject(value)) continue;
     if (ctx.filterPaths) {
       const match = ctx.filterPaths instanceof RegExp ? ctx.filterPaths.test(path) : ctx.filterPaths(path);
       if (!match) continue;
     }
-    if ("$ref" in pathConfig) {
-      console.warn(`${ctx.logTag} $ref should be resolved before (skipping)`);
-      continue;
-    }
+    const pathConfig = unref(ctx, value);
+    if (!pathConfig) continue;
     for (const method of HttpMethods) {
-      ctx.logTag = `${method.toUpperCase().padEnd(6, " ")} ${path}`;
       const config = pathConfig[method];
       if (!config) continue;
-      if (pathConfig.parameters) {
-        config.parameters = [...config.parameters ?? [], ...pathConfig.parameters];
-      }
-      const opTags = config.tags ?? [];
-      if (ctx.includeTags?.length && !opTags.some((t) => ctx.includeTags.includes(t))) continue;
-      if (ctx.excludeTags?.length && opTags.some((t) => ctx.excludeTags.includes(t))) continue;
-      const [ns, op] = getOpName(ctx, { ...config, method, path });
-      if (!routes[ns]) routes[ns] = [];
-      const joined = [ns, op].join(".");
-      if (ctx.usedNames.has(joined)) {
-        continue;
-      } else {
-        ctx.usedNames.add(joined);
-      }
-      try {
-        routes[ns].push(prepareOp(ctx, { ...config, method, path }, op));
-      } catch (e) {
-        console.error(`${ctx.logTag} - ${e}`, config);
-        throw e;
-      }
+      addOp(ctx, routes, pathConfig, { ...config, method, path }, method.toUpperCase());
+    }
+    for (const [method, value2] of Object.entries(pathConfig.additionalOperations ?? {})) {
+      const config = unref(ctx, value2);
+      if (!config) continue;
+      addOp(ctx, routes, pathConfig, { ...config, method, path }, method);
     }
   }
   return routes;

package/package.json

@@ -1,10 +1,13 @@
 {
   "type": "module",
   "name": "apigen-ts",
-  "version": "1.3.1",
+  "version": "1.4.0",
   "license": "MIT",
   "author": "vladkens <v.pronsky@gmail.com>",
-  "repository": "vladkens/apigen-ts",
+  "repository": {
+    "type": "git",
+    "url": "vladkens/apigen-ts"
+  },
   "description": "Simple typed OpenAPI client generator",
   "keywords": [
     "openapi",
@@ -14,8 +17,11 @@
     "generator",
     "codegen"
   ],
+  "engines": {
+    "node": ">=22"
+  },
   "dependencies": {
-    "@redocly/openapi-core": "2.31.5",
+    "@redocly/openapi-core": "2.47.0",
     "@types/lodash-es": "4.17.12",
     "@types/swagger2openapi": "7.0.4",
     "array-utils-ts": "1.1.0",
@@ -24,13 +30,13 @@
     "swagger2openapi": "7.0.8"
   },
   "devDependencies": {
-    "@types/node": "25.9.1",
+    "@types/node": "26.2.0",
     "fetch-mock": "12.6.0",
-    "npm-check-updates": "22.2.1",
+    "npm-check-updates": "23.0.2",
     "pkgroll": "2.27.1",
-    "prettier": "3.8.3",
+    "prettier": "3.9.6",
     "prettier-plugin-organize-imports": "4.3.0",
-    "tsx": "4.22.4",
+    "tsx": "4.23.12",
     "typescript": "6.0.3"
   },
   "peerDependencies": {

package/readme.md

@@ -3,7 +3,7 @@
 <div align="center">
 
 [<img src="https://badges.ws/npm/v/apigen-ts" alt="version" />](https://npmjs.org/package/apigen-ts)
-[<img src="https://packagephobia.com/badge?p=array-utils-ts" alt="size" />](https://packagephobia.now.sh/result?p=apigen-ts)
+[<img src="https://badges.ws/packagephobia/publish/apigen-ts" alt="size" />](https://packagephobia.com/result?p=apigen-ts)
 [<img src="https://badges.ws/npm/dm/apigen-ts" alt="downloads" />](https://npmjs.org/package/apigen-ts)
 [<img src="https://badges.ws/github/license/vladkens/apigen-ts" alt="license" />](https://github.com/vladkens/apigen-ts/blob/main/LICENSE)
 [<img src="https://badges.ws/badge/-/buy%20me%20a%20coffee/ff813f?icon=buymeacoffee&label" alt="donate" />](https://buymeacoffee.com/vladkens)
@@ -18,7 +18,7 @@ Turn your OpenAPI spec into a typed TypeScript client with one command.
 
 - **One file.** Outputs a single `api-client.ts` — no scattered modules, no runtime deps in generated code.
 - **Fully typed.** Every method returns the exact response type from your schema. No casting, no `any`.
-- **Pure Node.js.** No Java, no Docker. Works with `npx` in any project.
+- **Pure Node.js.** No Java, no Docker. Works with `pnpm` in any project.
 - **Fetch-based.** Uses native `fetch`. Override it with your own function for auth, retries, or logging.
 - **All OpenAPI versions.** Supports v2 (Swagger), v3, and v3.1 — auto-upgrades v2 on the fly.
 - **Extras built in.** Automatic date parsing, string literal unions instead of enums, Prettier formatting.
@@ -29,7 +29,7 @@ Unlike `openapi-typescript`, it generates a ready-to-call client — not just ty
 ## Install
 
 ```sh
-npm i -D apigen-ts
+pnpm add -D apigen-ts
 ```
 
 ## Usage
@@ -38,16 +38,16 @@ npm i -D apigen-ts
 
 ```sh
 # From a local file
-npx apigen-ts ./openapi.json ./api-client.ts
+pnpm apigen-ts ./openapi.json ./api-client.ts
 
 # From a URL
-npx apigen-ts https://petstore3.swagger.io/api/v3/openapi.json ./api-client.ts
+pnpm apigen-ts https://petstore3.swagger.io/api/v3/openapi.json ./api-client.ts
 
 # From a protected URL
-npx apigen-ts https://secret-api.example.com ./api-client.ts -H "x-api-key: secret-key"
+pnpm apigen-ts https://secret-api.example.com ./api-client.ts -H "x-api-key: secret-key"
 ```
 
-Run `npx apigen-ts --help` for all options. See [generated examples](./examples/).
+Run `pnpm apigen-ts --help` for all options. See [generated examples](./examples/).
 
 ### 2. Import
 
@@ -87,7 +87,7 @@ await api.protectedRoute.get() // authenticated
 ### Automatic date parsing
 
 ```sh
-npx apigen-ts ./openapi.json ./api-client.ts --parse-dates
+pnpm apigen-ts ./openapi.json ./api-client.ts --parse-dates
 ```
 
 ```ts
@@ -100,7 +100,7 @@ const createdAt: Date = pet.createdAt // parsed from format=date-time string
 Pass `--inline-enums` to generate string literal unions — useful for Node.js [type stripping](https://nodejs.org/api/typescript.html#type-stripping):
 
 ```sh
-npx apigen-ts ./openapi.json ./api-client.ts --inline-enums
+pnpm apigen-ts ./openapi.json ./api-client.ts --inline-enums
 ```
 
 ```ts
@@ -119,17 +119,17 @@ enum MyEnum {
 Include only the endpoints you need — useful with large schemas (e.g. Cloudflare's 8 MB monolith):
 
 ```sh
-npx apigen-ts ./openapi.json ./api-client.ts --filter-paths '^/accounts'
+pnpm apigen-ts ./openapi.json ./api-client.ts --filter-paths '^/accounts'
 ```
 
 ### Filter by tag
 
 ```sh
 # include only endpoints tagged "pets" or "store"
-npx apigen-ts ./openapi.json ./api-client.ts --include-tags pets,store
+pnpm apigen-ts ./openapi.json ./api-client.ts --include-tags pets,store
 
 # exclude endpoints tagged "internal"
-npx apigen-ts ./openapi.json ./api-client.ts --exclude-tags internal
+pnpm apigen-ts ./openapi.json ./api-client.ts --exclude-tags internal
 ```
 
 When both flags are set, `--exclude-tags` wins.
@@ -139,7 +139,7 @@ When both flags are set, `--exclude-tags` wins.
 Pass `--fetch-options` to add an optional last argument to every generated method, accepting any [`RequestInit`](https://developer.mozilla.org/en-US/docs/Web/API/RequestInit) field:
 
 ```sh
-npx apigen-ts ./openapi.json ./api-client.ts --fetch-options
+pnpm apigen-ts ./openapi.json ./api-client.ts --fetch-options
 ```
 
 ```ts