typescript-resolver-filesの制約に対応するためのワークアラウンドをやめた

eddeee888/graphql-code-generator-plugins#242
kgtkr · Mar 25, 2024 · ecb7611 · ecb7611
1 parent 48f1843
commit ecb7611
Show file tree

Hide file tree

Showing 6 changed files with 105 additions and 78 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -2,6 +2,7 @@
   "name": "@anontown-backend/root",
   "private": true,
   "devDependencies": {
+    "@eddeee888/gcg-typescript-resolver-files": "^0.0.0-pr242-run423-1-20240323110222",
     "@lerna-lite/cli": "^1.11.2",
     "@lerna-lite/run": "^1.11.2",
     "@typescript-eslint/eslint-plugin": "^5.36.1",

diff --git a/packages/server/package.json b/packages/server/package.json
@@ -36,7 +36,7 @@
     "zod": "^3.18.0"
   },
   "devDependencies": {
-    "@eddeee888/gcg-typescript-resolver-files": "^0.7.2",
+    "@eddeee888/gcg-typescript-resolver-files": "pr242-run423-1",
     "@graphql-codegen/cli": "^5.0.0",
     "@graphql-codegen/core": "^4.0.0",
     "@graphql-codegen/typescript": "^4.0.1",

diff --git a/packages/server/src/entities/res/res.ts b/packages/server/src/entities/res/res.ts
@@ -41,45 +41,41 @@ export type IResAPI =
   | IResForkAPI
   | IResDeleteAPI;
 
-// --
-// typescript-resolver-files がinterfaceのextendsをサポートしていないので、classとして定義するがinterfaceとして使う
-export class IResBaseAPI<T extends ResAPIType> {
-  readonly id!: string;
-  readonly topicID!: string;
-  readonly date!: Date;
-  readonly self!: boolean | null;
-  readonly uv!: number;
-  readonly dv!: number;
-  readonly hash!: string;
-  readonly replyCount!: number;
-  readonly voteFlag!: VoteFlag | null;
-  readonly type!: T;
+export interface IResBaseAPI<T extends ResAPIType> {
+  readonly id: string;
+  readonly topicID: string;
+  readonly date: Date;
+  readonly self: boolean | null;
+  readonly uv: number;
+  readonly dv: number;
+  readonly hash: string;
+  readonly replyCount: number;
+  readonly voteFlag: VoteFlag | null;
+  readonly type: T;
 }
 
-export class IResNormalAPI extends IResBaseAPI<"normal"> {
-  readonly name!: string | null;
-  readonly text!: string;
-  readonly replyID!: string | null;
-  readonly profileID!: string | null;
-  readonly isReply!: boolean | null;
+export interface IResNormalAPI extends IResBaseAPI<"normal"> {
+  readonly name: string | null;
+  readonly text: string;
+  readonly replyID: string | null;
+  readonly profileID: string | null;
+  readonly isReply: boolean | null;
 }
 
-export class IResHistoryAPI extends IResBaseAPI<"history"> {
-  readonly historyID!: string;
+export interface IResHistoryAPI extends IResBaseAPI<"history"> {
+  readonly historyID: string;
 }
 
-export class IResTopicAPI extends IResBaseAPI<"topic"> {}
+export type IResTopicAPI = IResBaseAPI<"topic">;
 
-export class IResForkAPI extends IResBaseAPI<"fork"> {
-  readonly forkID!: string;
+export interface IResForkAPI extends IResBaseAPI<"fork"> {
+  readonly forkID: string;
 }
 
-export class IResDeleteAPI extends IResBaseAPI<"delete"> {
-  readonly flag!: "self" | "freeze";
+export interface IResDeleteAPI extends IResBaseAPI<"delete"> {
+  readonly flag: "self" | "freeze";
 }
 
-// --
-
 export type VoteFlag = "uv" | "dv" | "not";
 export type ResDeleteFlag = "active" | "self" | "freeze";
 export interface IReply {

diff --git a/packages/server/src/entities/token/token.ts b/packages/server/src/entities/token/token.ts
@@ -22,21 +22,18 @@ export type TokenType = "master" | "general";
 
 export type ITokenAPI = ITokenGeneralAPI | ITokenMasterAPI;
 
-// --
-// typescript-resolver-files がinterfaceのextendsをサポートしていないので、classとして定義するがinterfaceとして使う
-export class ITokenBaseAPI<T extends TokenType> {
-  readonly id!: string;
-  readonly key!: string;
-  readonly date!: string;
-  readonly type!: T;
+export interface ITokenBaseAPI<T extends TokenType> {
+  readonly id: string;
+  readonly key: string;
+  readonly date: string;
+  readonly type: T;
 }
 
-export class ITokenMasterAPI extends ITokenBaseAPI<"master"> {}
+export type ITokenMasterAPI = ITokenBaseAPI<"master">;
 
-export class ITokenGeneralAPI extends ITokenBaseAPI<"general"> {
-  readonly clientID!: string;
+export interface ITokenGeneralAPI extends ITokenBaseAPI<"general"> {
+  readonly clientID: string;
 }
-// --
 
 export type Token = TokenMaster | TokenGeneral;
 

diff --git a/packages/server/src/entities/topic/topic.ts b/packages/server/src/entities/topic/topic.ts
@@ -18,33 +18,29 @@ export interface ITagsAPI {
 export type ITopicAPI = ITopicOneAPI | ITopicNormalAPI | ITopicForkAPI;
 export type ITopicSearchAPI = ITopicOneAPI | ITopicNormalAPI;
 
-// --
-// typescript-resolver-files がinterfaceのextendsをサポートしていないので、classとして定義するがinterfaceとして使う
-export class ITopicBaseAPI<T extends TopicType> {
-  readonly id!: string;
-  readonly title!: string;
-  readonly update!: string;
-  readonly date!: string;
-  readonly resCount!: number;
-  readonly type!: T;
-  readonly active!: boolean;
+export interface ITopicBaseAPI<T extends TopicType> {
+  readonly id: string;
+  readonly title: string;
+  readonly update: string;
+  readonly date: string;
+  readonly resCount: number;
+  readonly type: T;
+  readonly active: boolean;
 }
 
-export class ITopicSearchBaseAPI<
-  T extends TopicSearchType
-> extends ITopicBaseAPI<T> {
-  readonly tags!: Array<string>;
-  readonly text!: string;
+export interface ITopicSearchBaseAPI<T extends TopicSearchType>
+  extends ITopicBaseAPI<T> {
+  readonly tags: Array<string>;
+  readonly text: string;
 }
 
-export class ITopicNormalAPI extends ITopicSearchBaseAPI<"normal"> {}
+export type ITopicNormalAPI = ITopicSearchBaseAPI<"normal">;
 
-export class ITopicOneAPI extends ITopicSearchBaseAPI<"one"> {}
+export type ITopicOneAPI = ITopicSearchBaseAPI<"one">;
 
-export class ITopicForkAPI extends ITopicBaseAPI<"fork"> {
-  readonly parentID!: string;
+export interface ITopicForkAPI extends ITopicBaseAPI<"fork"> {
+  readonly parentID: string;
 }
-// --
 
 export type TopicSearchType = "one" | "normal";
 export type TopicType = TopicSearchType | "fork";