annil 1.5.15 → 1.6.1

package/src/api/SubComponent/SubStore/SubStoreOption.ts

@@ -1,7 +1,6 @@
-import type { V } from "hry-types";
-import type { InnerFields } from "../../../types/InnerData";
+import type { G } from "hry-types";
 
-export type SubStoreOption<TSubStore extends object, legalKeys extends PropertyKey, TPrefix extends string> = {
+export type SubStoreOption<TSubStore extends object, legalKeys extends PropertyKey> = {
   /**
    * 全局响应式数据字段,全局store对应数据变化实例对应数据自动setData。
    * 约束为组件properties字段去除inherit和data的剩余字段和内部字段
@@ -18,10 +17,10 @@ export type SubStoreOption<TSubStore extends object, legalKeys extends PropertyK
    */
   store?:
     & TSubStore
-    & V.IllegalFieldValidator<
+    & G.IllegalFieldValidator<
       TSubStore,
       // legalKeys,
-      legalKeys | InnerFields<TPrefix>,
+      legalKeys,
       0,
       "",
       "与inherit和data字段重复或前缀错误"

package/src/api/SubComponent/SubStore/test/error.test.ts

@@ -25,7 +25,6 @@ SubComponent<{
   },
   data: {
     aaa_num: 20,
-    aaa_isReady: false,
   },
   store: {
     // @ts-expect-error 1 与 inherit 字段重复
@@ -34,9 +33,5 @@ SubComponent<{
     aaa_num: () => user.age,
     // @ts-expect-error 3 超出约束字段
     num: () => user.age,
-    // @ts-expect-error 4 于data字段重复
-    aaa_isReady() {
-      return false;
-    },
   },
 });

package/src/api/SubComponent/SubStore/test/normal.test.ts

@@ -25,13 +25,6 @@ SubComponent<{}, DocA>()({
 SubComponent<{}, DocA, "a">()({
   store: {
     // 2 可写内部字段
-    _aaaA_xxxxxx: () => user.age,
-  },
-});
-
-SubComponent<{}, DocA, "a">()({
-  store: {
-    // 3 可写特许字段
-    aaaA_isReady: () => false,
+    _aaaA_xxx: () => user.age,
   },
 });

package/src/api/SubComponent/index.ts

@@ -6,7 +6,7 @@ import type { ReplacePrefix } from "../../types/ReplacePrefix";
 import type { ComponentDoc } from "../DefineComponent/ReturnType/ComponentDoc";
 
 import type { Func } from "hry-types/src/Misc/Func";
-import type { Extra } from "../../types/Extra";
+
 import type { InnerFields } from "../../types/InnerData";
 import type { WMCompOtherOption } from "../../types/OfficialTypeAlias";
 import type { Replace } from "../../types/Replace";
@@ -62,18 +62,18 @@ type Options<
   & SubInheritOption<TInherit, CompDocKeys>
   & SubDataOption<
     TSubData,
-    Exclude<CompDocKeys | keyof Extra<Prefix>, (keyof InheritDoc)>,
-    Prefix
+    // 合法的配置
+    Exclude<CompDocKeys, (keyof InheritDoc)> | InnerFields<Prefix>
   >
   & SubStoreOption<
     TSubStore,
-    Exclude<CompDocKeys | keyof Extra<Prefix>, (keyof (InheritDoc & SubDataDoc))>,
-    Prefix
+    // 合法的配置
+    Exclude<CompDocKeys, (keyof (InheritDoc & SubDataDoc))> | InnerFields<Prefix>
   >
   & SubComputedOption<
     TSubComputed,
     // 合法的配置
-    Exclude<CompDocKeys | keyof Extra<Prefix>, (keyof (InheritDoc & SubDataDoc & SubStoreDoc))>
+    Exclude<CompDocKeys, (keyof (InheritDoc & SubDataDoc & SubStoreDoc))> | InnerFields<Prefix>
   >
   // 无需与根组件的events字段重复检测,因为根组件多了bubbles字段,一定不会重复
   & SubEventsOption<TEvents, SubEventsDoc, keyof SubEventsConstraint<CurrentCompDoc>>
@@ -130,18 +130,18 @@ type SubComponentConstructor<
   <
     TInherit extends InheritConstraint<AllRootDataDoc, CurrentCompDoc>,
     TSubData extends SubDataConstraint<
-      & Omit<Required<CurrentCompDoc["properties"]> & Extra<CurrentPrefix>, keyof InheritDoc>
+      & Omit<Required<CurrentCompDoc["properties"]>, keyof InheritDoc>
       & Record<InnerFields<CurrentPrefix>, unknown> // 内部字段
     >,
     TSubStore extends SubStoreConstraint<
-      & Omit<Required<CurrentCompDoc["properties"]> & Extra<CurrentPrefix>, keyof (InheritDoc & SubDataDoc)>
+      & Omit<Required<CurrentCompDoc["properties"]>, keyof (InheritDoc & SubDataDoc)>
       & Record<InnerFields<CurrentPrefix>, unknown> // 内部字段
     >,
     TEvents extends SubEventsConstraint<CurrentCompDoc>,
     // 加默认值计算字段无提示且需要手写返回类型,不加watch无法对computed监控
     TSubComputed extends SubComputedConstraint<
       & Omit<
-        Required<CurrentCompDoc["properties"]> & Extra<CurrentPrefix>,
+        Required<CurrentCompDoc["properties"]>,
         keyof (InheritDoc & SubDataDoc & SubStoreDoc)
       >
       & Record<InnerFields<CurrentPrefix>, unknown> // 内部字段
@@ -150,7 +150,7 @@ type SubComponentConstructor<
     InheritDoc extends object = IfExtends<InheritConstraint<AllRootDataDoc, CurrentCompDoc>, TInherit, {}, TInherit>,
     SubDataDoc extends object = IfExtends<
       SubDataConstraint<
-        & Omit<Required<CurrentCompDoc["properties"]> & Extra<CurrentPrefix>, keyof InheritDoc>
+        & Omit<Required<CurrentCompDoc["properties"]>, keyof InheritDoc>
         & Record<InnerFields<CurrentPrefix>, unknown>
       >,
       TSubData,
@@ -159,7 +159,7 @@ type SubComponentConstructor<
     >,
     SubStoreDoc extends object = IfExtends<
       SubStoreConstraint<
-        & Omit<Required<CurrentCompDoc["properties"]> & Extra<CurrentPrefix>, keyof (InheritDoc & SubDataDoc)>
+        & Omit<Required<CurrentCompDoc["properties"]>, keyof (InheritDoc & SubDataDoc)>
         & Record<InnerFields<CurrentPrefix>, unknown>
       >,
       TSubStore,
@@ -170,7 +170,7 @@ type SubComponentConstructor<
     SubComputedDoc extends object = IfExtends<
       SubComputedConstraint<
         & Omit<
-          Required<CurrentCompDoc["properties"]> & Extra<CurrentPrefix>,
+          Required<CurrentCompDoc["properties"]>,
           keyof (InheritDoc & SubDataDoc & SubStoreDoc)
         >
         & Record<InnerFields<CurrentPrefix>, unknown> // 内部字段

package/src/types/Extra.ts

@@ -1 +1 @@
-export type Extra<Prefix extends string> = Record<`${Prefix}_isReady`, boolean>;
+// export type Extra<Prefix extends string> = Record<`${Prefix}_isReady`, boolean>;

package/dist/types/Extra.d.ts

@@ -1 +0,0 @@
-export type Extra<Prefix extends string> = Record<`${Prefix}_isReady`, boolean>;

package/dist/types/Extra.js

@@ -1,2 +0,0 @@
-export {};
-//# sourceMappingURL=Extra.js.map

package/dist/types/Extra.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"Extra.js","sourceRoot":"","sources":["../../src/types/Extra.ts"],"names":[],"mappings":""}