codegenしてもdiffが発生しないようにした

packages/server/src/entities/res/res.ts

@@ -41,41 +41,45 @@ export type IResAPI =
   | IResForkAPI
   | IResDeleteAPI;
 
-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;
+// --
+// 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 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 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 IResHistoryAPI extends IResBaseAPI<"history"> {
-  readonly historyID: string;
+export class IResHistoryAPI extends IResBaseAPI<"history"> {
+  readonly historyID!: string;
 }
 
-export type IResTopicAPI = IResBaseAPI<"topic">;
+export class IResTopicAPI extends IResBaseAPI<"topic"> {}
 
-export interface IResForkAPI extends IResBaseAPI<"fork"> {
-  readonly forkID: string;
+export class IResForkAPI extends IResBaseAPI<"fork"> {
+  readonly forkID!: string;
 }
 
-export interface IResDeleteAPI extends IResBaseAPI<"delete"> {
-  readonly flag: "self" | "freeze";
+export class IResDeleteAPI extends IResBaseAPI<"delete"> {
+  readonly flag!: "self" | "freeze";
 }
 
+// --
+
 export type VoteFlag = "uv" | "dv" | "not";
 export type ResDeleteFlag = "active" | "self" | "freeze";
 export interface IReply {

packages/server/src/entities/token/token.ts

@@ -13,27 +13,30 @@ export interface ITokenReq {
   readonly active: boolean;
 }
 
-export interface ITokenReqAPI {
-  readonly token: string;
-  readonly key: string;
+export class ITokenReqAPI {
+  readonly token!: string;
+  readonly key!: string;
 }
 
 export type TokenType = "master" | "general";
 
 export type ITokenAPI = ITokenGeneralAPI | ITokenMasterAPI;
 
-export interface ITokenBaseAPI<T extends TokenType> {
-  readonly id: string;
-  readonly key: string;
-  readonly date: string;
-  readonly type: T;
+// --
+// 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 type ITokenMasterAPI = ITokenBaseAPI<"master">;
+export class ITokenMasterAPI extends ITokenBaseAPI<"master"> {}
 
-export interface ITokenGeneralAPI extends ITokenBaseAPI<"general"> {
-  readonly clientID: string;
+export class ITokenGeneralAPI extends ITokenBaseAPI<"general"> {
+  readonly clientID!: string;
 }
+// --
 
 export type Token = TokenMaster | TokenGeneral;
 

packages/server/src/entities/topic/topic.ts

@@ -18,29 +18,33 @@ export interface ITagsAPI {
 export type ITopicAPI = ITopicOneAPI | ITopicNormalAPI | ITopicForkAPI;
 export type ITopicSearchAPI = ITopicOneAPI | ITopicNormalAPI;
 
-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;
+// --
+// 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 ITopicSearchBaseAPI<T extends TopicSearchType>
-  extends ITopicBaseAPI<T> {
-  readonly tags: Array<string>;
-  readonly text: string;
+export class ITopicSearchBaseAPI<
+  T extends TopicSearchType
+> extends ITopicBaseAPI<T> {
+  readonly tags!: Array<string>;
+  readonly text!: string;
 }
 
-export type ITopicNormalAPI = ITopicSearchBaseAPI<"normal">;
+export class ITopicNormalAPI extends ITopicSearchBaseAPI<"normal"> {}
 
-export type ITopicOneAPI = ITopicSearchBaseAPI<"one">;
+export class ITopicOneAPI extends ITopicSearchBaseAPI<"one"> {}
 
-export interface ITopicForkAPI extends ITopicBaseAPI<"fork"> {
-  readonly parentID: string;
+export class ITopicForkAPI extends ITopicBaseAPI<"fork"> {
+  readonly parentID!: string;
 }
+// --
 
 export type TopicSearchType = "one" | "normal";
 export type TopicType = TopicSearchType | "fork";

packages/server/src/schema/res/resolvers/ResDelete.ts

@@ -1,6 +1,6 @@
 import type { ResDeleteResolvers } from "./../../types.generated";
-import { ResBase } from "./ResBase";
+import { base_Res } from "./base_Res";
 
 export const ResDelete: ResDeleteResolvers = {
-  ...ResBase,
+  topic: base_Res.topic,
 };

packages/server/src/schema/res/resolvers/ResFork.ts

@@ -1,9 +1,9 @@
 import { getTopic } from "../../../usecases";
 import type { ResForkResolvers } from "./../../types.generated";
-import { ResBase } from "./ResBase";
+import { base_Res } from "./base_Res";
 
 export const ResFork: ResForkResolvers = {
-  ...ResBase,
+  topic: base_Res.topic,
   fork: async (res, _args, context, _info) => {
     const fork = await getTopic({ id: res.forkID }, context.ports);
     if (fork.type !== "fork") {

packages/server/src/schema/res/resolvers/ResHistory.ts

@@ -1,9 +1,9 @@
 import { getHistory } from "../../../usecases";
 import type { ResHistoryResolvers } from "./../../types.generated";
-import { ResBase } from "./ResBase";
+import { base_Res } from "./base_Res";
 
 export const ResHistory: ResHistoryResolvers = {
-  ...ResBase,
+  topic: base_Res.topic,
   history: async (res, _args, context, _info) => {
     const history = await getHistory({ id: res.historyID }, context.ports);
     return history;

packages/server/src/schema/res/resolvers/ResNormal.ts

@@ -1,9 +1,9 @@
 import { getProfile, getRes } from "../../../usecases";
 import type { ResNormalResolvers } from "./../../types.generated";
-import { ResBase } from "./ResBase";
+import { base_Res } from "./base_Res";
 
 export const ResNormal: ResNormalResolvers = {
-  ...ResBase,
+  topic: base_Res.topic,
   reply: async (res, _args, context, _info) => {
     if (res.replyID !== null) {
       const reply = await getRes({ id: res.replyID }, context.ports);

packages/server/src/schema/res/resolvers/ResSubscript.ts

@@ -1,8 +1,8 @@
-import type   { ResSubscriptResolvers } from './../../types.generated';
-    export const ResSubscript: ResSubscriptResolvers = {
-    /* Implement ResSubscript resolver logic here */
-        res: ({ res }) => {
-                            /* ResSubscript.res resolver is required because ResSubscript.res and ResSubscriptMapper.res are not compatible */
-                            return res
-                          }
-    };
+import type { ResSubscriptResolvers } from "./../../types.generated";
+export const ResSubscript: ResSubscriptResolvers = {
+  /* Implement ResSubscript resolver logic here */
+  res: ({ res }) => {
+    /* ResSubscript.res resolver is required because ResSubscript.res and ResSubscriptMapper.res are not compatible */
+    return res;
+  },
+};

packages/server/src/schema/res/resolvers/ResTopic.ts

@@ -1,6 +1,6 @@
 import type { ResTopicResolvers } from "./../../types.generated";
-import { ResBase } from "./ResBase";
+import { base_Res } from "./base_Res";
 
 export const ResTopic: ResTopicResolvers = {
-  ...ResBase,
+  topic: base_Res.topic,
 };

packages/server/src/schema/res/resolvers/ResBase.ts → packages/server/src/schema/res/resolvers/base_Res.ts

@@ -1,7 +1,7 @@
 import { getTopic } from "../../../usecases";
 import type { ResResolvers } from "./../../types.generated";
 
-export const ResBase: Omit<ResResolvers, "__resolveType"> = {
+export const base_Res: Required<Pick<ResResolvers, "topic">> = {
   topic: async (res, _args, context, _info) => {
     const topic = await getTopic({ id: res.topicID }, context.ports);
     return topic;

packages/server/src/schema/storage/resolvers/SetStoragesPayload.ts

@@ -1,4 +1,4 @@
-import type   { SetStoragesPayloadResolvers } from './../../types.generated';
-    export const SetStoragesPayload: SetStoragesPayloadResolvers = {
-    /* Implement SetStoragesPayload resolver logic here */
-  };
+import type { SetStoragesPayloadResolvers } from "./../../types.generated";
+export const SetStoragesPayload: SetStoragesPayloadResolvers = {
+  /* Implement SetStoragesPayload resolver logic here */
+};

packages/server/src/schema/storage/resolvers/Storage.ts

@@ -1,4 +1,4 @@
-import type   { StorageResolvers } from './../../types.generated';
-    export const Storage: StorageResolvers = {
-    /* Implement Storage resolver logic here */
-    };
+import type { StorageResolvers } from "./../../types.generated";
+export const Storage: StorageResolvers = {
+  /* Implement Storage resolver logic here */
+};

packages/server/src/schema/token/resolvers/CreateTokenGeneralResponse.ts

@@ -1,4 +1,3 @@
 import type { CreateTokenGeneralResponseResolvers } from "./../../types.generated";
 export const CreateTokenGeneralResponse: CreateTokenGeneralResponseResolvers =
-  {
-};
+  {};

packages/server/src/schema/token/resolvers/Mutation/authTokenReq.ts

@@ -1,7 +1,9 @@
 import { AtNotFoundError } from "../../../../at-error";
 import type { MutationResolvers } from "./../../../types.generated";
 
-export const authTokenReq: NonNullable<MutationResolvers['authTokenReq']> = async (_obj, args, context, _info) => {
+export const authTokenReq: NonNullable<
+  MutationResolvers["authTokenReq"]
+> = async (_obj, args, context, _info) => {
   const token = await context.ports.tokenRepo.findOne(args.id);
   if (token.type !== "general") {
     throw new AtNotFoundError("トークンが見つかりません");

packages/server/src/schema/token/resolvers/Query/token.ts

@@ -1,5 +1,5 @@
 import type { QueryResolvers } from "./../../../types.generated";
-export const token: NonNullable<QueryResolvers['token']> = async (
+export const token: NonNullable<QueryResolvers["token"]> = async (
   _obj,
   _args,
   context,

packages/server/src/schema/token/resolvers/Query/tokens.ts

@@ -1,5 +1,5 @@
 import type { QueryResolvers } from "./../../../types.generated";
-export const tokens: NonNullable<QueryResolvers['tokens']> = async (
+export const tokens: NonNullable<QueryResolvers["tokens"]> = async (
   _obj,
   _args,
   context,

packages/server/src/schema/token/resolvers/TokenMaster.ts

@@ -1,3 +1,2 @@
 import type { TokenMasterResolvers } from "./../../types.generated";
-export const TokenMaster: TokenMasterResolvers = {
-};
+export const TokenMaster: TokenMasterResolvers = {};

packages/server/src/schema/token/resolvers/TokenReq.ts

@@ -1,3 +1,2 @@
 import type { TokenReqResolvers } from "./../../types.generated";
-export const TokenReq: TokenReqResolvers = {
-};
+export const TokenReq: TokenReqResolvers = {};

packages/server/src/schema/topic/resolvers/Tags.ts

@@ -1,4 +1,4 @@
-import type   { TagsResolvers } from './../../types.generated';
-    export const Tags: TagsResolvers = {
-    /* Implement Tags resolver logic here */
-    };
+import type { TagsResolvers } from "./../../types.generated";
+export const Tags: TagsResolvers = {
+  /* Implement Tags resolver logic here */
+};

packages/server/src/schema/topic/resolvers/TopicFork.ts

@@ -1,9 +1,9 @@
 import { getTopic } from "../../../usecases";
 import type { TopicForkResolvers } from "./../../types.generated";
-import { TopicBase } from "./TopicBase";
+import { base_Topic } from "./base_Topic";
 
 export const TopicFork: TopicForkResolvers = {
-  ...TopicBase,
+  subscribe: base_Topic.subscribe,
   parent: async (token, _args, context, _info) => {
     const parent = await getTopic({ id: token.parentID }, context.ports);
     if (parent.type !== "normal") {

packages/server/src/schema/topic/resolvers/TopicNormal.ts

@@ -1,6 +1,6 @@
 import type { TopicNormalResolvers } from "./../../types.generated";
-import { TopicSearchBase } from "./TopicSearchBase";
+import { base_Topic } from "./base_Topic";
 
 export const TopicNormal: TopicNormalResolvers = {
-  ...TopicSearchBase,
+  subscribe: base_Topic.subscribe,
 };

packages/server/src/schema/topic/resolvers/TopicOne.ts

@@ -1,6 +1,6 @@
 import type { TopicOneResolvers } from "./../../types.generated";
-import { TopicSearchBase } from "./TopicSearchBase";
+import { base_Topic } from "./base_Topic";
 
 export const TopicOne: TopicOneResolvers = {
-  ...TopicSearchBase,
+  subscribe: base_Topic.subscribe,
 };

packages/server/src/schema/topic/resolvers/TopicBase.ts → packages/server/src/schema/topic/resolvers/base_Topic.ts

@@ -1,7 +1,7 @@
 import type { TopicResolvers } from "./../../types.generated";
 import * as O from "fp-ts/lib/Option";
 
-export const TopicBase: Omit<TopicResolvers, "__resolveType"> = {
+export const base_Topic: Required<Pick<TopicResolvers, "subscribe">> = {
   subscribe: async (topic, _args, context, _info) => {
     // TODO: N+1
     const token = context.ports.authContainer.getTokenOrNull();

packages/server/src/schema/user/resolvers/CreateUserResponse.ts

@@ -1,4 +1,4 @@
-import type   { CreateUserResponseResolvers } from './../../types.generated';
-    export const CreateUserResponse: CreateUserResponseResolvers = {
-    /* Implement CreateUserResponse resolver logic here */
-  };
+import type { CreateUserResponseResolvers } from "./../../types.generated";
+export const CreateUserResponse: CreateUserResponseResolvers = {
+  /* Implement CreateUserResponse resolver logic here */
+};

packages/server/src/schema/user/resolvers/UpdateUserResponse.ts

@@ -1,4 +1,4 @@
-import type   { UpdateUserResponseResolvers } from './../../types.generated';
-    export const UpdateUserResponse: UpdateUserResponseResolvers = {
-    /* Implement UpdateUserResponse resolver logic here */
-  };
+import type { UpdateUserResponseResolvers } from "./../../types.generated";
+export const UpdateUserResponse: UpdateUserResponseResolvers = {
+  /* Implement UpdateUserResponse resolver logic here */
+};

packages/server/src/schema/user/resolvers/User.ts

@@ -1,4 +1,4 @@
-import type   { UserResolvers } from './../../types.generated';
-    export const User: UserResolvers = {
-    /* Implement User resolver logic here */
-    };
+import type { UserResolvers } from "./../../types.generated";
+export const User: UserResolvers = {
+  /* Implement User resolver logic here */
+};