annil 1.7.5-beta.4 → 1.7.6

package/dist/api/SubComponent/{SubComponentDoc.d.ts → SubComponentType.d.ts}

@@ -1,9 +1,9 @@
 import type { SelectKeys } from "hry-types/src/Object/_api";
 import type { Composed, CustomEventsTags } from "../RootComponent/CustomEvents/CustomEventsTag";
-type _SubComponentDoc = {
+type _SubComponentType = {
     [k in string]: string | number | bigint | boolean | symbol | null | Record<string, unknown> | unknown[] | CustomEventsTags;
 };
-type _Validator<O, ErrKeys = Exclude<keyof O, SelectKeys<O, Composed, "contains->">>> = [ErrKeys] extends [never] ? _SubComponentDoc : `${ErrKeys & string} 不是穿透事件`;
+type _Validator<O, ErrKeys = Exclude<keyof O, SelectKeys<O, Composed, "contains->">>> = [ErrKeys] extends [never] ? _SubComponentType : `${ErrKeys & string} 不是穿透事件`;
 /**
  * SubComponent API 返回类型
  * @remarks 穿透的子组件自定义事件
@@ -13,5 +13,5 @@ type _Validator<O, ErrKeys = Exclude<keyof O, SelectKeys<O, Composed, "contains-
  * };
  * ```
  */
-export type SubComponentDoc<O extends _Validator<O> = _SubComponentDoc> = O;
+export type SubComponentType<O extends _Validator<O> = _SubComponentType> = O;
 export {};

package/dist/api/SubComponent/SubComponentType.js

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

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

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

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

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

package/dist/api/SubComponent/SubEvents/SubEventsConstraint.d.ts

@@ -1,11 +1,11 @@
 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> = {
+export type SubEventsConstraint<CompDoc extends ComponentType> = {
     [k in keyof CompDoc["customEvents"] as Contains<CompDoc["customEvents"][k], Bubbles | Capture> extends true ? (k | `${k & string}_catch`) : k]?: (e: IfExtends<WMBaseEvent, CompDoc["customEvents"][k], WMBaseEvent, Detail<Exclude<CompDoc["customEvents"][k], CustomEventsTags>>>) => void;
 };

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

@@ -1,13 +1,13 @@
 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";
 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;
 };
 export {};

package/dist/api/SubComponent/index.d.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";
@@ -36,15 +37,17 @@ 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, CompDocKeys extends PropertyKey = keyof CurrentCompDoc["properties"]> = SubInheritOption<TInherit, CompDocKeys> & SubDataOption<TSubData, Exclude<CompDocKeys, (keyof InheritDoc)> | InnerFields<Prefix>> & SubStoreOption<TSubStore, Exclude<CompDocKeys, (keyof (InheritDoc & SubDataDoc))> | InnerFields<Prefix>> & SubComputedOption<TSubComputed, Exclude<CompDocKeys, (keyof (InheritDoc & SubDataDoc & SubStoreDoc))> | InnerFields<Prefix>> & 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> & Record<InnerFields<CurrentPrefix>, unknown>>, TSubStore extends SubStoreConstraint<Omit<Required<CurrentCompDoc["properties"]>, keyof (InheritDoc & SubDataDoc)> & Record<InnerFields<CurrentPrefix>, unknown>>, TEvents extends SubEventsConstraint<CurrentCompDoc>, TSubComputed extends SubComputedConstraint<Omit<Required<CurrentCompDoc["properties"]>, 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> & Record<InnerFields<CurrentPrefix>, unknown>>, TSubData, {}, TSubData>, SubStoreDoc extends object = IfExtends<SubStoreConstraint<Omit<Required<CurrentCompDoc["properties"]>, keyof (InheritDoc & SubDataDoc)> & Record<InnerFields<CurrentPrefix>, unknown>>, TSubStore, {}, {
+type Options<RootDoc extends RootComponentType, IsPage extends boolean, CurrentCompDoc extends ComponentType, 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 InheritDoc)> | InnerFields<Prefix>> & SubStoreOption<TSubStore, Exclude<CompDocKeys, (keyof (InheritDoc & SubDataDoc))> | InnerFields<Prefix>> & SubComputedOption<TSubComputed, Exclude<CompDocKeys, (keyof (InheritDoc & SubDataDoc & SubStoreDoc))> | InnerFields<Prefix>, {
+    data: ComputeObject<AllRootDataDoc & Replace<SubComputedDoc, Required<CurrentCompDoc["properties"]>> & IInjectAllData>;
+}> & 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 RootComponentType, TOriginalCompDoc extends ComponentType, TSupplementalPrefix extends string = "", IsPage extends boolean = TRootDoc["isPage"] extends true ? true : false, CurrentPrefix extends string = `${GetComponentPrefix<TOriginalCompDoc>}${Capitalize<TSupplementalPrefix>}`, CurrentCompDoc extends ComponentType = 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> & Record<InnerFields<CurrentPrefix>, unknown>>, TSubStore extends SubStoreConstraint<Omit<Required<CurrentCompDoc["properties"]>, keyof (InheritDoc & SubDataDoc)> & Record<InnerFields<CurrentPrefix>, unknown>>, TEvents extends SubEventsConstraint<CurrentCompDoc>, TSubComputed extends SubComputedConstraint<Omit<Required<CurrentCompDoc["properties"]>, 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> & Record<InnerFields<CurrentPrefix>, unknown>>, TSubData, {}, TSubData>, SubStoreDoc extends object = IfExtends<SubStoreConstraint<Omit<Required<CurrentCompDoc["properties"]>, 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"]>, 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>;
 /**
  * 子组件构建函数
  * @returns `(options:) => SubComponentDoc`
  */
-export declare function SubComponent<RootDoc extends RootComponentDoc, CompDoc extends ComponentDoc, Prefix extends string = "">(): IfExtends<EmptyObject, CompDoc, (opt: EmptyObject) => never, SubComponentConstructor<RootDoc, CompDoc, Prefix>>;
+export declare function SubComponent<RootDoc extends RootComponentType, CompDoc extends ComponentType, Prefix extends string = "">(): IfExtends<EmptyObject, CompDoc, (opt: EmptyObject) => never, SubComponentConstructor<RootDoc, CompDoc, Prefix>>;
 export type SubComponentTrueOptions = {
     inhrit?: string;
     data?: DataConstraint;

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

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/api/SubComponent/index.ts"],"names":[],"mappings":"AAiOA;;;GAGG;AACH,MAAM,UAAU,YAAY;IAK1B,8DAA8D;IAC9D,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":"AAuOA;;;GAGG;AACH,MAAM,UAAU,YAAY;IAK1B,8DAA8D;IAC9D,OAAO,CAAC,CAAC,OAAY,EAAE,EAAE,CAAC,OAAkC,CAAQ,CAAC;AACvE,CAAC"}

package/dist/behaviors/BStore.d.ts

@@ -1,5 +1,5 @@
 /**
- * 在created生命周期中,初始化 store数据(__storeConfig__)到data中
+ * 在attached(1.7.5之前在created中)生命周期中,建立store数据的reaction
  * 在detached生命周期中,清除store数据
  */
 export declare const BStore: string;

package/dist/behaviors/BStore.js

@@ -1,29 +1,44 @@
+import { deepEqual } from "../utils/deepEqual";
+import { isEmptyObject } from "../utils/isEmptyObject";
+function reactionRegister(storeConfig) {
+    const unequalData = {};
+    // eslint-disable-next-line @typescript-eslint/no-require-imports
+    const { comparer, reaction, toJS } = require("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) => {
+            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() {
+        attached() {
+            // 此时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");
-            // 存储reaction的disposer 需要冲突字段验证
-            this.disposer = {};
-            for (const key in storeConfig) {
-                // 添加响应式逻辑
-                this.disposer[key] = reaction(storeConfig[key], (value) => {
-                    // 加入到待setData对象中
-                    this.setData({
-                        [key]: toJS(value),
-                    });
-                }, {
-                    equals: comparer.structural,
-                });
-            }
-            delete this.data.__storeConfig__;
+            reactionRegister.call(this, storeConfig);
         },
         detached() {
             /* istanbul ignore next 清除store数据 test中模拟了测试，所以忽略 框架(1.6.1)不支持 issue {@link https://github.com/wechat-miniprogram/miniprogram-simulate/issues/110}*/

package/dist/behaviors/BStore.js.map

@@ -1 +1 @@
-{"version":3,"file":"BStore.js","sourceRoot":"","sources":["../../src/behaviors/BStore.ts"],"names":[],"mappings":"AAGA;;;GAGG;AACH,MAAM,CAAC,MAAM,MAAM,GAAG,QAAQ,CAAC;IAC7B,SAAS,EAAE;QACT,OAAO;YACL,MAAM,WAAW,GAAG,IAAI,CAAC,IAAI,CAAC,eAAe,CAAC;YAC9C,IAAI,CAAC,WAAW;gBAAE,OAAO;YAEzB,iEAAiE;YACjE,MAAM,EAAE,QAAQ,EAAE,QAAQ,EAAE,IAAI,EAAE,GAAG,OAAO,CAAC,MAAM,CAAgB,CAAC;YACpE,+BAA+B;YAC/B,IAAI,CAAC,QAAQ,GAAG,EAAE,CAAC;YACnB,KAAK,MAAM,GAAG,IAAI,WAAW,EAAE,CAAC;gBAC9B,UAAU;gBACV,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,GAAG,QAAQ,CAC3B,WAAW,CAAC,GAAG,CAAC,EAChB,CAAC,KAAc,EAAE,EAAE;oBACjB,iBAAiB;oBACjB,IAAI,CAAC,OAAO,CAAC;wBACX,CAAC,GAAG,CAAC,EAAE,IAAI,CAAC,KAAK,CAAC;qBACnB,CAAC,CAAC;gBACL,CAAC,EACD;oBACE,MAAM,EAAE,QAAQ,CAAC,UAAU;iBAC5B,CACF,CAAC;YACJ,CAAC;YACD,OAAO,IAAI,CAAC,IAAI,CAAC,eAAe,CAAC;QACnC,CAAC;QAED,QAAQ;YACN,oJAAoJ;YACpJ,KAAK,MAAM,GAAG,IAAI,IAAI,CAAC,QAAQ,EAAE,CAAC;gBAChC,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;YACvB,CAAC;QACH,CAAC;KACF;CACF,CAAC,CAAC"}
+{"version":3,"file":"BStore.js","sourceRoot":"","sources":["../../src/behaviors/BStore.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAC/C,OAAO,EAAE,aAAa,EAAE,MAAM,wBAAwB,CAAC;AAEvD,SAAS,gBAAgB,CAAiB,WAA0C;IAClF,MAAM,WAAW,GAA4B,EAAE,CAAC;IAChD,iEAAiE;IACjE,MAAM,EAAE,QAAQ,EAAE,QAAQ,EAAE,IAAI,EAAE,GAAG,OAAO,CAAC,MAAM,CAAgB,CAAC;IACpE,iCAAiC;IACjC,IAAI,CAAC,QAAQ,GAAG,EAAE,CAAC;IACnB,KAAK,MAAM,GAAG,IAAI,WAAW,EAAE,CAAC;QAC9B,MAAM,iBAAiB,GAAG,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;QACnD,4EAA4E;QAC5E,gCAAgC;QAChC,IAAI,CAAC,SAAS,CAAC,iBAAiB,EAAE,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC;YAClD,WAAW,CAAC,GAAG,CAAC,GAAG,iBAAiB,CAAC;QACvC,CAAC;QACD,UAAU;QACV,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,GAAG,QAAQ,CAC3B,WAAW,CAAC,GAAG,CAAC,EAChB,CAAC,KAAc,EAAE,EAAE;YACjB,IAAI,CAAC,OAAO,CAAC;gBACX,CAAC,GAAG,CAAC,EAAE,IAAI,CAAC,KAAK,CAAC;aACnB,CAAC,CAAC;QACL,CAAC,EACD;YACE,MAAM,EAAE,QAAQ,CAAC,UAAU;SAC5B,CACF,CAAC;IACJ,CAAC;IACD,OAAO,IAAI,CAAC,IAAI,CAAC,eAAe,CAAC;IACjC,2BAA2B;IAC3B,IAAI,CAAC,aAAa,CAAC,WAAW,CAAC;QAAE,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC;AAC7D,CAAC;AAED;;;GAGG;AACH,MAAM,CAAC,MAAM,MAAM,GAAG,QAAQ,CAAC;IAC7B,SAAS,EAAE;QACT,QAAQ;YACN,iCAAiC;YACjC,MAAM,WAAW,GAAG,IAAI,CAAC,IAAI,CAAC,eAAe,CAAC;YAC9C,IAAI,CAAC,WAAW;gBAAE,OAAO;YAEzB,gBAAgB,CAAC,IAAI,CAAC,IAAI,EAAE,WAAW,CAAC,CAAC;QAC3C,CAAC;QACD,QAAQ;YACN,oJAAoJ;YACpJ,KAAK,MAAM,GAAG,IAAI,IAAI,CAAC,QAAQ,EAAE,CAAC;gBAChC,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;YACvB,CAAC;QACH,CAAC;KACF;CACF,CAAC,CAAC"}

package/dist/index.d.ts

@@ -5,8 +5,8 @@ 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";
 export type { CurrentTargetDataset, Dataset, Detail, Mark, TargetDataset, WMBaseEvent, WMCustomEvent, } from "./types/OfficialTypeAlias";
-export { type CreateComponentType, DefineComponent, type DetailedType, type DocAssign, type IInjectInfo, instanceConfig, navigateTo, type ParamsEqual, RootComponent, SubComponent, };
+export { type CreateComponentType, DefineComponent, type DetailedType, type ExtendComponentType, type IInjectInfo, instanceConfig, navigateTo, type ParamsEqual, RootComponent, SubComponent, };

package/dist/types/CreateComponentType.d.ts

@@ -1,8 +1,29 @@
 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<IfExtends<unknown, T["properties"], {}, {
+/**
+ * 建立一个组件类型
+ * @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"], {}, {
     properties: AddPrefix<T["properties"] & {}, TName>;
 }> & IfExtends<unknown, T["customEvents"], {}, {
     customEvents: AddPrefix<T["customEvents"] & {}, TName>;

package/dist/types/ExtendComponentType.d.ts

@@ -0,0 +1,34 @@
+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, TExtensionType extends Validator<TOriginalComponentType, TExtensionType>> = ComputeIntersectionDeep<TOriginalComponentType & TExtensionType>;
+export {};

package/dist/types/ExtendComponentType.js

@@ -0,0 +1,6 @@
+export {};
+// 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"
+//# sourceMappingURL=ExtendComponentType.js.map

package/dist/types/ExtendComponentType.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"ExtendComponentType.js","sourceRoot":"","sources":["../../src/types/ExtendComponentType.ts"],"names":[],"mappings":";AAqDA,kIAAkI;AAElI,sIAAsI;AAEtI,iIAAiI;AAEjI,qIAAqI"}

package/dist/types/GetComponentPrefix.d.ts

@@ -1,7 +1,7 @@
 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 : keyof IfExtends<unknown, TComponentDoc["properties"], TComponentDoc["customEvents"], TComponentDoc["properties"]> extends `${infer P}_${string}` ? P : never;
+export type GetComponentPrefix<TComponentDoc extends ComponentType> = EmptyObject extends TComponentDoc ? never : keyof IfExtends<unknown, TComponentDoc["properties"], TComponentDoc["customEvents"], TComponentDoc["properties"]> extends `${infer P}_${string}` ? P : never;

package/dist/types/RemoveNullOfRequired.d.ts

@@ -0,0 +1,7 @@
+import type { RequiredKeys } from "hry-types/src/Object/RequiredKeys";
+/**
+ * 去除对象中非可选字段类型中的null
+ */
+export type RemoveNullOfRequired<T extends object, RequireKeys extends keyof T = RequiredKeys<T>> = {
+    [k in keyof T]: k extends RequireKeys ? Exclude<T[k], null> : T[k];
+};

package/dist/types/RemoveNullOfRequired.js

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

package/dist/types/RemoveNullOfRequired.js.map

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

package/dist/types/ReplacePrefix.d.ts

@@ -1,5 +1,5 @@
 import type { IfExtends } from "hry-types/src/Any/IfExtends";
-import type { ComponentDoc } from "../api/DefineComponent/ReturnType/ComponentDoc";
+import type { ComponentType } from "../api/DefineComponent/ReturnType/ComponentType";
 type _ReplacePrefix<O, TPrefix extends string> = {
     [k in keyof O as k extends `${string}_${infer L}` ? `${TPrefix}_${L}` : k]: O[k];
 };
@@ -8,7 +8,7 @@ type _ReplacePrefix<O, TPrefix extends string> = {
  * @param TComponentDoc - ComponentDoc
  * @returns ComponentDoc
  */
-export type ReplacePrefix<TComponentDoc extends ComponentDoc, TPrefix extends string = ""> = IfExtends<unknown, TComponentDoc["properties"], {}, {
+export type ReplacePrefix<TComponentDoc extends ComponentType, TPrefix extends string = ""> = IfExtends<unknown, TComponentDoc["properties"], {}, {
     properties: _ReplacePrefix<TComponentDoc["properties"], TPrefix>;
 }> & IfExtends<unknown, TComponentDoc["customEvents"], {}, {
     customEvents: _ReplacePrefix<TComponentDoc["customEvents"], TPrefix>;

package/dist/utils/assertNonNullable.js

@@ -1,4 +1,5 @@
 export function assertNonNullable(value) {
+    /* istanbul ignore next  */
     if (value === null || value === undefined) {
         throw new Error(`${value} should not be null or undefined`);
     }

package/dist/utils/assertNonNullable.js.map

@@ -1 +1 @@
-{"version":3,"file":"assertNonNullable.js","sourceRoot":"","sources":["../../src/utils/assertNonNullable.ts"],"names":[],"mappings":"AAEA,MAAM,UAAU,iBAAiB,CAC/B,KAAsE;IAEtE,IAAI,KAAK,KAAK,IAAI,IAAI,KAAK,KAAK,SAAS,EAAE,CAAC;QAC1C,MAAM,IAAI,KAAK,CAAC,GAAG,KAAK,kCAAkC,CAAC,CAAC;IAC9D,CAAC;IAED,OAAO,KAAuB,CAAC;AACjC,CAAC"}
+{"version":3,"file":"assertNonNullable.js","sourceRoot":"","sources":["../../src/utils/assertNonNullable.ts"],"names":[],"mappings":"AAEA,MAAM,UAAU,iBAAiB,CAC/B,KAAsE;IAEtE,2BAA2B;IAC3B,IAAI,KAAK,KAAK,IAAI,IAAI,KAAK,KAAK,SAAS,EAAE,CAAC;QAC1C,MAAM,IAAI,KAAK,CAAC,GAAG,KAAK,kCAAkC,CAAC,CAAC;IAC9D,CAAC;IAED,OAAO,KAAuB,CAAC;AACjC,CAAC"}

package/dist/{api/DefineComponent/normalizeOptions/computedWatchHandle/isEqual.d.ts → utils/deepEqual.d.ts}

@@ -4,4 +4,4 @@
  * 两个函数使用toString()比较
  * 支持Date,RegExp
  */
-export declare function isEqual(a: unknown, b: unknown): boolean;
+export declare function deepEqual(a: unknown, b: unknown): boolean;

package/dist/{api/DefineComponent/normalizeOptions/computedWatchHandle/isEqual.js → utils/deepEqual.js}

@@ -25,7 +25,7 @@ function isSamePattern(a, b) {
  * 两个函数使用toString()比较
  * 支持Date,RegExp
  */
-export function isEqual(a, b) {
+export function deepEqual(a, b) {
     // 如果两个值是原始类型或null，直接用Object.is比较
     if (a === null || b === null || typeof a !== "object" || typeof b !== "object") {
         if (typeof a !== "function" || typeof b !== "function") {
@@ -55,7 +55,7 @@ export function isEqual(a, b) {
     for (const key of keysA) {
         if (keysB.includes(key)) {
             // @ts-ignore
-            if (!isEqual(a[key], b[key])) {
+            if (!deepEqual(a[key], b[key])) {
                 return false;
             }
         }
@@ -66,4 +66,4 @@ export function isEqual(a, b) {
     // 如果以上的条件都满足，说明两个值是深度相等的
     return true;
 }
-//# sourceMappingURL=isEqual.js.map
+//# sourceMappingURL=deepEqual.js.map

package/dist/utils/deepEqual.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"deepEqual.js","sourceRoot":"","sources":["../../src/utils/deepEqual.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "annil",
-  "version": "1.7.5-beta.4",
+  "version": "1.7.6",
   "description": "微信小程序(原生开发)插件",
   "main": "dist/index.js",
   "types": "src/index.ts",
@@ -40,8 +40,7 @@
     "CHANGELOG.md",
     "README.md",
     "src",
-    "dist",
-    "tsconfig.json"
+    "dist"
   ],
   "keywords": [
     "mini",

package/src/api/DefineComponent/NameOrPage/test/error.test.ts

@@ -1,32 +1,32 @@
-import type { RootComponentDoc } from "../../../RootComponent/RootComponentDoc";
+import type { RootComponentType } from "../../../RootComponent/RootComponentType";
 import { DefineComponent } from "../..";
 
 DefineComponent({
   // @ts-expect-error  1 RootComponentDoc中isPage为true时 应该书写page字段
   name: "test",
-  rootComponent: { isPage: true } satisfies RootComponentDoc,
+  rootComponent: { isPage: true } satisfies RootComponentType,
 });
 
 DefineComponent({
   // @ts-expect-error 2 RootComponentDoc中isPage不为true时 应该书写name字段
   path: "/pages/index/index",
-  rootComponent: {} satisfies RootComponentDoc,
+  rootComponent: {} satisfies RootComponentType,
 });
 
 DefineComponent({
   // @ts-expect-error 3 页面路径已'/'开头
   path: "pages/index/index",
-  rootComponent: { isPage: true } satisfies RootComponentDoc,
+  rootComponent: { isPage: true } satisfies RootComponentType,
 });
 
 DefineComponent({
   // @ts-expect-error 4 组件名不可为空
   name: "",
-  rootComponent: {} satisfies RootComponentDoc,
+  rootComponent: {} satisfies RootComponentType,
 });
 
 DefineComponent({
   // @ts-expect-error 5 组件名不可包含下划线 _
   name: "ddd_ddd",
-  rootComponent: {} satisfies RootComponentDoc,
+  rootComponent: {} satisfies RootComponentType,
 });

package/src/api/DefineComponent/ReturnType/{ComponentDoc.ts → ComponentType.ts}

@@ -1,16 +1,15 @@
-/* eslint-disable @typescript-eslint/no-explicit-any */
 type PrefixKeys = `${string}_${string}`;
 
-type _ComponentDoc = {
-  properties?: Record<PrefixKeys, any>;
-  customEvents?: Record<PrefixKeys, any>;
+type _ComponentType = {
+  properties?: Record<PrefixKeys, unknown>;
+  customEvents?: Record<PrefixKeys, unknown>;
 };
 
 type Error = "{ properties?: Record<PrefixKeys, any>; customEvents?: Record<PrefixKeys, any>;}";
 
-type _Validator<O> = keyof O extends keyof _ComponentDoc
+type _Validator<O> = keyof O extends keyof _ComponentType
   // @ts-ignore 要求ComponentDoc有前缀
-  ? keyof (O["properties"] & O["customEvents"]) extends PrefixKeys ? _ComponentDoc
+  ? keyof (O["properties"] & O["customEvents"]) extends PrefixKeys ? _ComponentType
   : Error
   : Error;
 
@@ -23,4 +22,4 @@ type _Validator<O> = keyof O extends keyof _ComponentDoc
  * };
  * ```
  */
-export type ComponentDoc<O extends _Validator<O> = _ComponentDoc> = O;
+export type ComponentType<O extends _Validator<O> = _ComponentType> = O;

package/src/api/DefineComponent/ReturnType/CreateComponentDoc.ts

@@ -1,17 +1,17 @@
 import type { IfExtends } from "hry-types/src/Any/IfExtends";
 import type { ComputeIntersection } from "hry-types/src/Object/ComputeIntersection";
 import type { AddNullForObject } from "../../../types/AddNullForObject";
-import type { RootComponentDoc } from "../../RootComponent/RootComponentDoc";
-import type { SubComponentDoc } from "../../SubComponent/SubComponentDoc";
+import type { RootComponentType } from "../../RootComponent/RootComponentType";
+import type { SubComponentType } from "../../SubComponent/SubComponentType";
 import type { GetCustomEventDocOfSubDoc } from "./GetCustomEventDocOfSubDoc";
 
 // 获取RootComponetDoc中events字段类型阻止事件(后最为catch)的key `${ 组件前缀 }_${infer Key}_${ bubbles | capture }_catch`
 type GetStopKeys<O> = { [k in keyof O]: k extends `${string}_${infer Key}_${string}_catch` ? Key : never }[keyof O];
 
 export type CreateComponentDoc<
-  TRootDoc extends RootComponentDoc,
+  TRootDoc extends RootComponentType,
   TName extends string,
-  TSubComponentTuple extends SubComponentDoc[],
+  TSubComponentTuple extends SubComponentType[],
   // 获取RootDoc和SubComponent[]中所有的properties字段类型
   AllPropertiesDoc extends unknown | object = TRootDoc["properties"],
   AllCustomEventsDoc extends unknown | object =

package/src/api/DefineComponent/ReturnType/CreatePageDoc.ts

@@ -1,9 +1,9 @@
 import type { IfExtends } from "hry-types/src/Any/IfExtends";
 import type { ComputeIntersection } from "hry-types/src/Object/ComputeIntersection";
-import type { RootComponentDoc } from "../../RootComponent/RootComponentDoc";
+import type { RootComponentType } from "../../RootComponent/RootComponentType";
 
 export type CreatePageDoc<
-  TRootDoc extends RootComponentDoc,
+  TRootDoc extends RootComponentType,
   TPath extends string,
 > = ComputeIntersection<
   & { path: TPath }

package/src/api/DefineComponent/ReturnType/GetCustomEventDocOfSubDoc.ts

@@ -1,13 +1,13 @@
 import type { IsNever, IsUnion } from "hry-types/src/Any/_api";
 import type { UnionTwoObject } from "hry-types/src/Object/UnionTwoObject";
 import type { Last } from "hry-types/src/Union/Last";
-import type { SubComponentDoc } from "../../SubComponent/SubComponentDoc";
+import type { SubComponentType } from "../../SubComponent/SubComponentType";
 
 /**
  * 因为子组件文档customEvents字段有可能相同(无前缀),所以使用UnionTwoObject
  * 由于SubComponentDoc为空时返回never而不`{}`,所以`Exclude<U, TLast>`不影响结果。
  */
-type _GetCustomEventDocOfSubDoc<U extends SubComponentDoc, Result = {}, TLast = Last<U>> = IsNever<U> extends true
+type _GetCustomEventDocOfSubDoc<U extends SubComponentType, Result = {}, TLast = Last<U>> = IsNever<U> extends true
   ? Result
   : _GetCustomEventDocOfSubDoc<Exclude<U, TLast>, UnionTwoObject<Result, TLast>>;
 
@@ -15,6 +15,6 @@ type _GetCustomEventDocOfSubDoc<U extends SubComponentDoc, Result = {}, TLast =
  * 获取子组件自定义事件文档
  * @remarks U 中 相同字段类型联合,所以使用元组推导不如Last性能好。
  */
-export type GetCustomEventDocOfSubDoc<UnionSubDoc extends SubComponentDoc> = IsUnion<UnionSubDoc> extends true
+export type GetCustomEventDocOfSubDoc<UnionSubDoc extends SubComponentType> = IsUnion<UnionSubDoc> extends true
   ? _GetCustomEventDocOfSubDoc<UnionSubDoc>
   : UnionSubDoc;

package/src/api/DefineComponent/ReturnType/GetPropertiesDocOfSubDoc.ts

@@ -1,7 +1,7 @@
-import type { SubComponentDoc } from "../../SubComponent/SubComponentDoc";
+import type { SubComponentType } from "../../SubComponent/SubComponentType";
 
 // 获取元组中所有SubComponentDoc的properties字段类型。这里忽略相同key的情况,结果为各个properties对象交叉类型。因为DefinComopnent API 在获取 SubComponentDoc字段类型时做了相同字段类型报错。
-export type GetPropertiesDocOfSubDoc<Tuple extends SubComponentDoc[], Result = unknown> = Tuple extends
-  [infer Head extends SubComponentDoc, ...infer Rest extends SubComponentDoc[]]
+export type GetPropertiesDocOfSubDoc<Tuple extends SubComponentType[], Result = unknown> = Tuple extends
+  [infer Head extends SubComponentType, ...infer Rest extends SubComponentType[]]
   ? GetPropertiesDocOfSubDoc<Rest, Result & Head["properties"]>
   : Result;

package/src/api/DefineComponent/ReturnType/test/normalComponentDoc.test.ts

@@ -16,8 +16,8 @@ import type {
 import type { ComputeIntersection } from "hry-types/src/Object/ComputeIntersection";
 import type { PropertiesConstraint } from "../../../RootComponent/Properties/PropertiesConstraint";
 import type { Mock_User } from "../../../RootComponent/Properties/test/normalRequired.test";
-import type { RootComponentDoc } from "../../../RootComponent/RootComponentDoc";
-import type { SubComponentDoc } from "../../../SubComponent/SubComponentDoc";
+import type { RootComponentType } from "../../../RootComponent/RootComponentType";
+import type { SubComponentType } from "../../../SubComponent/SubComponentType";
 import { DefineComponent } from "../..";
 
 const properties = {
@@ -123,7 +123,7 @@ const compDoc = DefineComponent({
 
 Checking<typeof compDoc, ComputeIntersection<CompOnlyCustomEventsExpected & OnlyPropertiesExpected>, Test.Pass>;
 
-type SubA = SubComponentDoc<{
+type SubA = SubComponentType<{
   str: string | Bubbles | Composed;
   num: number | Capture | Composed;
   null: null | Bubbles | Capture | Composed;
@@ -145,7 +145,7 @@ type customEventsRootDocExpect = {
 
 Checking<typeof customEventsRootDoc, customEventsRootDocExpect, Test.Pass>;
 
-type SubB = SubComponentDoc<{
+type SubB = SubComponentType<{
   str: number | Bubbles | Composed;
   num: string | Capture | Composed;
   null: boolean | Bubbles | Capture | Composed;
@@ -168,7 +168,7 @@ type WhenSameKeyOfCustomEventsRootDocExpect = {
 
 Checking<typeof WhenSameKeyOfCustomEventsRootDoc, WhenSameKeyOfCustomEventsRootDocExpect, Test.Pass>;
 
-type RootDocCatch = RootComponentDoc<{
+type RootDocCatch = RootComponentType<{
   events: {
     aaa_str_bubbles_catch: () => void;
   };