m

Hiroshiba · Oct 29, 2024 · 6d56d0b · 6d56d0b
1 parent 1627f00
commit 6d56d0b
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 33 deletions.
diff --git a/src/backend/common/envEngineInfoSchema.ts b/src/backend/common/envEngineInfoSchema.ts
diff --git a/src/backend/electron/manager/engineInfoManager.ts b/src/backend/electron/manager/engineInfoManager.ts
@@ -15,15 +15,17 @@ import {
 } from "@/type/preload";
 import { AltPortInfos } from "@/store/type";
 import { BaseConfigManager } from "@/backend/common/ConfigManager";
-import { EnvEngineInfo } from "@/backend/common/envEngineInfoSchema";
 import { UnreachableError } from "@/type/utility";
-import { loadEnvEngineInfos } from "@/domain/defaultEngine/envEngineInfo";
+import {
+  EnvEngineInfoType,
+  loadEnvEngineInfos,
+} from "@/domain/defaultEngine/envEngineInfo";
 
 /**
  * デフォルトエンジンの情報を取得する
  */
 function fetchDefaultEngineInfos(
-  envEngineInfos: EnvEngineInfo[],
+  envEngineInfos: EnvEngineInfoType[],
   defaultEngineDir: string,
 ): EngineInfo[] {
   // TODO: envから直接ではなく、envに書いたengine_manifest.jsonから情報を得るようにする

diff --git a/src/domain/defaultEngine/envEngineInfo.ts b/src/domain/defaultEngine/envEngineInfo.ts
@@ -11,10 +11,12 @@ export const envEngineInfoSchema = z.object({
   uuid: engineIdSchema,
   host: z.string(),
   name: z.string(),
-  executionEnabled: z.boolean(),
-  executionFilePath: z.string(),
+  executionEnabled: z.boolean(), // FIXME: typeがurlのときのみ必要
+  executionFilePath: z.string(), // FIXME: typeがpathのときは必須
   executionArgs: z.array(z.string()),
-  path: z.string().optional(),
+  path: z.string().optional(), // FIXME: typeがpathで、アンインストール可能なときは必須
+  type: z.union([z.literal("path"), z.literal("downloadVvpp")]).default("path"),
+  latestUrl: z.string().optional(), // FIXME: typeがdownloadVvppのときは必須
 });
 export type EnvEngineInfoType = z.infer<typeof envEngineInfoSchema>;
 

diff --git a/tests/unit/domain/defaultEngine/defaultEngine.node.spec.ts b/tests/unit/domain/defaultEngine/defaultEngine.node.spec.ts
@@ -2,7 +2,7 @@
 
 import path from "path";
 import fs from "fs";
-import { fetchDefaultEngineInfos } from "@/domain/defaultEngine/latetDefaultEngine";
+import { fetchDefaultEngineUpdateInfo } from "@/domain/defaultEngine/latetDefaultEngine";
 
 const currentDir = "tests/unit/domain/defaultEngine";