#155 処理負荷の高い箇所をリファクタリング

Author: ienaga

src/application/Application.ts

@@ -105,11 +105,11 @@ export class Application
      * @description configで設定したリクエストのレスポンスマップを返却します
      *              Returns the response map of the request set in config
      *
-     * @return {Map<string, any>}
+     * @return {Map<string, unknown>}
      * @method
      * @public
      */
-    getResponse (): Map<string, any>
+    getResponse (): Map<string, unknown>
     {
         return response;
     }
@@ -118,11 +118,11 @@ export class Application
      * @description キャッシュのMapオブジェクトを返却します
      *              Returns the Map object of the cache
      *
-     * @return {Map<string, any>}
+     * @return {Map<string, unknown>}
      * @method
      * @public
      */
-    getCache (): Map<string, any>
+    getCache (): Map<string, unknown>
     {
         return cache;
     }

src/application/service/QueryStringParserService.ts

@@ -61,14 +61,14 @@ export const execute = (name: string = ""): IQueryObject =>
      * 任意で設定したQueryStringを分解
      * Decompose an arbitrarily set QueryString
      */
-    if (name.indexOf("?") > -1) {
-        const idx = name.indexOf("?");
-        queryString = name.slice(idx);
-        const parsed = parseQueryString(name.slice(idx + 1));
+    const questionIdx = name.indexOf("?");
+    if (questionIdx > -1) {
+        queryString = name.slice(questionIdx);
+        const parsed = parseQueryString(name.slice(questionIdx + 1));
         for (const [key, value] of parsed) {
             query.set(key, value);
         }
-        name = name.slice(0, idx);
+        name = name.slice(0, questionIdx);
     }
 
     if (name.charAt(0) === ".") {

src/application/usecase/ApplicationGotoViewUseCase.test.ts

@@ -30,7 +30,8 @@ vi.mock("../service/QueryStringParserService", () => ({
 }));
 
 vi.mock("../../infrastructure/usecase/RequestUseCase", () => ({
-    execute: vi.fn().mockResolvedValue([])
+    execute: vi.fn().mockResolvedValue([]),
+    getRequests: vi.fn().mockReturnValue([])
 }));
 
 vi.mock("./ExecuteCallbackUseCase", () => ({

src/application/usecase/ApplicationGotoViewUseCase.ts

@@ -3,7 +3,10 @@ import { $getConfig } from "../variable/Config";
 import { $getContext } from "../variable/Context";
 import { response } from "../../infrastructure/variable/Response";
 import { execute as queryStringParserService } from "../service/QueryStringParserService";
-import { execute as requestUseCase } from "../../infrastructure/usecase/RequestUseCase";
+import {
+    execute as requestUseCase,
+    getRequests
+} from "../../infrastructure/usecase/RequestUseCase";
 import { execute as executeCallbackUseCase } from "./ExecuteCallbackUseCase";
 import { execute as responseRemoveVariableUseCase } from "../../infrastructure/usecase/ResponseRemoveVariableUseCase";
 import { ViewBinderService } from "../../domain/service/ViewBinderService";
@@ -53,7 +56,8 @@ export const execute = async (
      * 前の画面で取得したレスポンスデータを初期化
      * Initialize the response data obtained on the previous screen
      */
-    responseRemoveVariableUseCase(application.currentName);
+    const previousRequests = getRequests(application.currentName);
+    responseRemoveVariableUseCase(previousRequests);
 
     /**
      * 指定されたパス、もしくはURLからアクセス先を算出
@@ -87,15 +91,23 @@ export const execute = async (
     const responses = await requestUseCase(application.currentName);
 
     /**
-     * レスポンス情報をマップに登録
-     * Response information is registered on the map
+     * レスポンス情報をマップに登録し、コールバックを実行
+     * Register response information on the map and execute callbacks
      */
     for (let idx = 0; idx < responses.length; ++idx) {
 
         const object = responses[idx];
         if (object.name) {
             response.set(object.name, object.response);
         }
+
+        /**
+         * リクエストごとのコールバック処理を実行
+         * Execute callback for each request
+         */
+        if (object.callback) {
+            await executeCallbackUseCase(object.callback, object.response);
+        }
     }
 
     if (hasLoading) {

src/application/variable/Cache.ts

@@ -1,5 +1,5 @@
 /**
- * @type {Map<string, any>}
+ * @type {Map<string, unknown>}
  * @protected
  */
-export const cache: Map<string, any> = new Map();
+export const cache: Map<string, unknown> = new Map();

src/application/variable/Context.ts

@@ -1,22 +1,26 @@
 import type { Context } from "../Context";
 
 /**
- * @type {Context}
- * @public
+ * @type {Context | null}
+ * @private
  */
-let $context: Context;
+let $context: Context | null = null;
 
 /**
  * @description コンテキストを取得します
  *              Get the context
  *
  * @return {Context}
+ * @throws {Error} コンテキストが初期化されていない場合
  * @method
  * @protected
  */
 export const $getContext = (): Context =>
 {
-    return $context as NonNullable<Context>;
+    if (!$context) {
+        throw new Error("Context is not initialized. Call run() first.");
+    }
+    return $context;
 };
 
 /**

src/application/variable/Query.ts

@@ -1,5 +1,5 @@
 /**
- * @type {Map<string, any>}
+ * @type {Map<string, string>}
  * @protected
  */
-export const query: Map<string, any> = new Map();
+export const query: Map<string, string> = new Map();

src/domain/service/ScreenCaptureService.ts

@@ -131,11 +131,11 @@ export const ScreenCaptureService =
         }
 
         /**
-         * rootの子要素を全て削除
-         * Remove all child elements of root
+         * rootの子要素を全て削除（末尾から削除することでO(n)に最適化）
+         * Remove all child elements of root (optimized to O(n) by removing from end)
          */
-        while (root.numChildren > 0) {
-            root.removeChildAt(0);
+        for (let idx = root.numChildren - 1; idx >= 0; --idx) {
+            root.removeChildAt(idx);
         }
 
         /**

src/domain/service/ViewBinderService.ts

@@ -44,12 +44,12 @@ export const ViewBinderService =
         await context.view.initialize();
 
         /**
-         * rootの子要素を全て削除
-         * Remove all child elements of root
+         * rootの子要素を全て削除（末尾から削除することでO(n)に最適化）
+         * Remove all child elements of root (optimized to O(n) by removing from end)
          */
         const root = context.root;
-        while (root.numChildren) {
-            root.removeChildAt(0);
+        for (let idx = root.numChildren - 1; idx >= 0; --idx) {
+            root.removeChildAt(idx);
         }
 
         /**

src/domain/variable/Loading.ts

@@ -1,7 +1,7 @@
 import type { ILoading } from "../../interface/ILoading";
 
 /**
- * @type {object}
+ * @type {ILoading | null}
  * @default null
  * @private
  */
@@ -11,25 +11,25 @@ let $instance: ILoading | null = null;
  * @description ローダーのインスタンスを取得
  *              Get loader instance
  *
- * @return {ILoading}
+ * @return {ILoading | null}
  * @method
- * @public
+ * @protected
  */
-export const $getInstance = (): ILoading =>
+export const $getInstance = (): ILoading | null =>
 {
-    return $instance as ILoading;
+    return $instance;
 };
 
 /**
  * @description ローダーのインスタンスを設定
  *              Set loader instance
  *
- * @param {ILoading} instance
+ * @param {ILoading | null} instance
  * @return {void}
  * @method
- * @public
+ * @protected
  */
-export const $setInstance = (instance: ILoading): void =>
+export const $setInstance = (instance: ILoading | null): void =>
 {
     $instance = instance;
 };