annil 1.7.5-beta.4 → 1.7.6

package/src/api/SubComponent/SubEvents/SubEventsConstraint.ts

@@ -1,14 +1,14 @@
 import type { Contains } from "hry-types/src/Any/Contains";
 import type { IfExtends } from "hry-types/src/Any/IfExtends";
 import type { Detail, WMBaseEvent } from "../../../types/OfficialTypeAlias";
-import type { ComponentDoc } from "../../DefineComponent/ReturnType/ComponentDoc";
+import type { ComponentType } from "../../DefineComponent/ReturnType/ComponentType";
 import type { Bubbles, Capture, CustomEventsTags } from "../../RootComponent/CustomEvents/CustomEventsTag";
 
 /**
  * 把组件事件类型转为函数类型,冒泡事件捕获事件会多一个加后缀(_catch)的key,表示阻止事件冒泡和捕获。
  */
 export type SubEventsConstraint<
-  CompDoc extends ComponentDoc,
+  CompDoc extends ComponentType,
 > = {
   [
     k in keyof CompDoc["customEvents"] as Contains<CompDoc["customEvents"][k], Bubbles | Capture> extends true

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

@@ -1,8 +1,8 @@
-import type { ComponentDoc } from "../../../DefineComponent/ReturnType/ComponentDoc";
+import type { ComponentType } from "../../../DefineComponent/ReturnType/ComponentType";
 import type { Bubbles } from "../../../RootComponent/CustomEvents/CustomEventsTag";
 import { SubComponent } from "../..";
 
-type CompDoc = ComponentDoc<{
+type CompDoc = ComponentType<{
   properties: {
     aaa_str: string;
   };
@@ -16,7 +16,7 @@ SubComponent<{}, CompDoc>()({
   },
 });
 
-type CompDoc1 = ComponentDoc<{
+type CompDoc1 = ComponentType<{
   customEvents: {
     aaa_str: string | Bubbles;
   };

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

@@ -4,7 +4,7 @@ import { Checking, type Test } from "hry-types";
 import type { Wm } from "../../../../thirdLib";
 
 import type { Detail, Mark, WMBaseEvent } from "../../../..";
-import type { ComponentDoc } from "../../../DefineComponent/ReturnType/ComponentDoc";
+import type { ComponentType } from "../../../DefineComponent/ReturnType/ComponentType";
 import type {
   Bubbles,
   BubblesCapture,
@@ -16,7 +16,7 @@ import type {
 import type { Mock_User } from "../../../RootComponent/Properties/test/normalRequired.test";
 import { SubComponent } from "../..";
 
-type CompDoc = ComponentDoc<{
+type CompDoc = ComponentType<{
   customEvents: {
     aaa_str: string;
     aaa_bubbles: string | Bubbles;

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

@@ -1,6 +1,6 @@
 import type { SelectKeys } from "hry-types/src/Object/_api";
 import type { RemoveInnerData } from "../../../types/RemoveInnerData";
-import type { ComponentDoc } from "../../DefineComponent/ReturnType/ComponentDoc";
+import type { ComponentType } from "../../DefineComponent/ReturnType/ComponentType";
 
 type WXMLSign = "wxml";
 
@@ -10,7 +10,7 @@ type unionAddList<Keys extends string> = Keys | Keys[];
  * 子组件inherit字段约束,key为构建组件所需的properties字段,类型为根组件数据的key或key[]或`WXMLSign`。要求根数据类型为子数据类型的子类型。当key的值来自wxml(循环产生的子数据等情况)时用`WXMLSign`表示。
  * @returns object
  */
-export type InheritConstraint<AllRootData extends object, TComponentDoc extends ComponentDoc> = {
+export type InheritConstraint<AllRootData extends object, TComponentDoc extends ComponentType> = {
   [k in keyof TComponentDoc["properties"]]?:
     | unionAddList<RemoveInnerData<SelectKeys<AllRootData, TComponentDoc["properties"][k]> & string>>
     | WXMLSign;

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

@@ -1,11 +1,11 @@
 import { Checking, type Test } from "hry-types";
 import { DefineComponent } from "../../../DefineComponent";
-import type { ComponentDoc } from "../../../DefineComponent/ReturnType/ComponentDoc";
-import type { RootComponentDoc } from "../../../RootComponent/RootComponentDoc";
+import type { ComponentType } from "../../../DefineComponent/ReturnType/ComponentType";
+import type { RootComponentType } from "../../../RootComponent/RootComponentType";
 import { SubComponent } from "../..";
-import type { SubComponentDoc } from "../../SubComponentDoc";
+import type { SubComponentType } from "../../SubComponentType";
 
-type Mock_RootDoc = RootComponentDoc<{
+type Mock_RootDoc = RootComponentType<{
   properties: {
     required_num: number;
     optional_literal_num?: 123 | 456 | 789;
@@ -25,7 +25,7 @@ type Mock_RootDoc = RootComponentDoc<{
   };
 }>;
 
-type Mock_CompDoc = ComponentDoc<{
+type Mock_CompDoc = ComponentType<{
   properties: {
     aaa_num: number;
     aaa_literal_num: 123 | 456;
@@ -55,7 +55,7 @@ const subDoc = SubComponent<Mock_RootDoc, Mock_CompDoc>()({
   },
 });
 
-void Checking<typeof subDoc, SubComponentDoc, Test.Fail>;
+void Checking<typeof subDoc, SubComponentType, Test.Fail>;
 
 DefineComponent({
   name: "xxx",

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

@@ -1,11 +1,11 @@
-import type { ComponentDoc } from "../../../DefineComponent/ReturnType/ComponentDoc";
-import type { RootComponentDoc } from "../../../RootComponent/RootComponentDoc";
+import type { ComponentType } from "../../../DefineComponent/ReturnType/ComponentType";
+import type { RootComponentType } from "../../../RootComponent/RootComponentType";
 import { SubComponent } from "../..";
 
 /**
  * inherit字段最终会在选项中删除,它用ts开发类型检测。
  */
-type Mock_RootDoc = RootComponentDoc<{
+type Mock_RootDoc = RootComponentType<{
   properties: {
     required_num: number;
     optional_literal_num?: 123 | 456 | 789;
@@ -23,7 +23,7 @@ type Mock_RootDoc = RootComponentDoc<{
   };
 }>;
 
-type Mock_CompDoc = ComponentDoc<{
+type Mock_CompDoc = ComponentType<{
   properties: {
     aaa_num: number;
     aaa_literal_num: 123 | 456;
@@ -65,3 +65,17 @@ SubComponent<Mock_RootDoc, Mock_CompDoc>()({
     aaa_obj1: "" as "required_obj" | "optional_obj" | ["required_obj" | "optional_obj"] | "wxml",
   },
 });
+
+// 4. 实例上没有computed字段。
+SubComponent<{}, Mock_CompDoc>()({
+  computed: {
+    aaa_num() {
+      return 1;
+    },
+  },
+  methods: {
+    aaa_meA() {
+      console.log(this.data.aaa_num);
+    },
+  },
+});

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

@@ -1,8 +1,8 @@
 import type { View } from "../../../../thirdLib/wm";
-import type { RootComponentDoc } from "../../../RootComponent/RootComponentDoc";
+import type { RootComponentType } from "../../../RootComponent/RootComponentType";
 import { SubComponent } from "../..";
 
-type RootDoc = RootComponentDoc<{
+type RootDoc = RootComponentType<{
   events: {
     RootE1: () => string;
   };

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

@@ -1,13 +1,13 @@
 import { Checking, type Test } from "hry-types";
-import type { ComponentDoc } from "../../../DefineComponent/ReturnType/ComponentDoc";
+import type { ComponentType } from "../../../DefineComponent/ReturnType/ComponentType";
 
 import type { ComputeIntersection } from "hry-types/src/Object/ComputeIntersection";
 import type { IInjectAllData } from "../../../InstanceInject/instanceConfig";
 import type { Mock_User } from "../../../RootComponent/Properties/test/normalRequired.test";
-import type { RootComponentDoc } from "../../../RootComponent/RootComponentDoc";
+import type { RootComponentType } from "../../../RootComponent/RootComponentType";
 import { SubComponent } from "../..";
 
-type RootDoc = RootComponentDoc<{
+type RootDoc = RootComponentType<{
   properties: {
     Pstr: string;
     Pobj: Mock_User | null;
@@ -30,7 +30,7 @@ type RootDoc = RootComponentDoc<{
   };
 }>;
 
-type CompDoc = ComponentDoc<{
+type CompDoc = ComponentType<{
   properties: {
     aaa_str: string;
   };

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

@@ -1,9 +1,9 @@
-import type { ComponentDoc } from "../../../DefineComponent/ReturnType/ComponentDoc";
+import type { ComponentType } from "../../../DefineComponent/ReturnType/ComponentType";
 import type { Bubbles } from "../../../RootComponent/CustomEvents/CustomEventsTag";
-import type { RootComponentDoc } from "../../../RootComponent/RootComponentDoc";
+import type { RootComponentType } from "../../../RootComponent/RootComponentType";
 import { SubComponent } from "../..";
 
-type RootDoc = RootComponentDoc<{
+type RootDoc = RootComponentType<{
   methods: {
     Mstr: () => string;
   };
@@ -15,7 +15,7 @@ type RootDoc = RootComponentDoc<{
   };
 }>;
 
-type CompDoc = ComponentDoc<{
+type CompDoc = ComponentType<{
   customEvents: {
     aaa_str: string | Bubbles;
   };

package/src/api/SubComponent/SubMethods/test/normarl.test.ts

@@ -1,14 +1,14 @@
-import type { ComponentDoc } from "../../../DefineComponent/ReturnType/ComponentDoc";
-import type { RootComponentDoc } from "../../../RootComponent/RootComponentDoc";
+import type { ComponentType } from "../../../DefineComponent/ReturnType/ComponentType";
+import type { RootComponentType } from "../../../RootComponent/RootComponentType";
 import { SubComponent } from "../..";
 
-type RootDoc = RootComponentDoc<{
+type RootDoc = RootComponentType<{
   methods: {
     Mstr: () => string;
   };
 }>;
 
-type CompDoc = ComponentDoc<{
+type CompDoc = ComponentType<{
   customEvents: {
     aaa_str: string;
   };

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

@@ -1,8 +1,8 @@
 import { Checking, type Test } from "hry-types";
-import type { ComponentDoc } from "../../../DefineComponent/ReturnType/ComponentDoc";
+import type { ComponentType } from "../../../DefineComponent/ReturnType/ComponentType";
 import { SubComponent } from "../..";
 
-type CompDoc = ComponentDoc<{
+type CompDoc = ComponentType<{
   properties: {
     aaa_str: string;
     aaa_bool: boolean;

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

@@ -1,5 +1,5 @@
 import { Checking, type Test } from "hry-types";
-import type { ComponentDoc } from "../../../DefineComponent/ReturnType/ComponentDoc";
+import type { ComponentType } from "../../../DefineComponent/ReturnType/ComponentType";
 import type {
   Bubbles,
   BubblesCaptureComposed,
@@ -9,7 +9,7 @@ import type {
 } from "../../../RootComponent/CustomEvents/CustomEventsTag";
 import { SubComponent } from "../..";
 
-type CompDoc = ComponentDoc<{
+type CompDoc = ComponentType<{
   properties: {
     aaa_str: string;
   };

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

@@ -1,13 +1,13 @@
 import { observable } from "mobx";
 
-import type { ComponentDoc } from "../../../DefineComponent/ReturnType/ComponentDoc";
+import type { ComponentType } from "../../../DefineComponent/ReturnType/ComponentType";
 import { SubComponent } from "../..";
 const user = observable({
   name: "zhao",
   age: 20,
 });
 
-type DocA = ComponentDoc<{
+type DocA = ComponentType<{
   properties: {
     aaa_str: string;
     aaa_num: number;

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

@@ -1,13 +1,13 @@
 import { observable } from "mobx";
 
-import type { ComponentDoc } from "../../../DefineComponent/ReturnType/ComponentDoc";
+import type { ComponentType } from "../../../DefineComponent/ReturnType/ComponentType";
 import { SubComponent } from "../..";
 const user = observable({
   name: "zhao",
   age: 20,
 });
 
-type DocA = ComponentDoc<{
+type DocA = ComponentType<{
   properties: {
     aaa_str: string;
     aaa_num: number;

package/src/api/SubComponent/SubWatch/test/WatchComputed.test.ts

@@ -1,10 +1,10 @@
 import { Checking, type Test } from "hry-types";
-import type { ComponentDoc } from "../../../DefineComponent/ReturnType/ComponentDoc";
+import type { ComponentType } from "../../../DefineComponent/ReturnType/ComponentType";
 import type { Mock_User } from "../../../RootComponent/Properties/test/normalRequired.test";
-import type { RootComponentDoc } from "../../../RootComponent/RootComponentDoc";
+import type { RootComponentType } from "../../../RootComponent/RootComponentType";
 import { SubComponent } from "../..";
 
-type RootDoc = RootComponentDoc<{
+type RootDoc = RootComponentType<{
   properties: {
     obj: Mock_User | null;
   };
@@ -16,7 +16,7 @@ type RootDoc = RootComponentDoc<{
   };
 }>;
 
-type CompDoc = ComponentDoc<{
+type CompDoc = ComponentType<{
   properties: {
     aaa_obj: Mock_User | null;
     aaa_str: string;

package/src/api/SubComponent/SubWatch/test/WatchRootData.test.ts

@@ -1,6 +1,6 @@
 import { Checking, type Test } from "hry-types";
 
-import type { ComponentDoc } from "../../../DefineComponent/ReturnType/ComponentDoc";
+import type { ComponentType } from "../../../DefineComponent/ReturnType/ComponentType";
 
 import type { Mock_User } from "../../../RootComponent/Properties/test/normalRequired.test";
 import { SubComponent } from "../..";
@@ -9,7 +9,7 @@ interface TestObj {
   subObj: Mock_User;
 }
 
-type CompDoc = ComponentDoc<{
+type CompDoc = ComponentType<{
   properties: {
     aaa_str: string;
     aaa_num: number;

package/src/api/SubComponent/SubWatch/test/WatchSubData.test.ts

@@ -1,8 +1,8 @@
 import { Checking, type Test } from "hry-types";
-import type { ComponentDoc } from "../../../DefineComponent/ReturnType/ComponentDoc";
+import type { ComponentType } from "../../../DefineComponent/ReturnType/ComponentType";
 import { SubComponent } from "../..";
 
-type CompDoc = ComponentDoc<{
+type CompDoc = ComponentType<{
   properties: {
     aaa_str: string;
     aaa_num: number;

package/src/api/SubComponent/index.ts

@@ -2,20 +2,21 @@ import type { IfExtends } from "hry-types/src/Any/IfExtends";
 import type { EmptyObject } from "hry-types/src/Misc/EmptyObject";
 import type { Func } from "hry-types/src/Misc/Func";
 import type { RequiredKeys } from "hry-types/src/Object/RequiredKeys";
+import type { ComputeObject } from "../../types/ComputeObj";
 import type { GetComponentPrefix } from "../../types/GetComponentPrefix";
 import type { InnerFields } from "../../types/InnerData";
 import type { WMCompOtherOption } from "../../types/OfficialTypeAlias";
 import type { Replace } from "../../types/Replace";
 import type { ReplacePrefix } from "../../types/ReplacePrefix";
-import type { ComponentDoc } from "../DefineComponent/ReturnType/ComponentDoc";
-import type { IInjectStore } from "../InstanceInject/instanceConfig";
+import type { ComponentType } from "../DefineComponent/ReturnType/ComponentType";
+import type { IInjectAllData, IInjectStore } from "../InstanceInject/instanceConfig";
 import type { ComputedConstraint } from "../RootComponent/Computed/ComputedConstraint";
 import type { DataConstraint } from "../RootComponent/Data/DataConstraint";
 import type { EventsConstraint } from "../RootComponent/Events/EventsConstraint";
 import type { LifetimesConstraint } from "../RootComponent/Lifetimes/LifetimesConstraint";
 import type { MethodsConstraint } from "../RootComponent/Methods/MethodsConstraint";
 import type { PageLifetimesOption } from "../RootComponent/PageLifetimes/PageLifetimesOption";
-import type { RootComponentDoc } from "../RootComponent/RootComponentDoc";
+import type { RootComponentType } from "../RootComponent/RootComponentType";
 import type { StoreConstraint } from "../RootComponent/Store/StoreConstraint";
 import type { GetSubComputedDoc } from "./SubComputed/GetSubComputedDoc";
 import type { SubComputedConstraint } from "./SubComputed/SubComputedConstraint";
@@ -38,9 +39,9 @@ import type { SubStoreOption } from "./SubStore/SubStoreOption";
 import type { SubWatchOption } from "./SubWatch/SubWatchOption";
 
 type Options<
-  RootDoc extends RootComponentDoc,
+  RootDoc extends RootComponentType,
   IsPage extends boolean,
-  CurrentCompDoc extends ComponentDoc,
+  CurrentCompDoc extends ComponentType,
   Prefix extends string,
   AllRootDataDoc extends object,
   TInherit extends object,
@@ -71,7 +72,12 @@ type Options<
   & SubComputedOption<
     TSubComputed,
     // 合法的配置
-    Exclude<CompDocKeys, (keyof (InheritDoc & SubDataDoc & SubStoreDoc))> | InnerFields<Prefix>
+    Exclude<CompDocKeys, (keyof (InheritDoc & SubDataDoc & SubStoreDoc))> | InnerFields<Prefix>,
+    {
+      data: ComputeObject<
+        AllRootDataDoc & Replace<SubComputedDoc, Required<CurrentCompDoc["properties"]>> & IInjectAllData
+      >;
+    }
   >
   // 无需与根组件的events字段重复检测,因为根组件多了bubbles字段,一定不会重复
   & SubEventsOption<TEvents, SubEventsDoc, keyof SubEventsConstraint<CurrentCompDoc>>
@@ -104,15 +110,15 @@ type Options<
   >;
 
 type SubComponentConstructor<
-  TRootDoc extends RootComponentDoc,
-  TOriginalCompDoc extends ComponentDoc,
+  TRootDoc extends RootComponentType,
+  TOriginalCompDoc extends ComponentType,
   // 补充的前缀
   TSupplementalPrefix extends string = "",
   IsPage extends boolean = TRootDoc["isPage"] extends true ? true : false,
   // 重构子组件的前缀
   CurrentPrefix extends string = `${GetComponentPrefix<TOriginalCompDoc>}${Capitalize<TSupplementalPrefix>}`,
   // 更新原始文档的前缀为Prefix
-  CurrentCompDoc extends ComponentDoc = IfExtends<
+  CurrentCompDoc extends ComponentType = IfExtends<
     TSupplementalPrefix,
     "",
     TOriginalCompDoc,
@@ -228,8 +234,8 @@ type SubComponentConstructor<
  * @returns `(options:) => SubComponentDoc`
  */
 export function SubComponent<
-  RootDoc extends RootComponentDoc,
-  CompDoc extends ComponentDoc,
+  RootDoc extends RootComponentType,
+  CompDoc extends ComponentType,
   Prefix extends string = "",
 >(): IfExtends<EmptyObject, CompDoc, (opt: EmptyObject) => never, SubComponentConstructor<RootDoc, CompDoc, Prefix>> {
   // eslint-disable-next-line @typescript-eslint/no-explicit-any

package/src/behaviors/BStore.ts

@@ -1,38 +1,52 @@
 import type mobx from "mobx";
 import type { Instance } from "../api/RootComponent/Instance/RootComponentInstance";
+import { deepEqual } from "../utils/deepEqual";
+import { isEmptyObject } from "../utils/isEmptyObject";
+
+function reactionRegister(this: Instance, storeConfig: Record<string, () => unknown>) {
+  const unequalData: Record<string, unknown> = {};
+  // eslint-disable-next-line @typescript-eslint/no-require-imports
+  const { comparer, reaction, toJS } = require("mobx") as typeof mobx;
+  // 存储reaction的disposer 需要保护内部字段验证
+  this.disposer = {};
+  for (const key in storeConfig) {
+    const currentStoreValue = toJS(storeConfig[key]());
+    /* istanbul ignore next 没办法测试啊,在打开一个页面后退回,修改store,再打开相同页面是会出现store数据不准确的问题*/
+    // @ts-ignore this.data[key]一定存在
+    if (!deepEqual(currentStoreValue, this.data[key])) {
+      unequalData[key] = currentStoreValue;
+    }
+    // 添加响应式逻辑
+    this.disposer[key] = reaction(
+      storeConfig[key],
+      (value: unknown) => {
+        this.setData({
+          [key]: toJS(value),
+        });
+      },
+      {
+        equals: comparer.structural,
+      },
+    );
+  }
+  delete this.data.__storeConfig__;
+  /* istanbul ignore next  */
+  if (!isEmptyObject(unequalData)) this.setData(unequalData);
+}
 
 /**
- * 在created生命周期中,初始化 store数据(__storeConfig__)到data中
+ * 在attached(1.7.5之前在created中)生命周期中,建立store数据的reaction
  * 在detached生命周期中,清除store数据
  */
 export const BStore = Behavior({
   lifetimes: {
-    created(this: Instance) {
+    attached(this: Instance) {
+      // 此时store数据已初始化到data中(initStore)
       const storeConfig = this.data.__storeConfig__;
       if (!storeConfig) return;
 
-      // eslint-disable-next-line @typescript-eslint/no-require-imports
-      const { comparer, reaction, toJS } = require("mobx") as typeof mobx;
-      // 存储reaction的disposer 需要冲突字段验证
-      this.disposer = {};
-      for (const key in storeConfig) {
-        // 添加响应式逻辑
-        this.disposer[key] = reaction(
-          storeConfig[key],
-          (value: unknown) => {
-            // 加入到待setData对象中
-            this.setData({
-              [key]: toJS(value),
-            });
-          },
-          {
-            equals: comparer.structural,
-          },
-        );
-      }
-      delete this.data.__storeConfig__;
+      reactionRegister.call(this, storeConfig);
     },
-
     detached(this: Instance) {
       /* istanbul ignore next 清除store数据 test中模拟了测试，所以忽略 框架(1.6.1)不支持 issue {@link https://github.com/wechat-miniprogram/miniprogram-simulate/issues/110}*/
       for (const key in this.disposer) {

package/src/index.ts

@@ -5,7 +5,7 @@ import { RootComponent } from "./api/RootComponent";
 import { SubComponent } from "./api/SubComponent";
 import type { CreateComponentType } from "./types/CreateComponentType";
 import type { DetailedType } from "./types/DetailedType";
-import type { DocAssign } from "./types/DocAssign";
+import type { ExtendComponentType } from "./types/ExtendComponentType";
 import type { ParamsEqual } from "./types/TwoParamsEqual";
 export type { Vant, Wm } from "./thirdLib";
 
@@ -23,7 +23,7 @@ export {
   type CreateComponentType,
   DefineComponent,
   type DetailedType,
-  type DocAssign,
+  type ExtendComponentType,
   type IInjectInfo,
   instanceConfig,
   navigateTo,

package/src/types/CreateComponentType.ts

@@ -1,9 +1,30 @@
 import type { IfExtends } from "hry-types/src/Any/_api";
 import type { ComputeIntersection } from "hry-types/src/Object/_api";
-import type { ComponentDoc } from "../api/DefineComponent/ReturnType/ComponentDoc";
+import type { ComponentType } from "../api/DefineComponent/ReturnType/ComponentType";
 import type { AddPrefix } from "./AddPrefix";
 
-export type CreateComponentType<TName extends string, T extends ComponentDoc> = ComputeIntersection<
+/**
+ * 建立一个组件类型
+ * @param TName 组件名称
+ * @param T 类型配置
+ * @example
+ * ```ts
+ * type $CustomA = CreateComponentType<"customA", {
+ *   properties: { num: string };
+ *   customEvents: { onTap: string }
+ * }>;
+ *
+ * // 等同下面的类型
+ * type $CustomA = {
+ *    properties: {
+ *      customA_num: string;
+ *    };
+ *    customEvents: {
+ *      customA_onTap: string;
+ *    };
+ * ```
+ */
+export type CreateComponentType<TName extends string, T extends ComponentType> = ComputeIntersection<
   & IfExtends<
     unknown,
     T["properties"],

package/src/types/ExtendComponentType.ts

@@ -0,0 +1,60 @@
+import type { IfExtends } from "hry-types/src/Any/IfExtends";
+import type { ComputeIntersectionDeep } from "hry-types/src/Object/ComputeIntersectionDeep";
+import type { ComponentType } from "../api/DefineComponent/ReturnType/ComponentType";
+import type { GetComponentPrefix } from "./GetComponentPrefix";
+
+type Validator<
+  TOriginalComponentType extends ComponentType,
+  TExtensionType extends ComponentType,
+  TOriginalPrefix extends PropertyKey = GetComponentPrefix<TOriginalComponentType>,
+  TExtenstionPrefix extends PropertyKey = GetComponentPrefix<TExtensionType>,
+  DuplicateKeys extends PropertyKey =
+    | Extract<keyof TExtensionType["properties"], keyof TOriginalComponentType["properties"]>
+    | Extract<keyof TExtensionType["customEvents"], keyof TOriginalComponentType["customEvents"]>,
+> = IfExtends<
+  TOriginalPrefix,
+  TExtenstionPrefix,
+  IfExtends<DuplicateKeys, never, ComponentType, `${DuplicateKeys & string}字段重复`>,
+  `前缀错误,应为${TOriginalPrefix & string}`
+>;
+
+/**
+ * 拓展组件类型
+ * @param TOriginalComponentType 原始组件类型
+ * @param TExtensionType 拓展类型
+ * @description 拓展类型必须与原始类型有相同的前缀
+ * @example
+ * ```ts
+ * type $CustomA = ExtendComponentType<
+ *  { properties: { aaa_num: number };
+ *   customEvents: { aaa_xxx: string }
+ *  },
+ *  { properties: { aaa_str: string };
+ *   customEvents: { aaa_yyy: string }
+ * }>;
+ *
+ * // 等同下面的类型
+ *  type $CustomA = {
+ *    properties: {
+ *      aaa_num: number;
+ *      aaa_str: string;
+ *    };
+ *    customEvents: {
+ *      aaa_xxx: string;
+ *      aaa_yyy: string;
+ *    };
+ * ```
+ */
+export type ExtendComponentType<
+  TOriginalComponentType extends ComponentType,
+  // @ts-ignore
+  TExtensionType extends Validator<TOriginalComponentType, TExtensionType>,
+> = ComputeIntersectionDeep<TOriginalComponentType & TExtensionType>;
+
+// type test0 = ExtendComponentType<{ properties: { aaa_xxx: string } }, { properties: { aaa_xxx: string } }>; // => "aaa_xxx字段重复"
+
+// type test1 = ExtendComponentType<{ customEvents: { aaa_xxx: string } }, { customEvents: { aaa_xxx: string } }>; // => "aaa_xxx字段重复"
+
+// type test2 = ExtendComponentType<{ properties: { aaa_xxx: string } }, { properties: { ddd_xxx: string } }>; // => "前缀错误,应为aaa"
+
+// type test3 = ExtendComponentType<{ customEvents: { aaa_xxx: string } }, { customEvents: { ddd_xxx: string } }>; // => "前缀错误,应为aaa"

package/src/types/GetComponentPrefix.ts

@@ -1,12 +1,12 @@
 // import { Checking, type Test } from "hry-types";
 import type { IfExtends } from "hry-types/src/Any/IfExtends";
 import type { EmptyObject } from "hry-types/src/Misc/EmptyObject";
-import type { ComponentDoc } from "../api/DefineComponent/ReturnType/ComponentDoc";
+import type { ComponentType } from "../api/DefineComponent/ReturnType/ComponentType";
 
 /**
  * 提取文档前缀名
  */
-export type GetComponentPrefix<TComponentDoc extends ComponentDoc> = EmptyObject extends TComponentDoc ? never
+export type GetComponentPrefix<TComponentDoc extends ComponentType> = EmptyObject extends TComponentDoc ? never
   : keyof IfExtends<
     unknown,
     TComponentDoc["properties"],

package/src/types/GetPropertiesDuplicatedKeys.ts

@@ -1,11 +1,11 @@
-import type { SubComponentDoc } from "../api/SubComponent/SubComponentDoc";
+import type { SubComponentType } from "../api/SubComponent/SubComponentType";
 
 // 获取元组中properties字段的重复keys
 export type GetPropertiesDuplicatedKeys<
-  O extends SubComponentDoc[],
+  O extends SubComponentType[],
   Comparekeys extends PropertyKey,
   Duplicatekey extends string = never,
-> = O extends [infer Head extends SubComponentDoc, ...infer Rest extends SubComponentDoc[]]
+> = O extends [infer Head extends SubComponentType, ...infer Rest extends SubComponentType[]]
   ? GetPropertiesDuplicatedKeys<
     Rest,
     Comparekeys | keyof Head["properties"],