requestOk -> requestSafe

1cedsoda · Feb 2, 2024 · 80360d2 · 80360d2
1 parent b5cd1d8
commit 80360d2
Show file tree

Hide file tree

Showing 6 changed files with 1,936 additions and 2,979 deletions.
diff --git a/packages/ts-axios/package.json b/packages/ts-axios/package.json
@@ -1,6 +1,6 @@
 {
   "name": "pastapi-ts-axios",
-  "version": "0.3.4",
+  "version": "0.3.5",
   "main": "dist/index",
   "types": "dist/index",
   "files": [

diff --git a/packages/ts-axios/src/class.ts b/packages/ts-axios/src/class.ts
@@ -36,14 +36,14 @@ const operationMethod = (o: Operation) => {
 
 const operationMethodOk = (o: Operation) => {
   return `
-  public async ${o.operationId}Ok(variables: ${
+  public async ${o.operationId}Safe(variables: ${
     o.requestBodies.length == 1
       ? `Omit<${fuck(o.operationId)}.Variables, "contentType">`
       : `${fuck(o.operationId)}.Variables`
   }, config?: AxiosRequestConfig<${
     o.requestBodies.length > 0 ? `Pick<${fuck(o.operationId)}.RequestBody, "body">` : `undefined`
   }>) {
-    return ${fuck(o.operationId)}.requestOk(this.axiosInstance, ${
+    return ${fuck(o.operationId)}.requestSafe(this.axiosInstance, ${
       o.requestBodies.length == 1
         ? `{"contentType": "${o.requestBodies[0].applicationType}", ...variables}`
         : `variables`

diff --git a/packages/ts-axios/src/index.ts b/packages/ts-axios/src/index.ts
@@ -6,7 +6,7 @@ import { apiClass } from "./class";
 
 export const generate = (ops: Operation[], prettierConfig?: Options | undefined): string => {
   const code = generateRaw(ops);
-  return format(code, { parser: "typescript", ...prettierConfig });
+  // return format(code, { parser: "typescript", ...prettierConfig });
   return code;
 };
 

diff --git a/packages/ts-axios/src/namespace.ts b/packages/ts-axios/src/namespace.ts
@@ -100,23 +100,24 @@ const operationNamespace = (o: Operation) => {
           ? `data: requestBodySchemas[vars.contentType].parse(vars.body, { path: ["request", "body"] }),`
           : ``
       }
-      validateStatus: () => true,
       ...config
     })
 
-    export const requestOk = async <REQ_B = RequestBody, RES_B_OK = ResponseBodyOk, RES_B_ERROR = ResponseBodyError>(axios: AxiosInstance, vars: Variables, config?: AxiosRequestConfig<${
+    export const requestSafe = async <REQ_B = RequestBody, RES_B_OK = ResponseBodyOk, RES_B_ERROR = ResponseBodyError>(axios: AxiosInstance, vars: Variables, config?: AxiosRequestConfig<${
       o.requestBodies.length > 0 ? `Pick<RequestBody, "body">` : `undefined`
     }>) => {
       const res = await request<REQ_B, RES_B_OK & RES_B_ERROR>(axios, vars, {
         ...config,
-        validateStatus: (s) => s >= 200 && s < 300, // default
+        validateStatus: () => true
       })
-      return res.config.validateStatus!(res.status) == true ? {
+      return res.status >= 200 && res.status < 300 ? {
         ok: res as unknown as AxiosResponse<RES_B_OK, REQ_B>,
-        error: null
+        error: null,
+        any: res as unknown as AxiosResponse<RES_B_OK, REQ_B>
       } : {
         ok: null,
         error: res as unknown as AxiosResponse<RES_B_ERROR, REQ_B>,
+        any: res as unknown as AxiosResponse<RES_B_ERROR, REQ_B>
       }
     }
   }