🧪 增加parseUserConfig的测试

Author: CodFrm

src/pkg/utils/script.test.ts

@@ -301,41 +301,58 @@ describe("parseUserConfig", () => {
   test("解析单个YAML配置", () => {
     const code = `
 /* ==UserConfig==
-name: 测试配置
-value: 123
-enabled: true
+group1:
+  config1:
+    title: 测试配置
+    default: 123
+    enabled: true
 ==/UserConfig== */
 
 console.log('Hello World');
 `;
 
     const result = parseUserConfig(code);
     expect(result).toEqual({
-      name: "测试配置",
-      value: 123,
-      enabled: true,
+      group1: {
+        config1: {
+          title: "测试配置",
+          default: 123,
+          enabled: true,
+          index: 0,
+        },
+      },
     });
   });
 
   test("解析多个YAML配置（用---分隔）", () => {
     const code = `
 /* ==UserConfig==
-name: 配置1
-value: 123
+group1:
+  config1:
+    title: 配置1
+    default: 123
 ---
-name: 配置2
-value: 456
-enabled: true
+group1:
+  config2:
+    title: 配置2
+    default: 456
+    enabled: true
 ==/UserConfig== */
 
 console.log('Hello World');
 `;
 
     const result = parseUserConfig(code);
     expect(result).toEqual({
-      name: "配置2", // 后面的配置会覆盖前面的同名配置
-      value: 456,
-      enabled: true,
+      group1: {
+        config2: {
+          // 后面的配置会覆盖前面的同名分组
+          title: "配置2",
+          default: 456,
+          enabled: true,
+          index: 0,
+        },
+      },
     });
   });
 
@@ -357,18 +374,30 @@ console.log('Hello World');
     expect(result).toEqual({});
   });
 
-  test("解析格式错误的YAML应该处理异常", () => {
+  test("解析格式错误的YAML应该抛出错误", () => {
     const code = `
 /* ==UserConfig==
 name: 配置
   invalid yaml: [
-==UserConfig== */
+==/UserConfig== */
+
+console.log('Hello World');
+`;
+
+    expect(() => parseUserConfig(code)).toThrow();
+  });
+
+  test("不符合分组规范的YAML配置应该抛出错误", () => {
+    const code = `
+/* ==UserConfig==
+name: 测试配置
+value: 123
+enabled: true
+==/UserConfig== */
 
 console.log('Hello World');
 `;
 
-    // 这个测试检查函数是否能够处理YAML解析错误
-    // 具体行为取决于YAML.parse的实现
-    expect(() => parseUserConfig(code)).not.toThrow();
+    expect(() => parseUserConfig(code)).toThrow('UserConfig group "name" is not a valid object.');
   });
 });

src/pkg/utils/yaml.ts

@@ -7,16 +7,31 @@ export function parseUserConfig(code: string): UserConfig | undefined {
   if (!config) {
     return undefined;
   }
+
   const configs = config[1].trim().split(/[-]{3,}/);
   const ret: UserConfig = {};
-  configs.forEach((val) => {
+
+  for (const val of configs) {
     const obj: UserConfig = parse(val);
-    Object.keys(obj || {}).forEach((key) => {
-      ret[key] = obj[key];
-      Object.keys(ret[key] || {}).forEach((subKey, subIndex) => {
-        ret[key][subKey].index = ret[key][subKey].index || subIndex; // 确保index存在
+    if (!obj || typeof obj !== "object") {
+      continue;
+    }
+
+    // 验证是否符合分组规范：group -> config -> properties
+    for (const [groupKey, groupValue] of Object.entries(obj)) {
+      if (!groupValue || typeof groupValue !== "object") {
+        // 如果分组值不是对象，说明不符合规范
+        throw new Error(`UserConfig group "${groupKey}" is not a valid object.`);
+      }
+
+      ret[groupKey] = groupValue;
+      Object.keys(ret[groupKey] || {}).forEach((subKey, subIndex) => {
+        if (ret[groupKey][subKey] && typeof ret[groupKey][subKey] === "object") {
+          ret[groupKey][subKey].index = ret[groupKey][subKey].index || subIndex; // 确保index存在
+        }
       });
-    });
-  });
+    }
+  }
+
   return ret;
 }