refactor

Signed-off-by: ふぁ <yuki@yuki0311.com>

Author: fa0311

twitter-openapi-typescript/src/apis/defaultApi.ts

@@ -1,6 +1,7 @@
 import * as i from 'twitter-openapi-typescript-generated';
 import { DefaultFlag } from '@/types';
-import { RequestParamDefault } from '@/models';
+import { RequestParam, buildHeader } from '@/models';
+import { TwitterApiUtilsResponse } from '@/types/response';
 
 export type ProfileSpotlightsQueryParam = {
   screenName: string;
@@ -16,26 +17,35 @@ export class DefaultApiUtils {
     this.flag = flag;
   }
 
-  async request<T>(param: RequestParamDefault<T>): Promise<T> {
+  async request<T1, T2>(param: RequestParam<T1, T2>): Promise<TwitterApiUtilsResponse<T1>> {
     const apiFn: typeof param.apiFn = param.apiFn.bind(this.api);
     const response = await apiFn({
       queryId: this.flag[param.key]['queryId'],
       variables: JSON.stringify({ ...this.flag[param.key]['variables'], ...param }),
       features: JSON.stringify(this.flag[param.key]['features']),
     });
-    return response.value() as T;
+    const data = param.convertFn(await response.value());
+    return {
+      raw: { response: response.raw },
+      header: buildHeader(response.raw.headers),
+      data: data,
+    };
   }
 
-  async gettProfileSpotlightsQuery(param: ProfileSpotlightsQueryParam): Promise<i.UserResultByScreenName> {
+  async getProfileSpotlightsQuery(
+    param: ProfileSpotlightsQueryParam,
+  ): Promise<TwitterApiUtilsResponse<i.UserResultByScreenName>> {
     const args = {
       screenName: param.screenName,
       ...param.extraParam,
     };
-    const response = this.request({
+    const response = await this.request({
       key: 'ProfileSpotlightsQuery',
       apiFn: this.api.getProfileSpotlightsQueryRaw,
+      convertFn: (value) => value.data.userResultByScreenName,
       param: args,
     });
-    return (await response).data.userResultByScreenName;
+
+    return response;
   }
 }

twitter-openapi-typescript/src/apis/tweetApi.ts

@@ -73,12 +73,12 @@ export class TweetApiUtils {
 
   async request<T>(param: RequestParam<i.InstructionUnion[], T>): Promise<TweetListApiUtilsResponse> {
     const apiFn: typeof param.apiFn = param.apiFn.bind(this.api);
-    const response = await apiFn.bind(this.api)({
+    const response = await apiFn({
       queryId: this.flag[param.key]['queryId'],
       variables: JSON.stringify({ ...this.flag[param.key]['variables'], ...param }),
       features: JSON.stringify(this.flag[param.key]['features']),
     });
-    const instruction = param.convertFn((await response.value()) as T);
+    const instruction = param.convertFn(await response.value());
     const entry = instructionToEntry(instruction);
     const data = tweetEntriesConverter(entry);
     const raw: ApiUtilsRaw = {

twitter-openapi-typescript/src/apis/userApi.ts

@@ -18,17 +18,14 @@ export class UserApiUtils {
 
   async request<T>(param: RequestParam<i.UserResults, T>): Promise<UserApiUtilsResponse> {
     const apiFn: typeof param.apiFn = param.apiFn.bind(this.api);
-    const response = await apiFn.bind(this.api)({
+    const response = await apiFn({
       queryId: this.flag[param.key]['queryId'],
       variables: JSON.stringify({ ...this.flag[param.key]['variables'], ...param }),
       features: JSON.stringify(this.flag[param.key]['features']),
     });
-    const user = param.convertFn((await response.value()) as T);
-    const raw: UserApiUtilsRaw = {
-      response: response.raw,
-    };
+    const user = param.convertFn(await response.value());
     return {
-      raw: raw,
+      raw: { response: response.raw },
       header: buildHeader(response.raw.headers),
       data: user.result,
     };

twitter-openapi-typescript/src/apis/userListApi.ts

@@ -34,12 +34,12 @@ export class UserListApiUtils {
 
   async request<T>(param: RequestParam<i.InstructionUnion[], T>): Promise<UserListApiUtilsResponse> {
     const apiFn: typeof param.apiFn = param.apiFn.bind(this.api);
-    const response = await apiFn.bind(this.api)({
+    const response = await apiFn({
       queryId: this.flag[param.key]['queryId'],
       variables: JSON.stringify({ ...this.flag[param.key]['variables'], ...param }),
       features: JSON.stringify(this.flag[param.key]['features']),
     });
-    const instruction = param.convertFn((await response.value()) as T);
+    const instruction = param.convertFn(await response.value());
     const entry = instructionToEntry(instruction);
     const userList = userEntriesConverter(entry);
     const data = userList.map((user) => buildUserResponse(user));

twitter-openapi-typescript/src/models/type.ts

@@ -6,12 +6,6 @@ export type ApiFunction<T> = (requestParameters: {
   features: string;
 }) => Promise<i.ApiResponse<T>>;
 
-export type RequestParamDefault<T> = {
-  apiFn: ApiFunction<T>;
-  key: string;
-  param: { [key: string]: any };
-};
-
 export type RequestParam<T1, T2> = {
   apiFn: ApiFunction<T2>;
   convertFn: ConvertFunction<T1, T2>;

twitter-openapi-typescript/src/types/index.ts

@@ -4,3 +4,4 @@ export * from './timeline';
 export * from './tweet';
 export * from './user_list';
 export * from './user';
+export * from './response';

twitter-openapi-typescript/test/api/defaultApi.test.ts

@@ -1,13 +1,13 @@
 import { getClient, logger } from '@test/init';
 import { printTweet } from '@test/util';
 
-test('gettProfileSpotlightsQuery', async () => {
-  logger.log('gettProfileSpotlightsQuery');
+test('getProfileSpotlightsQuery', async () => {
+  logger.log('getProfileSpotlightsQuery');
   const client = await getClient();
-  const response = await client.getDefaultApi().gettProfileSpotlightsQuery({ screenName: 'elonmusk' });
-  const legacy = response.result.legacy;
+  const response = await client.getDefaultApi().getProfileSpotlightsQuery({ screenName: 'elonmusk' });
+  const legacy = response.data.result.legacy;
   logger.log(legacy.screenName);
   logger.log(`followedBy: ${legacy.followedBy} following: ${legacy.following}`);
   logger.log('┄'.repeat(50));
-  expect(0).toBe(0);
+  expect(response.raw.response.ok).toBe(true);
 });

twitter-openapi-typescript/test/api/tweetApi.test.ts

@@ -6,69 +6,69 @@ test('getTweetDetail', async () => {
   const client = await getClient();
   const response = await client.getTweetApi().getTweetDetail({ focalTweetId: '1349129669258448897' });
   response.data.filter((e) => !e.promotedMetadata).forEach((e) => printTweet(e));
-  expect(0).toBe(0);
+  expect(response.raw.response.ok).toBe(true);
 });
 
 test('getHomeTimeline', async () => {
   logger.log('getHomeTimeline');
   const client = await getClient();
   const response = await client.getTweetApi().getHomeTimeline();
   response.data.filter((e) => !e.promotedMetadata).forEach((e) => printTweet(e));
-  expect(0).toBe(0);
+  expect(response.raw.response.ok).toBe(true);
 });
 
 test('getHomeLatestTimeline', async () => {
   logger.log('getHomeLatestTimeline');
   const client = await getClient();
   const response = await client.getTweetApi().getHomeLatestTimeline();
   response.data.filter((e) => !e.promotedMetadata).forEach((e) => printTweet(e));
-  expect(0).toBe(0);
+  expect(response.raw.response.ok).toBe(true);
 });
 
 test('getListLatestTweetsTimeline', async () => {
   logger.log('getListLatestTweetsTimeline');
   const client = await getClient();
   const response = await client.getTweetApi().getListLatestTweetsTimeline({ listId: '1141162794290520064' });
   response.data.filter((e) => !e.promotedMetadata).forEach((e) => printTweet(e));
-  expect(0).toBe(0);
+  expect(response.raw.response.ok).toBe(true);
 });
 
 test('getUserTweets', async () => {
   logger.log('getUserTweets');
   const client = await getClient();
   const response = await client.getTweetApi().getUserTweets({ userId: '44196397' });
   response.data.filter((e) => !e.promotedMetadata).forEach((e) => printTweet(e));
-  expect(0).toBe(0);
+  expect(response.raw.response.ok).toBe(true);
 });
 
 test('getUserTweetsAndReplies', async () => {
   logger.log('getUserTweetsAndReplies');
   const client = await getClient();
   const response = await client.getTweetApi().getUserTweetsAndReplies({ userId: '44196397' });
   response.data.filter((e) => !e.promotedMetadata).forEach((e) => printTweet(e));
-  expect(0).toBe(0);
+  expect(response.raw.response.ok).toBe(true);
 });
 
 test('getUserMedia', async () => {
   logger.log('getUserMedia');
   const client = await getClient();
   const response = await client.getTweetApi().getUserMedia({ userId: '44196397' });
   response.data.filter((e) => !e.promotedMetadata).forEach((e) => printTweet(e));
-  expect(0).toBe(0);
+  expect(response.raw.response.ok).toBe(true);
 });
 
 test('getLikes', async () => {
   logger.log('getLikes');
   const client = await getClient();
   const response = await client.getTweetApi().getLikes({ userId: '44196397' });
   response.data.filter((e) => !e.promotedMetadata).forEach((e) => printTweet(e));
-  expect(0).toBe(0);
+  expect(response.raw.response.ok).toBe(true);
 });
 
 test('getBookmarks', async () => {
   logger.log('getBookmarks');
   const client = await getClient();
   const response = await client.getTweetApi().getBookmarks();
   response.data.filter((e) => !e.promotedMetadata).forEach((e) => printTweet(e));
-  expect(0).toBe(0);
+  expect(response.raw.response.ok).toBe(true);
 });

twitter-openapi-typescript/test/api/userApi.test.ts

@@ -9,5 +9,5 @@ test('getUserByScreenName', async () => {
   logger.log(`followedBy: ${legacy.followedBy} following: ${legacy.following}`);
   logger.log(`friendsCount: ${legacy.friendsCount} followersCount: ${legacy.followersCount}`);
   logger.log('┄'.repeat(50));
-  expect(0).toBe(0);
+  expect(response.raw.response.ok).toBe(true);
 });

twitter-openapi-typescript/test/api/userListApi.test.ts

@@ -6,13 +6,13 @@ test('getFollowers', async () => {
   const client = await getClient();
   const response = await client.getUserListApi().getFollowers({ userId: '44196397' });
   response.data.forEach((e) => printUser(e));
-  expect(0).toBe(0);
+  expect(response.raw.response.ok).toBe(true);
 });
 
 test('getFollowing', async () => {
   logger.log('getFollowing');
   const client = await getClient();
   const response = await client.getUserListApi().getFollowing({ userId: '44196397' });
   response.data.forEach((e) => printUser(e));
-  expect(0).toBe(0);
+  expect(response.raw.response.ok).toBe(true);
 });