rename

fa0311 · fa0311 · commit 8f67cde45242 · 2023-06-05T12:54:49.000+09:00
Signed-off-by: ふぁ &lt;yuki@yuki0311.com&gt;
diff --git a/twitter-openapi-typescript/package.json b/twitter-openapi-typescript/package.json
@@ -1,6 +1,6 @@
 {
   "name": "twitter-openapi-typescript",
-  "version": "0.0.6",
+  "version": "0.0.7",
   "description": "Implementation of Twitter internal API in TypeScript",
   "scripts": {
     "test": "jest",
diff --git a/twitter-openapi-typescript/src/api.ts b/twitter-openapi-typescript/src/api.ts
@@ -10,7 +10,7 @@ import {
   V11PostApiUtils,
   V20GetApiUtils,
 } from '@/apis';
-import { DefaultFlag } from '@/types/flag';
+import { DefaultFlag } from '@/models';
 
 export type TwitterOpenApiParams = {
   lang?: string;
diff --git a/twitter-openapi-typescript/src/apis/defaultApi.ts b/twitter-openapi-typescript/src/apis/defaultApi.ts
@@ -1,7 +1,6 @@
 import * as i from 'twitter-openapi-typescript-generated';
-import { DefaultFlag } from '@/types';
-import { RequestParam, buildHeader } from '@/models';
-import { TwitterApiUtilsResponse } from '@/types/response';
+import { buildHeader } from '@/utils';
+import { RequestParam, DefaultFlag, TwitterApiUtilsResponse } from '@/models';
 
 export type ProfileSpotlightsQueryParam = {
   screenName: string;
diff --git a/twitter-openapi-typescript/src/apis/postApi.ts b/twitter-openapi-typescript/src/apis/postApi.ts
@@ -1,7 +1,7 @@
 import * as i from 'twitter-openapi-typescript-generated';
-import { DefaultFlag } from '@/types';
-import { buildHeader, entriesCursor } from '@/models';
-import { TwitterApiUtilsResponse } from '@/types';
+import { DefaultFlag } from '@/models';
+import { buildHeader } from '@/utils';
+import { TwitterApiUtilsResponse } from '@/models';
 
 type PostCreateTweetParam = {
   tweetText: string;
diff --git a/twitter-openapi-typescript/src/apis/tweetApi.ts b/twitter-openapi-typescript/src/apis/tweetApi.ts
@@ -1,6 +1,6 @@
 import * as i from 'twitter-openapi-typescript-generated';
-import { DefaultFlag, TweetListApiUtilsResponse, ApiUtilsRaw } from '@/types';
-import { RequestParam, buildHeader, entriesCursor, instructionToEntry, tweetEntriesConverter } from '@/models';
+import { DefaultFlag, TweetListApiUtilsResponse, ApiUtilsRaw, RequestParam } from '@/models';
+import { buildHeader, entriesCursor, instructionToEntry, tweetEntriesConverter } from '@/utils';
 
 type GetTweetDetailParam = {
   focalTweetId: string;
diff --git a/twitter-openapi-typescript/src/apis/userApi.ts b/twitter-openapi-typescript/src/apis/userApi.ts
@@ -1,6 +1,6 @@
 import * as i from 'twitter-openapi-typescript-generated';
-import { UserApiUtilsRaw, DefaultFlag, UserApiUtilsResponse } from '@/types';
-import { RequestParam, buildHeader } from '@/models';
+import { RequestParam, DefaultFlag, UserApiUtilsResponse } from '@/models';
+import { buildHeader } from '@/utils';
 
 type getUserByScreenNameParam = {
   screenName: string;
diff --git a/twitter-openapi-typescript/src/apis/userListApi.ts b/twitter-openapi-typescript/src/apis/userListApi.ts
@@ -1,13 +1,6 @@
 import * as i from 'twitter-openapi-typescript-generated';
-import { DefaultFlag, ApiUtilsRaw, UserListApiUtilsResponse } from '@/types';
-import {
-  RequestParam,
-  buildHeader,
-  buildUserResponse,
-  entriesCursor,
-  instructionToEntry,
-  userEntriesConverter,
-} from '@/models';
+import { RequestParam, DefaultFlag, ApiUtilsRaw, UserListApiUtilsResponse } from '@/models';
+import { buildHeader, buildUserResponse, entriesCursor, instructionToEntry, userEntriesConverter } from '@/utils';
 
 type GetFollowers = {
   userId: string;
diff --git a/twitter-openapi-typescript/src/apis/v11GetApi.ts b/twitter-openapi-typescript/src/apis/v11GetApi.ts
@@ -1,5 +1,5 @@
 import * as i from 'twitter-openapi-typescript-generated';
-import { DefaultFlag } from '@/types';
+import { DefaultFlag } from '@/models';
 
 export class V11GetApiUtils {
   api: i.V11GetApi;
diff --git a/twitter-openapi-typescript/src/apis/v11PostApi.ts b/twitter-openapi-typescript/src/apis/v11PostApi.ts
@@ -1,6 +1,6 @@
 import * as i from 'twitter-openapi-typescript-generated';
-import { DefaultFlag, TwitterApiUtilsResponse } from '@/types';
-import { buildHeader } from '@/models';
+import { DefaultFlag, TwitterApiUtilsResponse } from '@/models';
+import { buildHeader } from '@/utils';
 
 type PostCreateFriendshipsParam = {
   userId: string;
diff --git a/twitter-openapi-typescript/src/apis/v20GetApi.ts b/twitter-openapi-typescript/src/apis/v20GetApi.ts
@@ -1,5 +1,5 @@
 import * as i from 'twitter-openapi-typescript-generated';
-import { DefaultFlag } from '@/types';
+import { DefaultFlag } from '@/models';
 
 export class V20GetApiUtils {
   api: i.V20GetApi;
diff --git a/twitter-openapi-typescript/src/index.ts b/twitter-openapi-typescript/src/index.ts
@@ -1,4 +1,4 @@
 export * from '@/apis';
 export * from '@/models';
-export * from '@/types';
+export * from '@/models';
 export * from '@/api';
diff --git a/twitter-openapi-typescript/src/models/flag.ts b/twitter-openapi-typescript/src/models/flag.ts
diff --git a/twitter-openapi-typescript/src/models/header.ts b/twitter-openapi-typescript/src/models/header.ts
diff --git a/twitter-openapi-typescript/src/models/index.ts b/twitter-openapi-typescript/src/models/index.ts
@@ -1,2 +1,8 @@
-export * from './api';
-export * from './type';
+export * from './flag';
+export * from './header';
+export * from './timeline';
+export * from './tweet';
+export * from './user_list';
+export * from './user';
+export * from './response';
+export * from './utils';
diff --git a/twitter-openapi-typescript/src/models/response.ts b/twitter-openapi-typescript/src/models/response.ts
@@ -1,4 +1,4 @@
-import { ApiUtilsHeader } from '@/types';
+import { ApiUtilsHeader } from '@/models';
 
 export type TwitterApiUtilsResponse<T> = {
   raw: TwitterApiUtilsRaw;
diff --git a/twitter-openapi-typescript/src/models/timeline.ts b/twitter-openapi-typescript/src/models/timeline.ts
diff --git a/twitter-openapi-typescript/src/models/tweet.ts b/twitter-openapi-typescript/src/models/tweet.ts
@@ -1,5 +1,5 @@
 import * as i from 'twitter-openapi-typescript-generated';
-import { CursorApiUtilsResponse, ApiUtilsRaw, ApiUtilsHeader } from '@/types';
+import { CursorApiUtilsResponse, ApiUtilsRaw, ApiUtilsHeader } from '@/models';
 
 export type TweetListApiUtilsResponse = {
   raw: ApiUtilsRaw;
diff --git a/twitter-openapi-typescript/src/models/user.ts b/twitter-openapi-typescript/src/models/user.ts
@@ -1,5 +1,5 @@
 import * as i from 'twitter-openapi-typescript-generated';
-import { ApiUtilsHeader } from '@/types';
+import { ApiUtilsHeader } from '@/models';
 
 export type UserApiUtilsResponse = {
   raw: UserApiUtilsRaw;
diff --git a/twitter-openapi-typescript/src/models/user_list.ts b/twitter-openapi-typescript/src/models/user_list.ts
@@ -1,5 +1,5 @@
 import * as i from 'twitter-openapi-typescript-generated';
-import { ApiUtilsRaw, CursorApiUtilsResponse, ApiUtilsHeader } from '@/types';
+import { ApiUtilsRaw, CursorApiUtilsResponse, ApiUtilsHeader } from '@/models';
 
 export type UserListApiUtilsResponse = {
   raw: ApiUtilsRaw;
diff --git a/twitter-openapi-typescript/src/models/utils.ts b/twitter-openapi-typescript/src/models/utils.ts
diff --git a/twitter-openapi-typescript/src/types/index.ts b/twitter-openapi-typescript/src/types/index.ts
diff --git a/twitter-openapi-typescript/src/utils/api.ts b/twitter-openapi-typescript/src/utils/api.ts
@@ -1,5 +1,5 @@
 import * as i from 'twitter-openapi-typescript-generated';
-import { TweetApiUtilsData, UserApiUtilsData, CursorApiUtilsResponse, ApiUtilsHeader } from '@/types';
+import { TweetApiUtilsData, UserApiUtilsData, CursorApiUtilsResponse, ApiUtilsHeader } from '@/models';
 
 export const instructionToEntry = (item: i.InstructionUnion[]): i.TimelineAddEntry[] => {
   return item
diff --git a/twitter-openapi-typescript/src/utils/index.ts b/twitter-openapi-typescript/src/utils/index.ts
@@ -0,0 +1 @@
+export * from './api';
diff --git a/twitter-openapi-typescript/test/util.ts b/twitter-openapi-typescript/test/util.ts
@@ -1,4 +1,4 @@
-import { TweetApiUtilsData, UserApiUtilsData } from '@/types';
+import { TweetApiUtilsData, UserApiUtilsData } from '@/models';
 import { getClient, logger } from '@test/init';
 
 export const printTweet = (tweet: TweetApiUtilsData) => {

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "twitter-openapi-typescript",`
`3`		`- "version": "0.0.6",`
	`3`	`+ "version": "0.0.7",`
`4`	`4`	`"description": "Implementation of Twitter internal API in TypeScript",`
`5`	`5`	`"scripts": {`
`6`	`6`	`"test": "jest",`