swaggie 1.9.0 → 2.0.0

package/dist/gen/genTypes.js

@@ -204,8 +204,9 @@ function generateItemsType(schema, options) {
 function renderExtendedEnumType(name, def) {
   const isString = def.type === 'string';
   let res = `export enum ${name} {\n`;
-  const enumNames = _nullishCoalesce(def['x-enumNames'], () => ( def['x-enum-varnames']));
-  const enumValues = def.enum.map((el) => (isString ? `"${el}"` : el));
+  const defAny = def ;
+  const enumNames = _nullishCoalesce(_nullishCoalesce(defAny['x-enumNames'], () => ( defAny['x-enum-varnames'])), () => ( []));
+  const enumValues = (_nullishCoalesce(def.enum, () => ( []))).map((el) => (isString ? `"${el}"` : el));
 
   for (let index = 0; index < enumNames.length; index++) {
     res += `  ${_utils.escapePropName.call(void 0, enumNames[index])} = ${enumValues[index]},\n`;
@@ -221,7 +222,7 @@ function renderEnumType(name, def, options) {
     return renderStringEnumDeclaration(name, def, options);
   }
 
-  const values = def.enum.map((v) => (typeof v === 'number' ? v : `"${v}"`)).join(' | ');
+  const values = (_nullishCoalesce(def.enum, () => ( []))).map((v) => (typeof v === 'number' ? v : `"${v}"`)).join(' | ');
   return `export type ${name} = ${values};\n`;
 }
 
@@ -272,7 +273,7 @@ function toPascalCase(value) {
  */
 function renderOpenApi31Enum(name, def) {
   let res = `export enum ${name} {\n`;
-  for (const v of def.oneOf) {
+  for (const v of _nullishCoalesce(def.oneOf, () => ( []))) {
     if ('const' in v) {
       res += `  ${_utils.escapePropName.call(void 0, v.title)} = ${
         typeof v.const === 'string' ? `"${v.const}"` : v.const
@@ -383,7 +384,7 @@ function getMergedCompositeObjects(schema) {
 }
 
 function isObject(item) {
-  return item && typeof item === 'object' && !Array.isArray(item);
+  return !!item && typeof item === 'object' && !Array.isArray(item);
 }
 function deepMerge(target, ...sources) {
   if (!sources.length) return target;

package/dist/gen/header.js

@@ -3,7 +3,6 @@
  * regardless of generation mode.
  */
  const FILE_HEADER =
-  '/* istanbul ignore file -- auto-generated code */\n' +
   '/* tslint:disable */\n' +
   '/* eslint-disable */\n' +
   '//----------------------\n' +

package/dist/gen/index.js

@@ -1,6 +1,7 @@
 "use strict";Object.defineProperty(exports, "__esModule", {value: true}); function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } function _createNamedExportFrom(obj, localName, importedName) { Object.defineProperty(exports, localName, {enumerable: true, configurable: true, get: () => obj[importedName]}); }
 
 var _genOperations = require('./genOperations'); var _genOperations2 = _interopRequireDefault(_genOperations);
+var _genMocks = require('./genMocks'); var _genMocks2 = _interopRequireDefault(_genMocks);
 var _genTypes = require('./genTypes'); var _genTypes2 = _interopRequireDefault(_genTypes);
 var _header = require('./header'); _createNamedExportFrom(_header, 'FILE_HEADER', 'FILE_HEADER');
 var _utils = require('../utils');
@@ -23,7 +24,19 @@ var _utils = require('../utils');
 
   if (options.out) {
     const destFile = _utils.prepareOutputFilename.call(void 0, options.out);
-    await _utils.saveFile.call(void 0, destFile, fileContents);
+    if (destFile) {
+      await _utils.saveFile.call(void 0, destFile, fileContents);
+    }
+  }
+
+  if (options.mocks && options.testingFramework && options.out) {
+    const resolvedMocksPath = _utils.prepareOutputFilename.call(void 0, options.mocks);
+    const resolvedOutPath = _utils.prepareOutputFilename.call(void 0, options.out);
+    if (resolvedMocksPath && resolvedOutPath) {
+      const relativeApiImport = _utils.deriveRelativeImport.call(void 0, resolvedMocksPath, resolvedOutPath);
+      const mockContents = _genMocks2.default.call(void 0, spec, options, relativeApiImport);
+      await _utils.saveFile.call(void 0, resolvedMocksPath, mockContents);
+    }
   }
 
   return fileContents;

package/dist/generated/bundledTemplates.js

@@ -6,45 +6,43 @@
     "barrel.ejs": "\n/**\n * Serializes a params object into a query string that is compatible with different REST APIs.\n * Implementation from: https://github.com/suhaotian/xior/blob/main/src/utils.ts\n * Kudos to @suhaotian for the original implementation\n */\nfunction encodeParams<T = any>(\n  params: T,\n  parentKey: string | null = null,\n  options?: {\n    allowDots?: boolean;\n    serializeDate?: (value: Date) => string;\n    arrayFormat?: 'indices' | 'repeat' | 'brackets';\n  }\n): string {\n  if (params === undefined || params === null) return '';\n  const encodedParams: string[] = [];\n  const paramsIsArray = Array.isArray(params);\n  const { arrayFormat, allowDots, serializeDate } = options || {};\n\n  const getKey = (key: string) => {\n    if (allowDots && !paramsIsArray) return `.${key}`;\n    if (paramsIsArray) {\n      if (arrayFormat === 'brackets') {\n        return '[]';\n      }\n      if (arrayFormat === 'repeat') {\n        return '';\n      }\n    }\n    return `[${key}]`;\n  };\n\n  for (const key in params) {\n    if (Object.prototype.hasOwnProperty.call(params, key)) {\n      let value = (params as any)[key];\n      if (value !== undefined) {\n        const encodedKey = parentKey ? `${parentKey}${getKey(key)}` : (key as string);\n\n        // biome-ignore lint/suspicious/noGlobalIsNan: <explanation>\n        if (!isNaN(value) && value instanceof Date) {\n          value = serializeDate ? serializeDate(value) : value.toISOString();\n        }\n        if (typeof value === 'object') {\n          // If the value is an object or array, recursively encode its contents\n          const result = encodeParams(value, encodedKey, options);\n          if (result !== '') encodedParams.push(result);\n        } else {\n          // Otherwise, encode the key-value pair\n          encodedParams.push(`${encodeURIComponent(encodedKey)}=${encodeURIComponent(value)}`);\n        }\n      }\n    }\n  }\n\n  return encodedParams.join('&');\n}\n\n",
     "baseClient.ejs": "import Axios, { type AxiosPromise, type AxiosRequestConfig } from \"axios\";\n\nexport const axios = Axios.create({\n  baseURL: '<%= it.baseUrl || '' %>',\n  paramsSerializer: (params: any) =>\n    encodeParams(params, null, {\n      allowDots: <%= it.allowDots %>,\n      arrayFormat: '<%= it.arrayFormat %>',\n    }),\n});\n\n",
     "client.ejs": "export const <%= it.camelCaseName %>Client = {\n  <% it.operations.forEach((operation) => { %>\n<%~ include('operation.ejs', operation); %>\n\n<% }); %>\n};\n\n",
-    "operation.ejs": "<%~ it.jsDocs %>\n\n  <%= it.name %>(<% it.parameters.forEach((parameter) => { %>\n<%= parameter.name %><%= parameter.skippable ? '?' : '' %>: <%~ parameter.type %> <%= parameter.optional ? (parameter.skippable ? '| null' : '| null | undefined') : '' %>,\n    <% }); %>\n$config?: AxiosRequestConfig\n  ): AxiosPromise<<%~ it.returnType %>> {\n    const url = `<%= it.url %>`;\n\n    return axios.request<<%~ it.returnType %>>({\n      url: url,\n      method: '<%= it.method %>',\n<% if(it.body) { %>\n<% if(it.body.contentType === 'urlencoded') { %>\n      data: new URLSearchParams(<%= it.body.name %> as any),\n<% } else { %>\n      data: <%= it.body.name %>,\n<% } %>\n<% } %>\n<% if(it.query && it.query.length > 0) { %>\n      params: {\n    <% it.query.forEach((parameter) => { %>\n    '<%= parameter.originalName %>': <%= parameter.name %>,\n    <% }); %>\n  },\n<% } %>\n<% if(it.headers && it.headers.length > 0) { %>\n      headers: {\n  <% it.headers.forEach((parameter) => { %>\n    <% if (parameter.value) { %>\n  '<%= parameter.originalName %>': '<%= parameter.value %>',\n    <% } else { %>\n  '<%= parameter.originalName %>': <%= parameter.name %>,\n    <% } %>\n  <% }); %>\n},\n<% } %>\n      ...$config,\n    });\n  },\n"
+    "operation.ejs": "<%~ it.jsDocs %>\n\n  <%= it.name %>(<% it.parameters.forEach((parameter) => { %>\n<%= parameter.name %><%= parameter.skippable ? '?' : '' %>: <%~ parameter.type %> <%= parameter.optional ? (parameter.skippable ? '| null' : '| null | undefined') : '' %>,\n    <% }); %>\n$config?: AxiosRequestConfig\n  ): AxiosPromise<<%~ it.returnType %>> {\n    const url = `<%= it.url %>`;\n\n    return axios.request<<%~ it.returnType %>>({\n      url: url,\n      method: '<%= it.method %>',\n<% if(it.body) { -%>\n<% if(it.body.contentType === 'urlencoded') { -%>\n      data: new URLSearchParams(<%= it.body.name %> as any),\n<% } else { -%>\n      data: <%= it.body.name %>,\n<% } -%>\n<% } -%>\n<% if(it.query && it.query.length > 0) { -%>\n      params: {\n<% it.query.forEach((parameter) => { -%>\n<% if (it.queryParamObject) { -%>\n        '<%= parameter.originalName %>': <%= it.queryParamObject.name %>?.<%= parameter.name %>,\n<% } else { -%>\n        '<%= parameter.originalName %>': <%= parameter.name %>,\n<% } -%>\n<% }); -%>\n      },\n<% } -%>\n<% if(it.headers && it.headers.length > 0) { -%>\n      headers: {\n<% it.headers.forEach((parameter) => { -%>\n<% if (parameter.value) { -%>\n        '<%= parameter.originalName %>': '<%= parameter.value %>',\n<% } else { -%>\n        '<%= parameter.originalName %>': <%= parameter.name %>,\n<% } -%>\n<% }); -%>\n      },\n<% } -%>\n      ...$config,\n    });\n  },\n"
   },
   "fetch": {
     "barrel.ejs": "\n/**\n * Serializes a params object into a query string that is compatible with different REST APIs.\n * Implementation from: https://github.com/suhaotian/xior/blob/main/src/utils.ts\n * Kudos to @suhaotian for the original implementation\n */\nfunction encodeParams<T = any>(\n  params: T,\n  parentKey: string | null = null,\n  options?: {\n    allowDots?: boolean;\n    serializeDate?: (value: Date) => string;\n    arrayFormat?: 'indices' | 'repeat' | 'brackets';\n  }\n): string {\n  if (params === undefined || params === null) return '';\n  const encodedParams: string[] = [];\n  const paramsIsArray = Array.isArray(params);\n  const { arrayFormat, allowDots, serializeDate } = options || {};\n\n  const getKey = (key: string) => {\n    if (allowDots && !paramsIsArray) return `.${key}`;\n    if (paramsIsArray) {\n      if (arrayFormat === 'brackets') {\n        return '[]';\n      }\n      if (arrayFormat === 'repeat') {\n        return '';\n      }\n    }\n    return `[${key}]`;\n  };\n\n  for (const key in params) {\n    if (Object.prototype.hasOwnProperty.call(params, key)) {\n      let value = (params as any)[key];\n      if (value !== undefined) {\n        const encodedKey = parentKey ? `${parentKey}${getKey(key)}` : (key as string);\n\n        // biome-ignore lint/suspicious/noGlobalIsNan: <explanation>\n        if (!isNaN(value) && value instanceof Date) {\n          value = serializeDate ? serializeDate(value) : value.toISOString();\n        }\n        if (typeof value === 'object') {\n          // If the value is an object or array, recursively encode its contents\n          const result = encodeParams(value, encodedKey, options);\n          if (result !== '') encodedParams.push(result);\n        } else {\n          // Otherwise, encode the key-value pair\n          encodedParams.push(`${encodeURIComponent(encodedKey)}=${encodeURIComponent(value)}`);\n        }\n      }\n    }\n  }\n\n  return encodedParams.join('&');\n}\n\n",
     "baseClient.ejs": "export const defaults = {\n  baseUrl: '<%= it.baseUrl || '' %>',\n  paramsSerializer: (params: any) =>\n    encodeParams(params, null, {\n      allowDots: <%= it.allowDots %>,\n      arrayFormat: '<%= it.arrayFormat %>',\n    }),\n};\n\n",
     "client.ejs": "export const <%= it.camelCaseName %>Client = {\n  <% it.operations.forEach((operation) => { %>\n<%~ include('operation.ejs', operation); %>\n\n<% }); %>\n};\n",
-    "operation.ejs": "<%~ it.jsDocs %>\n\n  <%= it.name %>(<% it.parameters.forEach((parameter) => { %>\n<%= parameter.name %><%= parameter.skippable ? '?' : '' %>: <%~ parameter.type %> <%= parameter.optional ? (parameter.skippable ? '| null' : '| null | undefined') : '' %>,\n    <% }); %>\n$config?: RequestInit\n  ): Promise<<%~ it.returnType %>> {\n    const url = `${defaults.baseUrl}<%= it.url %>?<%\n    if(it.query && it.query.length > 0) { %>${defaults.paramsSerializer({<%\n      it.query.forEach((parameter) => { %>\n'<%= parameter.originalName %>': <%= parameter.name %>,\n      <% }); %>})}<% } %>`;\n\n<% if(it.headers && it.headers.length > 0) { %>\n    const { headers: $configHeaders, ...$configRest } = $config ?? {};\n    const headers = new Headers({\n<% it.headers.forEach((parameter) => { %>\n<% if (parameter.value) { %>\n      '<%= parameter.originalName %>': '<%= parameter.value %>',\n<% } else { %>\n      '<%= parameter.originalName %>': <%= parameter.name %> ?? '',\n<% } %>\n<% }); %>\n    });\n    if ($configHeaders) {\n      new Headers($configHeaders).forEach((value, key) => headers.set(key, value));\n    }\n\n    return fetch(url, {\n      method: '<%= it.method %>',\n<% if(it.body) { %>\n<% if(it.body.contentType === 'json') { %>\n      body: JSON.stringify(<%= it.body.name %>),\n<% } else if(it.body.contentType === 'urlencoded') { %>\n      body: new URLSearchParams(<%= it.body.name %> as any),\n<% } else { %>\n      body: <%= it.body.name %>,\n<% } %>\n<% } %>\n      headers,\n      ...$configRest,\n    })\n<% } else { %>\n    return fetch(url, {\n      method: '<%= it.method %>',\n<% if(it.body) { %>\n<% if(it.body.contentType === 'json') { %>\n      body: JSON.stringify(<%= it.body.name %>),\n<% } else if(it.body.contentType === 'urlencoded') { %>\n      body: new URLSearchParams(<%= it.body.name %> as any),\n<% } else { %>\n      body: <%= it.body.name %>,\n<% } %>\n<% } %>\n      ...$config,\n    })\n<% } %>\n<% if(it.responseContentType === 'binary') { %>\n    .then((response) => response.blob() as Promise<<%~ it.returnType %>>);\n<% } else if(it.responseContentType === 'text') { %>\n    .then((response) => response.text() as Promise<<%~ it.returnType %>>);\n<% } else { %>\n    .then((response) => response.json() as Promise<<%~ it.returnType %>>);\n<% } %>\n  },\n"
+    "operation.ejs": "<%~ it.jsDocs %>\n\n  <%= it.name %>(<% it.parameters.forEach((parameter) => { %>\n<%= parameter.name %><%= parameter.skippable ? '?' : '' %>: <%~ parameter.type %> <%= parameter.optional ? (parameter.skippable ? '| null' : '| null | undefined') : '' %>,\n    <% }); %>\n$config?: RequestInit\n  ): Promise<<%~ it.returnType %>> {\n    const url = `${defaults.baseUrl}<%= it.url %>?<%\n    if(it.query && it.query.length > 0) { %>${defaults.paramsSerializer({<%\n      it.query.forEach((parameter) => { %>\n<% if (it.queryParamObject) { %>\n'<%= parameter.originalName %>': <%= it.queryParamObject.name %>?.<%= parameter.name %>,\n<% } else { %>\n'<%= parameter.originalName %>': <%= parameter.name %>,\n<% } %>\n      <% }); %>})}<% } %>`;\n\n<% if(it.headers && it.headers.length > 0) { %>\n    const { headers: $configHeaders, ...$configRest } = $config ?? {};\n    const headers = new Headers({\n<% it.headers.forEach((parameter) => { %>\n<% if (parameter.value) { %>\n      '<%= parameter.originalName %>': '<%= parameter.value %>',\n<% } else { %>\n      '<%= parameter.originalName %>': <%= parameter.name %> ?? '',\n<% } %>\n<% }); %>\n    });\n    if ($configHeaders) {\n      new Headers($configHeaders).forEach((value, key) => headers.set(key, value));\n    }\n\n    return fetch(url, {\n      method: '<%= it.method %>',\n<% if(it.body) { %>\n<% if(it.body.contentType === 'json') { %>\n      body: JSON.stringify(<%= it.body.name %>),\n<% } else if(it.body.contentType === 'urlencoded') { %>\n      body: new URLSearchParams(<%= it.body.name %> as any),\n<% } else { %>\n      body: <%= it.body.name %>,\n<% } %>\n<% } %>\n      headers,\n      ...$configRest,\n    })\n<% } else { %>\n    return fetch(url, {\n      method: '<%= it.method %>',\n<% if(it.body) { %>\n<% if(it.body.contentType === 'json') { %>\n      body: JSON.stringify(<%= it.body.name %>),\n<% } else if(it.body.contentType === 'urlencoded') { %>\n      body: new URLSearchParams(<%= it.body.name %> as any),\n<% } else { %>\n      body: <%= it.body.name %>,\n<% } %>\n<% } %>\n      ...$config,\n    })\n<% } %>\n<% if(it.responseContentType === 'binary') { %>\n    .then((response) => response.blob() as Promise<<%~ it.returnType %>>);\n<% } else if(it.responseContentType === 'text') { %>\n    .then((response) => response.text() as Promise<<%~ it.returnType %>>);\n<% } else { %>\n    .then((response) => response.json() as Promise<<%~ it.returnType %>>);\n<% } %>\n  },\n"
   },
   "ng1": {
     "barrel.ejs": "export class ApiServices {\n  public static bootstrap(moduleName: string, baseUrl: string) {\n    angular\n      .module(moduleName)\n      .constant('Api<%= it.servicePrefix -%>BaseUrl', baseUrl)\n<% it.clients.forEach((client) => { %>\n      .service('<%= client.fileName %>Service', <%= client.fileName %>Service)\n<% }); %>;\n  }\n}\n\nfunction serializeQueryParam(obj: any, property: string): string {\n  if (obj === null || obj === undefined || obj === '') {\n    return '';\n  } else if (obj instanceof Date) {\n    return property + '=' + encodeURIComponent(obj.toJSON());\n  } else if (Array.isArray(obj)) {\n    return Object.values(obj)\n      .map(value => `${property}[]=${value}`)\n      .join('&');\n  } else if (typeof obj !== 'object') {\n    return property + '=' + encodeURIComponent(obj);\n  } else if (typeof obj === 'object') {\n    return Object.keys(obj)\n      .filter(key => !!serializeQueryParam(obj[key], property + '.' + key))\n      .reduce(\n        (a: any, b) =>\n          a.push(serializeQueryParam(obj[b], property + '.' + b)) && a,\n        []\n      )\n      .join('&');\n  } else {\n    return '';\n  }\n}\n",
     "baseClient.ejs": "import type { IHttpService, IRequestShortcutConfig, IPromise } from 'angular';\n\nabstract class BaseService {\n  constructor(protected readonly $http: IHttpService, public baseUrl: string) { }\n\n  protected $get<T>(\n    url: string,\n    config?: IRequestShortcutConfig\n  ): IPromise<T> {\n    return this.$http.get(this.baseUrl + url, config).then((response: any) => {\n      return this.processSingle<T>(response);\n    });\n  }\n\n  protected $getAll<T>(\n    url: string,\n    config?: IRequestShortcutConfig\n  ): IPromise<T[]> {\n    return this.$http.get(this.baseUrl + url, config).then((response: any) => {\n      return this.processMany<T>(response);\n    });\n  }\n\n  protected $delete<T>(\n    url: string,\n    config?: IRequestShortcutConfig\n  ): IPromise<any> {\n    return this.$http\n      .delete(this.baseUrl + url, config)\n      .then((response: any) => {\n        return this.processSingle<T>(response);\n      });\n  }\n\n  protected $head<T>(\n    url: string,\n    config?: IRequestShortcutConfig\n  ): IPromise<any> {\n    return this.$http.head(this.baseUrl + url, config).then((response: any) => {\n      return this.processSingle<T>(response);\n    });\n  }\n\n  protected $jsonp<T>(\n    url: string,\n    config?: IRequestShortcutConfig\n  ): IPromise<any> {\n    return this.$http\n      .jsonp(this.baseUrl + url, config)\n      .then((response: any) => {\n        return this.processSingle<T>(response);\n      });\n  }\n\n  protected $post<T>(\n    url: string,\n    data: any,\n    config?: IRequestShortcutConfig\n  ): IPromise<any> {\n    return this.$http\n      .post(this.baseUrl + url, data, config)\n      .then((response: any) => {\n        return this.processSingle<T>(response);\n      });\n  }\n\n  protected $put<T>(\n    url: string,\n    data: any,\n    config?: IRequestShortcutConfig\n  ): IPromise<any> {\n    return this.$http\n      .put(this.baseUrl + url, data, config)\n      .then((response: any) => {\n        return this.processSingle<T>(response);\n      });\n  }\n\n  protected $patch<T>(\n    url: string,\n    data: any,\n    config?: IRequestShortcutConfig\n  ): IPromise<any> {\n    return this.$http\n      .patch(this.baseUrl + url, data, config)\n      .then((response: any) => {\n        return this.processSingle<T>(response);\n      });\n  }\n\n  protected processSingle<T>(response: any): T {\n    var data = response.data;\n    var status = response.status;\n\n    if (status >= 200 && status <= 299) {\n      return data;\n    } else {\n      throw 'error_no_callback_for_the_received_http_status';\n    }\n  }\n\n  protected processMany<T>(response: any): T[] {\n    var data = response.data;\n    var status = response.status;\n\n    if (status >= 200 && status <= 299) {\n      return data;\n    } else {\n      throw 'error_no_callback_for_the_received_http_status';\n    }\n  }\n}\n\n",
     "client.ejs": "export class <%= it.clientName -%>Service extends BaseService {\n  /* @ngInject */\n  constructor($http: IHttpService, Api<%= it.servicePrefix -%>BaseUrl: string) {\n    super($http, Api<%= it.servicePrefix -%>BaseUrl);\n  }\n\n  <% it.operations.forEach((operation) => { %>\n<%~ include('operation.ejs', operation); %>\n\n<% }); %>\n}\n\n",
-    "operation.ejs": "<%~ it.jsDocs %>\n\n  <%= it.name %>(<% it.parameters.forEach((parameter) => { %>\n<%= parameter.name %><%= parameter.skippable ? '?' : '' %>: <%~ parameter.type %> <%= parameter.optional ? (parameter.skippable ? '| null' : '| null | undefined') : '' %>,\n    <% }); %>\n    config?: IRequestShortcutConfig\n  ): IPromise<<%~ it.returnType %>> {\n    let url = `<%= it.url %>?`;\n<% if(it.query && it.query.length > 0) { %>\n  <% it.query.forEach((parameter) => { %>\n  if (<%= parameter.name %> !== undefined) {\n  <% if(!!parameter.original && parameter.original.type === 'array') { %>\n    <%= parameter.name %>.forEach(item => { url += serializeQueryParam(item, '<%= parameter.originalName %>') + \"&\"; });\n  <% } else {%>\n    url += serializeQueryParam(<%= parameter.name %>, '<%= parameter.originalName %>') + \"&\";\n  <% } %>\n  }\n  <% }); %>\n<% } %>\n\n    return this.$<%= it.method.toLowerCase() %>(\n      url,\n<% if(['POST', 'PUT', 'PATCH'].includes(it.method)) { %>\n  <% if(it.body) { %>\n    <%= it.body.contentType === 'urlencoded' ? 'new URLSearchParams(' + it.body.name + ' as any)' : it.body.name %>,\n  <% } else { %>\n    null,\n  <% } %>\n<% } %>\n    config\n    );\n  }\n"
+    "operation.ejs": "<%~ it.jsDocs %>\n\n  <%= it.name %>(<% it.parameters.forEach((parameter) => { %>\n<%= parameter.name %><%= parameter.skippable ? '?' : '' %>: <%~ parameter.type %> <%= parameter.optional ? (parameter.skippable ? '| null' : '| null | undefined') : '' %>,\n    <% }); %>\n    config?: IRequestShortcutConfig\n  ): IPromise<<%~ it.returnType %>> {\n    let url = `<%= it.url %>?`;\n<% if(it.query && it.query.length > 0) { %>\n  <% it.query.forEach((parameter) => { %>\n  if (<%= it.queryParamObject ? `${it.queryParamObject.name}?.${parameter.name}` : parameter.name %> !== undefined) {\n  <% if(!!parameter.original && parameter.original.type === 'array') { %>\n    <%= it.queryParamObject ? `${it.queryParamObject.name}.${parameter.name}` : parameter.name %>.forEach(item => { url += serializeQueryParam(item, '<%= parameter.originalName %>') + \"&\"; });\n  <% } else {%>\n    url += serializeQueryParam(<%= it.queryParamObject ? `${it.queryParamObject.name}.${parameter.name}` : parameter.name %>, '<%= parameter.originalName %>') + \"&\";\n  <% } %>\n  }\n  <% }); %>\n<% } %>\n\n<% if(it.headers && it.headers.length > 0) { it.headers.forEach((parameter) => { %>\n<% if (parameter.value) { %>\n    config = { ...config, headers: { ...config?.headers, '<%= parameter.originalName %>': '<%= parameter.value %>' } };\n<% } else { %>\n    if (<%= parameter.name %>) {\n      config = { ...config, headers: { ...config?.headers, '<%= parameter.originalName %>': <%= parameter.name %> } };\n    }\n<% } %><% }); } %>\n    return this.$<%= it.method.toLowerCase() %>(\n      url,\n<% if(['POST', 'PUT', 'PATCH'].includes(it.method)) { %>\n  <% if(it.body) { %>\n    <%= it.body.contentType === 'urlencoded' ? 'new URLSearchParams(' + it.body.name + ' as any)' : it.body.name %>,\n  <% } else { %>\n    null,\n  <% } %>\n<% } %>\n    config\n    );\n  }\n"
   },
   "ng2": {
     "barrel.ejs": "\n/**\n * Serializes a params object into a query string that is compatible with different REST APIs.\n * Implementation from: https://github.com/suhaotian/xior/blob/main/src/utils.ts\n * Kudos to @suhaotian for the original implementation\n */\nfunction encodeParams<T = any>(\n  params: T,\n  parentKey: string | null = null,\n  options?: {\n    allowDots?: boolean;\n    serializeDate?: (value: Date) => string;\n    arrayFormat?: 'indices' | 'repeat' | 'brackets';\n  }\n): string {\n  if (params === undefined || params === null) return '';\n  const encodedParams: string[] = [];\n  const paramsIsArray = Array.isArray(params);\n  const { arrayFormat, allowDots, serializeDate } = options || {};\n\n  const getKey = (key: string) => {\n    if (allowDots && !paramsIsArray) return `.${key}`;\n    if (paramsIsArray) {\n      if (arrayFormat === 'brackets') {\n        return '[]';\n      }\n      if (arrayFormat === 'repeat') {\n        return '';\n      }\n    }\n    return `[${key}]`;\n  };\n\n  for (const key in params) {\n    if (Object.prototype.hasOwnProperty.call(params, key)) {\n      let value = (params as any)[key];\n      if (value !== undefined) {\n        const encodedKey = parentKey ? `${parentKey}${getKey(key)}` : (key as string);\n\n        // biome-ignore lint/suspicious/noGlobalIsNan: <explanation>\n        if (!isNaN(value) && value instanceof Date) {\n          value = serializeDate ? serializeDate(value) : value.toISOString();\n        }\n        if (typeof value === 'object') {\n          // If the value is an object or array, recursively encode its contents\n          const result = encodeParams(value, encodedKey, options);\n          if (result !== '') encodedParams.push(result);\n        } else {\n          // Otherwise, encode the key-value pair\n          encodedParams.push(`${encodeURIComponent(encodedKey)}=${encodeURIComponent(value)}`);\n        }\n      }\n    }\n  }\n\n  return encodedParams.join('&');\n}\n\n",
-    "baseClient.ejs": "import type { Observable } from \"rxjs\";\nimport { Injectable, Inject, Optional, InjectionToken } from \"@angular/core\";\nimport { HttpClient } from \"@angular/common/http\";\n\nexport const <%= (it.servicePrefix || 'API').toUpperCase() -%>_BASE_URL = new InjectionToken<string>(\"<%= (it.servicePrefix || 'API').toUpperCase() -%>_BASE_URL\");\n\nabstract class BaseService {\n  private httpClient: HttpClient;\n  private baseUrl: string;\n\n  constructor(\n    @Inject(HttpClient) httpClient: HttpClient,\n    @Optional() @Inject(<%= (it.servicePrefix || 'API').toUpperCase() -%>_BASE_URL) baseUrl?: string\n  ) {\n    this.httpClient = httpClient;\n    this.baseUrl = baseUrl ? baseUrl : '';\n  }\n\n  protected $get<T>(url: string, options?: any): Observable<T> {\n    return this.httpClient\n      .get<T>(this.baseUrl + url, options)\n      .pipe((response: any) => response);\n  }\n\n  protected $getAll<T>(url: string, options?: any): Observable<T[]> {\n    return this.httpClient\n      .get<T[]>(this.baseUrl + url, options)\n      .pipe((response: any) => response);\n  }\n\n  protected $delete<T>(url: string, options?: any): Observable<T> {\n    return this.httpClient\n      .delete(this.baseUrl + url, options)\n      .pipe((response: any) => response);\n  }\n\n  protected $post(url: string, data: any, options?: any): Observable<any> {\n    return this.httpClient\n      .post(this.baseUrl + url, data, options)\n      .pipe((response: any) => response);\n  }\n\n  protected $patch<T>(url: string, data: any, options?: any): Observable<T> {\n    return this.httpClient\n      .patch(this.baseUrl + url, data, options)\n      .pipe((response: any) => response);\n  }\n\n  protected $put(url: string, data: any, options?: any): Observable<any> {\n    return this.httpClient\n      .put(this.baseUrl + url, data, options)\n      .pipe((response: any) => response);\n  }\n}\n\nfunction paramsSerializer(params: any) {\n  return encodeParams(params, null, {\n    allowDots: <%= it.allowDots %>,\n    arrayFormat: '<%= it.arrayFormat %>',\n  });\n}\n\n",
-    "client.ejs": "@Injectable({\n  providedIn: 'root'\n})\nexport class <%= it.clientName -%>Service extends BaseService {\n  constructor(\n    @Inject(HttpClient) httpClient: HttpClient,\n    @Optional() @Inject(<%= (it.servicePrefix || 'API').toUpperCase() -%>_BASE_URL) baseUrl?: string\n  ) {\n    super(httpClient, baseUrl);\n  }\n\n  <% it.operations.forEach((operation) => { %>\n<%~ include('operation.ejs', operation); %>\n\n<% }); %>\n}\n\n",
-    "operation.ejs": "<%~ it.jsDocs %>\n\n  <%= it.name %>(\n    <% it.parameters.forEach((parameter) => { %>\n<%= parameter.name %><%= parameter.skippable ? '?' : '' %>: <%~ parameter.type %> <%= parameter.optional ? (parameter.skippable ? '| null' : '| null | undefined') : '' %>,\n    <% }); %>\nconfig?: any\n  ): Observable<<%~ it.returnType %>> {\n    const url = `<%= it.url %>?<%\n    if(it.query && it.query.length > 0) { %>${paramsSerializer({<%\n      it.query.forEach((parameter) => { %>\n'<%= parameter.originalName %>': <%= parameter.name %>,\n      <% }); %>})}<% } %>`;\n\n    return this.$<%= it.method.toLowerCase() %>(\n      url,\n<% if(['POST', 'PUT', 'PATCH'].includes(it.method)) { %>\n<% if(it.body) { %>\n      <%= it.body.contentType === 'urlencoded' ? 'new URLSearchParams(' + it.body.name + ' as any)' : it.body.name %>,\n<% } else { %>\n      null,\n<% } %>\n<% } %>\n      config\n    );\n  }\n"
+    "baseClient.ejs": "import type { Observable } from \"rxjs\";\nimport { Injectable, InjectionToken, inject } from \"@angular/core\";\nimport { HttpClient, type HttpContext, type HttpHeaders, type HttpParams } from \"@angular/common/http\";\n\nexport const <%= (it.servicePrefix || 'API').toUpperCase() -%>_BASE_URL = new InjectionToken<string>(\"<%= (it.servicePrefix || 'API').toUpperCase() -%>_BASE_URL\");\n\nexport interface HttpConfig {\n  headers?: HttpHeaders | Record<string, string | string[]>;\n  context?: HttpContext;\n  params?: HttpParams | Record<string, string | number | boolean | (string | number | boolean)[]>;\n  reportProgress?: boolean;\n  withCredentials?: boolean;\n  transferCache?: boolean | { includeHeaders?: string[] };\n}\n\nfunction paramsSerializer(params: any) {\n  return encodeParams(params, null, {\n    allowDots: <%= it.allowDots %>,\n    arrayFormat: '<%= it.arrayFormat %>',\n  });\n}\n\n",
+    "client.ejs": "@Injectable({\n  providedIn: 'root'\n})\nexport class <%= it.clientName.charAt(0).toUpperCase() + it.clientName.slice(1) -%>Service {\n  private http = inject(HttpClient);\n  private baseUrl = inject(<%= (it.servicePrefix || 'API').toUpperCase() -%>_BASE_URL, { optional: true }) ?? '';\n\n  <% it.operations.forEach((operation) => { %>\n<%~ include('operation.ejs', operation); %>\n\n<% }); %>\n}\n\n",
+    "operation.ejs": "<%~ it.jsDocs %>\n\n  <%= it.name %>(\n    <% it.parameters.forEach((parameter) => { %>\n<%= parameter.name %><%= parameter.skippable ? '?' : '' %>: <%~ parameter.type %> <%= parameter.optional ? (parameter.skippable ? '| null' : '| null | undefined') : '' %>,\n    <% }); %>\nconfig?: HttpConfig\n  ): Observable<<%~ it.returnType %>> {\n<% if(it.query && it.query.length > 0) { -%>\n    const params = paramsSerializer({\n<% it.query.forEach((parameter) => { -%>\n<% if (it.queryParamObject) { -%>\n      '<%= parameter.originalName %>': <%= it.queryParamObject.name %>?.<%= parameter.name %>,\n<% } else { -%>\n      '<%= parameter.originalName %>': <%= parameter.name %>,\n<% } -%>\n<% }); -%>\n    });\n    const url = `<%= it.url %>${params ? '?' + params : ''}`;\n<% } else { -%>\n    const url = `<%= it.url %>`;\n<% } -%>\n<% if(it.headers && it.headers.length > 0) { it.headers.forEach((parameter) => { -%>\n<% if (parameter.value) { -%>\n    config = { ...config, headers: { ...config?.headers, '<%= parameter.originalName %>': '<%= parameter.value %>' } };\n<% } else { -%>\n    if (<%= parameter.name %>) {\n      config = { ...config, headers: { ...config?.headers, '<%= parameter.originalName %>': <%= parameter.name %> } };\n    }\n<% } -%>\n<% }); } -%>\n<% if(it.method === 'GET') { -%>\n    return this.http.get<<%~ it.returnType %>>(this.baseUrl + url, config);\n<% } else if(it.method === 'DELETE') { -%>\n    return this.http.delete<<%~ it.returnType %>>(this.baseUrl + url, config);\n<% } else if(['POST', 'PUT', 'PATCH'].includes(it.method)) {\n  const bodyArg = it.body\n    ? (it.body.contentType === 'urlencoded' ? 'new URLSearchParams(' + it.body.name + ' as any)' : it.body.name)\n    : 'null';\n-%>\n    return this.http.<%= it.method.toLowerCase() %><%~ '<' + it.returnType + '>' %>(this.baseUrl + url, <%~ bodyArg %>, config);\n<% } %>\n  }\n"
   },
-  "swr-axios": {
-    "barrel.ejs": "\n/**\n * Serializes a params object into a query string that is compatible with different REST APIs.\n * Implementation from: https://github.com/suhaotian/xior/blob/main/src/utils.ts\n * Kudos to @suhaotian for the original implementation\n */\nfunction encodeParams<T = any>(\n  params: T,\n  parentKey: string | null = null,\n  options?: {\n    allowDots?: boolean;\n    serializeDate?: (value: Date) => string;\n    arrayFormat?: 'indices' | 'repeat' | 'brackets';\n  }\n): string {\n  if (params === undefined || params === null) return '';\n  const encodedParams: string[] = [];\n  const paramsIsArray = Array.isArray(params);\n  const { arrayFormat, allowDots, serializeDate } = options || {};\n\n  const getKey = (key: string) => {\n    if (allowDots && !paramsIsArray) return `.${key}`;\n    if (paramsIsArray) {\n      if (arrayFormat === 'brackets') {\n        return '[]';\n      }\n      if (arrayFormat === 'repeat') {\n        return '';\n      }\n    }\n    return `[${key}]`;\n  };\n\n  for (const key in params) {\n    if (Object.prototype.hasOwnProperty.call(params, key)) {\n      let value = (params as any)[key];\n      if (value !== undefined) {\n        const encodedKey = parentKey ? `${parentKey}${getKey(key)}` : (key as string);\n\n        // biome-ignore lint/suspicious/noGlobalIsNan: <explanation>\n        if (!isNaN(value) && value instanceof Date) {\n          value = serializeDate ? serializeDate(value) : value.toISOString();\n        }\n        if (typeof value === 'object') {\n          // If the value is an object or array, recursively encode its contents\n          const result = encodeParams(value, encodedKey, options);\n          if (result !== '') encodedParams.push(result);\n        } else {\n          // Otherwise, encode the key-value pair\n          encodedParams.push(`${encodeURIComponent(encodedKey)}=${encodeURIComponent(value)}`);\n        }\n      }\n    }\n  }\n\n  return encodedParams.join('&');\n}\n\n",
-    "baseClient.ejs": "import Axios, { type AxiosPromise, type AxiosRequestConfig } from \"axios\";\nimport useSWR, { type SWRConfiguration, type Key } from 'swr';\n\nexport const axios = Axios.create({\n  baseURL: '<%= it.baseUrl || '' -%>',\n  paramsSerializer: (params: any) =>\n    encodeParams(params, null, {\n      allowDots: <%= it.allowDots %>,\n      arrayFormat: '<%= it.arrayFormat %>',\n    }),\n});\n\ninterface SwrConfig extends SWRConfiguration {\n  /* Custom key for SWR. You don't have to worry about this as by default it's the URL. You can use standard SWR Key here if you need more flexibility. */\n  key?: Key;\n\n  /* Configuration for axios fetcher */\n  axios?: AxiosRequestConfig;\n}\n\n",
-    "client.ejs": "export const <%= it.camelCaseName -%>Client = {\n  <% it.operations.forEach((operation) => { %>\n<%~ include('operation.ejs', operation); %>\n\n  <% }); %>\n};\n\n<% var getOperations = it.operations.filter((o) => o.method === 'GET');\nif(getOperations.length > 0) { %>\n  <% getOperations.forEach((operation) => {\n  var opName = operation.name;\n  if(opName.toLowerCase().startsWith(\"get\")) {\n    opName = opName.substring(3);\n  }\n  opName[0] = opName[0].toUpperCase();\n  var customName = \"use\" + it.clientName + opName;\n  var swrOperation = Object.assign({ swrOpName: customName }, operation); %>\n<%~ include('swrOperation.ejs', swrOperation); %>\n\n  <% }); %>\n<% } %>\n",
-    "operation.ejs": "<%~ it.jsDocs %>\n\n  <%= it.name %>(<% it.parameters.forEach((parameter) => { %>\n<%= parameter.name %><%= parameter.skippable ? '?' : '' %>: <%~ parameter.type %> <%= parameter.optional ? (parameter.skippable ? '| null' : '| null | undefined') : '' %>,\n    <% }); %>\n  $config?: AxiosRequestConfig\n  ): AxiosPromise<<%~ it.returnType %>> {\n    const url = `<%= it.url %>`;\n\n    return axios.request<<%~ it.returnType %>>({\n      url: url,\n      method: '<%= it.method %>',\n<% if(it.body) { %>\n<% if(it.body.contentType === 'urlencoded') { %>\n      data: new URLSearchParams(<%= it.body.name %> as any),\n<% } else { %>\n      data: <%= it.body.name %>,\n<% } %>\n<% } %>\n<% if(it.query && it.query.length > 0) { %>\n      params: {\n    <% it.query.forEach((parameter) => { %>\n    '<%= parameter.originalName %>': <%= parameter.name %>,\n    <% }); %>\n  },\n<% } %>\n<% if(it.headers && it.headers.length > 0) { %>\n      headers: {\n  <% it.headers.forEach((parameter) => { %>\n    <% if (parameter.value) { %>\n  '<%= parameter.originalName %>': '<%= parameter.value %>',\n    <% } else { %>\n  '<%= parameter.originalName %>': <%= parameter.name %>,\n    <% } %>\n  <% }); %>\n},\n<% } %>\n      ...$config,\n    });\n  },\n",
-    "swrOperation.ejs": "<%~ it.jsDocs %>\n\nexport function <%= it.swrOpName %>(<% it.parameters.forEach((parameter) => { %>\n  <%= parameter.name %><%= parameter.skippable ? '?' : '' %>: <%~ parameter.type %> <%= parameter.optional ? (parameter.skippable ? '| null' : '| null | undefined') : '' %>,\n    <% }); %>\n  $config?: SwrConfig\n  ) {\n  const url = `<%= it.url %>`;\n  const { axios: $axiosConf, key, ...config } = $config || {};\n\n  const cacheUrl = `${url}?<%\n  if(it.query && it.query.length > 0) { %>${encodeParams({<%\n    it.query.forEach((parameter) => { %>\n'<%= parameter.originalName %>': <%= parameter.name %>,\n    <% }); %>})}<% } %>`;\n\nconst { data, error, mutate } = useSWR<<%~ it.returnType %>>(\n  key ?? cacheUrl,\n  () => axios.request({\n    url: url,\n    method: '<%= it.method %>',\n<% if(it.query && it.query.length > 0) { %>\n    params: {\n    <% it.query.forEach((parameter) => { %>\n  '<%= parameter.originalName %>': <%= parameter.name %>,\n    <% }); %>\n},\n<% } %>\n<% if(it.headers && it.headers.length > 0) { %>\n    headers: {\n      <% it.headers.forEach((parameter) => { %>\n    <% if (parameter.value) { %>\n    '<%= parameter.originalName %>': '<%= parameter.value %>',\n    <% } else { %>\n    '<%= parameter.originalName %>': <%= parameter.name %>,\n    <% } %>\n    <% }); %>\n      },\n<% } %>\n    ...$axiosConf})\n    .then((resp) => resp.data),\n  config);\n\n  return {\n    data,\n    isLoading: !error && !data,\n    error: error,\n    mutate,\n  };\n}\n"
+  "swr": {
+    "baseClient.ejs": "import useSWR, { type SWRConfiguration, type Key } from 'swr';\nimport useSWRMutation, { type SWRMutationConfiguration } from 'swr/mutation';\n\ninterface SwrConfig extends SWRConfiguration {\n  /* Custom key for SWR. You don't have to worry about this as by default it's the URL. You can use standard SWR Key here if you need more flexibility. */\n  key?: Key;\n}\n",
+    "client.ejs": "export const <%= it.camelCaseName -%>Client = {\n  <% it.operations.forEach((operation) => { %>\n<%~ include('operation.ejs', operation); %>\n\n  <% }); %>\n};\n\n<%\nvar getOperations = it.operations.filter((o) => o.method === 'GET');\nvar mutationOperations = it.operations.filter((o) => o.method !== 'GET');\n\nfunction toOpName(name) {\n  var n = name.toLowerCase().startsWith('get') ? name.substring(3) : name;\n  return n.charAt(0).toUpperCase() + n.slice(1);\n}\n\nfunction safeOperation(operation, clientName) {\n  var safeParams = operation.parameters.map(function(p) {\n    return p.name === clientName ? Object.assign({}, p, { name: '_' + p.name }) : p;\n  });\n  return Object.assign({}, operation, { parameters: safeParams });\n}\n%>\n\nexport const <%= it.camelCaseName %> = {\n  queries: {\n<% getOperations.forEach((operation) => {\n  var opName = toOpName(operation.name);\n  var swrOperation = Object.assign({\n    swrOpName: 'use' + opName,\n    clientName: it.camelCaseName,\n    httpConfigType: it.httpConfigType,\n  }, safeOperation(operation, it.camelCaseName));\n%>\n<%~ include('swrOperation.ejs', swrOperation); %>\n\n<% }); %>\n  },\n\n  mutations: {\n<% mutationOperations.forEach((operation) => {\n  var opName = operation.name.charAt(0).toUpperCase() + operation.name.slice(1);\n  var swrMutationOperation = Object.assign({\n    mutOpName: 'use' + opName,\n    clientName: it.camelCaseName,\n    httpConfigType: it.httpConfigType,\n  }, safeOperation(operation, it.camelCaseName));\n%>\n<%~ include('swrMutationOperation.ejs', swrMutationOperation); %>\n\n<% }); %>\n  },\n\n  queryKeys: {\n<% getOperations.forEach((operation) => {\n  var opName = toOpName(operation.name);\n  var keyName = opName.charAt(0).toLowerCase() + opName.slice(1);\n  var safeOp = safeOperation(operation, it.camelCaseName);\n%>\n    <%= keyName %>: (<% safeOp.parameters.forEach((parameter) => { %><%= parameter.name %><%= parameter.skippable ? '?' : '' %>: <%~ parameter.type %><%= parameter.optional ? (parameter.skippable ? ' | null' : ' | null | undefined') : '' %>, <% }); %>) => `<%= operation.url %><% if(safeOp.query && safeOp.query.length > 0) { %>?${encodeParams({<% safeOp.query.forEach((parameter) => { %>'<%= parameter.originalName %>': <%= safeOp.queryParamObject ? `${safeOp.queryParamObject.name}?.${parameter.name}` : parameter.name %>, <% }); %>})}<% } %>`,\n<% }); %>\n  },\n};\n",
+    "swrMutationOperation.ejs": "<%\nvar hasParams = it.parameters.length > 0;\n\nvar variablesType;\nif (!hasParams) {\n  variablesType = 'void';\n} else {\n  var parts = it.parameters.map(function(p) {\n    return p.name + (p.skippable ? '?' : '') + ': ' + p.type + (p.optional ? ' | null' : '');\n  });\n  variablesType = '{ ' + parts.join('; ') + ' }';\n}\n\nvar callArgs = it.parameters.map(function(p) { return 'arg.' + p.name; });\n\n// Stable SWR key: replace all ${...} path expressions with *\nvar swrKey = it.url.replace(/\\$\\{(?:[^{}]|\\{[^{}]*\\})*\\}/g, '*');\n\nvar docs = it.jsDocs ? it.jsDocs.replace(/^/gm, '  ') + '\\n' : '';\n%>\n<%~ docs %>\n    <%= it.mutOpName %>(\n      $config?: SWRMutationConfiguration<<%~ it.returnType %>, Error, string, <%~ variablesType %>>,\n      $httpConfig?: <%= it.httpConfigType %>\n    ) {\n      return useSWRMutation<<%~ it.returnType %>, Error, string, <%~ variablesType %>>(\n        '<%= swrKey %>',\n        (_key: string, { arg }<%= hasParams ? ': { arg: ' + variablesType + ' }' : '' %>) =>\n          <%= it.clientName %>Client.<%= it.name %>(<%= callArgs.join(', ') %><%= callArgs.length > 0 ? ', ' : '' %>$httpConfig).then((resp) => resp.data),\n        $config\n      );\n    },\n",
+    "swrOperation.ejs": "<% var docs = it.jsDocs ? it.jsDocs.replace(/^/gm, '  ') + '\\n' : ''; %>\n<%~ docs %>\n    <%= it.swrOpName %>(\n<% it.parameters.forEach((parameter) => { %>      <%= parameter.name %><%= parameter.skippable ? '?' : '' %>: <%~ parameter.type %><%= parameter.optional ? (parameter.skippable ? ' | null' : ' | null | undefined') : '' %>,\n<% }); %>      $config?: Omit<SwrConfig, 'key'> & { key?: Key },\n      $httpConfig?: <%= it.httpConfigType %>\n    ) {\n      const { key, ...config } = $config || {};\n      const cacheUrl = key ?? <%= it.clientName %>.queryKeys.<%= it.swrOpName.charAt(3).toLowerCase() + it.swrOpName.slice(4) %>(<% it.parameters.forEach((parameter) => { %><%= parameter.name %>, <% }); %>);\n\n      const { data, error, isLoading, mutate } = useSWR<<%~ it.returnType %>>(\n        cacheUrl,\n        () => <%= it.clientName %>Client.<%= it.name %>(<% it.parameters.forEach((parameter) => { %><%= parameter.name %>, <% }); %>$httpConfig).then((resp) => resp.data),\n        config\n      );\n\n      return { data, isLoading, error, mutate };\n    },\n"
   },
-  "tsq-xior": {
-    "barrel.ejs": "",
-    "baseClient.ejs": "import xior, { type XiorResponse, type XiorRequestConfig, encodeParams } from \"xior\";\nimport { QueryClient, type UseQueryOptions, useQuery } from '@tanstack/react-query';\n\nexport const queryClient = new QueryClient();\n\nexport const http = xior.create({\n  baseURL: '<%= it.baseUrl || '' %>',\n  paramsSerializer: (params: any) =>\n    encodeParams(params, true, null, {\n      allowDots: <%= it.allowDots %>,\n      arrayFormat: '<%= it.arrayFormat %>',\n    }),\n});\n\n",
-    "client.ejs": "export const <%= it.camelCaseName %>Client = {\n  <% it.operations.forEach((operation) => { %>\n<%~ include('operation.ejs', operation); %>\n\n<% }); %>\n};\n\n\n<% var getOperations = it.operations.filter((o) => o.method === 'GET');\nif(getOperations.length > 0) { %>\n  <% getOperations.forEach((operation) => {\n  var opName = operation.name;\n  if(opName.toLowerCase().startsWith(\"get\")) {\n    opName = opName.substring(3);\n  }\n  opName[0] = opName[0].toUpperCase();\n  var customName = \"use\" + it.clientName + opName;\n  var queryOperation = Object.assign({ rqOpName: customName, opKey: it.clientName + opName, clientName: it.camelCaseName }, operation); %>\n<%~ include('queryOperation.ejs', queryOperation); %>\n\n  <% }); %>\n<% } %>\n",
-    "operation.ejs": "<%~ it.jsDocs %>\n\n  <%= it.name %>(<% it.parameters.forEach((parameter) => { %>\n<%= parameter.name %><%= parameter.skippable ? '?' : '' %>: <%~ parameter.type %> <%= parameter.optional ? (parameter.skippable ? '| null' : '| null | undefined') : '' %>,\n    <% }); %>\n$config?: XiorRequestConfig\n  ): Promise<XiorResponse<<%~ it.returnType %>>> {\n    const url = `<%= it.url %>`;\n\n    return http.request<<%~ it.returnType %>>({\n      url: url,\n      method: '<%= it.method %>',\n<% if(it.body) { %>\n<% if(it.body.contentType === 'urlencoded') { %>\n      data: new URLSearchParams(<%= it.body.name %> as any),\n<% } else { %>\n      data: <%= it.body.name %>,\n<% } %>\n<% } %>\n<% if(it.query && it.query.length > 0) { %>\n      params: {\n    <% it.query.forEach((parameter) => { %>\n    '<%= parameter.originalName %>': <%= parameter.name %>,\n    <% }); %>\n  },\n<% } %>\n<% if(it.headers && it.headers.length > 0) { %>\n      headers: {\n  <% it.headers.forEach((parameter) => { %>\n    <% if (parameter.value) { %>\n  '<%= parameter.originalName %>': '<%= parameter.value %>',\n    <% } else { %>\n  '<%= parameter.originalName %>': <%= parameter.name %>,\n    <% } %>\n  <% }); %>\n},\n<% } %>\n      ...$config,\n    });\n  },\n",
-    "queryOperation.ejs": "<%\nif (it.jsDocs) {\n  const additionalParams = `  * @param $config (optional) Additional configuration for TanStack Query\n  * @param $httpConfig (optional) Additional configuration for xior request (actually executes the request)`;\n\n  // Replace the closing */ with newline + additional params + closing */\n  const modifiedDocs = it.jsDocs.replace(/(\\s*)\\*\\/\\s*$/, `\\n${additionalParams}\\n */`);\n-%>\n<%~ modifiedDocs %>\n<% } else { -%>\n<%~ it.jsDocs %>\n<% } %>\n\nexport function <%= it.rqOpName %><TData = <%~ it.returnType %>, TError = Error>(<% it.parameters.forEach((parameter) => { %>\n  <%= parameter.name %><%= parameter.skippable ? '?' : '' %>: <%~ parameter.type %> <%= parameter.optional ? (parameter.skippable ? '| null' : '| null | undefined') : '' %>,\n    <% }); %>\n$config?: Omit<\n  UseQueryOptions<<%~ it.returnType %>, TError, TData>,\n  'queryKey' | 'queryFn'\n>,\n    $httpConfig?: XiorRequestConfig\n  ) {\n  return useQuery<<%~ it.returnType %>, TError, TData>({\n    queryKey: ['<%= it.clientName %>', '<%= it.opKey %>', <% it.parameters.forEach((parameter) => { %><%= parameter.name %>, <% }); %>],\n    queryFn: () => <%= it.clientName %>Client.<%= it.name %>(<% it.parameters.forEach((parameter) => { %>\n<%= parameter.name %>, <% }); %>$httpConfig).then(res => res.data),\n    ...$config\n  });\n}\n<%= it.rqOpName %>.queryKeys = ['<%= it.clientName %>', '<%= it.opKey %>'];\n"
+  "tsq": {
+    "baseClient.ejs": "import { type UseQueryOptions, type UseMutationOptions, useQuery, useMutation } from '@tanstack/react-query';\n",
+    "client.ejs": "export const <%= it.camelCaseName %>Client = {\n  <% it.operations.forEach((operation) => { %>\n<%~ include('operation.ejs', operation); %>\n\n<% }); %>\n};\n\n<%\nvar getOperations = it.operations.filter((o) => o.method === 'GET');\nvar mutationOperations = it.operations.filter((o) => o.method !== 'GET');\n\n// Helper: strip leading \"get\" and capitalise\nfunction toOpName(name) {\n  var n = name.toLowerCase().startsWith('get') ? name.substring(3) : name;\n  return n.charAt(0).toUpperCase() + n.slice(1);\n}\n\n// Returns a deep copy of operation with any parameter whose name collides with\n// the group object name (clientName) renamed to _<name> to avoid TS shadowing.\nfunction safeOperation(operation, clientName) {\n  var safeParams = operation.parameters.map(function(p) {\n    return p.name === clientName ? Object.assign({}, p, { name: '_' + p.name }) : p;\n  });\n  return Object.assign({}, operation, { parameters: safeParams });\n}\n%>\n\nexport const <%= it.camelCaseName %> = {\n  queries: {\n<% getOperations.forEach((operation) => {\n  var opName = toOpName(operation.name);\n  var queryOperation = Object.assign({\n    rqOpName: 'use' + opName,\n    opKey: it.camelCaseName + opName,\n    clientName: it.camelCaseName,\n    httpConfigType: it.httpConfigType,\n  }, safeOperation(operation, it.camelCaseName));\n%>\n<%~ include('queryOperation.ejs', queryOperation); %>\n\n<% }); %>\n  },\n\n  mutations: {\n<% mutationOperations.forEach((operation) => {\n  var opName = operation.name.charAt(0).toUpperCase() + operation.name.slice(1);\n  var mutationOperation = Object.assign({\n    mutOpName: 'use' + opName,\n    clientName: it.camelCaseName,\n    httpConfigType: it.httpConfigType,\n  }, safeOperation(operation, it.camelCaseName));\n%>\n<%~ include('mutationOperation.ejs', mutationOperation); %>\n\n<% }); %>\n  },\n\n  queryKeys: {\n<% getOperations.forEach((operation) => {\n  var opName = toOpName(operation.name);\n  var keyName = opName.charAt(0).toLowerCase() + opName.slice(1);\n  var safeOp = safeOperation(operation, it.camelCaseName);\n%>\n    <%= keyName %>: (<% safeOp.parameters.forEach((parameter) => { %><%= parameter.name %><%= parameter.skippable ? '?' : '' %>: <%~ parameter.type %><%= parameter.optional ? (parameter.skippable ? ' | null' : ' | null | undefined') : '' %>, <% }); %>) => ['<%= it.camelCaseName %>', '<%= it.camelCaseName + opName %>'<% safeOp.parameters.forEach((parameter) => { %>, <%= parameter.name %><% }); %>] as const,\n<% }); %>\n  },\n};\n",
+    "mutationOperation.ejs": "<%\nvar hasParams = it.parameters.length > 0;\n\nvar variablesType;\nif (!hasParams) {\n  variablesType = 'void';\n} else {\n  var parts = it.parameters.map(function(p) {\n    return p.name + (p.skippable ? '?' : '') + ': ' + p.type + (p.optional ? ' | null' : '');\n  });\n  variablesType = '{ ' + parts.join('; ') + ' }';\n}\n\nvar callArgs = it.parameters.map(function(p) { return 'vars.' + p.name; });\n\nvar baseAdditionalParams = '  * @param $config (optional) Additional configuration for TanStack Query\\n  * @param $httpConfig (optional) Additional HTTP client configuration (passed to the underlying ' + it.httpConfigType + ')';\nvar rawDocs = it.jsDocs\n  ? it.jsDocs.replace(/(\\s*)\\*\\/\\s*$/, '\\n' + baseAdditionalParams + '\\n */')\n  : '';\nvar docs = rawDocs ? rawDocs.replace(/^/gm, '  ') + '\\n' : '';\n%>\n<%~ docs %>\n    <%= it.mutOpName %><TData = <%~ it.returnType %>, TError = Error>(\n      $config?: UseMutationOptions<<%~ it.returnType %>, TError, <%~ variablesType %>>,\n      $httpConfig?: <%= it.httpConfigType %>\n    ) {\n      return useMutation<<%~ it.returnType %>, TError, <%~ variablesType %>>({\n        mutationFn: (<%= hasParams ? 'vars' : '' %>) => <%= it.clientName %>Client.<%= it.name %>(<%= callArgs.join(', ') %><%= callArgs.length > 0 ? ', ' : '' %>$httpConfig).then(res => res.data),\n        ...$config\n      });\n    },\n",
+    "queryOperation.ejs": "<%\nvar baseAdditionalParams = '  * @param $config (optional) Additional configuration for TanStack Query\\n  * @param $httpConfig (optional) Additional HTTP client configuration (passed to the underlying ' + it.httpConfigType + ')';\nvar rawDocs = it.jsDocs\n  ? it.jsDocs.replace(/(\\s*)\\*\\/\\s*$/, '\\n' + baseAdditionalParams + '\\n */')\n  : '';\nvar docs = rawDocs ? rawDocs.replace(/^/gm, '  ') + '\\n' : '';\n%>\n<%~ docs %>\n    <%= it.rqOpName %><TData = <%~ it.returnType %>, TError = Error>(\n<% it.parameters.forEach((parameter) => { %>      <%= parameter.name %><%= parameter.skippable ? '?' : '' %>: <%~ parameter.type %><%= parameter.optional ? (parameter.skippable ? ' | null' : ' | null | undefined') : '' %>,\n<% }); %>      $config?: Omit<UseQueryOptions<<%~ it.returnType %>, TError, TData>, 'queryKey' | 'queryFn'>,\n      $httpConfig?: <%= it.httpConfigType %>\n    ) {\n      return useQuery<<%~ it.returnType %>, TError, TData>({\n        queryKey: <%= it.clientName %>.queryKeys.<%= it.rqOpName.charAt(3).toLowerCase() + it.rqOpName.slice(4) %>(<% it.parameters.forEach((parameter) => { %><%= parameter.name %>, <% }); %>),\n        queryFn: () => <%= it.clientName %>Client.<%= it.name %>(<% it.parameters.forEach((parameter) => { %><%= parameter.name %>, <% }); %>$httpConfig).then(res => res.data),\n        ...$config\n      });\n    },\n"
   },
   "xior": {
     "barrel.ejs": "",
     "baseClient.ejs": "import xior, { type XiorResponse, type XiorRequestConfig, encodeParams } from \"xior\";\n\nexport const http = xior.create({\n  baseURL: '<%= it.baseUrl || '' %>',\n  paramsSerializer: (params: any) =>\n    encodeParams(params, true, null, {\n      allowDots: <%= it.allowDots %>,\n      arrayFormat: '<%= it.arrayFormat %>',\n    }),\n});\n\n",
     "client.ejs": "export const <%= it.camelCaseName %>Client = {\n  <% it.operations.forEach((operation) => { %>\n<%~ include('operation.ejs', operation); %>\n\n<% }); %>\n};\n\n",
-    "operation.ejs": "<%~ it.jsDocs %>\n\n  <%= it.name %>(<% it.parameters.forEach((parameter) => { %>\n<%= parameter.name %><%= parameter.skippable ? '?' : '' %>: <%~ parameter.type %> <%= parameter.optional ? (parameter.skippable ? '| null' : '| null | undefined') : '' %>,\n    <% }); %>\n$config?: XiorRequestConfig\n  ): Promise<XiorResponse<<%~ it.returnType %>>> {\n    const url = `<%= it.url %>`;\n\n    return http.request<<%~ it.returnType %>>({\n      url: url,\n      method: '<%= it.method %>',\n<% if(it.body) { %>\n<% if(it.body.contentType === 'urlencoded') { %>\n      data: new URLSearchParams(<%= it.body.name %> as any),\n<% } else { %>\n      data: <%= it.body.name %>,\n<% } %>\n<% } %>\n<% if(it.query && it.query.length > 0) { %>\n      params: {\n    <% it.query.forEach((parameter) => { %>\n    '<%= parameter.originalName %>': <%= parameter.name %>,\n    <% }); %>\n  },\n<% } %>\n<% if(it.headers && it.headers.length > 0) { %>\n      headers: {\n  <% it.headers.forEach((parameter) => { %>\n    <% if (parameter.value) { %>\n  '<%= parameter.originalName %>': '<%= parameter.value %>',\n    <% } else { %>\n  '<%= parameter.originalName %>': <%= parameter.name %>,\n    <% } %>\n  <% }); %>\n},\n<% } %>\n      ...$config,\n    });\n  },\n"
+    "operation.ejs": "<%~ it.jsDocs %>\n\n  <%= it.name %>(<% it.parameters.forEach((parameter) => { %>\n<%= parameter.name %><%= parameter.skippable ? '?' : '' %>: <%~ parameter.type %> <%= parameter.optional ? (parameter.skippable ? '| null' : '| null | undefined') : '' %>,\n    <% }); %>\n$config?: XiorRequestConfig\n  ): Promise<XiorResponse<<%~ it.returnType %>>> {\n    const url = `<%= it.url %>`;\n\n    return http.request<<%~ it.returnType %>>({\n      url: url,\n      method: '<%= it.method %>',\n<% if(it.body) { -%>\n<% if(it.body.contentType === 'urlencoded') { -%>\n      data: new URLSearchParams(<%= it.body.name %> as any),\n<% } else { -%>\n      data: <%= it.body.name %>,\n<% } -%>\n<% } -%>\n<% if(it.query && it.query.length > 0) { -%>\n      params: {\n<% it.query.forEach((parameter) => { -%>\n<% if (it.queryParamObject) { -%>\n        '<%= parameter.originalName %>': <%= it.queryParamObject.name %>?.<%= parameter.name %>,\n<% } else { -%>\n        '<%= parameter.originalName %>': <%= parameter.name %>,\n<% } -%>\n<% }); -%>\n      },\n<% } -%>\n<% if(it.headers && it.headers.length > 0) { -%>\n      headers: {\n<% it.headers.forEach((parameter) => { -%>\n<% if (parameter.value) { -%>\n        '<%= parameter.originalName %>': '<%= parameter.value %>',\n<% } else { -%>\n        '<%= parameter.originalName %>': <%= parameter.name %>,\n<% } -%>\n<% }); -%>\n      },\n<% } -%>\n      ...$config,\n    });\n  },\n"
   }
 } ; exports.BUNDLED_TEMPLATES = BUNDLED_TEMPLATES;
 

package/dist/index.js

@@ -4,6 +4,7 @@
 var _gen = require('./gen'); var _gen2 = _interopRequireDefault(_gen);
 
 var _utils = require('./utils');
+var _templateValidator = require('./utils/templateValidator');
 var _swagger = require('./swagger');
 
 /**
@@ -31,10 +32,19 @@ function verifyOptions(options) {
   if (!!options.config === !!options.src) {
     throw new Error('You need to provide either --config or --src parameters');
   }
+  if (!!options.mocks !== !!options.testingFramework) {
+    throw new Error('--mocks and --testingFramework must be used together');
+  }
+  if (options.mocks && !options.out) {
+    throw new Error(
+      '--mocks requires --out to be set, since the mock file needs to import the generated client'
+    );
+  }
 }
 
 function gen(spec, options) {
   if (options.generationMode === 'full') {
+    _templateValidator.validateTemplate.call(void 0, options.template);
     _utils.loadAllTemplateFiles.call(void 0, options.template);
   }
 
@@ -83,6 +93,7 @@ function readFile(filePath) {
   const {
     allowDots,
     arrayFormat,
+    queryParamsAsObject,
     mode,
     schemaStyle,
     enumStyle,
@@ -90,6 +101,8 @@ function readFile(filePath) {
     nullables,
     template,
     queryParamsSerialization = {},
+    mocks,
+    testingFramework,
     ...rest
   } = cliOpts;
   const mergedQueryParamsSerialization = {
@@ -99,11 +112,12 @@ function readFile(filePath) {
     ),
     ...(allowDots !== undefined ? { allowDots } : {}),
     ...(arrayFormat !== undefined ? { arrayFormat } : {}),
+    ...(queryParamsAsObject !== undefined ? { queryParamsAsObject } : {}),
   };
 
   return {
     ...rest,
-    template: _nullishCoalesce(template, () => ( _swagger.APP_DEFAULTS.template)),
+    template: _templateValidator.normalizeTemplate.call(void 0, _nullishCoalesce(template, () => ( _swagger.APP_DEFAULTS.template))),
     servicePrefix: _nullishCoalesce(rest.servicePrefix, () => ( _swagger.APP_DEFAULTS.servicePrefix)),
     nullableStrategy: _nullishCoalesce(_nullishCoalesce(nullables, () => ( rest.nullableStrategy)), () => ( _swagger.APP_DEFAULTS.nullableStrategy)),
     generationMode: _nullishCoalesce(_nullishCoalesce(mode, () => ( rest.generationMode)), () => ( _swagger.APP_DEFAULTS.generationMode)),
@@ -113,6 +127,8 @@ function readFile(filePath) {
       _nullishCoalesce(_nullishCoalesce(enumStyle, () => ( rest.enumDeclarationStyle)), () => ( _swagger.APP_DEFAULTS.enumDeclarationStyle)),
     enumNamesStyle: normalizeEnumNamesStyle(enumNamesStyle),
     queryParamsSerialization: mergedQueryParamsSerialization,
+    ...(mocks !== undefined ? { mocks } : {}),
+    ...(testingFramework !== undefined ? { testingFramework } : {}),
   };
 } exports.prepareAppOptions = prepareAppOptions;
 

package/dist/swagger/operations.js

@@ -53,11 +53,15 @@ function inheritPathParams(op, inheritableParams) {
     return;
   }
 
+  if (!op.parameters) {
+    op.parameters = [];
+  }
+
   for (const pathParam of inheritableParams) {
     // If the operation doesn't have a parameter with the same name and in, then add it
     if (
       !op.parameters.some(
-        (p) => p.name === pathParam.name && p.in === pathParam.in
+        (p) => !('$ref' in p) && (p ).name === pathParam.name && (p ).in === pathParam.in
       )
     ) {
       op.parameters.push(Object.assign({}, pathParam));
@@ -70,9 +74,10 @@ function getPathOperation(
   pathInfo,
   spec
 ) {
+  const pathOp = pathInfo[method];
   const op = Object.assign(
-    { method, path: pathInfo.path, parameters: [], group: getOperationGroupName(pathInfo[method]) },
-    pathInfo[method]
+    { method, path: pathInfo.path, parameters: [], group: getOperationGroupName(pathOp) },
+    pathOp
   );
 
   // if there's no explicit operationId given, create one based on the method and path
@@ -83,13 +88,13 @@ function getPathOperation(
       .replace(/[\/}\-]/g, '');
   }
 
-  const pathLevelParams = _nullishCoalesce(spec.paths[pathInfo.path].parameters, () => ( []));
+  const pathLevelParams = _nullishCoalesce(_optionalChain([spec, 'access', _2 => _2.paths, 'optionalAccess', _3 => _3[pathInfo.path], 'optionalAccess', _4 => _4.parameters]), () => ( []));
 
   // Replace the path level parameters references with the actual parameters
-  replaceReferencedParams(pathLevelParams, _nullishCoalesce(_optionalChain([spec, 'access', _2 => _2.components, 'optionalAccess', _3 => _3.parameters]), () => ( {})));
+  replaceReferencedParams(pathLevelParams, _nullishCoalesce(_optionalChain([spec, 'access', _5 => _5.components, 'optionalAccess', _6 => _6.parameters]), () => ( {})));
 
   // Replace the operation parameters references with the actual parameters
-  replaceReferencedParams(op.parameters, _nullishCoalesce(_optionalChain([spec, 'access', _4 => _4.components, 'optionalAccess', _5 => _5.parameters]), () => ( {})));
+  replaceReferencedParams(op.parameters, _nullishCoalesce(_optionalChain([spec, 'access', _7 => _7.components, 'optionalAccess', _8 => _8.parameters]), () => ( {})));
 
   // At this stage path level parameters are already replaced with the actual parameters
   inheritPathParams(op, pathLevelParams );
@@ -103,7 +108,7 @@ function getPathOperation(
  * Removes invalid characters and ensures the name doesn't start with a number.
  */
 function getOperationGroupName(op) {
-  let name = _optionalChain([op, 'access', _6 => _6.tags, 'optionalAccess', _7 => _7.length]) ? op.tags[0] : 'default';
+  let name = _optionalChain([op, 'access', _9 => _9.tags, 'optionalAccess', _10 => _10.length]) ? op.tags[0] : 'default';
   name = name.replace(/[^$_a-z0-9]+/gi, '');
   return name.replace(/^[0-9]+/m, '');
 }
@@ -117,6 +122,10 @@ function replaceReferencedParams(
   parameters,
   componentParams
 ) {
+  if (!parameters || !componentParams) {
+    return;
+  }
+
   for (let index = 0; index < parameters.length; index++) {
     const param = parameters[index];
 

package/dist/swagger/typesExtractor.js

@@ -25,7 +25,7 @@ var _utils = require('../utils/utils');
     return unknownType;
   }
 
-  return getTypeFromSchemaResolved(param.schema, options, `${context}.schema`);
+  return getTypeFromSchemaResolved(param.schema , options, `${context}.schema`);
 } exports.getParameterType = getParameterType;
 
 /**
@@ -172,7 +172,7 @@ function getTypeFromSchemaInternal(
     return getTypeFromObject(schema, options, undefined, context);
   }
   if ('enum' in schema) {
-    return `${schema.enum.map((v) => JSON.stringify(v)).join(' | ')}`;
+    return `${(_nullishCoalesce(schema.enum, () => ( []))).map((v) => JSON.stringify(v)).join(' | ')}`;
   }
   if (schema.type === 'integer' || schema.type === 'number') {
     return 'number';
@@ -368,25 +368,26 @@ function isRequiredOnlyCompositeBranch(schema) {
  * It is used only for `allOf` property, as it enforces extending types.
  */
  function getRefCompositeTypes(schema) {
-  return schema.allOf
+  return (_nullishCoalesce(schema.allOf, () => ( [])))
     .filter((v) => '$ref' in v)
     .map((s) => getSafeIdentifier(s.$ref.split('/').pop()));
 } exports.getRefCompositeTypes = getRefCompositeTypes;
 
 /** Default values applied to every field of AppOptions that has a default. */
  const APP_DEFAULTS = {
-  template: 'axios',
+  template: 'axios' ,
   servicePrefix: '',
-  nullableStrategy: 'ignore',
-  generationMode: 'full',
-  schemaDeclarationStyle: 'interface',
-  enumDeclarationStyle: 'union',
-  enumNamesStyle: 'original',
+  nullableStrategy: 'ignore' ,
+  generationMode: 'full' ,
+  schemaDeclarationStyle: 'interface' ,
+  enumDeclarationStyle: 'union' ,
+  enumNamesStyle: 'original' ,
   queryParamsSerialization: {
     allowDots: true,
-    arrayFormat: 'repeat',
+    arrayFormat: 'repeat' ,
+    queryParamsAsObject: false ,
   },
-}; exports.APP_DEFAULTS = APP_DEFAULTS;
+} ; exports.APP_DEFAULTS = APP_DEFAULTS;
 
 /**
  * Fills in all AppOptions defaults for a partial ClientOptions object.

package/dist/types.d.ts

@@ -2,6 +2,7 @@ import type { OpenAPIV3 as OA3 } from 'openapi-types';
 interface QueryParamsSerializationOptions {
     allowDots?: boolean;
     arrayFormat?: ArrayFormat;
+    queryParamsAsObject?: boolean | number;
 }
 export interface ClientOptions {
     /**
@@ -11,8 +12,14 @@ export interface ClientOptions {
     src: string | object;
     /** Path to the file which will contain generated TypeScript code */
     out?: string;
-    /** Template to be used for code generation */
-    template: Template;
+    /**
+     * Template to be used for code generation.
+     * Can be a single L1 template name (e.g. "axios"), a single L2 template name
+     * (e.g. "swr" — defaults to "fetch" as the L1), or a 2-element tuple of
+     * [L2, L1] (e.g. ["swr", "axios"]).
+     * Custom filesystem paths are also accepted in any position.
+     */
+    template: TemplateInput;
     baseUrl?: string;
     preferAny?: boolean;
     /** Skip deprecated operations. When enabled, deprecated operations will be skipped from the generated code */
@@ -42,6 +49,26 @@ export interface ClientOptions {
      * - `'PascalCase'` — convert values to PascalCase (e.g. `OrgName = "org name"`)
      */
     enumNamesStyle?: EnumNamesStyle;
+    /**
+     * Prepends `'use client';` as the very first line of the generated file.
+     * Required for Next.js App Router when using SWR or TanStack Query hooks,
+     * which can only run in Client Components.
+     * Has no effect and should not be used with non-RSC environments.
+     */
+    useClient?: boolean;
+    /**
+     * Output path for the generated mock/stub file. Requires `testingFramework`
+     * and `out` to also be set. When provided, a companion mock file is generated
+     * alongside the main client, exporting typed spy stubs for every operation.
+     */
+    mocks?: string;
+    /**
+     * The test framework to use for generated mock stubs.
+     * - `'vitest'` — uses `vi.fn()` from `vitest`
+     * - `'jest'`   — uses `jest.fn()` from `@jest/globals`
+     * Requires `mocks` and `out` to also be set.
+     */
+    testingFramework?: TestingFramework;
     /** Offers ability to adjust the OpenAPI spec before it is processed */
     modifiers?: {
         /** Global-level modifiers for parameter with a given name */
@@ -53,18 +80,37 @@ export interface ClientOptions {
 export interface CliOptions extends Omit<FullAppOptions, 'enumNamesStyle'> {
     allowDots?: boolean;
     arrayFormat?: ArrayFormat;
+    queryParamsAsObject?: boolean | number;
     mode?: GenerationMode;
     schemaStyle?: SchemaDeclarationStyle;
     enumStyle?: EnumDeclarationStyle;
     /** Accepts 'original', 'PascalCase', or 'pascal' (normalized to 'PascalCase') */
     enumNamesStyle?: string;
     nullables?: NullableStrategy;
+    mocks?: string;
+    testingFramework?: TestingFramework;
 }
 export interface FullAppOptions extends ClientOptions {
     /** Path to the configuration file that contains actual config to be used */
     config?: string;
 }
-export type Template = 'axios' | 'fetch' | 'ng1' | 'ng2' | 'swr-axios' | 'xior' | 'tsq-xior';
+/** HTTP client templates (standalone, no reactive layer) */
+export type L1Template = 'axios' | 'fetch' | 'xior' | 'ng1' | 'ng2';
+/** Reactive query layer templates (must be composed with an L1 template) */
+export type L2Template = 'swr' | 'tsq';
+/** Any named built-in template */
+export type Template = L1Template | L2Template;
+/**
+ * What the user may supply as a `template` value:
+ * - a single template name or custom path string
+ * - a [L2, L1] pair (names or custom paths)
+ */
+export type TemplateInput = Template | string | [string, string];
+/**
+ * After normalization inside prepareAppOptions the template is always
+ * either a single L1 string or a resolved [L2, L1] pair.
+ */
+export type ResolvedTemplate = L1Template | string | [string, string];
 export type HttpMethod = 'get' | 'put' | 'post' | 'delete' | 'options' | 'head' | 'patch';
 export type DateSupport = 'string' | 'Date';
 export type ArrayFormat = 'indices' | 'repeat' | 'brackets';
@@ -73,13 +119,14 @@ export type GenerationMode = 'full' | 'schemas';
 export type SchemaDeclarationStyle = 'interface' | 'type';
 export type EnumDeclarationStyle = 'union' | 'enum';
 export type EnumNamesStyle = 'original' | 'PascalCase';
+export type TestingFramework = 'vitest' | 'jest';
 /**
  * Internal options type used throughout the app after `prepareAppOptions` has run.
  * All fields that have defaults are required here so the rest of the codebase never
  * needs to perform its own `?? fallback` logic.
  */
 export interface AppOptions extends ClientOptions {
-    template: Template;
+    template: ResolvedTemplate;
     servicePrefix: string;
     nullableStrategy: NullableStrategy;
     generationMode: GenerationMode;
@@ -89,7 +136,10 @@ export interface AppOptions extends ClientOptions {
     queryParamsSerialization: {
         allowDots: boolean;
         arrayFormat: ArrayFormat;
+        queryParamsAsObject: boolean | number;
     };
+    mocks?: string;
+    testingFramework?: TestingFramework;
 }
 /**
  * Local type that represent Operation as understood by Swaggie
@@ -97,6 +147,6 @@ export interface AppOptions extends ClientOptions {
 export interface ApiOperation extends OA3.OperationObject {
     method: HttpMethod;
     path: string;
-    group: string;
+    group: string | null;
 }
 export {};

package/dist/utils/documentLoader.js

@@ -35,9 +35,7 @@ async function loadFromUrl(url) {
 
 async function readLocalFile(filePath) {
   const contents = await new Promise((res, rej) =>
-    _nodefs2.default.readFile(filePath, 'utf8', (err, loadedContents) =>
-      err ? rej(err) : res(loadedContents)
-    )
+    _nodefs2.default.readFile(filePath, 'utf8', (err, loadedContents) => (err ? rej(err) : res(loadedContents)))
   );
   const spec = parseFileContents(contents , filePath) ;