annil 1.14.0 → 1.16.0

package/src/api/{CustomComponent/CustomComputed → SubComponent/SubComputed}/test/normal.test.ts

@@ -4,7 +4,7 @@ import type { ComponentDoc } from "../../../DefineComponent/returnType/Component
 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 { CustomComponent } from "../..";
+import { SubComponent } from "../..";
 
 type OnlyCustomCompDoc = ComponentDoc<{
   events: { aaa_str: string };
@@ -35,7 +35,7 @@ type $aaa = ComponentDoc<
   { properties: { aaa_str: string; aaa_user: User | null; aaa_num: number; aaa_age: number } }
 >;
 
-CustomComponent<{}, OnlyCustomCompDoc>()({
+SubComponent<{}, OnlyCustomCompDoc>()({
   // 1 CompDoc的properties为空时,可以写{}
   computed: {},
 });
@@ -49,7 +49,7 @@ type OnlyPropsCompDoc = ComponentDoc<{
   };
 }>;
 
-CustomComponent<Root, OnlyPropsCompDoc>()({
+SubComponent<Root, OnlyPropsCompDoc>()({
   inherit: {
     aaa_num: "num",
   },
@@ -67,7 +67,7 @@ CustomComponent<Root, OnlyPropsCompDoc>()({
   },
 });
 // 3 computed字段的返回类型应为对应的文档类型,避免返回字面量类型导致与实际文档类型不符
-CustomComponent<Root, OnlyPropsCompDoc>()({
+SubComponent<Root, OnlyPropsCompDoc>()({
   computed: {
     aaa_num() {
       return 123;
@@ -127,7 +127,7 @@ CustomComponent<Root, OnlyPropsCompDoc>()({
 
 // 计算属性可互相引用,但要加返回类型注释
 
-CustomComponent<Root, $aaa>()({
+SubComponent<Root, $aaa>()({
   computed: {
     aaa_num(): number {
       return this.data.SNum;
@@ -144,7 +144,7 @@ CustomComponent<Root, $aaa>()({
   },
 });
 // 计算属性this.data可获取store和data的字段中文档中的字段和内部字段(_开头的字段)
-CustomComponent<Root, $aaa>()({
+SubComponent<Root, $aaa>()({
   data: {
     aaa_age: 123,
     _aaa_age1: 123,
@@ -161,7 +161,7 @@ CustomComponent<Root, $aaa>()({
   },
 });
 // computed中可写 额外字段 isReady
-CustomComponent<{ data: { _num: number } }, $aaa>()({
+SubComponent<{ data: { _num: number } }, $aaa>()({
   computed: {
     aaa_isReady() {
       return true;
@@ -170,7 +170,7 @@ CustomComponent<{ data: { _num: number } }, $aaa>()({
 });
 
 // computed中可写 内部字段
-CustomComponent<{ data: { _num: number } }, $aaa>()({
+SubComponent<{ data: { _num: number } }, $aaa>()({
   computed: {
     aaa_isReady() {
       return true;
@@ -185,7 +185,7 @@ CustomComponent<{ data: { _num: number } }, $aaa>()({
 type Custom = { type: "custom"; xxx: string };
 type Chunk = { type: "chunk"; yyy: number };
 type Union = Custom | Chunk;
-CustomComponent<{ data: { _num: number }; methods: { IsChunk: (union: Union) => union is Chunk } }, $aaa>()({
+SubComponent<{ data: { _num: number }; methods: { IsChunk: (union: Union) => union is Chunk } }, $aaa>()({
   data: {
     _aaa_union: { type: "custom", xxx: "123" } as Union,
   },

package/src/api/{CustomComponent/CustomData/CustomDataConstraint.ts → SubComponent/SubData/SubDataConstraint.ts}

@@ -2,7 +2,7 @@
  * 子组件Data字段约束
  * @returns 当剩余对象不为空对象,约束对象的key为剩余key,类型为剩余key对应的文档类型.
  */
-export type CustomDataConstraint<
+export type SubDataConstraint<
   TComponentDoc extends object,
 > = {
   [k in keyof TComponentDoc]?: TComponentDoc[k];

package/src/api/{CustomComponent/CustomData/CustomDataOption.ts → SubComponent/SubData/SubDataOption.ts}

@@ -1,6 +1,6 @@
 import type { G } from "hry-types";
 
-export type CustomDataOption<TData extends object, legalKeys extends PropertyKey, errMsg extends string> = {
+export type SubDataOption<TData extends object, legalKeys extends PropertyKey, errMsg extends string> = {
   /**
    * 可写子组件所需数据和内部公共数据
    * 非法字段检测和与Inherit字段的重复检测

package/src/api/{CustomComponent/CustomData → SubComponent/SubData}/test/error.test.ts

@@ -1,14 +1,14 @@
 import type { ComponentDoc } from "../../../DefineComponent/returnType/ComponentDoc";
 
 import type { Mock_User } from "../../../RootComponent/Properties/test/normalRequired.test";
-import { CustomComponent } from "../..";
+import { SubComponent } from "../..";
 
 type OnlyCustomCompDoc = ComponentDoc<{
   events: { aaa_str: string };
 }>;
 
 // 1 CompDoc无properties字段时 data字段只可写内部字段
-CustomComponent<{}, OnlyCustomCompDoc>()({
+SubComponent<{}, OnlyCustomCompDoc>()({
   data: {
     // @ts-expect-error "⚠️ 与Inherit字段重复或组件文档无需字段 ⚠️"
     aaa_str: "str",
@@ -25,7 +25,7 @@ type OnlyPropsCompDoc = ComponentDoc<{
 }>;
 
 // 2 CompDoc有properties字段但去除Inherit字段后为空,只可写内部字段
-CustomComponent<{}, OnlyPropsCompDoc>()({
+SubComponent<{}, OnlyPropsCompDoc>()({
   inherit: {
     aaa_str: "wxml",
     aaa_num: "wxml",
@@ -41,7 +41,7 @@ CustomComponent<{}, OnlyPropsCompDoc>()({
 });
 
 // 3 重复字段和非组件所需字段错误
-CustomComponent<{}, OnlyPropsCompDoc>()({
+SubComponent<{}, OnlyPropsCompDoc>()({
   inherit: {
     aaa_str: "wxml",
   },
@@ -56,7 +56,7 @@ CustomComponent<{}, OnlyPropsCompDoc>()({
   },
 });
 // 4 与root的数据字段重复
-CustomComponent<{ data: { aaa_str: 123 } }, OnlyPropsCompDoc>()({
+SubComponent<{ data: { aaa_str: 123 } }, OnlyPropsCompDoc>()({
   data: {
     // @ts-expect-error 与root的data字段重复
     aaa_str: "a",

package/src/api/{CustomComponent/CustomData → SubComponent/SubData}/test/normal.test.ts

@@ -4,7 +4,7 @@ import type { ComponentDoc } from "../../../DefineComponent/returnType/Component
 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 { CustomComponent } from "../..";
+import { SubComponent } from "../..";
 
 type CompDoc = ComponentDoc<{
   properties: {
@@ -14,7 +14,7 @@ type CompDoc = ComponentDoc<{
   };
 }>;
 
-CustomComponent<{}, CompDoc>()({
+SubComponent<{}, CompDoc>()({
   inherit: {
     aaa_obj: "wxml",
   },
@@ -27,7 +27,7 @@ CustomComponent<{}, CompDoc>()({
   },
 });
 
-CustomComponent<{ data: { _num: number } }, CompDoc>()({
+SubComponent<{ data: { _num: number } }, CompDoc>()({
   inherit: {
     aaa_str: "wxml",
     aaa_num: "wxml",
@@ -39,7 +39,7 @@ CustomComponent<{ data: { _num: number } }, CompDoc>()({
   },
 });
 
-CustomComponent<{}, CompDoc>()({
+SubComponent<{}, CompDoc>()({
   data: {
     aaa_str: "a" as "a" | "b",
     aaa_num: 123 as number,
@@ -66,7 +66,7 @@ CustomComponent<{}, CompDoc>()({
 });
 
 // 确保实例和setData中使用的data字段类型为文档中定义的类型而非data配置中的类型(data中配置的类型可能推导默认为字面量类型,通过加入Replace泛型替换为对应的文档类型。),
-CustomComponent<{ data: { _num: number } }, CompDoc>()({
+SubComponent<{ data: { _num: number } }, CompDoc>()({
   data: {
     aaa_obj: null, // 类型为null 而非 Mock_User | null
     aaa_str: "a", // 类型为"a" 而非string
@@ -84,7 +84,7 @@ CustomComponent<{ data: { _num: number } }, CompDoc>()({
   },
 });
 // data中可写 额外字段 isReady
-CustomComponent<{ data: { _num: number } }, CompDoc>()({
+SubComponent<{ data: { _num: number } }, CompDoc>()({
   data: {
     aaa_isReady: false,
   },

package/src/api/{CustomComponent/CustomEvents/CustomEventsConstraint.ts → SubComponent/SubEvents/SubEventsConstraint.ts}

@@ -7,7 +7,7 @@ import type { Bubbles, Capture, CustomEventsTags } from "../../RootComponent/Cus
 /**
  * 把组件事件类型转为函数类型,冒泡事件捕获事件会多一个加后缀(_catch)的key,表示阻止事件冒泡和捕获。
  */
-export type CustomEventsConstraint<
+export type SubEventsConstraint<
   CompDoc extends ComponentDoc,
 > = {
   [

package/src/api/{CustomComponent/CustomEvents/CustomEventsOption.ts → SubComponent/SubEvents/SubEventsOption.ts}

@@ -1,6 +1,6 @@
 import type { G } from "hry-types";
 
-export type CustomEventsOption<TSubEvents, SubEventsDoc extends object, legalKeys extends PropertyKey> = {
+export type SubEventsOption<TSubEvents, SubEventsDoc extends object, legalKeys extends PropertyKey> = {
   /**
    * 子组件事件(基础事件|自定义事件)
    * 可使用内部泛型(Detail、Mark、WMBaseEvent、WMCustomEvent、CurrentTargetDataset、TargetDataset)自定义事件类型

package/src/api/{CustomComponent/CustomEvents → SubComponent/SubEvents}/test/error.test.ts

@@ -1,6 +1,6 @@
 import type { ComponentDoc } from "../../../DefineComponent/returnType/ComponentDoc";
 import type { Bubbles } from "../../../RootComponent/CustomEvents/CustomEventsTag";
-import { CustomComponent } from "../..";
+import { SubComponent } from "../..";
 
 type CompDoc = ComponentDoc<{
   properties: {
@@ -9,7 +9,7 @@ type CompDoc = ComponentDoc<{
 }>;
 
 // 组件文档无自定义事件时,events字段类型为EmptyObject
-CustomComponent<{}, CompDoc>()({
+SubComponent<{}, CompDoc>()({
   events: {
     // @ts-expect-error 非法字段
     xxx: 123,
@@ -23,7 +23,7 @@ type CompDoc1 = ComponentDoc<{
 }>;
 
 // 非法字段检测 组件文档有自定义事件时,events下的字段仅可写文档包含字段
-CustomComponent<{}, CompDoc1>()({
+SubComponent<{}, CompDoc1>()({
   events: {
     aaa_str(e) { // ok
       void e;

package/src/api/{CustomComponent/CustomEvents → SubComponent/SubEvents}/test/normal.test.ts

@@ -14,7 +14,7 @@ import type {
   CaptureComposed,
 } from "../../../RootComponent/CustomEvents/CustomEventsTag";
 import type { Mock_User } from "../../../RootComponent/Properties/test/normalRequired.test";
-import { CustomComponent } from "../..";
+import { SubComponent } from "../..";
 
 type CompDoc = ComponentDoc<{
   events: {
@@ -29,7 +29,7 @@ type CompDoc = ComponentDoc<{
 }>;
 
 // 1.1 events字段提示 key为 CompDoc下customEvents的字段,类型为函数(e)=>void,e为对应keys类型去除事件标记(冒泡 捕获 穿透)
-const custom1 = CustomComponent<{}, CompDoc>()({
+const custom1 = SubComponent<{}, CompDoc>()({
   events: {
     aaa_str(e) {
       Checking<typeof e.detail, string, Test.Pass>;
@@ -76,7 +76,7 @@ type custom1Expected = {
 Checking<typeof custom1, custom1Expected, Test.Pass>;
 
 // 2.1 key可写入后缀字段(_catch,表示阻止冒泡和捕获事件)。
-const custom2 = CustomComponent<{}, CompDoc>()({
+const custom2 = SubComponent<{}, CompDoc>()({
   events: {
     aaa_BubblesComposed_catch(e) {
       Checking<typeof e.detail, string, Test.Pass>;
@@ -98,7 +98,7 @@ Checking<typeof custom2, {
   // };
 }, Test.Pass>;
 
-const custom3 = CustomComponent<{}, CompDoc>()({
+const custom3 = SubComponent<{}, CompDoc>()({
   events: {
     aaa_BubblesComposed_catch(e) {
       Checking<typeof e.detail, string, Test.Pass>;
@@ -116,7 +116,7 @@ const custom3 = CustomComponent<{}, CompDoc>()({
 Checking<typeof custom3, never, Test.Pass>;
 
 // 3.1 基础组件基本事件参数为WMBaseEvent
-CustomComponent<{}, Wm.View>()({
+SubComponent<{}, Wm.View>()({
   events: {
     view_tap(e) {
       Checking<typeof e, WMBaseEvent, Test.Pass>;
@@ -129,7 +129,7 @@ CustomComponent<{}, Wm.View>()({
 });
 
 // 3.1 基础组件自定义事件参数为Detail<object>
-CustomComponent<{}, Wm.ScrollView>()({
+SubComponent<{}, Wm.ScrollView>()({
   events: {
     scrollView_bindscroll(e) {
       Checking<
@@ -150,7 +150,7 @@ CustomComponent<{}, Wm.ScrollView>()({
 });
 
 // 4 可为事件自定义类型
-CustomComponent<{}, Wm.View>()({
+SubComponent<{}, Wm.View>()({
   events: {
     view_tap(e: Detail<number>) {
       Checking<typeof e.detail, number, Test.Pass>;
@@ -163,7 +163,7 @@ CustomComponent<{}, Wm.View>()({
 });
 
 // 4 可为事件自定义类型
-CustomComponent<{}, Wm.View>()({
+SubComponent<{}, Wm.View>()({
   events: {
     view_tap(e: Detail<number>) {
       Checking<typeof e.detail, number, Test.Pass>;
@@ -176,7 +176,7 @@ CustomComponent<{}, Wm.View>()({
 });
 
 // 5 可以调用自身事件
-CustomComponent<{ methods: { aaa: () => string } }, Wm.View>()({
+SubComponent<{ methods: { aaa: () => string } }, Wm.View>()({
   methods: {
     view_xxx() {
       return 123;
@@ -190,7 +190,7 @@ CustomComponent<{ methods: { aaa: () => string } }, Wm.View>()({
   },
 });
 // 5 可以调用自身事件
-CustomComponent<{ methods: { aaa: () => string } }, Wm.Map>()({
+SubComponent<{ methods: { aaa: () => string } }, Wm.Map>()({
   methods: {
     map_xxx() {
       return 123;

package/src/api/{CustomComponent/CustomInherit/CustomInheritConstraint.ts → SubComponent/SubInherit/SubInheritConstraint.ts}

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

package/src/api/{CustomComponent/CustomInherit/CustomInheritOption.ts → SubComponent/SubInherit/SubInheritOption.ts}

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

package/src/api/{CustomComponent/CustomInherit → SubComponent/SubInherit}/test/error.test.ts

@@ -2,8 +2,8 @@ import { Checking, type Test } from "hry-types";
 import { DefineComponent } from "../../../DefineComponent";
 import type { ComponentDoc } from "../../../DefineComponent/returnType/ComponentDoc";
 import type { RootComponentDefinition } from "../../../RootComponent/returnType";
-import { CustomComponent } from "../..";
-import type { CustomComponentDefinition } from "../../returnType";
+import { SubComponent } from "../..";
+import type { SubComponentDefinition } from "../../returnType";
 
 type Mock_RootDoc = RootComponentDefinition<{
   properties: {
@@ -37,7 +37,7 @@ type Mock_CompDoc = ComponentDoc<{
 }>;
 
 // 1 继承字段类型错误
-CustomComponent<Mock_RootDoc, Mock_CompDoc>()({
+SubComponent<Mock_RootDoc, Mock_CompDoc>()({
   inherit: {
     // @ts-expect-error 1.1 [string | number] 不是 [number] 的子集
     aaa_num: "unionStrNum",
@@ -49,13 +49,13 @@ CustomComponent<Mock_RootDoc, Mock_CompDoc>()({
 });
 
 // 2 inherit字段最终不会在组件配置中,意义在于通过声明继承字段便于类型判断,配置是否满足子组件文档的需求。下面示例中,配置不满足组件需求,Mock_CompDoc需要一些必传字段没有配置,即使这些字段存在在于根组件(或wmxl).而返回的字符串(错误),无法通过DefinedComponent Api 类型检测。
-const customDoc = CustomComponent<Mock_RootDoc, Mock_CompDoc>()({
+const customDoc = SubComponent<Mock_RootDoc, Mock_CompDoc>()({
   data: {
     aaa_num: 123,
   },
 });
 
-void Checking<typeof customDoc, CustomComponentDefinition, Test.Fail>;
+void Checking<typeof customDoc, SubComponentDefinition, Test.Fail>;
 
 DefineComponent({
   name: "xxx",
@@ -65,7 +65,7 @@ DefineComponent({
 
 // 3 错误的key检查
 
-CustomComponent<Mock_RootDoc, Mock_CompDoc>()({
+SubComponent<Mock_RootDoc, Mock_CompDoc>()({
   inherit: {
     aaa_num: "required_num",
     // @ts-expect-error 3.1 不存在于组件中的key给错误提示
@@ -76,7 +76,7 @@ CustomComponent<Mock_RootDoc, Mock_CompDoc>()({
 });
 // 4 数组时类型错误
 
-CustomComponent<Mock_RootDoc, Mock_CompDoc>()({
+SubComponent<Mock_RootDoc, Mock_CompDoc>()({
   inherit: {
     // @ts-expect-error   取消了数组类型,之前的版本允许数组类型表示三元表达式
     aaa_num: ["optional_lit1eral_num", "require1d_num"],

package/src/api/{CustomComponent/CustomInherit → SubComponent/SubInherit}/test/normal.test.ts

@@ -1,6 +1,6 @@
 import type { ComponentDoc } from "../../../DefineComponent/returnType/ComponentDoc";
 import type { RootComponentDefinition } from "../../../RootComponent/returnType";
-import { CustomComponent } from "../..";
+import { SubComponent } from "../..";
 
 /**
  * inherit字段最终会在选项中删除,它用ts开发类型检测。
@@ -35,7 +35,7 @@ type Mock_CompDoc = ComponentDoc<{
 }>;
 
 // 1 没有可继承的数据,类型可为'wxml',表示数据来自wxml(例如数据来自父元素循环wx:for后的数据等情况)
-CustomComponent<{}, Mock_CompDoc>()({
+SubComponent<{}, Mock_CompDoc>()({
   inherit: {
     aaa_num: "wxml",
     aaa_str: "wxml",
@@ -46,7 +46,7 @@ CustomComponent<{}, Mock_CompDoc>()({
 });
 
 // 2 RootDoc不为空时,可继承对应类型的字段。
-CustomComponent<Mock_RootDoc, Mock_CompDoc>()({
+SubComponent<Mock_RootDoc, Mock_CompDoc>()({
   inherit: {
     aaa_num: "" as "optional_literal_num" | "required_num" | "wxml",
     aaa_str: "" as "str" | "literal_str" | "wxml",
@@ -57,7 +57,7 @@ CustomComponent<Mock_RootDoc, Mock_CompDoc>()({
 
 // 3 value为数组时,表示多个字段的联合类型
 
-CustomComponent<Mock_RootDoc, Mock_CompDoc>()({
+SubComponent<Mock_RootDoc, Mock_CompDoc>()({
   inherit: {
     aaa_num: ["optional_literal_num", "required_num"],
     aaa_str: ["literal_str", "str"],
@@ -67,7 +67,7 @@ CustomComponent<Mock_RootDoc, Mock_CompDoc>()({
 });
 
 // 4. 实例上没有computed字段。
-CustomComponent<{}, Mock_CompDoc>()({
+SubComponent<{}, Mock_CompDoc>()({
   computed: {
     aaa_num() {
       return 1;

package/src/api/{CustomComponent/CustomInstance → SubComponent/SubInstance}/SubInstance.ts

@@ -1,6 +1,6 @@
 import type { RootComponentInstance } from "../../RootComponent/Instance/RootComponentInstance";
 
-export type CustomInstance<
+export type SubInstance<
   TAllMethods extends object,
   TDataForSetData extends object,
   AllData extends object,

package/src/api/{CustomComponent/CustomInstance → SubComponent/SubInstance}/test/error.test.ts

@@ -1,6 +1,6 @@
 import type { View } from "../../../../thirdLib/wm";
 import type { RootComponentDefinition } from "../../../RootComponent/returnType";
-import { CustomComponent } from "../..";
+import { SubComponent } from "../..";
 
 type RootDoc = RootComponentDefinition<{
   events: {
@@ -9,7 +9,7 @@ type RootDoc = RootComponentDefinition<{
 }>;
 
 // 实例中只存在RootDoc和自身的methods字段
-CustomComponent<RootDoc, View>()({
+SubComponent<RootDoc, View>()({
   lifetimes: {
     created() {
       // @ts-expect-error 不存在的方法  (Root事件方法不可调用)

package/src/api/{CustomComponent/CustomInstance → SubComponent/SubInstance}/test/normal.test.ts

@@ -5,7 +5,7 @@ import type { ComputeIntersection } from "hry-types/src/Object/ComputeIntersecti
 import type { IInjectAllData } from "../../../InstanceInject/instanceConfig";
 import type { Mock_User } from "../../../RootComponent/Properties/test/normalRequired.test";
 import type { RootComponentDefinition } from "../../../RootComponent/returnType";
-import { CustomComponent } from "../..";
+import { SubComponent } from "../..";
 
 type RootDoc = RootComponentDefinition<{
   properties: {
@@ -39,7 +39,7 @@ type CompDoc = ComponentDoc<{
   };
 }>;
 
-CustomComponent<RootDoc, CompDoc>()({
+SubComponent<RootDoc, CompDoc>()({
   data: {
     aaa_str: "str" as string,
   },

package/src/api/{CustomComponent/CustomLifetimes → SubComponent/SubLifetimes}/SubLifetimesOption.ts

@@ -1,3 +1,3 @@
 import type { LifetimesOption } from "../../RootComponent/Lifetimes/LifetimesOption";
 
-export type CustomLifetimesOption = LifetimesOption;
+export type SubLifetimesOption = LifetimesOption;

package/src/api/SubComponent/SubMethods/SubMethodsConstraint.ts

@@ -0,0 +1,3 @@
+import type { Func } from "hry-types/src/Misc/Func";
+
+export type SubMethodsConstraint = Record<string, Func>;

package/src/api/{CustomComponent/CustomMethods/CustomMethodsOption.ts → SubComponent/SubMethods/SubMethodsOption.ts}

@@ -1,9 +1,9 @@
 import type { G } from "hry-types";
 
-import type { CustomMethodsConstraint } from "./CustomMethodsConstraint";
+import type { SubMethodsConstraint } from "./SubMethodsConstraint";
 
-export type CustomMethodsOption<
-  TMethods extends CustomMethodsConstraint,
+export type SubMethodsOption<
+  TMethods extends SubMethodsConstraint,
   TPrefix extends string,
   ExcludedKeys extends PropertyKey,
 > = {

package/src/api/{CustomComponent/CustomMethods → SubComponent/SubMethods}/test/error.test.ts

@@ -1,7 +1,7 @@
 import type { ComponentDoc } from "../../../DefineComponent/returnType/ComponentDoc";
 import type { Bubbles } from "../../../RootComponent/CustomEvents/CustomEventsTag";
 import type { RootComponentDefinition } from "../../../RootComponent/returnType";
-import { CustomComponent } from "../..";
+import { SubComponent } from "../..";
 
 type RootDoc = RootComponentDefinition<{
   methods: {
@@ -22,7 +22,7 @@ type CompDoc = ComponentDoc<{
 }>;
 
 // 1 前缀错误
-CustomComponent<RootDoc, CompDoc>()({
+SubComponent<RootDoc, CompDoc>()({
   methods: {
     // @ts-expect-error 1.1 前缀错误
     xxx_yyy() {
@@ -32,7 +32,7 @@ CustomComponent<RootDoc, CompDoc>()({
 });
 
 // 2 重复检测
-CustomComponent<RootDoc, CompDoc>()({
+SubComponent<RootDoc, CompDoc>()({
   events: {
     aaa_str_catch() {
       void 0;

package/src/api/{CustomComponent/CustomMethods → SubComponent/SubMethods}/test/normarl.test.ts

@@ -1,6 +1,6 @@
 import type { ComponentDoc } from "../../../DefineComponent/returnType/ComponentDoc";
 import type { RootComponentDefinition } from "../../../RootComponent/returnType";
-import { CustomComponent } from "../..";
+import { SubComponent } from "../..";
 
 type RootDoc = RootComponentDefinition<{
   methods: {
@@ -15,7 +15,7 @@ type CompDoc = ComponentDoc<{
 }>;
 
 // methods字段同组件前缀
-CustomComponent<RootDoc, CompDoc>()({
+SubComponent<RootDoc, CompDoc>()({
   methods: {
     aaa_xxx() {
       void 0;
@@ -28,6 +28,6 @@ CustomComponent<RootDoc, CompDoc>()({
 });
 
 // 2 默认可以为{}。
-CustomComponent<RootDoc, CompDoc>()({
+SubComponent<RootDoc, CompDoc>()({
   methods: {},
 });

package/src/api/SubComponent/SubObservers/SubObserversOption.ts

@@ -0,0 +1,3 @@
+import type { ObserversOption } from "../../RootComponent/Observers/ObserversOption";
+
+export type SubObserversOption<TObserversData extends object> = ObserversOption<TObserversData>;

package/src/api/{CustomComponent/CustomPageLifetimes/CustomPageLifetimesOption.ts → SubComponent/SubPageLifetimes/SubPageLifetimesOption.ts}

@@ -1,6 +1,6 @@
 import type { PageLifetimesOption } from "../../RootComponent/PageLifetimes/PageLifetimesOption";
 
-export type CustomPageLifetimesOption<TIsPage extends boolean, PropertiesDoc extends object> = PageLifetimesOption<
+export type SubPageLifetimesOption<TIsPage extends boolean, PropertiesDoc extends object> = PageLifetimesOption<
   TIsPage,
   PropertiesDoc
 >;

package/src/api/{CustomComponent/CustomReturnType/CreateCustomComponentDoc.ts → SubComponent/SubReturnType/CreateSubComponentDoc.ts}

@@ -17,7 +17,7 @@ type GetComposedEvents<
   "contains->"
 >;
 
-export type CreatCustomComponentDoc<
+export type CreatSubComponentDoc<
   ComponentCustomEvents extends object,
   EventsDoc extends object,
   // allDatas extends object,

package/src/api/{CustomComponent/CustomReturnType → SubComponent/SubReturnType}/test/error.test.ts

@@ -1,6 +1,6 @@
 import { Checking, type Test } from "hry-types";
 import type { ComponentDoc } from "../../../DefineComponent/returnType/ComponentDoc";
-import { CustomComponent } from "../..";
+import { SubComponent } from "../..";
 
 type CompDoc = ComponentDoc<{
   properties: {
@@ -10,7 +10,7 @@ type CompDoc = ComponentDoc<{
   };
 }>;
 
-const SubDoc = CustomComponent<{}, CompDoc>()({});
+const SubDoc = SubComponent<{}, CompDoc>()({});
 void SubDoc;
 // 返回穿透的自定义事件, 并去除了前缀
 type SubDocExpect = "缺少必传的字段aaa_str、aaa_bool";

package/src/api/{CustomComponent/CustomReturnType → SubComponent/SubReturnType}/test/normal.test.ts

@@ -8,7 +8,7 @@ import type {
   Capture,
   CaptureComposed,
 } from "../../../RootComponent/CustomEvents/CustomEventsTag";
-import { CustomComponent } from "../..";
+import { SubComponent } from "../..";
 
 type CompDoc = ComponentDoc<{
   properties: {
@@ -24,7 +24,7 @@ type CompDoc = ComponentDoc<{
   };
 }>;
 
-const SubDoc = CustomComponent<{}, CompDoc>()({
+const SubDoc = SubComponent<{}, CompDoc>()({
   data: {
     aaa_str: "string",
   },
@@ -44,7 +44,7 @@ type SubDocExpect = {
 
 Checking<typeof SubDoc, SubDocExpect, Test.Pass>();
 // 去除已经声明的穿透事件
-const removeCatchedEvents = CustomComponent<{}, CompDoc>()({
+const removeCatchedEvents = SubComponent<{}, CompDoc>()({
   data: {
     aaa_str: "string",
   },
@@ -72,7 +72,7 @@ void removeCatchedEvents;
 
 Checking<typeof removeCatchedEvents, never, Test.Pass>();
 // 去除有后缀时,已经声明的穿透事件
-const removeCatchedEventsOfSuffix = CustomComponent<{}, CompDoc, "aa">()({
+const removeCatchedEventsOfSuffix = SubComponent<{}, CompDoc, "aa">()({
   data: {
     aaaAa_str: "string",
   },