apigen-ts 1.1.0 → 1.2.1

package/dist/cli.cjs

@@ -1,6 +1,6 @@
 'use strict';
 
-var main$1 = require('./main-B2qgp9dv.cjs');
+var main$1 = require('./main-BLaUzCCM.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-BvB08bJo.js';
+import { a as apigen, g as getCliConfig } from './main-BZrWxHPM.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-BvB08bJo.mjs';
+import { a as apigen, g as getCliConfig } from './main-BZrWxHPM.mjs';
 import 'fs/promises';
 import 'path';
 import 'url';

package/dist/{main-B2qgp9dv.cjs → main-BLaUzCCM.cjs}

@@ -13,7 +13,7 @@ var path = require('node:path');
 
 var _documentCurrentScript = typeof document !== 'undefined' ? document.currentScript : null;
 var name = "apigen-ts";
-var version = "1.1.0";
+var version = "1.2.1";
 
 const initCtx = (config) => {
   return {
@@ -23,11 +23,20 @@ const initCtx = (config) => {
     doc: { openapi: "3.1.0" },
     parseDates: false,
     inlineEnums: false,
+    headers: {},
     ...config,
     logTag: "",
     usedNames: /* @__PURE__ */ new Set()
   };
 };
+const parseHeaders = (items) => {
+  const headers = {};
+  for (const item of items) {
+    const [key, val] = item.split(":");
+    if (key && val) headers[key.trim()] = val.trim();
+  }
+  return headers;
+};
 const getCliConfig = () => {
   const argv = cleye.cli({
     name,
@@ -36,18 +45,24 @@ const getCliConfig = () => {
     flags: {
       name: {
         type: String,
-        description: "api class name to export",
+        description: "API class name to export",
         default: "ApiClient"
       },
       parseDates: {
         type: Boolean,
-        description: "parse dates as Date objects",
+        description: "Parse dates as Date objects",
         default: false
       },
       inlineEnums: {
         type: Boolean,
-        description: "use inline enums instead of enum types",
+        description: "Use inline enums instead of enum types",
         default: false
+      },
+      header: {
+        type: [String],
+        alias: "H",
+        description: 'HTTP header as key=value (e.g., -H "x-api-key: your-key"). Used only when generating code.',
+        default: []
       }
     }
   });
@@ -56,13 +71,14 @@ const getCliConfig = () => {
     output: argv._.output ?? null,
     name: argv.flags.name,
     parseDates: argv.flags.parseDates,
-    inlineEnums: argv.flags.inlineEnums
+    inlineEnums: argv.flags.inlineEnums,
+    headers: parseHeaders(argv.flags.header)
   };
   return config;
 };
 
 const unref = (ctx, s) => {
-  if (!s) return undefined;
+  if (!s) return void 0;
   if ("$ref" in s && s.$ref) {
     const parts = s.$ref.replace("#/", "").split("/");
     const obj = parts.reduce(
@@ -72,15 +88,15 @@ const unref = (ctx, s) => {
     );
     if (obj) return obj;
     console.warn(`${ctx.logTag} ref ${s.$ref} not found`);
-    return undefined;
+    return void 0;
   }
   return s;
 };
 const getReqSchema = (ctx, config) => {
   const req = unref(ctx, config.requestBody);
-  if (!req) return undefined;
+  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 undefined;
+  if (cts.length === 0) return void 0;
   const pretenders = [
     "application/json",
     "text/",
@@ -92,18 +108,18 @@ const getReqSchema = (ctx, config) => {
     if (ct) return ct;
   }
   cts.map((x) => x[0]);
-  return undefined;
+  return void 0;
 };
 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 undefined;
+  if (cts.length === 0) 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/"));
   if (ctText) return { type: "string" };
   cts.map((x) => x[0]).join(", ");
-  return undefined;
+  return void 0;
 };
 
 const f$2 = ts.factory;
@@ -179,9 +195,9 @@ const normalizeIdentifier = (val, asVar = false) => {
   return name;
 };
 const makeInlineEnum = (s) => {
-  if (!s.enum) return undefined;
+  if (!s.enum) return void 0;
   const values = arrayUtilsTs.filterEmpty(s.enum);
-  if (!values.length) return undefined;
+  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";
@@ -202,7 +218,7 @@ const makeInlineEnum = (s) => {
     return f$2.createUnionTypeNode(tokens.map((x) => f$2.createLiteralTypeNode(x)));
   }
   console.warn(`enum with unknown type "${s.type}" in`, s);
-  return undefined;
+  return void 0;
 };
 const makeObject = (ctx, s) => {
   if (s.type !== "object") throw new Error(`makeObject: not an object ${JSON.stringify(s)}`);
@@ -214,9 +230,15 @@ const makeObject = (ctx, s) => {
   }
   return f$2.createKeywordTypeNode(ts.SyntaxKind.ObjectKeyword);
 };
+const makeLiteralUnion = (ctx, types) => {
+  const tokens = types.map((x) => makeType(ctx, { type: x }));
+  const hasUnknown = tokens.some((x) => x.kind === ts.SyntaxKind.UnknownKeyword);
+  if (hasUnknown) return f$2.createKeywordTypeNode(ts.SyntaxKind.UnknownKeyword);
+  return f$2.createUnionTypeNode(tokens);
+};
 const makeType = (ctx, s) => {
   const mk = makeType.bind(null, ctx);
-  if (s === undefined) return f$2.createKeywordTypeNode(ts.SyntaxKind.VoidKeyword);
+  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("/");
@@ -240,28 +262,22 @@ const makeType = (ctx, s) => {
     return f$2.createTypeLiteralNode(
       Object.entries(s.properties).map(([k, v]) => {
         const r = s.required ?? [];
-        const q = r.includes(k) ? undefined : f$2.createToken(ts.SyntaxKind.QuestionToken);
-        return f$2.createPropertySignature(undefined, f$2.createStringLiteral(k), q, mk(v));
+        const q = r.includes(k) ? void 0 : f$2.createToken(ts.SyntaxKind.QuestionToken);
+        return f$2.createPropertySignature(void 0, f$2.createStringLiteral(k), q, mk(v));
       })
     );
   }
   if ("type" in 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 });
-      }
-      return mk({ oneOf: types });
-    }
     let t;
     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 (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 if (lodashEs.isArray(s.type)) t = makeLiteralUnion(ctx, s.type);
+    else if (s.type === "array" && isPrefixItems(s) && s.prefixItems && !s.items)
+      t = f$2.createTupleTypeNode(s.prefixItems.map(mk));
+    else if (s.type === "array" && !lodashEs.isBoolean(s.items)) t = f$2.createArrayTypeNode(mk(s.items));
     else {
       console.warn(`makeType: unknown type "${s.type}"`);
       return f$2.createKeywordTypeNode(ts.SyntaxKind.UnknownKeyword);
@@ -270,7 +286,10 @@ const makeType = (ctx, s) => {
       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;
+    if ("nullable" in s && s.nullable) {
+      return f$2.createUnionTypeNode([t, f$2.createLiteralTypeNode(f$2.createNull())]);
+    }
+    return t;
   }
   return f$2.createKeywordTypeNode(ts.SyntaxKind.UnknownKeyword);
 };
@@ -280,6 +299,9 @@ const isStringEnum = (s) => {
   }
   return false;
 };
+const isPrefixItems = (s) => {
+  return s.prefixItems !== void 0;
+};
 const makeTypeAlias = (ctx, name, s) => {
   if (isStringEnum(s) && !ctx.inlineEnums) {
     const tokens1 = lodashEs.uniq(s.enum);
@@ -298,7 +320,7 @@ const makeTypeAlias = (ctx, name, s) => {
   return f$2.createTypeAliasDeclaration(
     [f$2.createToken(ts.SyntaxKind.ExportKeyword)],
     f$2.createIdentifier(normalizeIdentifier(name, true)),
-    undefined,
+    void 0,
     makeType(ctx, s)
   );
 };
@@ -327,7 +349,7 @@ const getOpName = (ctx, op) => {
   if (ctx.resolveName) {
     const res = ctx.resolveName(ctx, op, proposal);
     if (Array.isArray(res) && res.length === 2) return res;
-    if (res !== undefined) {
+    if (res !== void 0) {
       console.warn(`${ctx.logTag} resolveName should return [ns, fn] or undefined (skipping)`);
     }
   }
@@ -369,10 +391,10 @@ const prepareOp = (ctx, cfg, opName) => {
     const name = normalizeIdentifier(x.name, true);
     const type = makeType(ctx, x.schema);
     urlReplacements[x.name] = name;
-    return f$1.createParameterDeclaration(undefined, undefined, name, undefined, type);
+    return f$1.createParameterDeclaration(void 0, void 0, name, void 0, type);
   });
   const cbArgs = arrayUtilsTs.filterNullable([
-    search.length ? f$1.createShorthandPropertyAssignment("search") : undefined,
+    search.length ? f$1.createShorthandPropertyAssignment("search") : void 0,
     reqSchema && f$1.createShorthandPropertyAssignment("body"),
     reqSchema && reqSchema[0] !== "application/json" ? f$1.createPropertyAssignment(
       "headers",
@@ -382,16 +404,16 @@ const prepareOp = (ctx, cfg, opName) => {
           f$1.createStringLiteral(reqSchema[0])
         )
       ])
-    ) : undefined
+    ) : void 0
   ]);
   return f$1.createPropertyAssignment(
     f$1.createIdentifier(normalizeIdentifier(opName)),
     f$1.createArrowFunction(
-      undefined,
-      undefined,
+      void 0,
+      void 0,
       fnArgs,
-      undefined,
-      undefined,
+      void 0,
+      void 0,
       f$1.createBlock([
         f$1.createReturnStatement(
           f$1.createCallExpression(
@@ -413,10 +435,10 @@ const prepareOp = (ctx, cfg, opName) => {
 };
 const prepareNs = (ctx, name, handlers) => {
   return f$1.createPropertyDeclaration(
-    undefined,
+    void 0,
     normalizeIdentifier(name),
-    undefined,
-    undefined,
+    void 0,
+    void 0,
     f$1.createObjectLiteralExpression(handlers)
   );
 };
@@ -476,12 +498,23 @@ const generateAst = async (ctx) => {
   }
   return { modules, types };
 };
-const loadSchema = async (url, upgrade = true) => {
+const loadSchema = async ({
+  url,
+  upgrade = true,
+  headers = {}
+}) => {
   if (url.startsWith("file://")) url = url.substring(7);
   const { bundle } = await redocly.bundle({
     ref: url,
     config: await redocly.createConfig({}),
-    removeUnusedComponents: false
+    removeUnusedComponents: false,
+    externalRefResolver: new redocly.BaseResolver({
+      http: {
+        headers: Object.entries(headers).map(([name, value]) => {
+          return { name, value, matches: "**" };
+        })
+      }
+    })
   });
   if (bundle.parsed.swagger && upgrade) {
     const { openapi } = await swagger2openapi.convertObj(bundle.parsed, { patch: true });
@@ -519,10 +552,10 @@ const formatCode = async (code) => {
 };
 
 const apigen = async (config) => {
-  const doc = await loadSchema(config.source);
+  const doc = await loadSchema({ url: config.source, headers: config.headers });
   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.tagName.toUpperCase() === 'SCRIPT' && _documentCurrentScript.src || new URL('main-B2qgp9dv.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.tagName.toUpperCase() === 'SCRIPT' && _documentCurrentScript.src || new URL('main-BLaUzCCM.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-BvB08bJo.js → main-BZrWxHPM.js}

@@ -2,15 +2,15 @@ import fs from 'fs/promises';
 import { join, dirname } from 'path';
 import { fileURLToPath } from 'url';
 import { cli } from 'cleye';
-import redocly from '@redocly/openapi-core';
+import redocly, { BaseResolver } from '@redocly/openapi-core';
 import { filterEmpty, filterNullable } from 'array-utils-ts';
-import { get, uniq, upperFirst, isArray, isBoolean, isObject, sortBy, lowerFirst, uniqBy } from 'lodash-es';
+import { get, uniq, upperFirst, isArray, isBoolean, 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.1.0";
+var version = "1.2.1";
 
 const initCtx = (config) => {
   return {
@@ -20,11 +20,20 @@ const initCtx = (config) => {
     doc: { openapi: "3.1.0" },
     parseDates: false,
     inlineEnums: false,
+    headers: {},
     ...config,
     logTag: "",
     usedNames: /* @__PURE__ */ new Set()
   };
 };
+const parseHeaders = (items) => {
+  const headers = {};
+  for (const item of items) {
+    const [key, val] = item.split(":");
+    if (key && val) headers[key.trim()] = val.trim();
+  }
+  return headers;
+};
 const getCliConfig = () => {
   const argv = cli({
     name,
@@ -33,18 +42,24 @@ const getCliConfig = () => {
     flags: {
       name: {
         type: String,
-        description: "api class name to export",
+        description: "API class name to export",
         default: "ApiClient"
       },
       parseDates: {
         type: Boolean,
-        description: "parse dates as Date objects",
+        description: "Parse dates as Date objects",
         default: false
       },
       inlineEnums: {
         type: Boolean,
-        description: "use inline enums instead of enum types",
+        description: "Use inline enums instead of enum types",
         default: false
+      },
+      header: {
+        type: [String],
+        alias: "H",
+        description: 'HTTP header as key=value (e.g., -H "x-api-key: your-key"). Used only when generating code.',
+        default: []
       }
     }
   });
@@ -53,13 +68,14 @@ const getCliConfig = () => {
     output: argv._.output ?? null,
     name: argv.flags.name,
     parseDates: argv.flags.parseDates,
-    inlineEnums: argv.flags.inlineEnums
+    inlineEnums: argv.flags.inlineEnums,
+    headers: parseHeaders(argv.flags.header)
   };
   return config;
 };
 
 const unref = (ctx, s) => {
-  if (!s) return undefined;
+  if (!s) return void 0;
   if ("$ref" in s && s.$ref) {
     const parts = s.$ref.replace("#/", "").split("/");
     const obj = parts.reduce(
@@ -69,15 +85,15 @@ const unref = (ctx, s) => {
     );
     if (obj) return obj;
     console.warn(`${ctx.logTag} ref ${s.$ref} not found`);
-    return undefined;
+    return void 0;
   }
   return s;
 };
 const getReqSchema = (ctx, config) => {
   const req = unref(ctx, config.requestBody);
-  if (!req) return undefined;
+  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 undefined;
+  if (cts.length === 0) return void 0;
   const pretenders = [
     "application/json",
     "text/",
@@ -89,18 +105,18 @@ const getReqSchema = (ctx, config) => {
     if (ct) return ct;
   }
   cts.map((x) => x[0]);
-  return undefined;
+  return void 0;
 };
 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 undefined;
+  if (cts.length === 0) 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/"));
   if (ctText) return { type: "string" };
   cts.map((x) => x[0]).join(", ");
-  return undefined;
+  return void 0;
 };
 
 const f$2 = ts.factory;
@@ -176,9 +192,9 @@ const normalizeIdentifier = (val, asVar = false) => {
   return name;
 };
 const makeInlineEnum = (s) => {
-  if (!s.enum) return undefined;
+  if (!s.enum) return void 0;
   const values = filterEmpty(s.enum);
-  if (!values.length) return undefined;
+  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";
@@ -199,7 +215,7 @@ const makeInlineEnum = (s) => {
     return f$2.createUnionTypeNode(tokens.map((x) => f$2.createLiteralTypeNode(x)));
   }
   console.warn(`enum with unknown type "${s.type}" in`, s);
-  return undefined;
+  return void 0;
 };
 const makeObject = (ctx, s) => {
   if (s.type !== "object") throw new Error(`makeObject: not an object ${JSON.stringify(s)}`);
@@ -211,9 +227,15 @@ const makeObject = (ctx, s) => {
   }
   return f$2.createKeywordTypeNode(ts.SyntaxKind.ObjectKeyword);
 };
+const makeLiteralUnion = (ctx, types) => {
+  const tokens = types.map((x) => makeType(ctx, { type: x }));
+  const hasUnknown = tokens.some((x) => x.kind === ts.SyntaxKind.UnknownKeyword);
+  if (hasUnknown) return f$2.createKeywordTypeNode(ts.SyntaxKind.UnknownKeyword);
+  return f$2.createUnionTypeNode(tokens);
+};
 const makeType = (ctx, s) => {
   const mk = makeType.bind(null, ctx);
-  if (s === undefined) return f$2.createKeywordTypeNode(ts.SyntaxKind.VoidKeyword);
+  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("/");
@@ -237,28 +259,22 @@ const makeType = (ctx, s) => {
     return f$2.createTypeLiteralNode(
       Object.entries(s.properties).map(([k, v]) => {
         const r = s.required ?? [];
-        const q = r.includes(k) ? undefined : f$2.createToken(ts.SyntaxKind.QuestionToken);
-        return f$2.createPropertySignature(undefined, f$2.createStringLiteral(k), q, mk(v));
+        const q = r.includes(k) ? void 0 : f$2.createToken(ts.SyntaxKind.QuestionToken);
+        return f$2.createPropertySignature(void 0, f$2.createStringLiteral(k), q, mk(v));
       })
     );
   }
   if ("type" in 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 });
-      }
-      return mk({ oneOf: types });
-    }
     let t;
     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 (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 if (isArray(s.type)) t = makeLiteralUnion(ctx, s.type);
+    else if (s.type === "array" && isPrefixItems(s) && s.prefixItems && !s.items)
+      t = f$2.createTupleTypeNode(s.prefixItems.map(mk));
+    else if (s.type === "array" && !isBoolean(s.items)) t = f$2.createArrayTypeNode(mk(s.items));
     else {
       console.warn(`makeType: unknown type "${s.type}"`);
       return f$2.createKeywordTypeNode(ts.SyntaxKind.UnknownKeyword);
@@ -267,7 +283,10 @@ const makeType = (ctx, s) => {
       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;
+    if ("nullable" in s && s.nullable) {
+      return f$2.createUnionTypeNode([t, f$2.createLiteralTypeNode(f$2.createNull())]);
+    }
+    return t;
   }
   return f$2.createKeywordTypeNode(ts.SyntaxKind.UnknownKeyword);
 };
@@ -277,6 +296,9 @@ const isStringEnum = (s) => {
   }
   return false;
 };
+const isPrefixItems = (s) => {
+  return s.prefixItems !== void 0;
+};
 const makeTypeAlias = (ctx, name, s) => {
   if (isStringEnum(s) && !ctx.inlineEnums) {
     const tokens1 = uniq(s.enum);
@@ -295,7 +317,7 @@ const makeTypeAlias = (ctx, name, s) => {
   return f$2.createTypeAliasDeclaration(
     [f$2.createToken(ts.SyntaxKind.ExportKeyword)],
     f$2.createIdentifier(normalizeIdentifier(name, true)),
-    undefined,
+    void 0,
     makeType(ctx, s)
   );
 };
@@ -324,7 +346,7 @@ const getOpName = (ctx, op) => {
   if (ctx.resolveName) {
     const res = ctx.resolveName(ctx, op, proposal);
     if (Array.isArray(res) && res.length === 2) return res;
-    if (res !== undefined) {
+    if (res !== void 0) {
       console.warn(`${ctx.logTag} resolveName should return [ns, fn] or undefined (skipping)`);
     }
   }
@@ -366,10 +388,10 @@ const prepareOp = (ctx, cfg, opName) => {
     const name = normalizeIdentifier(x.name, true);
     const type = makeType(ctx, x.schema);
     urlReplacements[x.name] = name;
-    return f$1.createParameterDeclaration(undefined, undefined, name, undefined, type);
+    return f$1.createParameterDeclaration(void 0, void 0, name, void 0, type);
   });
   const cbArgs = filterNullable([
-    search.length ? f$1.createShorthandPropertyAssignment("search") : undefined,
+    search.length ? f$1.createShorthandPropertyAssignment("search") : void 0,
     reqSchema && f$1.createShorthandPropertyAssignment("body"),
     reqSchema && reqSchema[0] !== "application/json" ? f$1.createPropertyAssignment(
       "headers",
@@ -379,16 +401,16 @@ const prepareOp = (ctx, cfg, opName) => {
           f$1.createStringLiteral(reqSchema[0])
         )
       ])
-    ) : undefined
+    ) : void 0
   ]);
   return f$1.createPropertyAssignment(
     f$1.createIdentifier(normalizeIdentifier(opName)),
     f$1.createArrowFunction(
-      undefined,
-      undefined,
+      void 0,
+      void 0,
       fnArgs,
-      undefined,
-      undefined,
+      void 0,
+      void 0,
       f$1.createBlock([
         f$1.createReturnStatement(
           f$1.createCallExpression(
@@ -410,10 +432,10 @@ const prepareOp = (ctx, cfg, opName) => {
 };
 const prepareNs = (ctx, name, handlers) => {
   return f$1.createPropertyDeclaration(
-    undefined,
+    void 0,
     normalizeIdentifier(name),
-    undefined,
-    undefined,
+    void 0,
+    void 0,
     f$1.createObjectLiteralExpression(handlers)
   );
 };
@@ -473,12 +495,23 @@ const generateAst = async (ctx) => {
   }
   return { modules, types };
 };
-const loadSchema = async (url, upgrade = true) => {
+const loadSchema = async ({
+  url,
+  upgrade = true,
+  headers = {}
+}) => {
   if (url.startsWith("file://")) url = url.substring(7);
   const { bundle } = await redocly.bundle({
     ref: url,
     config: await redocly.createConfig({}),
-    removeUnusedComponents: false
+    removeUnusedComponents: false,
+    externalRefResolver: new BaseResolver({
+      http: {
+        headers: Object.entries(headers).map(([name, value]) => {
+          return { name, value, matches: "**" };
+        })
+      }
+    })
   });
   if (bundle.parsed.swagger && upgrade) {
     const { openapi } = await convertObj(bundle.parsed, { patch: true });
@@ -516,7 +549,7 @@ const formatCode = async (code) => {
 };
 
 const apigen = async (config) => {
-  const doc = await loadSchema(config.source);
+  const doc = await loadSchema({ url: config.source, headers: config.headers });
   const ctx = initCtx({ ...config, doc });
   const { modules, types } = await generateAst(ctx);
   const filepath = join(dirname(fileURLToPath(import.meta.url)), "_template.ts");

package/dist/{main-BvB08bJo.mjs → main-BZrWxHPM.mjs}

@@ -2,15 +2,15 @@ import fs from 'fs/promises';
 import { join, dirname } from 'path';
 import { fileURLToPath } from 'url';
 import { cli } from 'cleye';
-import redocly from '@redocly/openapi-core';
+import redocly, { BaseResolver } from '@redocly/openapi-core';
 import { filterEmpty, filterNullable } from 'array-utils-ts';
-import { get, uniq, upperFirst, isArray, isBoolean, isObject, sortBy, lowerFirst, uniqBy } from 'lodash-es';
+import { get, uniq, upperFirst, isArray, isBoolean, 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.1.0";
+var version = "1.2.1";
 
 const initCtx = (config) => {
   return {
@@ -20,11 +20,20 @@ const initCtx = (config) => {
     doc: { openapi: "3.1.0" },
     parseDates: false,
     inlineEnums: false,
+    headers: {},
     ...config,
     logTag: "",
     usedNames: /* @__PURE__ */ new Set()
   };
 };
+const parseHeaders = (items) => {
+  const headers = {};
+  for (const item of items) {
+    const [key, val] = item.split(":");
+    if (key && val) headers[key.trim()] = val.trim();
+  }
+  return headers;
+};
 const getCliConfig = () => {
   const argv = cli({
     name,
@@ -33,18 +42,24 @@ const getCliConfig = () => {
     flags: {
       name: {
         type: String,
-        description: "api class name to export",
+        description: "API class name to export",
         default: "ApiClient"
       },
       parseDates: {
         type: Boolean,
-        description: "parse dates as Date objects",
+        description: "Parse dates as Date objects",
         default: false
       },
       inlineEnums: {
         type: Boolean,
-        description: "use inline enums instead of enum types",
+        description: "Use inline enums instead of enum types",
         default: false
+      },
+      header: {
+        type: [String],
+        alias: "H",
+        description: 'HTTP header as key=value (e.g., -H "x-api-key: your-key"). Used only when generating code.',
+        default: []
       }
     }
   });
@@ -53,13 +68,14 @@ const getCliConfig = () => {
     output: argv._.output ?? null,
     name: argv.flags.name,
     parseDates: argv.flags.parseDates,
-    inlineEnums: argv.flags.inlineEnums
+    inlineEnums: argv.flags.inlineEnums,
+    headers: parseHeaders(argv.flags.header)
   };
   return config;
 };
 
 const unref = (ctx, s) => {
-  if (!s) return undefined;
+  if (!s) return void 0;
   if ("$ref" in s && s.$ref) {
     const parts = s.$ref.replace("#/", "").split("/");
     const obj = parts.reduce(
@@ -69,15 +85,15 @@ const unref = (ctx, s) => {
     );
     if (obj) return obj;
     console.warn(`${ctx.logTag} ref ${s.$ref} not found`);
-    return undefined;
+    return void 0;
   }
   return s;
 };
 const getReqSchema = (ctx, config) => {
   const req = unref(ctx, config.requestBody);
-  if (!req) return undefined;
+  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 undefined;
+  if (cts.length === 0) return void 0;
   const pretenders = [
     "application/json",
     "text/",
@@ -89,18 +105,18 @@ const getReqSchema = (ctx, config) => {
     if (ct) return ct;
   }
   cts.map((x) => x[0]);
-  return undefined;
+  return void 0;
 };
 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 undefined;
+  if (cts.length === 0) 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/"));
   if (ctText) return { type: "string" };
   cts.map((x) => x[0]).join(", ");
-  return undefined;
+  return void 0;
 };
 
 const f$2 = ts.factory;
@@ -176,9 +192,9 @@ const normalizeIdentifier = (val, asVar = false) => {
   return name;
 };
 const makeInlineEnum = (s) => {
-  if (!s.enum) return undefined;
+  if (!s.enum) return void 0;
   const values = filterEmpty(s.enum);
-  if (!values.length) return undefined;
+  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";
@@ -199,7 +215,7 @@ const makeInlineEnum = (s) => {
     return f$2.createUnionTypeNode(tokens.map((x) => f$2.createLiteralTypeNode(x)));
   }
   console.warn(`enum with unknown type "${s.type}" in`, s);
-  return undefined;
+  return void 0;
 };
 const makeObject = (ctx, s) => {
   if (s.type !== "object") throw new Error(`makeObject: not an object ${JSON.stringify(s)}`);
@@ -211,9 +227,15 @@ const makeObject = (ctx, s) => {
   }
   return f$2.createKeywordTypeNode(ts.SyntaxKind.ObjectKeyword);
 };
+const makeLiteralUnion = (ctx, types) => {
+  const tokens = types.map((x) => makeType(ctx, { type: x }));
+  const hasUnknown = tokens.some((x) => x.kind === ts.SyntaxKind.UnknownKeyword);
+  if (hasUnknown) return f$2.createKeywordTypeNode(ts.SyntaxKind.UnknownKeyword);
+  return f$2.createUnionTypeNode(tokens);
+};
 const makeType = (ctx, s) => {
   const mk = makeType.bind(null, ctx);
-  if (s === undefined) return f$2.createKeywordTypeNode(ts.SyntaxKind.VoidKeyword);
+  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("/");
@@ -237,28 +259,22 @@ const makeType = (ctx, s) => {
     return f$2.createTypeLiteralNode(
       Object.entries(s.properties).map(([k, v]) => {
         const r = s.required ?? [];
-        const q = r.includes(k) ? undefined : f$2.createToken(ts.SyntaxKind.QuestionToken);
-        return f$2.createPropertySignature(undefined, f$2.createStringLiteral(k), q, mk(v));
+        const q = r.includes(k) ? void 0 : f$2.createToken(ts.SyntaxKind.QuestionToken);
+        return f$2.createPropertySignature(void 0, f$2.createStringLiteral(k), q, mk(v));
       })
     );
   }
   if ("type" in 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 });
-      }
-      return mk({ oneOf: types });
-    }
     let t;
     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 (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 if (isArray(s.type)) t = makeLiteralUnion(ctx, s.type);
+    else if (s.type === "array" && isPrefixItems(s) && s.prefixItems && !s.items)
+      t = f$2.createTupleTypeNode(s.prefixItems.map(mk));
+    else if (s.type === "array" && !isBoolean(s.items)) t = f$2.createArrayTypeNode(mk(s.items));
     else {
       console.warn(`makeType: unknown type "${s.type}"`);
       return f$2.createKeywordTypeNode(ts.SyntaxKind.UnknownKeyword);
@@ -267,7 +283,10 @@ const makeType = (ctx, s) => {
       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;
+    if ("nullable" in s && s.nullable) {
+      return f$2.createUnionTypeNode([t, f$2.createLiteralTypeNode(f$2.createNull())]);
+    }
+    return t;
   }
   return f$2.createKeywordTypeNode(ts.SyntaxKind.UnknownKeyword);
 };
@@ -277,6 +296,9 @@ const isStringEnum = (s) => {
   }
   return false;
 };
+const isPrefixItems = (s) => {
+  return s.prefixItems !== void 0;
+};
 const makeTypeAlias = (ctx, name, s) => {
   if (isStringEnum(s) && !ctx.inlineEnums) {
     const tokens1 = uniq(s.enum);
@@ -295,7 +317,7 @@ const makeTypeAlias = (ctx, name, s) => {
   return f$2.createTypeAliasDeclaration(
     [f$2.createToken(ts.SyntaxKind.ExportKeyword)],
     f$2.createIdentifier(normalizeIdentifier(name, true)),
-    undefined,
+    void 0,
     makeType(ctx, s)
   );
 };
@@ -324,7 +346,7 @@ const getOpName = (ctx, op) => {
   if (ctx.resolveName) {
     const res = ctx.resolveName(ctx, op, proposal);
     if (Array.isArray(res) && res.length === 2) return res;
-    if (res !== undefined) {
+    if (res !== void 0) {
       console.warn(`${ctx.logTag} resolveName should return [ns, fn] or undefined (skipping)`);
     }
   }
@@ -366,10 +388,10 @@ const prepareOp = (ctx, cfg, opName) => {
     const name = normalizeIdentifier(x.name, true);
     const type = makeType(ctx, x.schema);
     urlReplacements[x.name] = name;
-    return f$1.createParameterDeclaration(undefined, undefined, name, undefined, type);
+    return f$1.createParameterDeclaration(void 0, void 0, name, void 0, type);
   });
   const cbArgs = filterNullable([
-    search.length ? f$1.createShorthandPropertyAssignment("search") : undefined,
+    search.length ? f$1.createShorthandPropertyAssignment("search") : void 0,
     reqSchema && f$1.createShorthandPropertyAssignment("body"),
     reqSchema && reqSchema[0] !== "application/json" ? f$1.createPropertyAssignment(
       "headers",
@@ -379,16 +401,16 @@ const prepareOp = (ctx, cfg, opName) => {
           f$1.createStringLiteral(reqSchema[0])
         )
       ])
-    ) : undefined
+    ) : void 0
   ]);
   return f$1.createPropertyAssignment(
     f$1.createIdentifier(normalizeIdentifier(opName)),
     f$1.createArrowFunction(
-      undefined,
-      undefined,
+      void 0,
+      void 0,
       fnArgs,
-      undefined,
-      undefined,
+      void 0,
+      void 0,
       f$1.createBlock([
         f$1.createReturnStatement(
           f$1.createCallExpression(
@@ -410,10 +432,10 @@ const prepareOp = (ctx, cfg, opName) => {
 };
 const prepareNs = (ctx, name, handlers) => {
   return f$1.createPropertyDeclaration(
-    undefined,
+    void 0,
     normalizeIdentifier(name),
-    undefined,
-    undefined,
+    void 0,
+    void 0,
     f$1.createObjectLiteralExpression(handlers)
   );
 };
@@ -473,12 +495,23 @@ const generateAst = async (ctx) => {
   }
   return { modules, types };
 };
-const loadSchema = async (url, upgrade = true) => {
+const loadSchema = async ({
+  url,
+  upgrade = true,
+  headers = {}
+}) => {
   if (url.startsWith("file://")) url = url.substring(7);
   const { bundle } = await redocly.bundle({
     ref: url,
     config: await redocly.createConfig({}),
-    removeUnusedComponents: false
+    removeUnusedComponents: false,
+    externalRefResolver: new BaseResolver({
+      http: {
+        headers: Object.entries(headers).map(([name, value]) => {
+          return { name, value, matches: "**" };
+        })
+      }
+    })
   });
   if (bundle.parsed.swagger && upgrade) {
     const { openapi } = await convertObj(bundle.parsed, { patch: true });
@@ -516,7 +549,7 @@ const formatCode = async (code) => {
 };
 
 const apigen = async (config) => {
-  const doc = await loadSchema(config.source);
+  const doc = await loadSchema({ url: config.source, headers: config.headers });
   const ctx = initCtx({ ...config, doc });
   const { modules, types } = await generateAst(ctx);
   const filepath = join(dirname(fileURLToPath(import.meta.url)), "_template.ts");

package/dist/main.cjs

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

package/dist/main.d.cts

@@ -13,6 +13,7 @@ type Config = {
     parseDates: boolean;
     inlineEnums: boolean;
     resolveName?: (ctx: Context, op: OpConfig, proposal: OpName) => OpName | undefined;
+    headers: Record<string, string>;
 };
 type Context = Config & {
     doc: Oas3Definition;

package/dist/main.d.mts

@@ -13,6 +13,7 @@ type Config = {
     parseDates: boolean;
     inlineEnums: boolean;
     resolveName?: (ctx: Context, op: OpConfig, proposal: OpName) => OpName | undefined;
+    headers: Record<string, string>;
 };
 type Context = Config & {
     doc: Oas3Definition;

package/dist/main.js

@@ -1,7 +1,7 @@
 import 'fs/promises';
 import 'path';
 import 'url';
-export { a as apigen } from './main-BvB08bJo.js';
+export { a as apigen } from './main-BZrWxHPM.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-BvB08bJo.mjs';
+export { a as apigen } from './main-BZrWxHPM.mjs';
 import 'cleye';
 import '@redocly/openapi-core';
 import 'array-utils-ts';

package/package.json

@@ -1,7 +1,7 @@
 {
   "type": "module",
   "name": "apigen-ts",
-  "version": "1.1.0",
+  "version": "1.2.1",
   "license": "MIT",
   "author": "vladkens <v.pronsky@gmail.com>",
   "repository": "vladkens/apigen-ts",
@@ -22,23 +22,23 @@
     "ci": "tsc --noEmit && yarn test-cov && yarn build"
   },
   "dependencies": {
-    "@redocly/openapi-core": "1.27.2",
+    "@redocly/openapi-core": "1.34.3",
     "@types/lodash-es": "4.17.12",
     "@types/swagger2openapi": "7.0.4",
     "array-utils-ts": "1.0.2",
-    "cleye": "1.3.2",
+    "cleye": "1.3.4",
     "lodash-es": "4.17.21",
     "swagger2openapi": "7.0.8"
   },
   "devDependencies": {
-    "@types/node": "22.10.7",
+    "@types/node": "22.15.18",
     "c8": "10.1.3",
-    "fetch-mock": "12.2.0",
-    "pkgroll": "2.6.1",
-    "prettier": "3.4.2",
+    "fetch-mock": "12.5.2",
+    "pkgroll": "2.12.2",
+    "prettier": "3.5.3",
     "prettier-plugin-organize-imports": "4.1.0",
     "tsm": "2.3.0",
-    "typescript": "5.7.3",
+    "typescript": "5.8.3",
     "uvu": "0.5.6"
   },
   "peerDependencies": {

package/readme.md

@@ -2,17 +2,16 @@
 
 <div align="center">
 
-[<img src="https://badgen.net/npm/v/apigen-ts" alt="version" />](https://npmjs.org/package/apigen-ts)
-[<img src="https://badgen.net/packagephobia/publish/apigen-ts" alt="size" />](https://packagephobia.now.sh/result?p=apigen-ts)
-[<img src="https://badgen.net/npm/dm/apigen-ts" alt="downloads" />](https://npmjs.org/package/apigen-ts)
-[<img src="https://badgen.net/github/license/vladkens/apigen-ts" alt="license" />](https://github.com/vladkens/apigen-ts/blob/main/LICENSE)
-[<img src="https://badgen.net/static/-/buy%20me%20a%20coffee/ff813f?icon=buymeacoffee&label" alt="donate" />](https://buymeacoffee.com/vladkens)
+[<img src="https://badges.ws/npm/v/apigen-ts" alt="version" />](https://npmjs.org/package/apigen-ts)
+[<img src="https://badges.ws/packagephobia/publish/apigen-ts" alt="size" />](https://packagephobia.now.sh/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)
 
 </div>
 
 <div align="center">
   <img src="./logo.svg" alt="apigen-ts logo" height="80" />
-  <div>Simple typed OpenAPI client generator</div>
 </div>
 
 ## Features
@@ -29,7 +28,11 @@
 ## Install
 
 ```sh
-yarn install -D apigen-ts
+npm install apigen-ts --save-dev
+```
+
+```sh
+yarn add -D apigen-ts
 ```
 
 ## Usage
@@ -37,14 +40,17 @@ yarn install -D apigen-ts
 ### 1. Generate
 
 ```sh
+# From file
+npx apigen-ts ./openapi.json ./api-client.ts
+
 # From url
-yarn apigen-ts https://petstore3.swagger.io/api/v3/openapi.json ./api-client.ts
+npx apigen-ts https://petstore3.swagger.io/api/v3/openapi.json ./api-client.ts
 
-# From file
-yarn apigen-ts ./openapi.json ./api-client.ts
+# From protected url
+npx apigen-ts https://secret-api.example.com ./api-client.ts -H "x-api-key: secret-key"
 ```
 
-Run `yarn apigen-ts --help` for more options. Examples of generated clients [here](./examples/).
+Run `npx apigen-ts --help` for more options. Examples of generated clients [here](./examples/).
 
 ### 2. Import
 
@@ -84,7 +90,7 @@ await api.protectedRoute.get() // here authenticated
 ### Automatic date parsing
 
 ```sh
-yarn apigen-ts ./openapi.json ./api-client.ts --parse-dates
+npx apigen-ts ./openapi.json ./api-client.ts --parse-dates
 ```
 
 ```ts
@@ -97,7 +103,7 @@ const createdAt: Date = pet.createdAt // date parsed from string with format=dat
 You can generate string literal union instead of native enums in case you want to run in Node.js environment with [type-stripping](https://nodejs.org/api/typescript.html#type-stripping). To achive this pass `--inline-enums` command line argument or use `inlineEnums: true` in Node.js API.
 
 ```sh
-yarn apigen-ts ./openapi.json ./api-client.ts --inline-enums
+npx apigen-ts ./openapi.json ./api-client.ts --inline-enums
 ```
 
 This will generate:
@@ -177,6 +183,7 @@ await apigen({
   name: "MyApiClient", // default "ApiClient"
   parseDates: true, // default false
   inlineEnums: false, // default false, use string literal union instead of enum
+  headers: { "x-api-key": "secret-key" }, // Custom HTTP headers to use when fetching schema
   resolveName(ctx, op, proposal) {
     // proposal is [string, string] which represents module.funcName
     if (proposal[0] === "users") return // will use default proposal