annil 1.15.1 → 1.17.0

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

@@ -0,0 +1,49 @@
+import type { IfExtends } from "hry-types/src/Any/IfExtends";
+import type { EmptyObject } from "hry-types/src/Misc/EmptyObject";
+import type { RequiredKeys } from "hry-types/src/Object/RequiredKeys";
+import type { Extra } from "../../types/Extra";
+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 { UnionToComma } from "../../types/UnionToComma.test";
+import type { ComponentDoc } from "../DefineComponent/returnType/ComponentDoc";
+import type { IInjectStore } from "../InstanceInject/instanceConfig";
+import type { RootComponentDefinition } from "../RootComponent/returnType";
+import type { GetStoreDef } from "../RootComponent/Store/GetStoreDef";
+import type { GetSubComputedDoc } from "./SubComputed/GetSubComputedDoc";
+import type { SubComputedConstraint } from "./SubComputed/SubComputedConstraint";
+import type { SubComputedOption } from "./SubComputed/SubComputedOption";
+import type { SubDataConstraint } from "./SubData/SubDataConstraint";
+import type { SubDataOption } from "./SubData/SubDataOption";
+import type { SubEventsConstraint } from "./SubEvents/SubEventsConstraint";
+import type { SubEventsOption } from "./SubEvents/SubEventsOption";
+import type { SubInheritConstraint } from "./SubInherit/SubInheritConstraint";
+import type { SubInheritOption } from "./SubInherit/SubInheritOption";
+import type { SubInstance } from "./SubInstance/SubInstance";
+import type { SubLifetimesOption } from "./SubLifetimes/SubLifetimesOption";
+import type { SubMethodsConstraint } from "./SubMethods/SubMethodsConstraint";
+import type { SubMethodsOption } from "./SubMethods/SubMethodsOption";
+import type { SubObserversOption } from "./SubObservers/SubObserversOption";
+import type { SubPageLifetimesOption } from "./SubPageLifetimes/SubPageLifetimesOption";
+import type { CreatSubComponentDoc } from "./SubReturnType/CreateSubComponentDoc";
+import type { SubStoreConstraint } from "./SubStore/SubStoreConstraint";
+import type { SubStoreOption } from "./SubStore/SubStoreOption";
+import type { SubWatchOption } from "./SubWatch/SubWatchOption";
+type Options<RootDoc extends RootComponentDefinition, 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, {
+    [k in keyof NoInfer<TInherit>]: k extends keyof (AllRootDataDoc) ? never : k extends CompDocKeys ? k : never;
+}[keyof NoInfer<TInherit>]> & SubDataOption<TSubData, {
+    [k in keyof NoInfer<TSubData>]: k extends keyof (AllRootDataDoc) ? never : k extends Exclude<CompDocKeys, (keyof (InheritDoc))> ? k : k extends InnerFields<Prefix> ? k : never;
+}[keyof NoInfer<TSubData>], "子组件无需此字段或与Inherit字段重复"> & SubStoreOption<TSubStore, {
+    [k in keyof NoInfer<TSubStore>]: k extends keyof (AllRootDataDoc & SubDataDoc) ? never : k extends Exclude<CompDocKeys, (keyof (InheritDoc & SubDataDoc))> ? k : k extends InnerFields<Prefix> ? k : never;
+}[keyof NoInfer<TSubStore>]> & SubComputedOption<TSubComputed, {
+    [k in keyof NoInfer<TSubComputed>]: k extends keyof (AllRootDataDoc & SubDataDoc & SubStoreDoc) ? never : k extends Exclude<CompDocKeys, (keyof (InheritDoc & SubDataDoc & SubStoreDoc))> ? k : k extends InnerFields<Prefix> ? k : never;
+}[keyof NoInfer<TSubComputed>]> & SubEventsOption<TEvents, SubEventsDoc, keyof SubEventsConstraint<CurrentCompDoc>> & SubMethodsOption<TSubMethods, Prefix, keyof (CurrentCompDoc["events"] & 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 RootComponentDefinition, 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 & {
+    properties: Extra<CurrentPrefix>;
+}, ReplacePrefix<TOriginalCompDoc & {
+    properties: Extra<CurrentPrefix>;
+}, CurrentPrefix>>, AllRootDataDoc extends object = Required<TRootDoc["properties"]> & TRootDoc["data"] & TRootDoc["computed"] & TRootDoc["store"]> = <TInherit extends SubInheritConstraint<AllRootDataDoc, CurrentCompDoc>, TData extends SubDataConstraint<Omit<Required<CurrentCompDoc["properties"]>, keyof InheritDoc> & Record<InnerFields<CurrentPrefix>, unknown>>, TStore extends SubStoreConstraint<Required<TRootDoc["properties"]>, Omit<Required<CurrentCompDoc["properties"]>, keyof (InheritDoc & DataDoc)> & Record<InnerFields<CurrentPrefix>, unknown>>, TEvents extends SubEventsConstraint<CurrentCompDoc>, TComputed extends SubComputedConstraint<Omit<Required<CurrentCompDoc["properties"]>, keyof (InheritDoc & DataDoc & StoreDoc)> & Record<InnerFields<CurrentPrefix>, unknown>>, TMethods extends SubMethodsConstraint = {}, InheritDoc extends object = IfExtends<SubInheritConstraint<AllRootDataDoc, CurrentCompDoc>, TInherit, {}, TInherit>, DataDoc extends object = IfExtends<SubDataConstraint<Omit<Required<CurrentCompDoc["properties"]>, keyof InheritDoc> & Record<InnerFields<CurrentPrefix>, unknown>>, TData, {}, TData>, StoreDoc extends object = IfExtends<SubStoreConstraint<Required<TRootDoc["properties"]>, Omit<Required<CurrentCompDoc["properties"]>, keyof (InheritDoc & DataDoc)> & Record<InnerFields<CurrentPrefix>, unknown>>, TStore, {}, GetStoreDef<TStore>>, ComputedDoc extends object = IfExtends<SubComputedConstraint<Omit<Required<CurrentCompDoc["properties"]>, keyof (InheritDoc & DataDoc & StoreDoc)> & Record<InnerFields<CurrentPrefix>, unknown>>, TComputed, {}, GetSubComputedDoc<TComputed>>, EventsDoc extends object = IfExtends<SubEventsConstraint<CurrentCompDoc>, TEvents, {}, TEvents>, MethodsDoc extends object = TMethods, MissingRequiredField extends PropertyKey = Exclude<RequiredKeys<NonNullable<CurrentCompDoc["properties"]>>, keyof (InheritDoc & DataDoc & StoreDoc & IfExtends<SubComputedConstraint<Omit<Required<CurrentCompDoc["properties"]>, keyof (InheritDoc & DataDoc & StoreDoc)>>, TComputed, {}, GetSubComputedDoc<TComputed>>)>>(options: Options<TRootDoc, IsPage, CurrentCompDoc, CurrentPrefix, AllRootDataDoc, TInherit, TData, TStore, TComputed, TEvents, TMethods, InheritDoc, DataDoc, StoreDoc, ComputedDoc, EventsDoc, MethodsDoc>) => IfExtends<MissingRequiredField, never, CreatSubComponentDoc<NonNullable<CurrentCompDoc["events"]>, EventsDoc>, `缺少必传的字段${UnionToComma<MissingRequiredField & string>}`>;
+export declare function SubComponent<TRootComponentDefinition extends RootComponentDefinition, TCompDoc extends ComponentDoc, Prefix extends string = "">(): IfExtends<EmptyObject, TCompDoc, (opt: EmptyObject) => never, SubComponentConstructor<TRootComponentDefinition, TCompDoc, Prefix>>;
+export {};

package/dist/api/SubComponent/index.js

@@ -0,0 +1,4 @@
+export function SubComponent() {
+    return ((options) => options);
+}
+//# sourceMappingURL=index.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/api/SubComponent/index.ts"],"names":[],"mappings":"AAgSA,MAAM,UAAU,YAAY;IAW1B,OAAO,CAAC,CAAC,OAAY,EAAE,EAAE,CAAC,OAAO,CAAQ,CAAC;AAC5C,CAAC"}

package/dist/api/{CustomComponent → SubComponent}/returnType.d.ts

@@ -6,12 +6,12 @@ import type { LifetimesConstraint } from "../RootComponent/Lifetimes/LifetimesCo
 import type { MethodsConstraint } from "../RootComponent/Methods/MethodsConstraint";
 import type { PageLifetimesOption } from "../RootComponent/PageLifetimes/PageLifetimesOption";
 import type { StoreConstraint } from "../RootComponent/Store/StoreConstraint";
-type _CustomComponentDefinition = {
+type _SubComponentDefinition = {
     composedEvents?: Record<string, unknown>;
 };
 type _Validator<O, Doc, ErrKeys = Exclude<keyof O, keyof Doc>> = [ErrKeys] extends [never] ? Doc : `错误的字段${ErrKeys & string}`;
-export type CustomComponentDefinition<O extends _Validator<O, _CustomComponentDefinition> = _CustomComponentDefinition> = O;
-export type CustomComponentDefinitionRuntime = {
+export type SubComponentDefinition<O extends _Validator<O, _SubComponentDefinition> = _SubComponentDefinition> = O;
+export type SubComponentDefinitionRuntime = {
     inhrit?: string;
     data?: DataConstraint;
     computed?: ComputedConstraint;

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

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

package/dist/index.d.ts

@@ -1,8 +1,7 @@
-import { ChunkComponent } from "./api/ChunkComponent";
-import { CustomComponent } from "./api/CustomComponent";
 import { DefineComponent } from "./api/DefineComponent";
 import { type IInjectInfo, instanceConfig } from "./api/InstanceInject/instanceConfig";
 import { RootComponent } from "./api/RootComponent";
+import { SubComponent } from "./api/SubComponent";
 import { navigateBack, navigateTo, redirectTo } from "./api/wxSugar";
 import type { CreateComponentType } from "./types/CreateComponentType";
 import type { DetailedType } from "./types/DetailedType";
@@ -11,4 +10,4 @@ export * from "./utils/_utils";
 export type { Bubbles, BubblesCapture, BubblesCaptureComposed, BubblesComposed, Capture, CaptureComposed, Composed, CustomEventsTags, } from "./api/RootComponent/CustomEvents/CustomEventsTag";
 export type { Vant, Wm } from "./thirdLib";
 export type { CurrentTargetDataset, Dataset, Detail, Mark, TargetDataset, WMBaseEvent, WMCustomEvent, } from "./types/OfficialTypeAlias";
-export { ChunkComponent, type CreateComponentType, CustomComponent, DefineComponent, type DetailedType, type ExtendComponentType, type IInjectInfo, instanceConfig, navigateBack, navigateTo, redirectTo, RootComponent, };
+export { type CreateComponentType, DefineComponent, type DetailedType, type ExtendComponentType, type IInjectInfo, instanceConfig, navigateBack, navigateTo, redirectTo, RootComponent, SubComponent, };

package/dist/index.js

@@ -1,9 +1,8 @@
-import { ChunkComponent } from "./api/ChunkComponent";
-import { CustomComponent } from "./api/CustomComponent";
 import { DefineComponent } from "./api/DefineComponent";
 import { instanceConfig } from "./api/InstanceInject/instanceConfig";
 import { RootComponent } from "./api/RootComponent";
+import { SubComponent } from "./api/SubComponent";
 import { navigateBack, navigateTo, redirectTo } from "./api/wxSugar";
 export * from "./utils/_utils";
-export { ChunkComponent, CustomComponent, DefineComponent, instanceConfig, navigateBack, navigateTo, redirectTo, RootComponent, };
+export { DefineComponent, instanceConfig, navigateBack, navigateTo, redirectTo, RootComponent, SubComponent, };
 //# sourceMappingURL=index.js.map

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AACtD,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AACxD,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AACxD,OAAO,EAAoB,cAAc,EAAE,MAAM,qCAAqC,CAAC;AACvF,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AACpD,OAAO,EAAE,YAAY,EAAE,UAAU,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAKrE,cAAc,gBAAgB,CAAC;AAwB/B,OAAO,EACL,cAAc,EAEd,eAAe,EACf,eAAe,EAIf,cAAc,EACd,YAAY,EACZ,UAAU,EACV,UAAU,EACV,aAAa,GACd,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AACxD,OAAO,EAAoB,cAAc,EAAE,MAAM,qCAAqC,CAAC;AACvF,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AACpD,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAClD,OAAO,EAAE,YAAY,EAAE,UAAU,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAKrE,cAAc,gBAAgB,CAAC;AAwB/B,OAAO,EAEL,eAAe,EAIf,cAAc,EACd,YAAY,EACZ,UAAU,EACV,UAAU,EACV,aAAa,EACb,YAAY,GACb,CAAC"}

package/package.json

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

package/src/api/DefineComponent/SubComponents/SubComponentsOption.ts

@@ -1,14 +1,13 @@
-import type { CustomComponentDefinition } from "../../CustomComponent/returnType";
+import type { SubComponentDefinition } from "../../SubComponent/returnType";
 
 /**
  * RootComponent API 的`subComponents`字段配置
- * 实际子组件包括CustomComponent和ChunkComponent,但ChunkComponent的返回类型为never,所以这里只用CustomComponentReturnType来约束子组件类型。
  */
 export type SubComponentsOption<
-  TCustomComponentReturnTypeList extends CustomComponentDefinition[],
+  TSubComponentReturnTypeList extends SubComponentDefinition[],
 > = {
   /**
    * 子组件列表
    */
-  subComponents?: [...TCustomComponentReturnTypeList];
+  subComponents?: [...TSubComponentReturnTypeList];
 };

package/src/api/DefineComponent/SubComponents/test/normal.test.ts

@@ -1,15 +1,15 @@
 import { typeEqual } from "../../../../utils/typeEqual";
-import type { CustomComponentDefinition } from "../../../CustomComponent/returnType";
 import type { Bubbles, Composed } from "../../../RootComponent/CustomEvents/CustomEventsTag";
+import type { SubComponentDefinition } from "../../../SubComponent/returnType";
 import { DefineComponent } from "../..";
 
-const SubDocIsAny = {} as CustomComponentDefinition<{
+const SubDocIsAny = {} as SubComponentDefinition<{
   composedEvents: {
     a: number | Composed;
   };
 }>;
 
-const NonEmptyRootDoc = {} as CustomComponentDefinition<{
+const NonEmptyRootDoc = {} as SubComponentDefinition<{
   composedEvents: {
     a: string | Bubbles | Composed;
   };

package/src/api/DefineComponent/index.ts

@@ -1,7 +1,7 @@
 import type { IfExtends } from "hry-types/src/Any/IfExtends";
 
-import type { CustomComponentDefinition, CustomComponentDefinitionRuntime } from "../CustomComponent/returnType";
 import type { RootComponentDefinition, RootComponentDefinitionRuntime } from "../RootComponent/returnType";
+import type { SubComponentDefinition, SubComponentDefinitionRuntime } from "../SubComponent/returnType";
 import type { NameOrPathOption } from "./NameOrPath/NameOrPathOption";
 import { normalizeOptions } from "./normalizeOptions";
 import type { GenerateComponentDoc } from "./returnType/GenerateComponentDoc";
@@ -12,27 +12,27 @@ export type Path = `/${string}`;
 
 type Options<
   TRootComponentDefinition extends RootComponentDefinition,
-  TCustomComponentDefinitionList extends CustomComponentDefinition[],
+  TSubComponentDefinitionList extends SubComponentDefinition[],
   TName extends string,
   TPath extends Path,
 > =
   & NameOrPathOption<TName, TPath, NonNullable<TRootComponentDefinition["isPage"]>>
   & RootComponentOption<TRootComponentDefinition>
-  & SubComponentsOption<TCustomComponentDefinitionList>;
+  & SubComponentsOption<TSubComponentDefinitionList>;
 
 type Constructor = <
   TRootComponentDefinition extends RootComponentDefinition = {},
-  TCustomComponentDefinitionList extends CustomComponentDefinition[] = [],
+  TSubComponentDefinitionList extends SubComponentDefinition[] = [],
   TName extends string = "",
   TPath extends Path = "/",
 >(
-  options: Options<TRootComponentDefinition, TCustomComponentDefinitionList, TName, TPath>,
+  options: Options<TRootComponentDefinition, TSubComponentDefinitionList, TName, TPath>,
 ) => //  根据是否传入name字段(当isPage不为true时,类型约束name不为空字符串)来区分生成页面文档还是组件文档。
 IfExtends<
   "",
   TName,
   GeneratePageDoc<TRootComponentDefinition, TPath>,
-  GenerateComponentDoc<TRootComponentDefinition, TName, TCustomComponentDefinitionList>
+  GenerateComponentDoc<TRootComponentDefinition, TName, TSubComponentDefinitionList>
 >;
 /**
  * DefineComponentOptionRuntime是DefineComponent的options参数的运行时类型。
@@ -41,13 +41,13 @@ export type DefineComponentOptionRuntime = {
   name?: string;
   path?: string;
   rootComponent?: RootComponentDefinitionRuntime;
-  subComponents?: CustomComponentDefinitionRuntime[];
+  subComponents?: SubComponentDefinitionRuntime[];
 };
 
 /**
  * DefineComponent是构建组件的核心API,所有组件(页面组件和自定义组件)都通过它来构建的。
  * 它返回的类型可能是页面文档(`PageDoc`)或者自定义组件文档(`ComponentDoc`),具体取决于传入rootComponent中isPage的值。
- * 它的作用是把根组件定义(`RootComponentDefinition`)和子组件定义(`CustomComponentDefinition`和`ChunkComponentDefinition`)整合成原生`Component`的选项配置,最终通过原生`Component`来构建组件。
+ * 它的作用是把根组件定义(`RootComponentDefinition`)和子组件定义(`SubComponentDefinition`)整合成原生`Component`的选项配置,最终通过原生`Component`来构建组件。
  */
 // eslint-disable-next-line @typescript-eslint/no-explicit-any -- 返回类型由Constructor定义,实现无需。
 export const DefineComponent: Constructor = function(options): any {

package/src/api/DefineComponent/normalizeOptions/__throttleDebounce__FieldCheck.ts

@@ -1,9 +1,8 @@
-import type { SlotComponentReturnType } from "../../ChunkComponent/SlotComponentReturnType";
-import type { CustomComponentDefinitionRuntime } from "../../CustomComponent/returnType";
 import type { RootComponentDefinitionRuntime } from "../../RootComponent/returnType";
+import type { SubComponentDefinitionRuntime } from "../../SubComponent/returnType";
 
 export function __throttleDebounce__FieldCheck(
-  config: RootComponentDefinitionRuntime | CustomComponentDefinitionRuntime[] | SlotComponentReturnType[],
+  config: RootComponentDefinitionRuntime | SubComponentDefinitionRuntime[],
 ) {
   if (Array.isArray(config)) {
     for (const subComponent of config) {

package/src/api/DefineComponent/normalizeOptions/handleSubComponents.ts

@@ -1,4 +1,4 @@
-import type { CustomComponentDefinitionRuntime } from "../../CustomComponent/returnType";
+import type { SubComponentDefinitionRuntime } from "../../SubComponent/returnType";
 import type { FinalOptionsOfComponent, SameFuncOptions } from ".";
 import { __throttleDebounce__FieldCheck } from "./__throttleDebounce__FieldCheck";
 import { otherFieldsHandle } from "./otherFieldsHandle";
@@ -6,7 +6,7 @@ import { sameFuncFieldsCollect } from "./sameFuncFieldsCollect";
 
 export function handleSubComponents(
   componentOptions: FinalOptionsOfComponent,
-  subComponents: CustomComponentDefinitionRuntime[] | undefined,
+  subComponents: SubComponentDefinitionRuntime[] | undefined,
   funcOptions: SameFuncOptions,
 ) {
   if (subComponents && subComponents.length !== 0) {

package/src/api/DefineComponent/normalizeOptions/initComputed/index.ts

@@ -7,15 +7,6 @@ import type { Instance } from "../../../RootComponent/Instance/RootComponentInst
 import { getPathsValue } from "../watchHandler/getPathsValue";
 import { hasComputedPath } from "../watchHandler/hasComputedPath";
 import { initComputedAndGetCache } from "./initComputedAndGetCache";
-// function initWatchOldValue(this: Instance, watchConfig: object): WatchOldValue {
-//   const watchOldValue: Record<string, unknown[]> = {};
-//   for (const key in watchConfig) {
-//     watchOldValue[key] = deepClone(getPathsValue(this.data, key));
-//   }
-
-//   return watchOldValue;
-// }
-
 /**
  * 初始化会在2个时间渲染,一个是observers.**的回调函数,一个是attached周期。
  * @param computedConfig

package/src/api/DefineComponent/normalizeOptions/injectInfoHandler.ts

@@ -29,7 +29,7 @@ function mergeOptions(
 
         default:
           // @ts-ignore
-          finalOptionsForComponent[renamedKey] = Object.assign(originalVal, injectVal);
+          finalOptionsForComponent[renamedKey] = Object.assign(injectVal, originalVal);
 
           break;
       }

package/src/api/DefineComponent/normalizeOptions/sameFuncFieldsCollect.ts

@@ -1,14 +1,14 @@
 import type { Func } from "hry-types/src/Misc/Func";
 
-import type { CustomComponentDefinitionRuntime } from "../../CustomComponent/returnType";
 import type { RootComponentDefinitionRuntime } from "../../RootComponent/returnType";
+import type { SubComponentDefinitionRuntime } from "../../SubComponent/returnType";
 import type { SameFuncOptions } from ".";
 
 /**
  * 把配置为函数的字段方法收集到funcOptions中
  */
 export function sameFuncFieldsCollect(
-  options: CustomComponentDefinitionRuntime | RootComponentDefinitionRuntime,
+  options: SubComponentDefinitionRuntime | RootComponentDefinitionRuntime,
   funcOptions: SameFuncOptions,
 ) {
   let key: keyof SameFuncOptions;

package/src/api/DefineComponent/normalizeOptions/watchHandler/index.ts

@@ -52,6 +52,7 @@ export function handleWatchConfig(
   if (!isEmptyObject(watchConfig)) {
     const rawPropertiesValue = getPropertiesValue(properties);
     const computedKeys = Object.keys(computedConfig);
+
     data.__watchOldValue__ = initWatchOldValuesWithoutComputed(
       { ...data, ...rawPropertiesValue },
       watchConfig,
@@ -61,12 +62,14 @@ export function handleWatchConfig(
       const watchHadle = watchConfig[key];
       const originObserversHandle = observersConfig[key] as Func | undefined;
       // 在监控多个数据时,参数是多个值
-      observersConfig[key] = function(this: Instance, ...newValue: unknown[]) {
+      observersConfig[key] = function(this: Instance, ...values: unknown[]) {
+        // 计算属性初始化完成时直接调用。
         if (this.data.__computedInited__) {
-          observerHandler.call(this, key, originObserversHandle, watchHadle, ...newValue);
+          observerHandler.call(this, key, originObserversHandle, watchHadle, ...values);
         } else {
+          // 计算属性未初始化完成时,先把watch的回调函数注册到实例上,等计算属性初始化完成时再调用。因为计算属性初始化完成时会把data中的值setData一次,会触发observers回调函数,所以在这里注册watch的回调函数,就能保证计算属性初始化完成后能正确调用watch的回调函数。
           (this.data.__oberverHandler__ ||= []).push(
-            observerHandler.bind(this, key, originObserversHandle, watchHadle, ...newValue),
+            observerHandler.bind(this, key, originObserversHandle, watchHadle, ...values),
           );
         }
       };

package/src/api/DefineComponent/returnType/GenerateComponentDoc.ts

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

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

@@ -2,16 +2,16 @@ 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 { Assert } from "../../../types/Assert";
-import type { CustomComponentDefinition } from "../../CustomComponent/returnType";
+import type { SubComponentDefinition } from "../../SubComponent/returnType";
 
 /**
  * 因为子组件文档customEvents字段有可能相同(无前缀),所以使用UnionTwoObject
  * 由于SubComponentDoc为空时返回never而不`{}`,所以`Exclude<U, TLast>`不影响结果。
  */
 type _GetCustomEventDocOfSubDoc<
-  U extends CustomComponentDefinition,
+  U extends SubComponentDefinition,
   Result = {},
-  TLast extends CustomComponentDefinition = Assert<Last<U>, CustomComponentDefinition>,
+  TLast extends SubComponentDefinition = Assert<Last<U>, SubComponentDefinition>,
 > = IsNever<U> extends true ? Result
   : _GetCustomEventDocOfSubDoc<Exclude<U, TLast>, UnionTwoObject<Result, TLast["composedEvents"]>>;
 
@@ -19,6 +19,6 @@ type _GetCustomEventDocOfSubDoc<
  * 获取子组件自定义事件文档
  * @remarks U 中 相同字段类型联合,所以使用元组推导不如Last性能好。
  */
-export type GetCustomEventDocOfSubDoc<UnionSubDoc extends CustomComponentDefinition> = IsUnion<UnionSubDoc> extends true
+export type GetCustomEventDocOfSubDoc<UnionSubDoc extends SubComponentDefinition> = IsUnion<UnionSubDoc> extends true
   ? _GetCustomEventDocOfSubDoc<UnionSubDoc>
   : UnionSubDoc["composedEvents"];

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

@@ -1,7 +1,7 @@
 /* eslint-disable @typescript-eslint/no-unused-expressions */
 /* eslint-disable @typescript-eslint/no-unused-vars */
 import { Checking, type Test } from "hry-types";
-import { CustomComponent, type DetailedType, RootComponent } from "../../../..";
+import { type DetailedType, RootComponent, SubComponent } from "../../../..";
 // import type { CustomEventConstraint } from "../../../rootComponent/CustomEvents/CustomEventConstraint";
 import type {
   Bubbles,
@@ -14,11 +14,11 @@ import type {
 } from "../../../RootComponent/CustomEvents/CustomEventsTag";
 
 import type { ComputeIntersection } from "hry-types/src/Object/ComputeIntersection";
-import type { CustomComponentDefinition } from "../../../CustomComponent/returnType";
 import type { CustomEventConstraint } from "../../../RootComponent/CustomEvents/CustomEventConstraint";
 import type { PropertiesConstraint } from "../../../RootComponent/Properties/PropertiesConstraint";
 import type { Mock_User } from "../../../RootComponent/Properties/test/normalRequired.test";
 import type { RootComponentDefinition } from "../../../RootComponent/returnType";
+import type { SubComponentDefinition } from "../../../SubComponent/returnType";
 import { DefineComponent } from "../..";
 
 const properties = {
@@ -134,7 +134,7 @@ const compDoc = DefineComponent({
 
 Checking<typeof compDoc, ComputeIntersection<CompOnlyCustomEventsExpected & OnlyPropertiesExpected>, Test.Pass>;
 
-type SubA = CustomComponentDefinition<{
+type SubA = SubComponentDefinition<{
   composedEvents: {
     str: string | Bubbles | Composed;
     num: number | Capture | Composed;
@@ -158,7 +158,7 @@ type customEventsRootDocExpect = {
 
 Checking<typeof customEventsRootDoc, customEventsRootDocExpect, Test.Pass>;
 
-type SubB = CustomComponentDefinition<{
+type SubB = SubComponentDefinition<{
   composedEvents: {
     str: number | Bubbles | Composed;
     num: string | Capture | Composed;
@@ -225,9 +225,9 @@ const rootComponent8 = RootComponent()({
 
 Checking<(typeof rootComponent8)["customEvents"]["decrease"], Mock_User, Test.Pass>;
 
-const subA = CustomComponent<RootComponentDefinition, { properties: { subA_num: number } }>()({});
+const subA = SubComponent<RootComponentDefinition, { properties: { subA_num: number } }>()({});
 // SubComponent中计算属性字段函数若不写返回值,会造成结果中没有计算属性字段类型,若没有其他字段,结果就为'{}'
-const subB = CustomComponent<RootComponentDefinition, { properties: { subB_str: string } }>()({
+const subB = SubComponent<RootComponentDefinition, { properties: { subB_str: string } }>()({
   computed: {
     subB_str() {
       return this.data.injectStr;

package/src/api/InstanceInject/inject.ts

@@ -11,15 +11,20 @@ wx.onThemeChange((Res) => {
 });
 
 // 注入的方法;
-function injectMethod(data: string) {
+function injectMethodA(data: string) {
+  return data;
+}
+function injectMethodB(data: number) {
   return data;
 }
 
 const data = {
   injectStr: "injectStr",
+  injectNum: 123,
 };
 const methods = {
-  injectMethod,
+  injectMethodA,
+  injectMethodB,
 };
 const store = {
   injectTheme: () => themeStore.theme,

package/src/api/InstanceInject/instanceConfig.ts

@@ -19,16 +19,15 @@ interface BaseInjectInfo {
 
 export interface IInjectInfo extends BaseInjectInfo {
 }
+export type InjectData = DataConstraint extends IInjectInfo["data"] ? {} : IInjectInfo["data"];
 
 export type IInjectAllData = IfEquals<
   {},
-  injectData & IInjectStore,
+  InjectData & IInjectStore,
   {},
-  ComputeIntersection<injectData & IInjectStore>
+  ComputeIntersection<InjectData & IInjectStore>
 >;
 
-type injectData = DataConstraint extends IInjectInfo["data"] ? {} : IInjectInfo["data"];
-
 export type IInjectStore = StoreConstraint extends IInjectInfo["store"] ? {}
   : ReturnTypeInObject<IInjectInfo["store"]>;
 

package/src/api/InstanceInject/test/normal.test.ts

@@ -10,7 +10,7 @@ RootComponent()({
 
       Checking<typeof this.data.injectTheme, "dark" | "light" | undefined, Test.Pass>;
 
-      Checking<typeof this.injectMethod, (data: string) => string, Test.Pass>;
+      Checking<typeof this.injectMethodA, (data: string) => string, Test.Pass>;
     },
   },
 });
@@ -18,12 +18,12 @@ RootComponent()({
 // 2. 注入字段重复时,自身覆盖注入类型
 RootComponent()({
   data: {
-    // 覆盖注入的数据类型
+    // 覆盖注入的数据类型,注入的类型为string。
     injectStr: 123,
   },
   store: {
-    // 覆盖注入的数据类型
-    injectTheme: (() => "aaa") as () => "aaa",
+    // 覆盖注入的数据类型,注入的类型为"dark" | "light" | undefined。
+    injectTheme: () => "aaa",
   },
   methods: {
     // 覆盖注入的方法类型
@@ -31,9 +31,10 @@ RootComponent()({
       return 123;
     },
     testInjectTypes() {
+      // 覆盖注入的数据类型,注入的类型为string。
       Checking<typeof this.data.injectStr, number, Test.Pass>;
-
-      Checking<typeof this.data.injectTheme, "aaa", Test.Pass>;
+      // 覆盖注入的数据类型,注入的类型为"dark" | "light" | undefined。
+      Checking<typeof this.data.injectTheme, string, Test.Pass>;
 
       Checking<typeof this.injectMethod, () => 123, Test.Pass>;
     },

package/src/api/RootComponent/Instance/test/datas/mormal.test.ts

@@ -0,0 +1,43 @@
+import { Checking, type Test } from "hry-types";
+import { type DetailedType, RootComponent } from "../../../../..";
+
+// 组件时
+RootComponent()({
+  properties: {
+    obj: Object,
+    optionalObj: {
+      type: Object as DetailedType<{ name: string }>,
+      value: { name: "zhao" },
+    },
+  },
+  data: {
+    dataStr: "dataStr",
+    // 相同字段覆盖注入类型
+    injectStr: 123,
+  },
+  store: {
+    storeData: (data) => {
+      return data.optionalObj.name;
+    },
+  },
+  lifetimes: {
+    attached() {
+      // 组件实例对象格外添加null类型
+      Checking<
+        typeof this.data,
+        {
+          optionalObj: {
+            name: string;
+          };
+          obj: object;
+          dataStr: string;
+          storeData: string;
+          injectTheme: "dark" | "light" | undefined;
+          injectStr: number; // 相同字段覆盖注入类型 injectStr: string -> number
+          injectNum: number;
+        },
+        Test.Pass
+      >();
+    },
+  },
+});

package/src/api/RootComponent/Instance/test/methods/mormal.test.ts

@@ -3,14 +3,23 @@ import { RootComponent } from "../../../../..";
 
 RootComponent()({
   methods: {
+    // 与注入方法同名,会覆盖注入方法
+    injectMethodB(num: string) {
+      return num;
+    },
+
     M1() {
       return 1;
     },
 
     M2(str: string) {
-      void Checking<typeof this.M1, () => 1, Test.Pass>;
+      Checking<typeof this.M1, () => 1, Test.Pass>();
+
+      Checking<typeof this.M2, (str: string) => string, Test.Pass>();
 
-      void Checking<typeof this.M2, (str: string) => string, Test.Pass>;
+      Checking<typeof this.injectMethodA, (str: string) => string, Test.Pass>();
+      // 自身方法会覆盖注入方法,所以类型为自身方法的类型
+      Checking<typeof this.injectMethodB, (num: string) => string, Test.Pass>();
 
       return str;
     },

package/src/api/RootComponent/Instance/test/properties/mormal.test.ts

@@ -44,7 +44,7 @@ RootComponent()({
   pageLifetimes: {
     onLoad(data) {
       Checking<typeof data, {
-        optionalObj?: {
+        optionalObj: {
           name: string;
         };
         obj: object;

package/src/api/RootComponent/PageLifetimes/PageLifetimesOption.ts

@@ -1,8 +1,6 @@
 import type { IfExtends } from "hry-types/src/Any/IfExtends";
 import type { ComputeIntersection } from "hry-types/src/Object/ComputeIntersection";
-import type { ComputeObject } from "../../../types/ComputeObject";
 import type { WMCompPageLifetimes, WMPageLifetimes } from "../../../types/OfficialTypeAlias";
-import type { RemoveNullOfRequired } from "../../../types/RemoveNullOfRequired";
 
 export type PageLifetimesOption<TIsPage extends boolean, PropertiesDoc extends object> = IfExtends<
   TIsPage,
@@ -23,8 +21,7 @@ export type PageLifetimesOption<TIsPage extends boolean, PropertiesDoc extends o
          * 页面加载时触发。一个页面只会调用一次，可以在 onLoad 的参数中获取Properties定义的数据。
          */
         onLoad?: (
-          // 默认PropertiesDoc
-          props: ComputeObject<RemoveNullOfRequired<PropertiesDoc>>,
+          props: Required<PropertiesDoc>,
         ) => void | Promise<void>;
       }
     >;