fix: 修复RootCOmonent在properties的可选数组类型时,value验证错误的问题

missannil · Jan 3, 2024 · b836e83 · b836e83
1 parent 837a0c3
commit b836e83
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 2 deletions.
diff --git a/jest/onlySubComonent/onlySubComonent.test.ts b/jest/onlySubComonent/onlySubComonent.test.ts
@@ -11,4 +11,6 @@ describe("RootComponent-events", () => {
   test("events字段 onTap事件", () => {
     expect(comp.instance.data.aaa_num).toBe(comp.instance.data.aaa2_num);
   });
+
+  // 有些测试描述不对，下次再改
 });
diff --git a/src/api/RootComponent/Properties/PropertiesValueValidator.ts b/src/api/RootComponent/Properties/PropertiesValueValidator.ts
@@ -1,4 +1,5 @@
 import type { EmptyObject } from "hry-types/src/Misc/EmptyObject";
+import type { NonReadonly } from "hry-types/src/Object/NonReadonly";
 import type { InferDetailedType } from "../../../types/InferDetailedType";
 
 /**
@@ -12,7 +13,7 @@ export type PropertiesValueValidator<
       k in keyof TProperties as TProperties[k] extends {
         type: infer R;
         value: infer V;
-      } ? V extends InferDetailedType<R> ? never
+      } ? NonReadonly<V> extends NonReadonly<InferDetailedType<R>> ? never
         : k
         : never
     ]: { value: () => "⚠️类型错误⚠️" };

diff --git a/src/api/RootComponent/Properties/test/normalOptional.test.ts b/src/api/RootComponent/Properties/test/normalOptional.test.ts
@@ -20,7 +20,7 @@ const OptionalDoc = RootComponent()({
     },
     optional_tuple: {
       type: Array as unknown as DetailedType<[number, string, boolean]>, // 元组类型
-      value: [1, "a", true] as [number, string, boolean],
+      value: [1, "a", true],
     },
     optional_obj: {
       type: Object as DetailedType<Mock_User>, // 对象类型
@@ -38,6 +38,10 @@ const OptionalDoc = RootComponent()({
       value: "string",
       optionalTypes: [Number],
     },
+    optional_arr: {
+      type: Array as DetailedType<string[]>,
+      value: [],
+    },
   },
   methods: {
     foo() {
@@ -52,6 +56,7 @@ const OptionalDoc = RootComponent()({
             optional_obj: Mock_User | null;
             optional_objOrNull: Mock_User | null;
             optional_union: string | number;
+            optional_arr: string[];
           } & IInjectData
         >,
         Test.Pass
@@ -69,6 +74,7 @@ type OptionalDocExpected = {
     optional_obj?: Mock_User | null;
     optional_objOrNull?: Mock_User | null;
     optional_union?: string | number;
+    optional_arr?: string[];
   };
   methods: {
     foo(): void;