annil 1.15.1 → 1.17.0

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",
   },

package/src/api/{CustomComponent/CustomStore/CustomStoreConstraint.ts → SubComponent/SubStore/SubStoreConstraint.ts}

@@ -5,7 +5,7 @@ import type { Getter } from "../../RootComponent/Store/StoreConstraint";
  * 子组件Data字段约束
  * @returns 当剩余对象不为空对象,约束对象的key为剩余key,类型为剩余key对应的文档类型或函数返回类型。
  */
-export type CustomStoreConstraint<
+export type SubStoreConstraint<
   PropertyDoc extends object,
   legal extends object,
 > = {

package/src/api/{CustomComponent/CustomStore/CustomStoreOption.ts → SubComponent/SubStore/SubStoreOption.ts}

@@ -1,7 +1,7 @@
 import type { G } from "hry-types";
 import type { Validators } from "../../../types/Validators";
 
-export type CustomStoreOption<TStore extends object, legalKeys extends PropertyKey> = {
+export type SubStoreOption<TStore extends object, legalKeys extends PropertyKey> = {
   /**
    * 全局响应式数据字段,全局store对应数据变化实例对应数据自动setData。
    * 约束为组件properties字段去除inherit和data的剩余字段和内部字段

package/src/api/{CustomComponent/CustomStore → SubComponent/SubStore}/test/error.test.ts

@@ -1,7 +1,7 @@
 import { observable } from "mobx";
 
 import type { ComponentDoc } from "../../../DefineComponent/returnType/ComponentDoc";
-import { CustomComponent } from "../..";
+import { SubComponent } from "../..";
 const user = observable({
   name: "zhao",
   age: 20,
@@ -14,7 +14,7 @@ type DocA = ComponentDoc<{
   };
 }>;
 
-CustomComponent<{
+SubComponent<{
   properties: {
     str: string;
   };
@@ -37,7 +37,7 @@ CustomComponent<{
     _aaa_xxx: () => user.age,
   },
 });
-CustomComponent<{
+SubComponent<{
   properties: {
     aaa_num: number;
   };
@@ -48,7 +48,7 @@ CustomComponent<{
   },
 });
 // 类型约束错误
-CustomComponent<{
+SubComponent<{
   properties: {
     aaa_num: number;
   };

package/src/api/{CustomComponent/CustomStore → SubComponent/SubStore}/test/normal.test.ts

@@ -1,7 +1,7 @@
 import { observable } from "mobx";
 
 import type { ComponentDoc } from "../../../DefineComponent/returnType/ComponentDoc";
-import { CustomComponent } from "../..";
+import { SubComponent } from "../..";
 const user = observable({
   name: "zhao",
   age: 20,
@@ -15,7 +15,7 @@ type DocA = ComponentDoc<{
   };
 }>;
 
-CustomComponent<{}, DocA>()({
+SubComponent<{}, DocA>()({
   store: {
     // 1 可写文档字段
     aaa_str: () => user.name,
@@ -23,20 +23,20 @@ CustomComponent<{}, DocA>()({
   },
 });
 
-CustomComponent<{}, DocA, "a">()({
+SubComponent<{}, DocA, "a">()({
   store: {
     // 2 可写内部字段
     _aaaA_xxx: () => user.age,
   },
 });
 // store中可写 额外字段 isReady
-CustomComponent<{ data: { _num: number } }, DocA, "a">()({
+SubComponent<{ data: { _num: number } }, DocA, "a">()({
   store: {
     aaaA_isReady: () => user.isReady,
   },
 });
 // 4 可以返回undefined,表示该字段不可响应式,不报错,有警告。
-CustomComponent<{ properties: { num: number } }, DocA, "a">()({
+SubComponent<{ properties: { num: number } }, DocA, "a">()({
   store: {
     aaaA_num: (data) => data.num > 10 ? user.age : void 0,
   },

package/src/api/SubComponent/SubWatch/SubWatchOption.ts

@@ -0,0 +1,3 @@
+import type { WatchOption } from "../../RootComponent/Watch/WatchOption";
+
+export type SubWatchOption<TWatchData extends object> = WatchOption<TWatchData>;

package/src/api/{CustomComponent/CustomWatch → SubComponent/SubWatch}/test/WatchComputed.test.ts

@@ -2,7 +2,7 @@ import { Checking, type Test } from "hry-types";
 import type { ComponentDoc } from "../../../DefineComponent/returnType/ComponentDoc";
 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: {
@@ -28,7 +28,7 @@ type CompDoc = ComponentDoc<{
 /**
  *  watch computed字段时需要手写类型,可悬停鼠标到key查看类型
  */
-CustomComponent<RootDoc, CompDoc>()({
+SubComponent<RootDoc, CompDoc>()({
   computed: {
     aaa_str(): string {
       return this.data.aaa_num.toString();

package/src/api/{CustomComponent/CustomWatch → SubComponent/SubWatch}/test/WatchProperties.test.ts

@@ -1,5 +1,5 @@
 import { Checking, type Test } from "hry-types";
-import { CustomComponent, type DetailedType, RootComponent } from "../../../..";
+import { type DetailedType, RootComponent, SubComponent } from "../../../..";
 import type { OptionalType } from "../../../RootComponent/Properties/PropertiesConstraint";
 import {
   type Mock_Cart,
@@ -45,7 +45,7 @@ void rootComponent;
 /**
  * watch properties字段 深度只读, 必传对象字段newValue去除null
  */
-CustomComponent<Root, { properties: { aaa_num: number } }>()({
+SubComponent<Root, { properties: { aaa_num: number } }>()({
   watch: {
     // 必传单一字段
     str(newValue, oldValue) {

package/src/api/{CustomComponent/CustomWatch → SubComponent/SubWatch}/test/WatchRootData.test.ts

@@ -3,7 +3,7 @@ import { Checking, type Test } from "hry-types";
 import type { ComponentDoc } from "../../../DefineComponent/returnType/ComponentDoc";
 
 import type { Mock_User } from "../../../RootComponent/Properties/test/normalRequired.test";
-import { CustomComponent } from "../..";
+import { SubComponent } from "../..";
 
 interface TestObj {
   subObj: Mock_User;
@@ -37,7 +37,7 @@ interface RootDoc {
 /**
  * watch RootDoc中的数据字段
  */
-CustomComponent<RootDoc, CompDoc>()({
+SubComponent<RootDoc, CompDoc>()({
   data: {
     aaa_str: "str",
   },

package/src/api/{CustomComponent/CustomWatch → SubComponent/SubWatch}/test/WatchSubData.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,14 +10,14 @@ type CompDoc = ComponentDoc<{
 }>;
 
 // 可以为空对象
-CustomComponent<{}, CompDoc>()({
+SubComponent<{}, CompDoc>()({
   watch: {},
 });
 
 /**
  * watch 自身data字段
  */
-CustomComponent<{}, CompDoc>()({
+SubComponent<{}, CompDoc>()({
   data: {
     aaa_str: "123",
 

package/src/api/{CustomComponent/CustomWatch → SubComponent/SubWatch}/test/WtachInject.test.ts

@@ -1,10 +1,10 @@
 import { Checking, type Test } from "hry-types";
-import { CustomComponent } from "../..";
+import { SubComponent } from "../..";
 
 /**
  * watch  注入的store字段
  */
-CustomComponent<{}, { properties: { aaa_num: number } }>()({
+SubComponent<{}, { properties: { aaa_num: number } }>()({
   watch: {
     injectTheme(newValue, oldValue) {
       void Checking<"dark" | "light" | undefined, typeof newValue, Test.Pass>;

package/src/api/{CustomComponent/CustomWatch → SubComponent/SubWatch}/test/error.test.ts

@@ -1,8 +1,8 @@
 import type { Wm } from "../../../..";
-import { CustomComponent } from "../..";
+import { SubComponent } from "../..";
 
 // 测试1
-CustomComponent<{ events: { a: string } }, Wm.View>()({
+SubComponent<{ events: { a: string } }, Wm.View>()({
   watch: {
     // @ts-expect-error 无可监控字段时，约束为EmptyObject,不可写任何字段
     nothing() {
@@ -14,7 +14,7 @@ CustomComponent<{ events: { a: string } }, Wm.View>()({
 /**
  * 测试2  超出约束字段报错
  */
-CustomComponent<{ events: { a: string } }, Wm.View>()({
+SubComponent<{ events: { a: string } }, Wm.View>()({
   data: {
     view_hoverClass: " h-100",
   },
@@ -28,7 +28,7 @@ CustomComponent<{ events: { a: string } }, Wm.View>()({
     },
   },
 });
-CustomComponent<{ data: { user: null | object } }, Wm.View>()({
+SubComponent<{ data: { user: null | object } }, Wm.View>()({
   data: {
     view_hoverClass: " h-100",
   },
@@ -45,7 +45,7 @@ CustomComponent<{ data: { user: null | object } }, Wm.View>()({
 /**
  * 3  对象联合null的类型 不能watch子字段
  */
-CustomComponent<{ data: { user: null | object } }, { properties: { a: number } }>()({
+SubComponent<{ data: { user: null | object } }, { properties: { a: number } }>()({
   watch: {
     user(newValue, oldValue) {
       void oldValue;