@povio/openapi-codegen-cli 0.5.0 → 0.5.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@povio/openapi-codegen-cli",
-  "version": "0.5.0",
+  "version": "0.5.1",
   "main": "./dist/index.js",
   "bin": {
     "openapi-codegen": "./dist/sh.js"
@@ -14,6 +14,7 @@
     "build": "yarn build:clean && yarn build:types && node ./esbuild.mjs && chmod +x ./dist/sh.js",
     "build:check": "yarn tsc --project . --noEmit",
     "start:dist": "node ./dist/sh.js",
+    "typecheck": "tsc --noEmit",
     "lint": "eslint --fix",
     "format:check": "prettier --check .",
     "format:fix": "prettier --write .",
@@ -21,6 +22,7 @@
   },
   "files": [
     "dist/*",
+    "src/assets/**",
     "src/generators/templates/**",
     "README.md"
   ],

package/src/assets/react-query.types.ts

@@ -0,0 +1,24 @@
+import { UseInfiniteQueryOptions, UseMutationOptions, UseQueryOptions } from "@tanstack/react-query";
+
+type Function = (...args: any) => any;
+type IfAny<T, Y, N> = 0 extends 1 & T ? Y : N;
+type IsAny<T> = IfAny<T, true, never>;
+type IsUnknown<T, Y, N = T> = IsAny<T> extends never ? (unknown extends T ? Y : N) : N;
+
+export type AppQueryOptions<TFunction extends Function, TData = Awaited<ReturnType<TFunction>>> = Omit<
+  UseQueryOptions<Awaited<ReturnType<TFunction>>, Error, IsUnknown<TData, Awaited<ReturnType<TFunction>>>>,
+  "queryKey" | "queryFn"
+>;
+
+export type AppMutationOptions<
+  TFunction extends Function,
+  TVariables = void,
+  TData = Awaited<ReturnType<TFunction>>,
+> = Omit<UseMutationOptions<TData, Error, TVariables>, "mutationKey" | "mutationFn"> & {
+  enableInvalidateAll?: boolean;
+};
+
+export type AppInfiniteQueryOptions<TFunction extends Function, TData = Awaited<ReturnType<TFunction>>> = Omit<
+  UseInfiniteQueryOptions<Awaited<ReturnType<TFunction>>, Error, IsUnknown<TData, Awaited<ReturnType<TFunction>>>>,
+  "queryKey" | "queryFn" | "initialPageParam" | "getNextPageParam"
+>;

package/src/assets/rest-client.ts

