Skip to content

Commit

Permalink
add prettier plugin to clean unused imports
Browse files Browse the repository at this point in the history
  • Loading branch information
elct9620 committed Jan 26, 2025
1 parent e1b250a commit c216b84
Show file tree
Hide file tree
Showing 32 changed files with 73 additions and 102 deletions.
4 changes: 3 additions & 1 deletion .prettierrc
Original file line number Diff line number Diff line change
@@ -1 +1,3 @@
{}
{
"plugins": ["prettier-plugin-organize-imports"]
}
6 changes: 3 additions & 3 deletions src/agent/GuideAgent.ts
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
import { inject, injectable } from "tsyringe-neo";
import { type LanguageModelV1 } from "ai";
import Mustache from "mustache";
import { inject, injectable } from "tsyringe-neo";

import { trackGenerateText } from "./utils";
import { Config } from "@app/config";
import { OpenAi } from "@app/container";
import system from "./prompts/guide.md";
import { Config } from "@app/config";
import { trackGenerateText } from "./utils";

@injectable()
export class GuideAgent {
Expand Down
13 changes: 2 additions & 11 deletions src/agent/Npc.ts
Original file line number Diff line number Diff line change
@@ -1,19 +1,10 @@
import { inject, injectable } from "tsyringe-neo";
import { z } from "zod";
import { CoreMessage, CoreTool, tool, type LanguageModelV1 } from "ai";
import { CoreTool, type LanguageModelV1 } from "ai";
import Mustache from "mustache";

import { trackGenerateText } from "./utils";
import { OpenAi } from "@app/container";
import { Config } from "@app/config";
import system from "./prompts/jack.md";
import { City } from "@entity/City";
import { NpcName } from "@entity/Npc";
import {
canChangeFavorability,
canGetFavorability,
} from "./tools/Favorability";
import { canCloseValve } from "./tools/Valve";
import { trackGenerateText } from "./utils";

export abstract class Npc {
protected readonly maxSteps = 15;
Expand Down
11 changes: 4 additions & 7 deletions src/agent/NpcJack.ts
Original file line number Diff line number Diff line change
@@ -1,20 +1,17 @@
import { CoreTool, type LanguageModelV1 } from "ai";
import { inject, injectable } from "tsyringe-neo";
import { z } from "zod";
import { CoreMessage, CoreTool, tool, type LanguageModelV1 } from "ai";
import Mustache from "mustache";

import { trackGenerateText } from "./utils";
import { OpenAi } from "@app/container";
import { Config } from "@app/config";
import system from "./prompts/jack.md";
import { OpenAi } from "@app/container";
import { City } from "@entity/City";
import { NpcName } from "@entity/Npc";
import { Npc } from "./Npc";
import system from "./prompts/jack.md";
import {
canChangeFavorability,
canGetFavorability,
} from "./tools/Favorability";
import { canCloseValve } from "./tools/Valve";
import { Npc } from "./Npc";

@injectable()
export class NpcJack extends Npc {
Expand Down
11 changes: 4 additions & 7 deletions src/agent/NpcMary.ts
Original file line number Diff line number Diff line change
@@ -1,20 +1,17 @@
import { CoreTool, type LanguageModelV1 } from "ai";
import { inject, injectable } from "tsyringe-neo";
import { z } from "zod";
import { CoreTool, tool, type LanguageModelV1 } from "ai";
import Mustache from "mustache";

import { trackGenerateText } from "./utils";
import { OpenAi } from "@app/container";
import { Config } from "@app/config";
import system from "./prompts/mary.md";
import { OpenAi } from "@app/container";
import { City } from "@entity/City";
import { NpcName } from "@entity/Npc";
import { Npc } from "./Npc";
import system from "./prompts/mary.md";
import {
canChangeFavorability,
canGetFavorability,
} from "./tools/Favorability";
import { canCallPeople } from "./tools/Skill";
import { Npc } from "./Npc";

@injectable()
export class NpcMary extends Npc {
Expand Down
11 changes: 4 additions & 7 deletions src/agent/NpcMatt.ts
Original file line number Diff line number Diff line change
@@ -1,20 +1,17 @@
import { CoreTool, type LanguageModelV1 } from "ai";
import { inject, injectable } from "tsyringe-neo";
import { z } from "zod";
import { CoreTool, tool, type LanguageModelV1 } from "ai";
import Mustache from "mustache";

import { trackGenerateText } from "./utils";
import { OpenAi } from "@app/container";
import { Config } from "@app/config";
import system from "./prompts/matt.md";
import { OpenAi } from "@app/container";
import { City } from "@entity/City";
import { NpcName } from "@entity/Npc";
import { Npc } from "./Npc";
import system from "./prompts/matt.md";
import {
canChangeFavorability,
canGetFavorability,
} from "./tools/Favorability";
import { canEnableProtectMachine } from "./tools/Skill";
import { Npc } from "./Npc";

@injectable()
export class NpcMatt extends Npc {
Expand Down
2 changes: 1 addition & 1 deletion src/agent/tools/Favorability.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { z } from "zod";
import { tool } from "ai";
import { z } from "zod";

import { City } from "@entity/City";
import { NpcName } from "@entity/Npc";
Expand Down
2 changes: 1 addition & 1 deletion src/agent/tools/Skill.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { z } from "zod";
import { tool } from "ai";
import { z } from "zod";

import { City } from "@entity/City";

Expand Down
2 changes: 1 addition & 1 deletion src/agent/tools/Valve.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { z } from "zod";
import { tool } from "ai";
import { z } from "zod";

import { City } from "@entity/City";

Expand Down
2 changes: 1 addition & 1 deletion src/app/container.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { createOpenAI } from "@ai-sdk/openai";
import { SESv2Client } from "@aws-sdk/client-sesv2";
import { experimental_wrapLanguageModel as wrapLanguageModel } from "ai";
import { createOpenAI } from "@ai-sdk/openai";
import {
container,
DependencyContainer,
Expand Down
2 changes: 1 addition & 1 deletion src/app/email.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { captureException, setUser, startSpan } from "@sentry/cloudflare";
import { setUser, startSpan } from "@sentry/cloudflare";
import { getContainer } from "./container";
import { routes } from "./routes/email";
import { sha256 } from "./utils";
Expand Down
3 changes: 1 addition & 2 deletions src/app/web.tsx
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
import { Hono } from "hono";
import { cache } from "hono/cache";
import { compress } from "hono/compress";
import { etag } from "hono/etag";

import { getContainer } from "./container";
import { CityViewController } from "@controller/CityViewController";
import { Credit } from "@view/Credit";
import { getContainer } from "./container";

const app = new Hono<{ Bindings: Env }>();
app.use(etag());
Expand Down
6 changes: 3 additions & 3 deletions src/builder/EndMessageBuilder.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import { inject, injectable } from "tsyringe-neo";
import Mustache from "mustache";
import endMessage from "./text/end.txt";
import { Config } from "@app/config";
import { City } from "@entity/City";
import Mustache from "mustache";
import { inject, injectable } from "tsyringe-neo";
import endMessage from "./text/end.txt";

@injectable()
export class EndMessageBuilder {
Expand Down
3 changes: 1 addition & 2 deletions src/builder/ProgressBuilder.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import { inject, injectable } from "tsyringe-neo";
import Mustache from "mustache";
import { Config } from "@app/config";
import { City } from "@entity/City";
import { inject, injectable } from "tsyringe-neo";

@injectable()
export class ProgressBuilder {
Expand Down
4 changes: 2 additions & 2 deletions src/builder/WelcomeMessageBuilder.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { inject, injectable } from "tsyringe-neo";
import { Config } from "@app/config";
import Mustache from "mustache";
import { inject, injectable } from "tsyringe-neo";
import welcomeMessage from "./text/welcome.txt";
import { Config } from "@app/config";

@injectable()
export class WelcomeMessageBuilder {
Expand Down
2 changes: 1 addition & 1 deletion src/controller/CityViewController.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/** @jsxImportSource hono/jsx */

import { inject, injectable } from "tsyringe-neo";
import { HtmlEscapedString } from "hono/utils/html";
import { inject, injectable } from "tsyringe-neo";

import { KvCityRepository } from "@repository/KvCityRepository";
import { CitySnapshotUsecase } from "@usecase/CitySnapshotUsecase";
Expand Down
4 changes: 2 additions & 2 deletions src/controller/DestroyController.ts
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import { inject, injectable } from "tsyringe-neo";

import { EmailController, EmailParams } from "./EmailController";
import { SESv2Client } from "@aws-sdk/client-sesv2";
import { SesEmailPresenter } from "@presenter/SesEmailPresenter";
import { DestroyUsecase } from "@usecase/DestroyUsecase";
import { KvCityRepository } from "@repository/KvCityRepository";
import { DestroyUsecase } from "@usecase/DestroyUsecase";
import { EmailController, EmailParams } from "./EmailController";

@injectable()
export class DestroyController extends EmailController {
Expand Down
12 changes: 6 additions & 6 deletions src/controller/NewGameController.ts
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
import { inject, injectable } from "tsyringe-neo";

import { EmailController, EmailParams } from "./EmailController";
import { SesEmailPresenter } from "@presenter/SesEmailPresenter";
import { SESv2Client } from "@aws-sdk/client-sesv2";
import { GuideUsecase } from "@usecase/GuideUsecase";
import { GuideAgent } from "@agent/GuideAgent";
import { KvCityRepository } from "@repository/KvCityRepository";
import { WelcomeMessageBuilder } from "@builder/WelcomeMessageBuilder";
import { SESv2Client } from "@aws-sdk/client-sesv2";
import { EndMessageBuilder } from "@builder/EndMessageBuilder";
import { WelcomeMessageBuilder } from "@builder/WelcomeMessageBuilder";
import { SesEmailPresenter } from "@presenter/SesEmailPresenter";
import { KvCityRepository } from "@repository/KvCityRepository";
import { GuideUsecase } from "@usecase/GuideUsecase";
import { EmailController, EmailParams } from "./EmailController";

@injectable()
export class NewGameController extends EmailController {
Expand Down
10 changes: 4 additions & 6 deletions src/controller/NpcController.ts
Original file line number Diff line number Diff line change
@@ -1,13 +1,11 @@
import { inject, injectable } from "tsyringe-neo";

import { EmailController, EmailParams } from "./EmailController";
import { SESv2Client } from "@aws-sdk/client-sesv2";
import { SesEmailPresenter } from "@presenter/SesEmailPresenter";
import { KvCityRepository } from "@repository/KvCityRepository";
import { TaklWithNpcUsecase } from "@usecase/TalkWithNpcUsecase";
import { EndMessageBuilder } from "@builder/EndMessageBuilder";
import { ProgressBuilder } from "@builder/ProgressBuilder";
import { SesEmailPresenter } from "@presenter/SesEmailPresenter";
import { KvCityRepository } from "@repository/KvCityRepository";
import { Npc } from "@usecase/interface";
import { TaklWithNpcUsecase } from "@usecase/TalkWithNpcUsecase";
import { EmailController, EmailParams } from "./EmailController";

export abstract class NpcController extends EmailController {
constructor(
Expand Down
8 changes: 3 additions & 5 deletions src/controller/NpcJackController.ts
Original file line number Diff line number Diff line change
@@ -1,14 +1,12 @@
import { inject, injectable } from "tsyringe-neo";

import { NpcController } from "./NpcController";
import { SESv2Client } from "@aws-sdk/client-sesv2";
import { SesEmailPresenter } from "@presenter/SesEmailPresenter";
import { KvCityRepository } from "@repository/KvCityRepository";
import { TaklWithNpcUsecase } from "@usecase/TalkWithNpcUsecase";
import { NpcJack } from "@agent/NpcJack";
import { SESv2Client } from "@aws-sdk/client-sesv2";
import { EndMessageBuilder } from "@builder/EndMessageBuilder";
import { ProgressBuilder } from "@builder/ProgressBuilder";
import { NpcName } from "@entity/Npc";
import { KvCityRepository } from "@repository/KvCityRepository";
import { NpcController } from "./NpcController";

@injectable()
export class NpcJackController extends NpcController {
Expand Down
8 changes: 3 additions & 5 deletions src/controller/NpcMaryController.ts
Original file line number Diff line number Diff line change
@@ -1,14 +1,12 @@
import { inject, injectable } from "tsyringe-neo";

import { NpcController } from "./NpcController";
import { NpcMary } from "@agent/NpcMary";
import { SESv2Client } from "@aws-sdk/client-sesv2";
import { SesEmailPresenter } from "@presenter/SesEmailPresenter";
import { KvCityRepository } from "@repository/KvCityRepository";
import { TaklWithNpcUsecase } from "@usecase/TalkWithNpcUsecase";
import { EndMessageBuilder } from "@builder/EndMessageBuilder";
import { ProgressBuilder } from "@builder/ProgressBuilder";
import { NpcName } from "@entity/Npc";
import { NpcMary } from "@agent/NpcMary";
import { KvCityRepository } from "@repository/KvCityRepository";
import { NpcController } from "./NpcController";

@injectable()
export class NpcMaryController extends NpcController {
Expand Down
9 changes: 3 additions & 6 deletions src/controller/NpcMattController.ts
Original file line number Diff line number Diff line change
@@ -1,15 +1,12 @@
import { inject, injectable } from "tsyringe-neo";

import { NpcController } from "./NpcController";
import { NpcMatt } from "@agent/NpcMatt";
import { SESv2Client } from "@aws-sdk/client-sesv2";
import { SesEmailPresenter } from "@presenter/SesEmailPresenter";
import { KvCityRepository } from "@repository/KvCityRepository";
import { TaklWithNpcUsecase } from "@usecase/TalkWithNpcUsecase";
import { EndMessageBuilder } from "@builder/EndMessageBuilder";
import { ProgressBuilder } from "@builder/ProgressBuilder";
import { NpcName } from "@entity/Npc";
import { NpcMary } from "@agent/NpcMary";
import { NpcMatt } from "@agent/NpcMatt";
import { KvCityRepository } from "@repository/KvCityRepository";
import { NpcController } from "./NpcController";

@injectable()
export class NpcMattController extends NpcController {
Expand Down
6 changes: 2 additions & 4 deletions src/entity/City.ts
Original file line number Diff line number Diff line change
@@ -1,13 +1,11 @@
import { handle } from "hono/cloudflare-pages";
import {
CallPeopleEvent,
CityEvent,
CityEventType,
CityInitializedEvent,
EnableProtectedMachineEvent,
FavorabilityChangedEvent,
RefreshEvent,
ValveClosedEvent,
EnableProtectedMachineEvent,
CallPeopleEvent,
} from "./CityEvent";
import { Npc, NpcName } from "./Npc";

Expand Down
2 changes: 1 addition & 1 deletion src/index.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import "reflect-metadata";

import { withSentry } from "./vendor/sentry";
import { email } from "@app/email";
import app from "@app/web";
import { withSentry } from "./vendor/sentry";

export default withSentry(
(env) => ({
Expand Down
8 changes: 4 additions & 4 deletions src/repository/KvCityRepository.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { type KVNamespace } from "@cloudflare/workers-types";
import { inject, injectable } from "tsyringe-neo";
import { Config } from "@app/config";
import { CloudFlareKv } from "@app/container";
import { type KVNamespace } from "@cloudflare/workers-types";
import { City } from "@entity/City";
import {
CallPeopleEvent,
Expand All @@ -12,9 +12,9 @@ import {
RefreshEvent,
ValveClosedEvent,
} from "@entity/CityEvent";
import { addBreadcrumb } from "@sentry/cloudflare";
import { Config } from "@app/config";
import { NpcName } from "@entity/Npc";
import { addBreadcrumb } from "@sentry/cloudflare";
import { inject, injectable } from "tsyringe-neo";

type EventSchema = {
type: string;
Expand Down
6 changes: 3 additions & 3 deletions src/usecase/GuideUsecase.ts
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import { City } from "@entity/City";
import {
EmailPresenter,
CityRepository,
Agent,
WelcomeMessageBuilder,
CityRepository,
EmailPresenter,
EndMessageBuilder,
WelcomeMessageBuilder,
} from "./interface";

export class GuideUsecase {
Expand Down
2 changes: 1 addition & 1 deletion src/view/Building.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/** @jsxImportSource hono/jsx */

import { FC } from "hono/jsx";
import { css } from "hono/css";
import { FC } from "hono/jsx";

const caculateDamaged = function (damage: number) {
if (damage < 30) return "_0.png";
Expand Down
4 changes: 2 additions & 2 deletions src/view/City.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@
import { FC } from "hono/jsx";

import { type CitySnapshot } from "@usecase/CitySnapshotUsecase";
import { Layout } from "./Layout";
import { css } from "hono/css";
import { Building } from "./Building";
import { Layout } from "./Layout";
import { Npc } from "./Npc";
import { css } from "hono/css";

const container = css`
width: 768px;
Expand Down
Loading

0 comments on commit c216b84

Please sign in to comment.