Update templates

Author: Ivan Kamkin

codegen/Templates/nodejs/api.mustache

@@ -1,5 +1,5 @@
 import { Configuration } from './Configuration';
-import { Multipart, RequestFile, FormParamsType } from './multipart';
+import { Multipart, RequestFile, FormParamPairs } from './multipart';
 
 export * from './models';
 
@@ -8,17 +8,17 @@ import { {{#models}} {{#model}}{{classname}},{{/model}} {{/models}} } from './mo
 import { {{#apiInfo}}{{#apis}}{{#operations}}{{#operation}} {{operationIdCamelCase}}RequestWrapper, {{/operation}}{{/operations}}{{/apis}}{{/apiInfo}} } from './models';
 
 
-type StringKeyWithStringValue = Record<string, string>;
+type StringMap = Record<string, string>;
 
 type ApiRequestOptions = {
     uri: string;
     body?: any;
     encoding?: BufferEncoding | null;
-    form?: StringKeyWithStringValue;
-    headers?: StringKeyWithStringValue;
+    form?: StringMap;
+    headers?: StringMap;
     json?: boolean;
     method?: string;
-    qs?: StringKeyWithStringValue;
+    qs?: StringMap;
 };
 
 type ApiResponse = {
@@ -39,27 +39,18 @@ type ApiRejectType = {
     error: Error;
 };
 
-interface FetchHeaders {
-    forEach(callback: (value: string, key: string) => void): void;
-}
-
-interface FetchResponse {
-    status: number;
-    statusText: string;
-    headers: FetchHeaders;
-    ok: boolean;
-    arrayBuffer(): Promise<ArrayBuffer>;
-}
+export class ApiClient {
+    private readonly _fetcher: typeof fetch;
 
-interface FetchRequestInit {
-    method?: string;
-    headers?: StringKeyWithStringValue;
-    body?: any;
-}
+    constructor() {
+        const resolvedFetch = (globalThis as { fetch?: typeof fetch }).fetch;
+        if (!resolvedFetch) {
+            throw new Error('Global fetch API is not available. Please use Node.js 18+.');
+        }
 
-type Fetcher = (input: string | URL, init?: FetchRequestInit) => Promise<FetchResponse>;
+        this._fetcher = resolvedFetch;
+    }
 
-export class ApiClient {
     public requestAsync(options: ApiRequestOptions): Promise<ApiResult> {
         const url: URL = options.qs
             ? new URL(`?${new URLSearchParams(options.qs).toString()}`, options.uri)
@@ -69,7 +60,7 @@ export class ApiClient {
 
         const responseEncoding: BufferEncoding | null = options.encoding === null ? null : options.encoding || 'utf-8';
 
-        const requestOptions: FetchRequestInit = {
+        const requestOptions: RequestInit = {
             method: options.method || 'GET',
             headers: options.headers,
         };
@@ -108,13 +99,12 @@ export class ApiClient {
 
     private async doFetchRequest(
         url: URL,
-        requestOptions: FetchRequestInit,
+        requestOptions: RequestInit,
         responseEncoding: BufferEncoding | null
     ): Promise<ApiResult> {
-        const fetcher = this.getFetch();
-        let response: FetchResponse;
+        let response: Response;
         try {
-            response = await fetcher(url.toString(), requestOptions);
+            response = await this._fetcher(url.toString(), requestOptions);
         } catch (error) {
             return Promise.reject({
                 response: null,
@@ -160,7 +150,7 @@ export class ApiClient {
     }
 
     private async readResponseBody(
-        response: FetchResponse,
+        response: Response,
         responseEncoding: BufferEncoding | null
     ): Promise<string | Buffer> {
         const arrayBuffer = await response.arrayBuffer();
@@ -173,7 +163,7 @@ export class ApiClient {
         return buffer.toString(responseEncoding);
     }
 
-    private toHeaderDict(headers: FetchHeaders): NodeJS.Dict<string | string[]> {
+    private toHeaderDict(headers: Headers): NodeJS.Dict<string | string[]> {
         const normalizedHeaders: NodeJS.Dict<string | string[]> = {};
 
         headers.forEach((value, key) => {
@@ -195,15 +185,6 @@ export class ApiClient {
         return normalizedHeaders;
     }
 
-    private getFetch(): Fetcher {
-        const fetcher = (globalThis as { fetch?: Fetcher }).fetch;
-        if (!fetcher) {
-            throw new Error('Global fetch API is not available. Please use Node.js 18+.');
-        }
-
-        return fetcher;
-    }
-
     private normalizeFetchError(error: unknown): Error {
         if (error instanceof Error) {
             const mutableError = error as Error & { code?: string; cause?: unknown; name: string };
@@ -447,7 +428,7 @@ export class {{classname}} {
         let queryParameters: any = {};
         let headerParams: any = (Object as any).assign({}, this.defaultHeaders);
 {{#hasFormParams}}
-        const formParams: FormParamsType = [];
+        const formParams: FormParamPairs = [];
 {{/hasFormParams}}
 
 {{#allParams}}

codegen/Templates/nodejs/multipart.mustache

@@ -1,8 +1,8 @@
 import crypto from 'crypto';
 
-type StringKeyWithStringValue = Record<string, string>;
+type StringMap = Record<string, string>;
 
-export interface FormParamsType extends Array<Array<string>> {}
+export interface FormParamPairs extends Array<Array<string>> {}
 
 interface IRequestFile {
     name: string;
@@ -23,9 +23,9 @@ export class RequestFile implements IRequestFile {
 export class Multipart {
     readonly boundary: string;
     readonly body: Buffer;
-    readonly headers: StringKeyWithStringValue;
+    readonly headers: StringMap;
 
-    constructor(textFields: FormParamsType, files?: IRequestFile[]) {
+    constructor(textFields: FormParamPairs, files?: IRequestFile[]) {
         const random = crypto.randomUUID();
         this.boundary = '------------------------' + random.replace(/-/g, '');
 

codegen/Templates/nodejs/package.mustache

@@ -133,6 +133,7 @@
   },
   "scripts": {
     "test": "npx jest",
+    "typecheck": "npx tsc --noEmit",
     "cover": "npx jest --coverage",
     "lint": "npx eslint src test snippets",
     "format": "npx eslint src test snippets eslint.config.mjs --fix",