annil 1.15.1 → 1.16.0

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.16.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/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/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>;
       }
     >;

package/src/api/RootComponent/PageLifetimes/test/normal.test.ts

@@ -2,10 +2,7 @@ import { Checking, type Test } from "hry-types";
 import { type DetailedType, RootComponent } from "../../../..";
 
 import type { Mock_User } from "../../Properties/test/normalRequired.test";
-type User = {
-  name: string;
-  age?: number;
-};
+
 /**
  * 组件时
  */
@@ -49,8 +46,8 @@ RootComponent()({
       void Checking<
         typeof props,
         {
-          union?: Mock_User;
-          optionalObject?: Mock_User | null;
+          union: Mock_User;
+          optionalObject: Mock_User | null;
           str: string;
           obj: object;
         },
@@ -72,28 +69,3 @@ RootComponent()({
     // ...
   },
 });
-// prop中必传对象没有null,但在实例中却需要有null
-RootComponent()({
-  isPage: true,
-  properties: {
-    optionalObj: {
-      type: Object,
-      value: {},
-    },
-    requiredObj: Object as DetailedType<User>,
-  },
-
-  pageLifetimes: {
-    onLoad(prop) {
-      void prop;
-      // 页面外部传值时没必要传null,组件时有需要的。
-      void Checking<typeof prop.requiredObj, User, true>;
-      // 虽然传值不应该是null,但由于实例建立时默认为null,所以实例类型加上null
-      void Checking<typeof this.data.requiredObj, User, true>;
-      // 页面传入的可选对象不需要null,有undefined
-      void Checking<typeof prop.optionalObj, object | undefined, true>;
-      // 实例中的可选对象不需要null,有默认值。
-      void Checking<typeof this.data.optionalObj, object, true>;
-    },
-  },
-});

package/src/api/{CustomComponent/CustomComputed/GetCustomComputedDoc.ts → SubComponent/SubComputed/GetSubComputedDoc.ts}

@@ -1,4 +1,4 @@
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
-export type GetCustomComputedDoc<TComputed extends Record<string, any>> = {
+export type GetSubComputedDoc<TComputed extends Record<string, any>> = {
   [k in keyof TComputed]: ReturnType<TComputed[k]>;
 };

package/src/api/SubComponent/SubComputed/SubComputedConstraint.ts

@@ -0,0 +1 @@
+export type SubComputedConstraint<obj extends object> = { [k in keyof obj]?: () => obj[k] };

package/src/api/{CustomComponent/CustomComputed/CustomComputedOption.ts → SubComponent/SubComputed/SubComputedOption.ts}

@@ -1,5 +1,5 @@
 import type { G } from "hry-types";
-export type CustomComputedOption<
+export type SubComputedOption<
   TComputed extends object,
   legal extends PropertyKey,
 > // Instance extends object,

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

@@ -1,12 +1,12 @@
 import type { ComponentDoc } from "../../../DefineComponent/returnType/ComponentDoc";
-import { CustomComponent } from "../..";
+import { SubComponent } from "../..";
 
 type OnlyCustomCompDoc = ComponentDoc<{
   events: { aaa_str: string };
 }>;
 
 // 1 CompDoc的properties为空时,写任何字段都报错
-CustomComponent<{}, OnlyCustomCompDoc>()({
+SubComponent<{}, OnlyCustomCompDoc>()({
   computed: {
     // @ts-expect-error ⚠️"重复或无效的字段"⚠️
     aaa_xxx() {
@@ -23,7 +23,7 @@ type OnlyPropsCompDoc = ComponentDoc<{
 }>;
 
 // 2 去除inhrit和data字段后无组件字段约束时,只可写内部字段
-CustomComponent<{}, OnlyPropsCompDoc>()({
+SubComponent<{}, OnlyPropsCompDoc>()({
   inherit: {
     aaa_str: "wxml",
   },
@@ -42,7 +42,7 @@ CustomComponent<{}, OnlyPropsCompDoc>()({
 });
 
 // 3 类型错误
-CustomComponent<{}, OnlyPropsCompDoc>()({
+SubComponent<{}, OnlyPropsCompDoc>()({
   inherit: {
     aaa_str: "wxml",
   },
@@ -54,7 +54,7 @@ CustomComponent<{}, OnlyPropsCompDoc>()({
   },
 });
 // 4 与data的内部字段重复
-CustomComponent<{}, OnlyPropsCompDoc>()({
+SubComponent<{}, OnlyPropsCompDoc>()({
   data: {
     _aaa_fff: 123,
   },
@@ -66,7 +66,7 @@ CustomComponent<{}, OnlyPropsCompDoc>()({
   },
 });
 // 5 与store的内部字段重复
-CustomComponent<{}, OnlyPropsCompDoc>()({
+SubComponent<{}, OnlyPropsCompDoc>()({
   store: {
     _aaa_ccc: () => 123,
   },
@@ -78,7 +78,7 @@ CustomComponent<{}, OnlyPropsCompDoc>()({
   },
 });
 // 6 与root字段重复
-CustomComponent<{ data: { _aaa_ccc: 123 } }, OnlyPropsCompDoc>()({
+SubComponent<{ data: { _aaa_ccc: 123 } }, OnlyPropsCompDoc>()({
   computed: {
     // @ts-expect-error 与store的内部字段重复
     _aaa_ccc(): number {

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