#155 contextのbind/unbindは内部でのみ利用に変更

Author: ienaga

src/application/Application/usecase/ApplicationGotoViewUseCase.test.ts

@@ -38,6 +38,14 @@ vi.mock("../../../domain/callback/service/CallbackService", () => ({
     execute: vi.fn().mockResolvedValue(undefined)
 }));
 
+vi.mock("../../Context/usecase/ContextBindUseCase", () => ({
+    execute: vi.fn().mockResolvedValue(null)
+}));
+
+vi.mock("../../Context/service/ContextUnbindService", () => ({
+    execute: vi.fn().mockResolvedValue(undefined)
+}));
+
 describe("ApplicationGotoViewUseCase Test", () =>
 {
     let mockApplication: any;
@@ -55,8 +63,6 @@ describe("ApplicationGotoViewUseCase Test", () =>
 
         root = new MovieClip();
         mockContext = new Context(root);
-        mockContext.unbind = vi.fn().mockResolvedValue(undefined);
-        mockContext.bind = vi.fn().mockResolvedValue(null);
 
         $setContext(mockContext);
         $setConfig({
@@ -84,6 +90,7 @@ describe("ApplicationGotoViewUseCase Test", () =>
     {
         const { execute: applicationQueryStringParserService } = await import("../service/ApplicationQueryStringParserService");
         const { execute: requestUseCase } = await import("../../../infrastructure/Request/usecase/RequestUseCase");
+        const { execute: contextBindUseCase } = await import("../../Context/usecase/ContextBindUseCase");
 
         vi.mocked(applicationQueryStringParserService).mockReturnValue({
             name: "home",
@@ -94,9 +101,8 @@ describe("ApplicationGotoViewUseCase Test", () =>
 
         await execute(mockApplication, "home");
 
-        expect(mockContext.unbind).toHaveBeenCalled();
         expect(mockApplication.currentName).toBe("home");
-        expect(mockContext.bind).toHaveBeenCalledWith("home");
+        expect(contextBindUseCase).toHaveBeenCalledWith(mockContext, "home");
     });
 
     it("execute test case2: navigation with response data", async () =>

src/application/Application/usecase/ApplicationGotoViewUseCase.ts

@@ -10,6 +10,8 @@ import { execute as responseRemoveVariableUseCase } from "../../../infrastructur
 import { execute as applicationQueryStringParserService } from "../service/ApplicationQueryStringParserService";
 import { execute as requestUseCase } from "../../../infrastructure/Request/usecase/RequestUseCase";
 import { execute as callbackService } from "../../../domain/callback/service/CallbackService";
+import { execute as contextUnbindService } from "../../Context/service/ContextUnbindService";
+import { execute as contextBindUseCase } from "../../Context/usecase/ContextBindUseCase";
 
 /**
  * @description 指定されたパス、もしくはURLのクラスを起動
@@ -45,7 +47,7 @@ export const execute = async (application: Application, name: string = ""): Prom
      * Unbind the View and ViewModel of the current screen
      */
     const context = $getContext();
-    await context.unbind();
+    await contextUnbindService(context);
 
     /**
      * 前の画面で取得したレスポンスデータを初期化
@@ -114,7 +116,7 @@ export const execute = async (application: Application, name: string = ""): Prom
      * ViewとViewModelを起動
      * Start View and ViewModel
      */
-    const view = await context.bind(application.currentName);
+    const view = await contextBindUseCase(context, application.currentName);
 
     /**
      * コールバック設定があれば実行

src/application/Context.ts

@@ -1,8 +1,6 @@
 import type { View } from "../view/View";
 import type { ViewModel } from "../view/ViewModel";
 import type { Sprite } from "@next2d/display";
-import { execute as contextUnbindService } from "./Context/service/ContextUnbindService";
-import { execute as contextBindUseCase } from "./Context/usecase/ContextBindUseCase";
 
 /**
  * @description メインコンテキスト、ViewとViewModelのunbind、bindをコントロールします。
@@ -65,31 +63,4 @@ export class Context
     {
         return this._$root;
     }
-
-    /**
-     * @description ViewクラスをrootのSpriteにアタッチします。
-     *              Attach the View class to the root Sprite.
-     *
-     * @param {string} name
-     * @return {Promise<View>}
-     * @method
-     * @public
-     */
-    async bind (name: string): Promise<View>
-    {
-        return await contextBindUseCase(this, name);
-    }
-
-    /**
-     * @description ViewとViewModelのバインドを解除します。
-     *              Unbinds View and ViewModel.
-     *
-     * @return {Promise<void>}
-     * @method
-     * @public
-     */
-    async unbind (): Promise<void>
-    {
-        await contextUnbindService(this);
-    }
 }