Feature: TzKT object query string (#1)

Author: aopoltorzhicky

package.json

@@ -1,5 +1,5 @@
 {
-    "name": "openapi-typescript-codegen",
+    "name": "@baking-bad/openapi-typescript-codegen",
     "version": "0.9.3",
     "description": "Library that generates Typescript clients based on the OpenAPI specification.",
     "author": "Ferdi Koomen",

src/openApi/v2/parser/getOperationPath.ts

@@ -12,5 +12,5 @@ export function getOperationPath(path: string): string {
         .replace(/\{(.*?)\}/g, (_, w: string) => {
             return `\${${getOperationParameterName(w)}}`;
         })
-        .replace('${apiVersion}', '${OpenAPI.VERSION}');
+        .replace('${apiVersion}', '${this.config.version}');
 }

src/openApi/v3/parser/getOperationPath.ts

@@ -12,5 +12,5 @@ export function getOperationPath(path: string): string {
         .replace(/\{(.*?)\}/g, (_, w: string) => {
             return `\${${getOperationParameterName(w)}}`;
         })
-        .replace('${apiVersion}', '${OpenAPI.VERSION}');
+        .replace('${apiVersion}', '${this.config.version}');
 }

src/templates/core/ApiOptions.hbs

@@ -0,0 +1,23 @@
+{{>header}}
+
+import type { Resolver, Headers } from './ApiRequestOptions';
+
+export type ApiOptions = {
+    baseUrl: string;
+    version: string;
+    withCredentials: boolean;
+    token?: string | Resolver<string>;
+    username?: string | Resolver<string>;
+    password?: string | Resolver<string>;
+    defaultHeaders?: Headers | Resolver<Headers>;
+}
+
+export const DefaultApiOptions: ApiOptions = {
+    baseUrl: '{{{server}}}',
+    version: '{{{version}}}',
+    withCredentials: false,
+    token: undefined,
+    username: undefined,
+    password: undefined,
+    defaultHeaders: undefined,
+};

src/templates/core/ApiRequestOptions.hbs

@@ -1,6 +1,16 @@
 {{>header}}
 
+export type Resolver<T> = (options: ApiRequestOptions) => Promise<T>;
+export type Headers = Record<string, string>;
+
 export type ApiRequestOptions = {
+    readonly baseUrl: string;
+    readonly withCredentials?: boolean;
+    readonly version: string;
+    readonly token?: string | Resolver<string>;
+    readonly username?: string | Resolver<string>;
+    readonly password?: string | Resolver<string>;
+    readonly defaultHeaders?: Headers | Resolver<Headers>;
     readonly method: 'GET' | 'PUT' | 'POST' | 'DELETE' | 'OPTIONS' | 'HEAD' | 'PATCH';
     readonly path: string;
     readonly cookies?: Record<string, any>;

src/templates/core/OpenAPI.hbs

@@ -1,8 +1,8 @@
 async function getHeaders(options: ApiRequestOptions): Promise<Headers> {
-    const token = await resolve(options, OpenAPI.TOKEN);
-    const username = await resolve(options, OpenAPI.USERNAME);
-    const password = await resolve(options, OpenAPI.PASSWORD);
-    const defaultHeaders = await resolve(options, OpenAPI.HEADERS);
+    const token = await resolve(options, options.token);
+    const username = await resolve(options, options.username);
+    const password = await resolve(options, options.password);
+    const defaultHeaders = await resolve(options, options.headers);
 
     const headers = new Headers({
         Accept: 'application/json',

src/templates/core/fetch/getHeaders.hbs

@@ -3,7 +3,6 @@
 import { ApiError } from './ApiError';
 import type { ApiRequestOptions } from './ApiRequestOptions';
 import type { ApiResult } from './ApiResult';
-import { OpenAPI } from './OpenAPI';
 
 {{>functions/isDefined}}
 

src/templates/core/fetch/request.hbs

@@ -4,7 +4,7 @@ async function sendRequest(options: ApiRequestOptions, url: string): Promise<Res
         headers: await getHeaders(options),
         body: getRequestBody(options),
     };
-    if (OpenAPI.WITH_CREDENTIALS) {
+    if (options.withCredentials) {
         request.credentials = 'include';
     }
     return await fetch(url, request);

src/templates/core/fetch/sendRequest.hbs

@@ -7,6 +7,32 @@ function getQueryString(params: Record<string, any>): string {
                 value.forEach(value => {
                     qs.push(`${encodeURIComponent(key)}=${encodeURIComponent(String(value))}`);
                 });
+            } else if (typeof value === 'object') {
+                switch (key) {
+                    case 'anyof': {
+                        qs.push(`${encodeURIComponent(key)}`);
+                        if (value.fields) {
+                            qs.push(`.${encodeURIComponent(Array(value.fileds).join('.'))}`);
+                        }
+                        qs.push(`=`);
+                        if (value.value) {
+                            qs.push(`${encodeURIComponent(value.value)}`);
+                        }
+                    }
+                    default: {
+                        Object.entries(value).map(raw => {
+                            let val = '';
+                            if (raw[1] instanceof Date) {
+                                val = (raw[1] as Date).toISOString();
+                            } else if (Array.isArray(raw[1])) {
+                                val = Array(raw[1]).join(',');
+                            } else {
+                                val = String(raw[1]);
+                            }
+                            qs.push(`${encodeURIComponent(key)}.${encodeURIComponent(String(raw[0]))}=${encodeURIComponent(val)}`);
+                        });
+                    }
+                }
             } else {
                 qs.push(`${encodeURIComponent(key)}=${encodeURIComponent(String(value))}`);
             }