fix: fix return type is unknown

type-safe-dx · Feb 23, 2023 · a11bae6 · a11bae6
1 parent ad9724b
commit a11bae6
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 10 deletions.
diff --git a/src/__snapshots__/index.test.ts.snap b/src/__snapshots__/index.test.ts.snap
@@ -102,7 +102,6 @@ export interface operations {
   };
 }
 
-  
 export const operationIdToPath = {
   listUsers: \\"/users\\",
   createUser: \\"/users\\",
@@ -124,7 +123,7 @@ type Func<OpId extends OperationIds> = (
     OperationIdToResponseBody<OpId> extends never ? {} : { body: OperationIdToResponseBody<OpId> }
   )
 ) => Promise<
-  Get<operations[OpId], [\\"responses\\", \\"200\\", \\"content\\", \\"application/json\\"]>
+  Get<operations[OpId], [\\"responses\\", 200, \\"content\\", \\"application/json\\"]>
 >
 
 type Fetchers = {

diff --git a/src/index.ts b/src/index.ts
@@ -31,7 +31,6 @@ export default async function generate({
 import { Get } from "${packageName}"
 
 ${await openapiTS(schema, { ...openApiTsOption, commentHeader: "" })}
-  
 export const operationIdToPath = {
   ${[...operationIdToSchemaInfo.entries()]
     .map(([operationId, { path }]) => `${operationId}: "${path}"`)
@@ -53,7 +52,7 @@ type Func<OpId extends OperationIds> = (
     OperationIdToResponseBody<OpId> extends never ? {} : { body: OperationIdToResponseBody<OpId> }
   )
 ) => Promise<
-  Get<operations[OpId], ["responses", "200", "content", "application/json"]>
+  Get<operations[OpId], ["responses", 200, "content", "application/json"]>
 >
 
 type Fetchers = {

diff --git a/test/generated/index.test.ts b/test/generated/index.test.ts
@@ -15,15 +15,29 @@ test("listUsers", async () => {
     { id: 1, name: "John" },
     { id: 2, name: "Jane" },
   ];
-  const h = rest.get(`${baseURL}/users`, (_req, res, ctx) => {
-    return res(ctx.json(dummyUsers));
-  });
-  server.use(h);
+  server.use(
+    rest.get(`${baseURL}/users`, (_req, res, ctx) => {
+      return res(ctx.json(dummyUsers));
+    }),
+  );
 
   const fetcher = createFetcher((path, { method, body }) =>
     axios({ baseURL, url: path, method, data: body }).then((res) => res.data),
   );
   const res = await fetcher.listUsers({ query: { per: 10, page: 0 } });
 
   expect(res).toStrictEqual(dummyUsers);
+
+  expectTypeOf(res).toMatchTypeOf<
+    {
+      id?: number | undefined;
+      username?: string | undefined;
+      firstName?: string | undefined;
+      lastName?: string | undefined;
+      email?: string | undefined;
+      password?: string | undefined;
+      phone?: string | undefined;
+      userStatus?: number | undefined;
+    }[]
+  >();
 });
diff --git a/test/generated/index.ts b/test/generated/index.ts
@@ -99,7 +99,6 @@ export interface operations {
   };
 }
 
-
 export const operationIdToPath = {
   listUsers: "/users",
   createUser: "/users",
@@ -121,7 +120,7 @@ type Func<OpId extends OperationIds> = (
     OperationIdToResponseBody<OpId> extends never ? {} : { body: OperationIdToResponseBody<OpId> }
   )
 ) => Promise<
-  Get<operations[OpId], ["responses", "200", "content", "application/json"]>
+  Get<operations[OpId], ["responses", 200, "content", "application/json"]>
 >
 
 type Fetchers = {