@@ -0,0 +1,107 @@
+import axios, { AxiosInstance, AxiosRequestConfig, AxiosResponse, CreateAxiosDefaults } from "axios";
+import { z } from "zod";
+import { RestInterceptor } from "./rest-interceptor";
+
+interface RequestInfo<ZResDto extends z.ZodRawShape, ResDto, Res> {
+  resSchema: z.ZodEffects<z.ZodObject<ZResDto, "strip", z.ZodTypeAny, ResDto>, Res> | z.ZodSchema<Res>;
+}
+
+type Method = "get" | "post" | "patch" | "put" | "delete";
+
+const MethodHasBody: Record<Method, boolean> = {
+  get: false,
+  post: true,
+  patch: true,
+  put: true,
+  delete: true,
+};
+
+export class RestClient {
+  private client: AxiosInstance;
+
+  constructor({
+    config,
+    interceptors,
+  }: {
+    config?: CreateAxiosDefaults;
+    interceptors?: RestInterceptor<any[]>[];
+  } = {}) {
+    this.client = axios.create(config);
+    this.attachInterceptors(interceptors);
+  }
+
+  public attachInterceptors<T extends any[]>(interceptors?: RestInterceptor<T>[], ...args: T) {
+    if (interceptors != null) {
+      interceptors.forEach((interceptor) => this.attachInterceptor(interceptor, ...args));
+    }
+  }
+
+  public attachInterceptor<T extends any[]>(interceptor: RestInterceptor<T>, ...args: T) {
+    interceptor.addInterceptor(this.client, ...args);
+  }
+
+  public ejectInterceptor<T extends any[]>(interceptor: RestInterceptor<T>) {
+    interceptor.removeInterceptor(this.client);
+  }
+
+  public async get<ZResDto extends z.ZodRawShape, ResDto, Res>(
+    requestInfo: RequestInfo<ZResDto, ResDto, Res>,
+    url: string,
+    config?: AxiosRequestConfig,
+  ): Promise<Res> {
+    return this.makeRequest(requestInfo, "get", url, undefined, config);
+  }
+
+  public async post<ZResDto extends z.ZodRawShape, ResDto, Res>(
+    requestInfo: RequestInfo<ZResDto, ResDto, Res>,
+    url: string,
+    data?: any,
+    config?: AxiosRequestConfig,
+  ): Promise<Res> {
+    return this.makeRequest(requestInfo, "post", url, data, config);
+  }
+
+  public async patch<ZResDto extends z.ZodRawShape, ResDto, Res>(
+    requestInfo: RequestInfo<ZResDto, ResDto, Res>,
+    url: string,
+    data?: any,
+    config?: AxiosRequestConfig,
+  ): Promise<Res> {
+    return this.makeRequest(requestInfo, "patch", url, data, config);
+  }
+
+  public async put<ZResDto extends z.ZodRawShape, ResDto, Res>(
+    requestInfo: RequestInfo<ZResDto, ResDto, Res>,
+    url: string,
+    data?: any,
+    config?: AxiosRequestConfig,
+  ): Promise<Res> {
+    return this.makeRequest(requestInfo, "put", url, data, config);
+  }
+
+  public async delete<ZResDto extends z.ZodRawShape, ResDto, Res>(
+    requestInfo: RequestInfo<ZResDto, ResDto, Res>,
+    url: string,
+    data?: any,
+    config?: AxiosRequestConfig,
+  ): Promise<Res> {
+    return this.makeRequest(requestInfo, "delete", url, data, config);
+  }
+
+  private async makeRequest<ZResDto extends z.ZodRawShape, ResDto, Res>(
+    requestInfo: RequestInfo<ZResDto, ResDto, Res>,
+    method: Method,
+    url: string,
+    data?: any,
+    config?: AxiosRequestConfig,
+  ): Promise<Res> {
+    let res: AxiosResponse;
+    if (MethodHasBody[method]) {
+      res = await this.client[method](url, data, config);
+    } else {
+      res = await this.client[method](url, config);
+    }
+
+    return requestInfo.resSchema.parse(res);
+  }
+}

package/src/assets/rest-interceptor.ts

@@ -0,0 +1,22 @@
+import { AxiosInstance } from "axios";
+
+export class RestInterceptor<T extends any[]> {
+  private interceptorIdMap: { client: AxiosInstance; interceptorId: number }[] = [];
+
+  constructor(private applyInterceptor: (client: AxiosInstance, ...args: T) => number) {}
+
+  public addInterceptor(client: AxiosInstance, ...args: T) {
+    this.removeInterceptor(client);
+    const interceptorId = this.applyInterceptor(client, ...args);
+    this.interceptorIdMap.push({ client, interceptorId });
+  }
+
+  public removeInterceptor(client: AxiosInstance) {
+    const interceptorId = this.interceptorIdMap.find((i) => i.client === client)?.interceptorId;
+
+    if (interceptorId != null) {
+      client.interceptors.request.eject(interceptorId);
+      this.interceptorIdMap = this.interceptorIdMap.filter((i) => i.client !== client);
+    }
+  }
+}

package/src/generators/templates/app-rest-client.hbs

@@ -0,0 +1,7 @@
+import { RestClient } from "./rest-client";
+
+export const {{appRestClientName}} = new RestClient({
+  config: {
+    baseURL: "{{baseUrl}}"
+  },
+});

package/src/generators/templates/endpoints.hbs

@@ -1,5 +1,5 @@
-{{! Rest client import}}
-{{{genImport restClientImport}}}
+{{! App rest client import}}
+{{{genImport appRestClientImport}}}
 {{! Zod import }}
 {{#if hasZodImport}}
 {{{genImport zodImport}}}

package/dist/generators/const/template.const.d.ts

@@ -1,10 +0,0 @@
-import { Import } from "../types/generate";
-export declare const DATA_FILE_PATH = "src/data";
-export declare const DATA_TS_PATH = "@/data";
-export declare const REST_CLIENT_NAME = "AppRestClient";
-export declare const REST_CLIENT_IMPORT: Import;
-export declare const QUERY_OPTIONS_TYPES: {
-    query: string;
-    mutation: string;
-};
-export declare const QUERY_TYPES_IMPORT: Import;