annil 1.5.13 → 1.5.15

package/CHANGELOG.md

@@ -4,6 +4,20 @@
 
 * 解决DetailedType不接收接口类型的错误 ([ae8acbf](https://github.com/missannil/annil/commit/ae8acbfc2e62f99db565c448ad9253aa549e78bb))
 
+## [1.5.15](https://github.com/missannil/annil/compare/v1.5.14...v1.5.15) (2024-01-15)
+
+
+### Bug Fixes
+
+* subComputed约束 去除默认{} ([054cb48](https://github.com/missannil/annil/commit/054cb482cdc6c84e820d69d163b9cafe0c01de81))
+
+## [1.5.14](https://github.com/missannil/annil/compare/v1.5.13...v1.5.14) (2024-01-15)
+
+
+### Bug Fixes
+
+* subComponents的data字段和store字段加入isReady字段和内部字段 ([06a22e0](https://github.com/missannil/annil/commit/06a22e0faff21dbc1e96862f190b2af11db55603))
+
 ## [1.5.13](https://github.com/missannil/annil/compare/v1.5.12...v1.5.13) (2024-01-12)
 
 

package/dist/api/SubComponent/SubComputed/SubComputedOption.d.ts

@@ -1,4 +1,4 @@
 import type { V } from "hry-types";
-export type SubComputedOption<TComputed extends object, legal extends Record<PropertyKey, unknown>> = {
-    computed?: TComputed & V.IllegalFieldValidator<TComputed, keyof legal, 0, "", "重复或无效的字段">;
+export type SubComputedOption<TComputed extends object, legal extends PropertyKey> = {
+    computed?: TComputed & V.IllegalFieldValidator<TComputed, legal, 0, "", "重复或无效的字段">;
 };

package/dist/api/SubComponent/SubData/SubDataOption.d.ts

@@ -1,4 +1,5 @@
 import type { V } from "hry-types";
+import type { InnerFields } from "../../../types/InnerData";
 export type SubDataOption<TSubData extends object, legalKeys extends PropertyKey, TPrefix extends string> = {
-    data?: TSubData & V.IllegalFieldValidator<TSubData, legalKeys | `_${TPrefix}_${string}`, 0, "", "⚠️ 子组件无需此字段或与Inherit字段重复 ⚠️">;
+    data?: TSubData & V.IllegalFieldValidator<TSubData, legalKeys | InnerFields<TPrefix>, 0, "", "子组件无需此字段或与Inherit字段重复">;
 };

package/dist/api/SubComponent/SubInherit/SubInheritOption.d.ts

@@ -1,3 +1,4 @@
-export type SubInheritOption<TInherit> = {
-    inherit?: TInherit;
+import type { V } from "hry-types";
+export type SubInheritOption<TInherit extends object, legalKeys extends PropertyKey> = {
+    inherit?: TInherit & V.IllegalFieldValidator<TInherit, legalKeys, 0, "">;
 };

package/dist/api/SubComponent/SubStore/SubStoreOption.d.ts

@@ -1,4 +1,5 @@
 import type { V } from "hry-types";
-export type SubStoreOption<TSubStore extends object, legalKeys extends PropertyKey> = {
-    store?: TSubStore & V.IllegalFieldValidator<TSubStore, legalKeys, 0, "", "与inherit和data字段重复或前缀错误">;
+import type { InnerFields } from "../../../types/InnerData";
+export type SubStoreOption<TSubStore extends object, legalKeys extends PropertyKey, TPrefix extends string> = {
+    store?: TSubStore & V.IllegalFieldValidator<TSubStore, legalKeys | InnerFields<TPrefix>, 0, "", "与inherit和data字段重复或前缀错误">;
 };

package/dist/api/SubComponent/index.d.ts

@@ -5,6 +5,8 @@ import type { GetComponentPrefix } from "../../types/GetComponentPrefix";
 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";
 import type { IInjectStore } from "../InstanceInject/instanceConfig";
@@ -35,11 +37,11 @@ import type { CreateSubComponentDoc } from "./SubReturnType/CreateSubComponentDo
 import type { SubStoreConstraint } from "./SubStore/SubStoreConstraint";
 import type { SubStoreOption } from "./SubStore/SubStoreOption";
 import type { SubWatchOption } from "./SubWatch/SubWatchOption";
-type Options<RootDoc extends RootComponentDoc, IsPage extends boolean, CurrentCompDoc extends ComponentDoc, Prefix extends string, AllRootDataDoc extends object, TInherit extends object, TSubData extends object, TSubStore extends object, TSubComputed extends object, TEvents extends object, TSubMethods extends SubMethodsConstraint, InheritDoc extends object, SubDataDoc extends object, SubStoreDoc extends object, SubComputedDoc extends object, SubEventsDoc extends object, SubMethodsDoc extends object> = SubInheritOption<TInherit> & SubDataOption<TSubData, Exclude<keyof CurrentCompDoc["properties"], (keyof InheritDoc)>, Prefix> & SubStoreOption<TSubStore, Exclude<keyof CurrentCompDoc["properties"], (keyof (InheritDoc & SubDataDoc))>> & SubComputedOption<TSubComputed, Omit<CurrentCompDoc["properties"], (keyof (InheritDoc & SubDataDoc & SubStoreDoc))>> & SubEventsOption<TEvents, SubEventsDoc, keyof SubEventsConstraint<CurrentCompDoc>> & SubMethodsOption<TSubMethods, Prefix, keyof (CurrentCompDoc["customEvents"] & SubEventsDoc)> & SubPageLifetimesOption<IsPage, RootDoc["properties"] & {}> & SubLifetimesOption & SubWatchOption<SubComputedDoc & SubDataDoc & AllRootDataDoc & SubStoreDoc & IInjectStore> & Partial<Omit<WMCompOtherOption, "pageLifetimes" | "definitionFilter" | "export" | "observers" | "relations">> & SubObserversOption<SubComputedDoc & SubDataDoc & AllRootDataDoc & SubStoreDoc & IInjectStore> & ThisType<SubInstance<SubMethodsDoc & RootDoc["methods"], Replace<SubDataDoc, Required<CurrentCompDoc["properties"]>>, AllRootDataDoc & Replace<SubDataDoc & SubComputedDoc & SubStoreDoc, Required<CurrentCompDoc["properties"]>>, RootDoc["customEvents"] & {}, SubStoreDoc>>;
+type Options<RootDoc extends RootComponentDoc, IsPage extends boolean, CurrentCompDoc extends ComponentDoc, Prefix extends string, AllRootDataDoc extends object, TInherit extends object, TSubData extends object, TSubStore extends object, TSubComputed extends object, TEvents extends object, TSubMethods extends SubMethodsConstraint, InheritDoc extends object, SubDataDoc extends object, SubStoreDoc extends object, SubComputedDoc extends object, SubEventsDoc extends object, SubMethodsDoc extends object, CompDocKeys extends PropertyKey = keyof CurrentCompDoc["properties"]> = SubInheritOption<TInherit, CompDocKeys> & SubDataOption<TSubData, Exclude<CompDocKeys | keyof Extra<Prefix>, (keyof InheritDoc)>, Prefix> & SubStoreOption<TSubStore, Exclude<CompDocKeys | keyof Extra<Prefix>, (keyof (InheritDoc & SubDataDoc))>, Prefix> & SubComputedOption<TSubComputed, Exclude<CompDocKeys | keyof Extra<Prefix>, (keyof (InheritDoc & SubDataDoc & SubStoreDoc))>> & SubEventsOption<TEvents, SubEventsDoc, keyof SubEventsConstraint<CurrentCompDoc>> & SubMethodsOption<TSubMethods, Prefix, keyof (CurrentCompDoc["customEvents"] & SubEventsDoc)> & SubPageLifetimesOption<IsPage, NonNullable<RootDoc["properties"]>> & SubLifetimesOption & SubWatchOption<SubComputedDoc & SubDataDoc & AllRootDataDoc & SubStoreDoc & IInjectStore> & Partial<Omit<WMCompOtherOption, "pageLifetimes" | "definitionFilter" | "export" | "observers" | "relations">> & SubObserversOption<SubComputedDoc & SubDataDoc & AllRootDataDoc & SubStoreDoc & IInjectStore> & ThisType<SubInstance<SubMethodsDoc & RootDoc["methods"], Replace<SubDataDoc, Required<CurrentCompDoc["properties"]>>, AllRootDataDoc & Replace<SubDataDoc & SubComputedDoc & SubStoreDoc, Required<CurrentCompDoc["properties"]>>, NonNullable<RootDoc["customEvents"]>, SubStoreDoc>>;
 type SubComponentConstructor<TRootDoc extends RootComponentDoc, TOriginalCompDoc extends ComponentDoc, TSupplementalPrefix extends string = "", IsPage extends boolean = TRootDoc["isPage"] extends true ? true : false, CurrentPrefix extends string = `${GetComponentPrefix<TOriginalCompDoc>}${Capitalize<TSupplementalPrefix>}`, CurrentCompDoc extends ComponentDoc = IfExtends<TSupplementalPrefix, "", TOriginalCompDoc, ReplacePrefix<TOriginalCompDoc, CurrentPrefix>>, AllRootDataDoc extends object = Required<TRootDoc["properties"]> & TRootDoc["data"] & TRootDoc["computed"] & TRootDoc["store"]> = {
-    <TInherit extends InheritConstraint<AllRootDataDoc, CurrentCompDoc>, TSubData extends SubDataConstraint<Omit<Required<CurrentCompDoc["properties"]>, keyof InheritDoc>>, TSubStore extends SubStoreConstraint<Omit<Required<CurrentCompDoc["properties"]>, keyof (InheritDoc & SubDataDoc)>>, TEvents extends SubEventsConstraint<CurrentCompDoc>, TSubComputed extends SubComputedConstraint<Omit<Required<CurrentCompDoc["properties"]>, keyof (InheritDoc & SubDataDoc & SubStoreDoc)>> = {}, TSubMethods extends SubMethodsConstraint = {}, InheritDoc extends object = IfExtends<InheritConstraint<AllRootDataDoc, CurrentCompDoc>, TInherit, {}, TInherit>, SubDataDoc extends object = IfExtends<SubDataConstraint<Omit<Required<CurrentCompDoc["properties"]>, keyof InheritDoc>>, TSubData, {}, TSubData>, SubStoreDoc extends object = IfExtends<SubStoreConstraint<Omit<Required<CurrentCompDoc["properties"]>, keyof (InheritDoc & SubDataDoc)>>, TSubStore, {}, {
-        [k in keyof TSubStore]: ReturnType<TSubStore[k] & {}>;
-    }>, SubComputedDoc extends object = IfExtends<SubComputedConstraint<Omit<Required<CurrentCompDoc["properties"]>, keyof (InheritDoc & SubDataDoc & SubStoreDoc)>>, TSubComputed, {}, GetSubComputedDoc<TSubComputed>>, SubEventsDoc extends object = IfExtends<SubEventsConstraint<CurrentCompDoc>, TEvents, {}, TEvents>, SubMethodsDoc extends object = TSubMethods, MissingRequiredField extends PropertyKey = Exclude<RequiredKeys<CurrentCompDoc["properties"] & {}>, keyof (InheritDoc & SubDataDoc & SubStoreDoc & IfExtends<SubComputedConstraint<Omit<Required<CurrentCompDoc["properties"]>, keyof (InheritDoc & SubDataDoc & SubStoreDoc)>>, TSubComputed, {}, GetSubComputedDoc<TSubComputed>>)>>(options: Options<TRootDoc, IsPage, CurrentCompDoc, CurrentPrefix, AllRootDataDoc, TInherit, TSubData, TSubStore, TSubComputed, TEvents, TSubMethods, InheritDoc, SubDataDoc, SubStoreDoc, SubComputedDoc, SubEventsDoc, SubMethodsDoc>): CreateSubComponentDoc<TOriginalCompDoc["customEvents"] & {}, SubEventsDoc, MissingRequiredField>;
+    <TInherit extends InheritConstraint<AllRootDataDoc, CurrentCompDoc>, TSubData extends SubDataConstraint<Omit<Required<CurrentCompDoc["properties"]> & Extra<CurrentPrefix>, keyof InheritDoc> & Record<InnerFields<CurrentPrefix>, unknown>>, TSubStore extends SubStoreConstraint<Omit<Required<CurrentCompDoc["properties"]> & Extra<CurrentPrefix>, keyof (InheritDoc & SubDataDoc)> & Record<InnerFields<CurrentPrefix>, unknown>>, TEvents extends SubEventsConstraint<CurrentCompDoc>, TSubComputed extends SubComputedConstraint<Omit<Required<CurrentCompDoc["properties"]> & Extra<CurrentPrefix>, keyof (InheritDoc & SubDataDoc & SubStoreDoc)> & Record<InnerFields<CurrentPrefix>, unknown>>, TSubMethods extends SubMethodsConstraint = {}, InheritDoc extends object = IfExtends<InheritConstraint<AllRootDataDoc, CurrentCompDoc>, TInherit, {}, TInherit>, SubDataDoc extends object = IfExtends<SubDataConstraint<Omit<Required<CurrentCompDoc["properties"]> & Extra<CurrentPrefix>, keyof InheritDoc> & Record<InnerFields<CurrentPrefix>, unknown>>, TSubData, {}, TSubData>, SubStoreDoc extends object = IfExtends<SubStoreConstraint<Omit<Required<CurrentCompDoc["properties"]> & Extra<CurrentPrefix>, keyof (InheritDoc & SubDataDoc)> & Record<InnerFields<CurrentPrefix>, unknown>>, TSubStore, {}, {
+        [k in keyof TSubStore]: ReturnType<NonNullable<TSubStore[k]>>;
+    }>, SubComputedDoc extends object = IfExtends<SubComputedConstraint<Omit<Required<CurrentCompDoc["properties"]> & Extra<CurrentPrefix>, keyof (InheritDoc & SubDataDoc & SubStoreDoc)> & Record<InnerFields<CurrentPrefix>, unknown>>, TSubComputed, {}, GetSubComputedDoc<TSubComputed>>, SubEventsDoc extends object = IfExtends<SubEventsConstraint<CurrentCompDoc>, TEvents, {}, TEvents>, SubMethodsDoc extends object = TSubMethods, MissingRequiredField extends PropertyKey = Exclude<RequiredKeys<NonNullable<CurrentCompDoc["properties"]>>, keyof (InheritDoc & SubDataDoc & SubStoreDoc & IfExtends<SubComputedConstraint<Omit<Required<CurrentCompDoc["properties"]>, keyof (InheritDoc & SubDataDoc & SubStoreDoc)>>, TSubComputed, {}, GetSubComputedDoc<TSubComputed>>)>>(options: Options<TRootDoc, IsPage, CurrentCompDoc, CurrentPrefix, AllRootDataDoc, TInherit, TSubData, TSubStore, TSubComputed, TEvents, TSubMethods, InheritDoc, SubDataDoc, SubStoreDoc, SubComputedDoc, SubEventsDoc, SubMethodsDoc>): CreateSubComponentDoc<NonNullable<TOriginalCompDoc["customEvents"]>, SubEventsDoc, MissingRequiredField>;
 };
 export declare function SubComponent<RootDoc extends RootComponentDoc, CompDoc extends ComponentDoc, Prefix extends string = "">(): IfExtends<EmptyObject, CompDoc, (opt: EmptyObject) => never, SubComponentConstructor<RootDoc, CompDoc, Prefix>>;
 export type SubComponentTrueOptions = {

package/dist/api/SubComponent/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/api/SubComponent/index.ts"],"names":[],"mappings":"AAkNA,MAAM,UAAU,YAAY;IAK1B,OAAO,CAAC,CAAC,OAAY,EAAE,EAAE,CAAC,OAAkC,CAAQ,CAAC;AACvE,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/api/SubComponent/index.ts"],"names":[],"mappings":"AAyOA,MAAM,UAAU,YAAY;IAK1B,OAAO,CAAC,CAAC,OAAY,EAAE,EAAE,CAAC,OAAkC,CAAQ,CAAC;AACvE,CAAC"}

package/dist/types/Extra.d.ts

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

package/dist/types/Extra.js

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

package/dist/types/Extra.js.map

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

package/dist/types/InnerData.d.ts

@@ -0,0 +1 @@
+export type InnerFields<Prefix extends string> = `_${Prefix}_${string}`;

package/dist/types/InnerData.js

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

package/dist/types/InnerData.js.map

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "annil",
-  "version": "1.5.13",
+  "version": "1.5.15",
   "description": "微信小程序(原生开发)插件",
   "main": "dist/index.js",
   "types": "src/index.ts",

package/src/api/SubComponent/SubComputed/SubComputedOption.ts

@@ -1,9 +1,9 @@
 import type { V } from "hry-types";
 export type SubComputedOption<
   TComputed extends object,
-  legal extends Record<PropertyKey, unknown>,
+  legal extends PropertyKey,
 > = {
   computed?:
     & TComputed
-    & V.IllegalFieldValidator<TComputed, keyof legal, 0, "", "重复或无效的字段">;
+    & V.IllegalFieldValidator<TComputed, legal, 0, "", "重复或无效的字段">;
 };

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

@@ -48,3 +48,16 @@ SubComponent<{}, OnlyPropsCompDoc>()({
     },
   },
 });
+
+// 4 类型错误
+SubComponent<{}, OnlyPropsCompDoc>()({
+  data: {
+    aaa_isReady: false,
+  },
+  computed: {
+    // @ts-ignore 重复的字段
+    aaa_isReady() {
+      return true;
+    },
+  },
+});

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

@@ -140,5 +140,18 @@ SubComponent<Root, $aaa>()({
     aaa_str(): string {
       return this.data.str;
     },
+
+    aaa_isReady() {
+      return false;
+    },
+  },
+});
+
+SubComponent<Root, $aaa>()({
+  computed: {
+    // 可以写isReady字段 ExtraFields
+    aaa_isReady() {
+      return false;
+    },
   },
 });

package/src/api/SubComponent/SubData/SubDataOption.ts

@@ -1,4 +1,5 @@
 import type { V } from "hry-types";
+import type { InnerFields } from "../../../types/InnerData";
 
 export type SubDataOption<TSubData extends object, legalKeys extends PropertyKey, TPrefix extends string> = {
   /**
@@ -9,9 +10,9 @@ export type SubDataOption<TSubData extends object, legalKeys extends PropertyKey
     & TSubData
     & V.IllegalFieldValidator<
       TSubData,
-      legalKeys | `_${TPrefix}_${string}`,
+      legalKeys | InnerFields<TPrefix>,
       0,
       "",
-      "⚠️ 子组件无需此字段或与Inherit字段重复 ⚠️"
+      "子组件无需此字段或与Inherit字段重复"
     >;
 };

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

@@ -27,7 +27,6 @@ SubComponent<{}, CompDoc>()({
   },
 });
 
-//
 SubComponent<{ data: { _num: number } }, CompDoc>()({
   inherit: {
     aaa_str: "wxml",
@@ -35,11 +34,22 @@ SubComponent<{ data: { _num: number } }, CompDoc>()({
     aaa_obj: "wxml",
   },
   data: {
-    // 3 CompDoc去除Inherit字段后为空时,可写内部字段
+    // 3 可写内部字段
     _aaa_str: "str",
   },
 });
 
+//
+SubComponent<{ data: { _num: number } }, CompDoc>()({
+  inherit: {
+    aaa_str: "wxml",
+  },
+  data: {
+    // 4 可写isReady 特许字段 ExtraFields
+    aaa_isReady: false,
+  },
+});
+
 SubComponent<{}, CompDoc>()({
   data: {
     aaa_str: "a",

package/src/api/SubComponent/SubInherit/SubInheritOption.ts

@@ -1,8 +1,17 @@
-export type SubInheritOption<TInherit> = {
+import type { V } from "hry-types";
+
+export type SubInheritOption<TInherit extends object, legalKeys extends PropertyKey> = {
   /**
    * 继承来自根组件的数据(key)或'wxml',wxml表示数据来自`.wxml`文件(例如数据来自父元素循环wx:for的数据).
    * inherit字段最终会在选项中删除,它的存在是为了ts开发时提供心智模型(类型检测),js开发好比注释功能.便于代码阅读。
    * 带类型检测
    */
-  inherit?: TInherit;
+  inherit?:
+    & TInherit
+    & V.IllegalFieldValidator<
+      TInherit,
+      legalKeys,
+      0,
+      ""
+    >;
 };

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

@@ -62,3 +62,15 @@ DefineComponent({
   // @ts-expect-error 2 不能将类型“string”分配给类型“_SubComponentDoc”。
   subComponents: [subDoc],
 });
+
+// 3 错误的key检查
+
+SubComponent<Mock_RootDoc, Mock_CompDoc>()({
+  inherit: {
+    aaa_num: "required_num",
+    // @ts-expect-error 3.1 不存在于组件中的key给错误提示
+    xxx: "",
+    // @ts-expect-error 3.2 不存在于组件中的key给错误提示
+    aaa_xxx: "",
+  },
+});

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

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

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

@@ -25,6 +25,7 @@ SubComponent<{
   },
   data: {
     aaa_num: 20,
+    aaa_isReady: false,
   },
   store: {
     // @ts-expect-error 1 与 inherit 字段重复
@@ -33,5 +34,9 @@ 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

@@ -16,20 +16,22 @@ type DocA = ComponentDoc<{
 
 SubComponent<{}, DocA>()({
   store: {
+    // 1 可写组件字段
     aaa_str: () => user.name,
-
     aaa_num: () => user.age,
-    // 内部字段
-    // _aaa_ddd: () => user.age,
   },
 });
 
 SubComponent<{}, DocA, "a">()({
   store: {
-    aaaA_str: () => user.name,
+    // 2 可写内部字段
+    _aaaA_xxxxxx: () => user.age,
+  },
+});
 
-    aaaA_num: () => user.age,
-    // 内部字段
-    // _aaaA_ddd: () => user.age,
+SubComponent<{}, DocA, "a">()({
+  store: {
+    // 3 可写特许字段
+    aaaA_isReady: () => false,
   },
 });

package/src/api/SubComponent/index.ts

@@ -6,6 +6,8 @@ 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";
 import type { IInjectStore } from "../InstanceInject/instanceConfig";
@@ -55,27 +57,28 @@ type Options<
   SubComputedDoc extends object,
   SubEventsDoc extends object,
   SubMethodsDoc extends object,
+  CompDocKeys extends PropertyKey = keyof CurrentCompDoc["properties"],
 > =
-  & SubInheritOption<TInherit>
+  & SubInheritOption<TInherit, CompDocKeys>
   & SubDataOption<
     TSubData,
-    Exclude<keyof CurrentCompDoc["properties"], (keyof InheritDoc)>,
+    Exclude<CompDocKeys | keyof Extra<Prefix>, (keyof InheritDoc)>,
     Prefix
   >
   & SubStoreOption<
     TSubStore,
-    Exclude<keyof CurrentCompDoc["properties"], (keyof (InheritDoc & SubDataDoc))>
+    Exclude<CompDocKeys | keyof Extra<Prefix>, (keyof (InheritDoc & SubDataDoc))>,
+    Prefix
   >
   & SubComputedOption<
     TSubComputed,
-    // AllRootDataDoc & SubDataDoc & SubDataDoc & SubComputedDoc,
     // 合法的配置
-    Omit<CurrentCompDoc["properties"], (keyof (InheritDoc & SubDataDoc & SubStoreDoc))>
+    Exclude<CompDocKeys | keyof Extra<Prefix>, (keyof (InheritDoc & SubDataDoc & SubStoreDoc))>
   >
   // 无需与根组件的events字段重复检测,因为根组件多了bubbles字段,一定不会重复
   & SubEventsOption<TEvents, SubEventsDoc, keyof SubEventsConstraint<CurrentCompDoc>>
   & SubMethodsOption<TSubMethods, Prefix, keyof (CurrentCompDoc["customEvents"] & SubEventsDoc)>
-  & SubPageLifetimesOption<IsPage, RootDoc["properties"] & {}>
+  & SubPageLifetimesOption<IsPage, NonNullable<RootDoc["properties"]>>
   & SubLifetimesOption
   & SubWatchOption<
     & SubComputedDoc
@@ -97,7 +100,7 @@ type Options<
       SubMethodsDoc & RootDoc["methods"],
       Replace<SubDataDoc, Required<CurrentCompDoc["properties"]>>,
       AllRootDataDoc & Replace<SubDataDoc & SubComputedDoc & SubStoreDoc, Required<CurrentCompDoc["properties"]>>,
-      RootDoc["customEvents"] & {},
+      NonNullable<RootDoc["customEvents"]>,
       SubStoreDoc
     >
   >;
@@ -126,31 +129,51 @@ type SubComponentConstructor<
 > = {
   <
     TInherit extends InheritConstraint<AllRootDataDoc, CurrentCompDoc>,
-    TSubData extends SubDataConstraint<Omit<Required<CurrentCompDoc["properties"]>, keyof InheritDoc>>,
-    TSubStore extends SubStoreConstraint<Omit<Required<CurrentCompDoc["properties"]>, keyof (InheritDoc & SubDataDoc)>>,
+    TSubData extends SubDataConstraint<
+      & Omit<Required<CurrentCompDoc["properties"]> & Extra<CurrentPrefix>, keyof InheritDoc>
+      & Record<InnerFields<CurrentPrefix>, unknown> // 内部字段
+    >,
+    TSubStore extends SubStoreConstraint<
+      & Omit<Required<CurrentCompDoc["properties"]> & Extra<CurrentPrefix>, keyof (InheritDoc & SubDataDoc)>
+      & Record<InnerFields<CurrentPrefix>, unknown> // 内部字段
+    >,
     TEvents extends SubEventsConstraint<CurrentCompDoc>,
     // 加默认值计算字段无提示且需要手写返回类型,不加watch无法对computed监控
     TSubComputed extends SubComputedConstraint<
-      Omit<Required<CurrentCompDoc["properties"]>, keyof (InheritDoc & SubDataDoc & SubStoreDoc)>
-    > = {},
+      & Omit<
+        Required<CurrentCompDoc["properties"]> & Extra<CurrentPrefix>,
+        keyof (InheritDoc & SubDataDoc & SubStoreDoc)
+      >
+      & Record<InnerFields<CurrentPrefix>, unknown> // 内部字段
+    >,
     TSubMethods extends SubMethodsConstraint = {},
     InheritDoc extends object = IfExtends<InheritConstraint<AllRootDataDoc, CurrentCompDoc>, TInherit, {}, TInherit>,
     SubDataDoc extends object = IfExtends<
-      SubDataConstraint<Omit<Required<CurrentCompDoc["properties"]>, keyof InheritDoc>>,
+      SubDataConstraint<
+        & Omit<Required<CurrentCompDoc["properties"]> & Extra<CurrentPrefix>, keyof InheritDoc>
+        & Record<InnerFields<CurrentPrefix>, unknown>
+      >,
       TSubData,
       {},
       TSubData
     >,
     SubStoreDoc extends object = IfExtends<
-      SubStoreConstraint<Omit<Required<CurrentCompDoc["properties"]>, keyof (InheritDoc & SubDataDoc)>>,
+      SubStoreConstraint<
+        & Omit<Required<CurrentCompDoc["properties"]> & Extra<CurrentPrefix>, keyof (InheritDoc & SubDataDoc)>
+        & Record<InnerFields<CurrentPrefix>, unknown>
+      >,
       TSubStore,
       {},
-      { [k in keyof TSubStore]: ReturnType<TSubStore[k] & {}> }
+      { [k in keyof TSubStore]: ReturnType<NonNullable<TSubStore[k]>> }
     >,
     // 无效的计算
     SubComputedDoc extends object = IfExtends<
       SubComputedConstraint<
-        Omit<Required<CurrentCompDoc["properties"]>, keyof (InheritDoc & SubDataDoc & SubStoreDoc)>
+        & Omit<
+          Required<CurrentCompDoc["properties"]> & Extra<CurrentPrefix>,
+          keyof (InheritDoc & SubDataDoc & SubStoreDoc)
+        >
+        & Record<InnerFields<CurrentPrefix>, unknown> // 内部字段
       >,
       TSubComputed,
       {},
@@ -165,7 +188,7 @@ type SubComponentConstructor<
     SubMethodsDoc extends object = TSubMethods,
     // 缺失的必传字段(配置中inhrit,data,computed的字段不包含的必传字段)
     MissingRequiredField extends PropertyKey = Exclude<
-      RequiredKeys<CurrentCompDoc["properties"] & {}>,
+      RequiredKeys<NonNullable<CurrentCompDoc["properties"]>>,
       keyof (
         & InheritDoc
         & SubDataDoc
@@ -201,7 +224,7 @@ type SubComponentConstructor<
       SubEventsDoc,
       SubMethodsDoc
     >,
-  ): CreateSubComponentDoc<TOriginalCompDoc["customEvents"] & {}, SubEventsDoc, MissingRequiredField>;
+  ): CreateSubComponentDoc<NonNullable<TOriginalCompDoc["customEvents"]>, SubEventsDoc, MissingRequiredField>;
 };
 
 /**

package/src/types/Extra.ts

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

package/src/types/InnerData.ts

@@ -0,0 +1 @@
+export type InnerFields<Prefix extends string> = `_${Prefix}_${string}`;