create-fastify-flux 2.22.0 → 2.22.6

package/dist/template-prisma/package.json

@@ -17,28 +17,28 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "@fastify/swagger": "8.1.0",
-    "@fastify/swagger-ui": "^1.1.0",
-    "@prisma/client": "^4.5.0",
-    "fastify": "4.9.2",
+    "@fastify/swagger": "8.2.1",
+    "@fastify/swagger-ui": "^1.3.0",
+    "@prisma/client": "^4.8.0",
+    "fastify": "4.10.2",
     "fastify-flux": "*",
     "source-map-support": "0.5.21",
-    "tsconfig-paths": "4.1.0"
+    "tsconfig-paths": "4.1.1"
   },
   "devDependencies": {
-    "@types/jest": "^29.2.0",
-    "@types/node": "18.11.6",
-    "@typescript-eslint/eslint-plugin": "^5.41.0",
-    "@typescript-eslint/parser": "^5.41.0",
-    "axios": "^1.1.3",
-    "esbuild": "^0.15.12",
+    "@types/jest": "^29.2.4",
+    "@types/node": "18.11.18",
+    "@typescript-eslint/eslint-plugin": "^5.47.1",
+    "@typescript-eslint/parser": "^5.47.1",
+    "axios": "^1.2.2",
+    "esbuild": "^0.16.12",
     "esbuild-jest": "^0.5.0",
-    "eslint": "^8.26.0",
+    "eslint": "^8.30.0",
     "fastify-flux-cli": "*",
-    "jest": "^29.2.2",
+    "jest": "^29.3.1",
     "pino-pretty": "^9.1.1",
-    "prisma": "^4.5.0",
-    "typescript": "4.8.4"
+    "prisma": "^4.8.0",
+    "typescript": "4.9.4"
   },
   "jest": {
     "transform": {

package/dist/template-prisma/tests-e2e/api/GeneratedApi.ts

@@ -15,7 +15,6 @@ export interface ListTodoQuery {
 
 export interface TodoResponse {
   id: number;
-
   /** @format date-time */
   createdAt: string;
   text: string;
@@ -58,10 +57,6 @@ export interface FullRequestParams extends Omit<AxiosRequestConfig, 'data' | 'pa
 export type RequestParams = Omit<FullRequestParams, 'body' | 'method' | 'query' | 'path'>;
 
 export interface ApiConfig<SecurityDataType = unknown> extends Omit<AxiosRequestConfig, 'data' | 'cancelToken'> {
-  securityWorker?: (
-    securityData: SecurityDataType | null,
-  ) => Promise<AxiosRequestConfig | void> | AxiosRequestConfig | void;
-  secure?: boolean;
   format?: ResponseType;
 }
 
@@ -73,51 +68,14 @@ export enum ContentType {
 
 export class HttpClient<SecurityDataType = unknown> {
   public instance: AxiosInstance;
-  private securityData: SecurityDataType | null = null;
-  private securityWorker?: ApiConfig<SecurityDataType>['securityWorker'];
-  private secure?: boolean;
   private format?: ResponseType;
 
-  constructor({ securityWorker, secure, format, ...axiosConfig }: ApiConfig<SecurityDataType> = {}) {
+  constructor({ format, ...axiosConfig }: ApiConfig<SecurityDataType> = {}) {
     this.instance = axios.create({ ...axiosConfig, baseURL: axiosConfig.baseURL || '' });
-    this.secure = secure;
     this.format = format;
-    this.securityWorker = securityWorker;
-  }
-
-  public setSecurityData = (data: SecurityDataType | null) => {
-    this.securityData = data;
-  };
-
-  private mergeRequestParams(params1: AxiosRequestConfig, params2?: AxiosRequestConfig): AxiosRequestConfig {
-    return {
-      ...this.instance.defaults,
-      ...params1,
-      ...(params2 || {}),
-      headers: {
-        ...(params1.headers || {}),
-        ...((params2 && params2.headers) || {}),
-      },
-    };
-  }
-
-  private createFormData(input: Record<string, unknown>): FormData {
-    return Object.keys(input || {}).reduce((formData, key) => {
-      const property = input[key];
-      formData.append(
-        key,
-        property instanceof Blob
-          ? property
-          : typeof property === 'object' && property !== null
-          ? JSON.stringify(property)
-          : `${property}`,
-      );
-      return formData;
-    }, new FormData());
   }
 
   public request = async <T = any, _E = any>({
-    secure,
     path,
     type,
     query,
@@ -125,18 +83,9 @@ export class HttpClient<SecurityDataType = unknown> {
     body,
     ...params
   }: FullRequestParams): Promise<T> => {
-    const secureParams =
-      ((typeof secure === 'boolean' ? secure : this.secure) &&
-        this.securityWorker &&
-        (await this.securityWorker(this.securityData))) ||
-      {};
-    const requestParams = this.mergeRequestParams(params, secureParams);
+    const requestParams = params;
     const responseFormat = (format && this.format) || void 0;
 
-    if (type === ContentType.FormData && body && body !== null && typeof body === 'object') {
-      body = this.createFormData(body as Record<string, unknown>);
-    }
-
     if (!type) {
       type = ContentType.Json;
     }
@@ -151,7 +100,7 @@ export class HttpClient<SecurityDataType = unknown> {
         headers: {
           ...(type && type !== ContentType.FormData ? { 'Content-Type': type } : {}),
           ...(requestParams.headers || {}),
-        },
+        } as any,
         params: query,
         responseType: responseFormat,
         data: body,
@@ -159,8 +108,8 @@ export class HttpClient<SecurityDataType = unknown> {
       });
 
       return result.data;
-    } catch (err) {
-      if (axios.isAxiosError(err)) {
+    } catch (err: any) /* istanbul ignore next */ {
+      if (axios.isAxiosError(err) && err.config) {
         err.message += ` [${err.config.method}] ${err.config.url}`;
         if (err.response) {
           (err as any).data = err.response.data;
@@ -184,8 +133,23 @@ export class Api<SecurityDataType extends unknown> extends HttpClient<SecurityDa
      * @name List
      * @request GET:/todos
      */
-    list: (query?: { includeDone?: boolean }, params: RequestParams = {}) =>
-      this.request<{ id: number; createdAt: string; text: string; priority: number; done: boolean }[], any>({
+    list: (
+      query?: {
+        includeDone?: boolean;
+      },
+      params: RequestParams = {},
+    ) =>
+      this.request<
+        {
+          id: number;
+          /** @format date-time */
+          createdAt: string;
+          text: string;
+          priority: number;
+          done: boolean;
+        }[],
+        any
+      >({
         path: `/todos`,
         method: 'GET',
         query: query,
@@ -200,8 +164,24 @@ export class Api<SecurityDataType extends unknown> extends HttpClient<SecurityDa
      * @name Create
      * @request POST:/todos
      */
-    create: (data: { text: string; priority: number }, params: RequestParams = {}) =>
-      this.request<{ id: number; createdAt: string; text: string; priority: number; done: boolean }, any>({
+    create: (
+      data: {
+        text: string;
+        priority: number;
+      },
+      params: RequestParams = {},
+    ) =>
+      this.request<
+        {
+          id: number;
+          /** @format date-time */
+          createdAt: string;
+          text: string;
+          priority: number;
+          done: boolean;
+        },
+        any
+      >({
         path: `/todos`,
         method: 'POST',
         body: data,
@@ -218,7 +198,17 @@ export class Api<SecurityDataType extends unknown> extends HttpClient<SecurityDa
      * @request GET:/todos/{id}
      */
     get: (id: number, params: RequestParams = {}) =>
-      this.request<{ id: number; createdAt: string; text: string; priority: number; done: boolean }, any>({
+      this.request<
+        {
+          id: number;
+          /** @format date-time */
+          createdAt: string;
+          text: string;
+          priority: number;
+          done: boolean;
+        },
+        any
+      >({
         path: `/todos/${id}`,
         method: 'GET',
         format: 'json',
@@ -234,10 +224,26 @@ export class Api<SecurityDataType extends unknown> extends HttpClient<SecurityDa
      */
     update: (
       id: number,
-      data: { createdAt?: string; text?: string; priority?: number; done?: boolean },
+      data: {
+        /** @format date-time */
+        createdAt?: string;
+        text?: string;
+        priority?: number;
+        done?: boolean;
+      },
       params: RequestParams = {},
     ) =>
-      this.request<{ id: number; createdAt: string; text: string; priority: number; done: boolean }, any>({
+      this.request<
+        {
+          id: number;
+          /** @format date-time */
+          createdAt: string;
+          text: string;
+          priority: number;
+          done: boolean;
+        },
+        any
+      >({
         path: `/todos/${id}`,
         method: 'POST',
         body: data,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-fastify-flux",
-  "version": "2.22.0",
+  "version": "2.22.6",
   "description": "",
   "main": "./dist/index.js",
   "bin": {
@@ -9,19 +9,19 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "chalk": "^5.1.2",
+    "chalk": "^5.2.0",
     "commander": "^9.4.1",
     "enquirer": "^2.3.6",
-    "fs-extra": "^10.1.0",
+    "fs-extra": "^11.1.0",
     "source-map-support": "^0.5.21"
   },
   "devDependencies": {
     "@types/fs-extra": "^9.0.13",
-    "@types/jest": "^29.2.0",
-    "@types/node": "^18.11.6",
-    "jest": "^29.2.2",
+    "@types/jest": "^29.2.4",
+    "@types/node": "^18.11.18",
+    "jest": "^29.3.1",
     "ts-jest": "^29.0.3",
-    "typescript": "4.8.4"
+    "typescript": "4.9.4"
   },
   "files": [
     "cli.js",