annil 1.15.1 → 1.17.0

package/CHANGELOG.md

@@ -4,6 +4,20 @@
 
 * 解决DetailedType不接收接口类型的错误 ([ae8acbf](https://github.com/missannil/annil/commit/ae8acbfc2e62f99db565c448ad9253aa549e78bb))
 
+## [1.17.0](https://github.com/missannil/annil/compare/v1.16.0...v1.17.0) (2026-06-30)
+
+
+### Features
+
+* 注入配置完善组件覆盖逻辑 ([17b75c4](https://github.com/missannil/annil/commit/17b75c445dc46c39cd30b56ffeece992f88aa722))
+
+## [1.16.0](https://github.com/missannil/annil/compare/v1.15.1...v1.16.0) (2026-06-18)
+
+
+### Features
+
+* 统一子组件API SubComponent ([646e1e7](https://github.com/missannil/annil/commit/646e1e72de41a22441cb38028fd3b719554b14fa))
+
 ## [1.15.1](https://github.com/missannil/annil/compare/v1.15.0...v1.15.1) (2026-06-16)
 
 

package/README.md

@@ -177,8 +177,6 @@ GH_TOKEN=xxxx npm run ship -- "feat: your message"
 
   [ChunkComponent](./docs/api/chunk-component.md)
 
-  [SubComponent(旧)](./docs/api/sub-component.md)
-
   [instanceConfig](./docs/api/instance-config.md)
 
 - **常用API**

package/dist/api/DefineComponent/SubComponents/SubComponentsOption.d.ts

@@ -1,4 +1,4 @@
-import type { CustomComponentDefinition } from "../../CustomComponent/returnType";
-export type SubComponentsOption<TCustomComponentReturnTypeList extends CustomComponentDefinition[]> = {
-    subComponents?: [...TCustomComponentReturnTypeList];
+import type { SubComponentDefinition } from "../../SubComponent/returnType";
+export type SubComponentsOption<TSubComponentReturnTypeList extends SubComponentDefinition[]> = {
+    subComponents?: [...TSubComponentReturnTypeList];
 };

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

@@ -1,19 +1,19 @@
 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 type { GenerateComponentDoc } from "./returnType/GenerateComponentDoc";
 import type { GeneratePageDoc } from "./returnType/GeneratePageDoc";
 import type { RootComponentOption } from "./RootComponent/RootComponentOption";
 import type { SubComponentsOption } from "./SubComponents/SubComponentsOption";
 export type Path = `/${string}`;
-type Options<TRootComponentDefinition extends RootComponentDefinition, TCustomComponentDefinitionList extends CustomComponentDefinition[], TName extends string, TPath extends Path> = NameOrPathOption<TName, TPath, NonNullable<TRootComponentDefinition["isPage"]>> & RootComponentOption<TRootComponentDefinition> & SubComponentsOption<TCustomComponentDefinitionList>;
-type Constructor = <TRootComponentDefinition extends RootComponentDefinition = {}, TCustomComponentDefinitionList extends CustomComponentDefinition[] = [], TName extends string = "", TPath extends Path = "/">(options: Options<TRootComponentDefinition, TCustomComponentDefinitionList, TName, TPath>) => IfExtends<"", TName, GeneratePageDoc<TRootComponentDefinition, TPath>, GenerateComponentDoc<TRootComponentDefinition, TName, TCustomComponentDefinitionList>>;
+type Options<TRootComponentDefinition extends RootComponentDefinition, TSubComponentDefinitionList extends SubComponentDefinition[], TName extends string, TPath extends Path> = NameOrPathOption<TName, TPath, NonNullable<TRootComponentDefinition["isPage"]>> & RootComponentOption<TRootComponentDefinition> & SubComponentsOption<TSubComponentDefinitionList>;
+type Constructor = <TRootComponentDefinition extends RootComponentDefinition = {}, TSubComponentDefinitionList extends SubComponentDefinition[] = [], TName extends string = "", TPath extends Path = "/">(options: Options<TRootComponentDefinition, TSubComponentDefinitionList, TName, TPath>) => IfExtends<"", TName, GeneratePageDoc<TRootComponentDefinition, TPath>, GenerateComponentDoc<TRootComponentDefinition, TName, TSubComponentDefinitionList>>;
 export type DefineComponentOptionRuntime = {
     name?: string;
     path?: string;
     rootComponent?: RootComponentDefinitionRuntime;
-    subComponents?: CustomComponentDefinitionRuntime[];
+    subComponents?: SubComponentDefinitionRuntime[];
 };
 export declare const DefineComponent: Constructor;
 export {};

package/dist/api/DefineComponent/normalizeOptions/__throttleDebounce__FieldCheck.d.ts

@@ -1,4 +1,3 @@
-import type { SlotComponentReturnType } from "../../ChunkComponent/SlotComponentReturnType";
-import type { CustomComponentDefinitionRuntime } from "../../CustomComponent/returnType";
 import type { RootComponentDefinitionRuntime } from "../../RootComponent/returnType";
-export declare function __throttleDebounce__FieldCheck(config: RootComponentDefinitionRuntime | CustomComponentDefinitionRuntime[] | SlotComponentReturnType[]): void;
+import type { SubComponentDefinitionRuntime } from "../../SubComponent/returnType";
+export declare function __throttleDebounce__FieldCheck(config: RootComponentDefinitionRuntime | SubComponentDefinitionRuntime[]): void;

package/dist/api/DefineComponent/normalizeOptions/__throttleDebounce__FieldCheck.js.map

@@ -1 +1 @@
-{"version":3,"file":"__throttleDebounce__FieldCheck.js","sourceRoot":"","sources":["../../../../src/api/DefineComponent/normalizeOptions/__throttleDebounce__FieldCheck.ts"],"names":[],"mappings":"AAIA,MAAM,UAAU,8BAA8B,CAC5C,MAAuG;IAEvG,IAAI,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC;QAC1B,KAAK,MAAM,YAAY,IAAI,MAAM,EAAE,CAAC;YAClC,8BAA8B,CAAC,YAAY,CAAC,CAAC;QAC/C,CAAC;IACH,CAAC;SAAM,CAAC;QACN,MAAM,QAAQ,GAAa,EAAE,CAAC;QAC9B,IAAI,MAAM,CAAC,IAAI,EAAE,CAAC;YAChB,QAAQ,CAAC,IAAI,CAAC,GAAG,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC;QAC7C,CAAC;QACD,IAAI,MAAM,CAAC,QAAQ,EAAE,CAAC;YACpB,QAAQ,CAAC,IAAI,CAAC,GAAG,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC;QACjD,CAAC;QACD,IAAI,MAAM,CAAC,UAAU,EAAE,CAAC;YACtB,QAAQ,CAAC,IAAI,CAAC,GAAG,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,CAAC;QACnD,CAAC;QACD,IAAI,MAAM,CAAC,KAAK,EAAE,CAAC;YACjB,QAAQ,CAAC,IAAI,CAAC,GAAG,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC;QAC9C,CAAC;QACD,IAAI,QAAQ,CAAC,QAAQ,CAAC,sBAAsB,CAAC,EAAE,CAAC;YAC9C,MAAM,KAAK,CAAC,gCAAgC,CAAC,CAAC;QAChD,CAAC;IACH,CAAC;AACH,CAAC"}
+{"version":3,"file":"__throttleDebounce__FieldCheck.js","sourceRoot":"","sources":["../../../../src/api/DefineComponent/normalizeOptions/__throttleDebounce__FieldCheck.ts"],"names":[],"mappings":"AAGA,MAAM,UAAU,8BAA8B,CAC5C,MAAwE;IAExE,IAAI,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC;QAC1B,KAAK,MAAM,YAAY,IAAI,MAAM,EAAE,CAAC;YAClC,8BAA8B,CAAC,YAAY,CAAC,CAAC;QAC/C,CAAC;IACH,CAAC;SAAM,CAAC;QACN,MAAM,QAAQ,GAAa,EAAE,CAAC;QAC9B,IAAI,MAAM,CAAC,IAAI,EAAE,CAAC;YAChB,QAAQ,CAAC,IAAI,CAAC,GAAG,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC;QAC7C,CAAC;QACD,IAAI,MAAM,CAAC,QAAQ,EAAE,CAAC;YACpB,QAAQ,CAAC,IAAI,CAAC,GAAG,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC;QACjD,CAAC;QACD,IAAI,MAAM,CAAC,UAAU,EAAE,CAAC;YACtB,QAAQ,CAAC,IAAI,CAAC,GAAG,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,CAAC;QACnD,CAAC;QACD,IAAI,MAAM,CAAC,KAAK,EAAE,CAAC;YACjB,QAAQ,CAAC,IAAI,CAAC,GAAG,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC;QAC9C,CAAC;QACD,IAAI,QAAQ,CAAC,QAAQ,CAAC,sBAAsB,CAAC,EAAE,CAAC;YAC9C,MAAM,KAAK,CAAC,gCAAgC,CAAC,CAAC;QAChD,CAAC;IACH,CAAC;AACH,CAAC"}

package/dist/api/DefineComponent/normalizeOptions/handleSubComponents.d.ts

@@ -1,3 +1,3 @@
-import type { CustomComponentDefinitionRuntime } from "../../CustomComponent/returnType";
+import type { SubComponentDefinitionRuntime } from "../../SubComponent/returnType";
 import type { FinalOptionsOfComponent, SameFuncOptions } from ".";
-export declare function handleSubComponents(componentOptions: FinalOptionsOfComponent, subComponents: CustomComponentDefinitionRuntime[] | undefined, funcOptions: SameFuncOptions): void;
+export declare function handleSubComponents(componentOptions: FinalOptionsOfComponent, subComponents: SubComponentDefinitionRuntime[] | undefined, funcOptions: SameFuncOptions): void;

package/dist/api/DefineComponent/normalizeOptions/handleSubComponents.js.map

@@ -1 +1 @@
-{"version":3,"file":"handleSubComponents.js","sourceRoot":"","sources":["../../../../src/api/DefineComponent/normalizeOptions/handleSubComponents.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,8BAA8B,EAAE,MAAM,kCAAkC,CAAC;AAClF,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AACxD,OAAO,EAAE,qBAAqB,EAAE,MAAM,yBAAyB,CAAC;AAEhE,MAAM,UAAU,mBAAmB,CACjC,gBAAyC,EACzC,aAA6D,EAC7D,WAA4B;IAE5B,IAAI,aAAa,IAAI,aAAa,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAEhD,8BAA8B,CAAC,aAAa,CAAC,CAAC;QAC9C,aAAa,CAAC,OAAO,CAAC,CAAC,SAAS,EAAE,EAAE;YAClC,IAAI,SAAS,CAAC,MAAM;gBAAE,MAAM,CAAC,MAAM,CAAC,gBAAgB,CAAC,OAAO,EAAE,SAAS,CAAC,MAAM,CAAC,CAAC;YAEhF,qBAAqB,CAAC,SAAS,EAAE,WAAW,CAAC,CAAC;YAE9C,iBAAiB,CAAC,gBAAgB,EAAE,SAAS,CAAC,CAAC;QACjD,CAAC,CAAC,CAAC;IACL,CAAC;AACH,CAAC"}
+{"version":3,"file":"handleSubComponents.js","sourceRoot":"","sources":["../../../../src/api/DefineComponent/normalizeOptions/handleSubComponents.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,8BAA8B,EAAE,MAAM,kCAAkC,CAAC;AAClF,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AACxD,OAAO,EAAE,qBAAqB,EAAE,MAAM,yBAAyB,CAAC;AAEhE,MAAM,UAAU,mBAAmB,CACjC,gBAAyC,EACzC,aAA0D,EAC1D,WAA4B;IAE5B,IAAI,aAAa,IAAI,aAAa,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAEhD,8BAA8B,CAAC,aAAa,CAAC,CAAC;QAC9C,aAAa,CAAC,OAAO,CAAC,CAAC,SAAS,EAAE,EAAE;YAClC,IAAI,SAAS,CAAC,MAAM;gBAAE,MAAM,CAAC,MAAM,CAAC,gBAAgB,CAAC,OAAO,EAAE,SAAS,CAAC,MAAM,CAAC,CAAC;YAEhF,qBAAqB,CAAC,SAAS,EAAE,WAAW,CAAC,CAAC;YAE9C,iBAAiB,CAAC,gBAAgB,EAAE,SAAS,CAAC,CAAC;QACjD,CAAC,CAAC,CAAC;IACL,CAAC;AACH,CAAC"}

package/dist/api/DefineComponent/normalizeOptions/initComputed/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/api/DefineComponent/normalizeOptions/initComputed/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAE,MAAM,6BAA6B,CAAC;AACxD,OAAO,EAAE,aAAa,EAAE,MAAM,iCAAiC,CAAC;AAChE,OAAO,EAAE,WAAW,EAAE,MAAM,+BAA+B,CAAC;AAG5D,OAAO,EAAE,aAAa,EAAE,MAAM,+BAA+B,CAAC;AAC9D,OAAO,EAAE,eAAe,EAAE,MAAM,iCAAiC,CAAC;AAClE,OAAO,EAAE,uBAAuB,EAAE,MAAM,2BAA2B,CAAC;AAiBpE,MAAM,UAAU,YAAY,CAC1B,cAAkC,EAClC,WAAiC;IAGjC,OAAO;QAGL,MAAM,qBAAqB,GAAG,uBAAuB,CAAC,IAAI,CAAC,IAAI,EAAE,cAAc,CAAC,CAAC;QAEjF,IAAI,CAAC,IAAI,CAAC,iBAAiB,GAAG,qBAAqB,CAAC;QAEpD,IAAI,CAAC,aAAa,CAAC,WAAW,CAAC,EAAE,CAAC;YAEhC,MAAM,aAAa,GAA8B,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC;YAC1F,KAAK,MAAM,IAAI,IAAI,WAAW,EAAE,CAAC;gBAE/B,IAAI,eAAe,CAAC,IAAI,EAAE,MAAM,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC,EAAE,CAAC;oBACvD,aAAa,CAAC,IAAI,CAAC,GAAG,SAAS,CAAC,aAAa,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC;gBAClE,CAAC;YACH,CAAC;QACH,CAAC;QAED,IAAI,CAAC,IAAI,CAAC,kBAAkB,GAAG,IAAI,CAAC;IACtC,CAAC,CAAC;AACJ,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/api/DefineComponent/normalizeOptions/initComputed/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAE,MAAM,6BAA6B,CAAC;AACxD,OAAO,EAAE,aAAa,EAAE,MAAM,iCAAiC,CAAC;AAChE,OAAO,EAAE,WAAW,EAAE,MAAM,+BAA+B,CAAC;AAG5D,OAAO,EAAE,aAAa,EAAE,MAAM,+BAA+B,CAAC;AAC9D,OAAO,EAAE,eAAe,EAAE,MAAM,iCAAiC,CAAC;AAClE,OAAO,EAAE,uBAAuB,EAAE,MAAM,2BAA2B,CAAC;AAQpE,MAAM,UAAU,YAAY,CAC1B,cAAkC,EAClC,WAAiC;IAGjC,OAAO;QAGL,MAAM,qBAAqB,GAAG,uBAAuB,CAAC,IAAI,CAAC,IAAI,EAAE,cAAc,CAAC,CAAC;QAEjF,IAAI,CAAC,IAAI,CAAC,iBAAiB,GAAG,qBAAqB,CAAC;QAEpD,IAAI,CAAC,aAAa,CAAC,WAAW,CAAC,EAAE,CAAC;YAEhC,MAAM,aAAa,GAA8B,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC;YAC1F,KAAK,MAAM,IAAI,IAAI,WAAW,EAAE,CAAC;gBAE/B,IAAI,eAAe,CAAC,IAAI,EAAE,MAAM,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC,EAAE,CAAC;oBACvD,aAAa,CAAC,IAAI,CAAC,GAAG,SAAS,CAAC,aAAa,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC;gBAClE,CAAC;YACH,CAAC;QACH,CAAC;QAED,IAAI,CAAC,IAAI,CAAC,kBAAkB,GAAG,IAAI,CAAC;IACtC,CAAC,CAAC;AACJ,CAAC"}

package/dist/api/DefineComponent/normalizeOptions/injectInfoHandler.js

@@ -10,7 +10,7 @@ function mergeOptions(finalOptionsForComponent, injectInfo) {
                     finalOptionsForComponent["behaviors"].push(...injectVal);
                     break;
                 default:
-                    finalOptionsForComponent[renamedKey] = Object.assign(originalVal, injectVal);
+                    finalOptionsForComponent[renamedKey] = Object.assign(injectVal, originalVal);
                     break;
             }
         }

package/dist/api/DefineComponent/normalizeOptions/injectInfoHandler.js.map

@@ -1 +1 @@
-{"version":3,"file":"injectInfoHandler.js","sourceRoot":"","sources":["../../../../src/api/DefineComponent/normalizeOptions/injectInfoHandler.ts"],"names":[],"mappings":"AAYA,SAAS,YAAY,CACnB,wBAAiD,EACjD,UAAuB;IAEvB,KAAK,MAAM,GAAG,IAAI,UAAU,EAAE,CAAC;QAC7B,MAAM,WAAW,GAAG,GAAgB,CAAC;QACrC,MAAM,SAAS,GAAG,UAAU,CAAC,WAAW,CAAC,CAAC;QAE1C,IAAI,GAAG,IAAI,wBAAwB,EAAE,CAAC;YACpC,MAAM,UAAU,GAAG,GAAoC,CAAC;YACxD,MAAM,WAAW,GAAG,wBAAwB,CAAC,UAAU,CAAC,CAAC;YACzD,QAAQ,WAAW,EAAE,CAAC;gBACpB,KAAK,WAAW;oBACd,wBAAwB,CAAC,WAAW,CAAC,CAAC,IAAI,CAAC,GAAG,SAAqB,CAAC,CAAC;oBAErE,MAAM;gBAER;oBAEE,wBAAwB,CAAC,UAAU,CAAC,GAAG,MAAM,CAAC,MAAM,CAAC,WAAW,EAAE,SAAS,CAAC,CAAC;oBAE7E,MAAM;YACV,CAAC;QACH,CAAC;aAAM,CAAC;YAEN,wBAAwB,CAAC,GAAG,CAAC,GAAG,SAAS,CAAC;QAC5C,CAAC;IACH,CAAC;IAED,OAAO,wBAAwB,CAAC;AAClC,CAAC;AACD,MAAM,UAAU,iBAAiB,CAC/B,wBAAiD,EACjD,UAAmC;IAEnC,IAAI,CAAC,UAAU;QAAE,OAAO,wBAAwB,CAAC;IAEjD,OAAO,YAAY,CAAC,wBAAwB,EAAE,UAAU,CAAC,CAAC;AAC5D,CAAC"}
+{"version":3,"file":"injectInfoHandler.js","sourceRoot":"","sources":["../../../../src/api/DefineComponent/normalizeOptions/injectInfoHandler.ts"],"names":[],"mappings":"AAYA,SAAS,YAAY,CACnB,wBAAiD,EACjD,UAAuB;IAEvB,KAAK,MAAM,GAAG,IAAI,UAAU,EAAE,CAAC;QAC7B,MAAM,WAAW,GAAG,GAAgB,CAAC;QACrC,MAAM,SAAS,GAAG,UAAU,CAAC,WAAW,CAAC,CAAC;QAE1C,IAAI,GAAG,IAAI,wBAAwB,EAAE,CAAC;YACpC,MAAM,UAAU,GAAG,GAAoC,CAAC;YACxD,MAAM,WAAW,GAAG,wBAAwB,CAAC,UAAU,CAAC,CAAC;YACzD,QAAQ,WAAW,EAAE,CAAC;gBACpB,KAAK,WAAW;oBACd,wBAAwB,CAAC,WAAW,CAAC,CAAC,IAAI,CAAC,GAAG,SAAqB,CAAC,CAAC;oBAErE,MAAM;gBAER;oBAEE,wBAAwB,CAAC,UAAU,CAAC,GAAG,MAAM,CAAC,MAAM,CAAC,SAAS,EAAE,WAAW,CAAC,CAAC;oBAE7E,MAAM;YACV,CAAC;QACH,CAAC;aAAM,CAAC;YAEN,wBAAwB,CAAC,GAAG,CAAC,GAAG,SAAS,CAAC;QAC5C,CAAC;IACH,CAAC;IAED,OAAO,wBAAwB,CAAC;AAClC,CAAC;AACD,MAAM,UAAU,iBAAiB,CAC/B,wBAAiD,EACjD,UAAmC;IAEnC,IAAI,CAAC,UAAU;QAAE,OAAO,wBAAwB,CAAC;IAEjD,OAAO,YAAY,CAAC,wBAAwB,EAAE,UAAU,CAAC,CAAC;AAC5D,CAAC"}

package/dist/api/DefineComponent/normalizeOptions/sameFuncFieldsCollect.d.ts

@@ -1,4 +1,4 @@
-import type { CustomComponentDefinitionRuntime } from "../../CustomComponent/returnType";
 import type { RootComponentDefinitionRuntime } from "../../RootComponent/returnType";
+import type { SubComponentDefinitionRuntime } from "../../SubComponent/returnType";
 import type { SameFuncOptions } from ".";
-export declare function sameFuncFieldsCollect(options: CustomComponentDefinitionRuntime | RootComponentDefinitionRuntime, funcOptions: SameFuncOptions): void;
+export declare function sameFuncFieldsCollect(options: SubComponentDefinitionRuntime | RootComponentDefinitionRuntime, funcOptions: SameFuncOptions): void;

package/dist/api/DefineComponent/normalizeOptions/sameFuncFieldsCollect.js.map

@@ -1 +1 @@
-{"version":3,"file":"sameFuncFieldsCollect.js","sourceRoot":"","sources":["../../../../src/api/DefineComponent/normalizeOptions/sameFuncFieldsCollect.ts"],"names":[],"mappings":"AASA,MAAM,UAAU,qBAAqB,CACnC,OAA0E,EAC1E,WAA4B;;IAE5B,IAAI,GAA0B,CAAC;IAC/B,KAAK,GAAG,IAAI,WAAW,EAAE,CAAC;QACxB,MAAM,gBAAgB,GAAqC,OAAO,CAAC,GAAG,CAAC,CAAC;QACxE,IAAI,gBAAgB,EAAE,CAAC;YACrB,KAAK,MAAM,IAAI,IAAI,gBAAgB,EAAE,CAAC;gBACpC,OAAC,WAAW,CAAC,GAAG,CAAC,EAAC,IAAI,SAAJ,IAAI,IAAM,EAAE,EAAC,CAAC,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,CAAC,CAAC;YAC/D,CAAC;QACH,CAAC;IACH,CAAC;AACH,CAAC"}
+{"version":3,"file":"sameFuncFieldsCollect.js","sourceRoot":"","sources":["../../../../src/api/DefineComponent/normalizeOptions/sameFuncFieldsCollect.ts"],"names":[],"mappings":"AASA,MAAM,UAAU,qBAAqB,CACnC,OAAuE,EACvE,WAA4B;;IAE5B,IAAI,GAA0B,CAAC;IAC/B,KAAK,GAAG,IAAI,WAAW,EAAE,CAAC;QACxB,MAAM,gBAAgB,GAAqC,OAAO,CAAC,GAAG,CAAC,CAAC;QACxE,IAAI,gBAAgB,EAAE,CAAC;YACrB,KAAK,MAAM,IAAI,IAAI,gBAAgB,EAAE,CAAC;gBACpC,OAAC,WAAW,CAAC,GAAG,CAAC,EAAC,IAAI,SAAJ,IAAI,IAAM,EAAE,EAAC,CAAC,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,CAAC,CAAC;YAC/D,CAAC;QACH,CAAC;IACH,CAAC;AACH,CAAC"}

package/dist/api/DefineComponent/normalizeOptions/watchHandler/index.js

@@ -29,13 +29,13 @@ export function handleWatchConfig(finalOptionsForComponent) {
         for (const key in watchConfig) {
             const watchHadle = watchConfig[key];
             const originObserversHandle = observersConfig[key];
-            observersConfig[key] = function (...newValue) {
+            observersConfig[key] = function (...values) {
                 var _a;
                 if (this.data.__computedInited__) {
-                    observerHandler.call(this, key, originObserversHandle, watchHadle, ...newValue);
+                    observerHandler.call(this, key, originObserversHandle, watchHadle, ...values);
                 }
                 else {
-                    ((_a = this.data).__oberverHandler__ || (_a.__oberverHandler__ = [])).push(observerHandler.bind(this, key, originObserversHandle, watchHadle, ...newValue));
+                    ((_a = this.data).__oberverHandler__ || (_a.__oberverHandler__ = [])).push(observerHandler.bind(this, key, originObserversHandle, watchHadle, ...values));
                 }
             };
         }

package/dist/api/DefineComponent/normalizeOptions/watchHandler/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/api/DefineComponent/normalizeOptions/watchHandler/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAE,SAAS,EAAE,aAAa,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AAG5F,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAChD,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAC1D,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AAGpD,SAAS,iCAAiC,CACxC,IAAqC,EACrC,WAAmB,EACnB,YAAsB;IAEtB,MAAM,aAAa,GAAkB,EAAE,CAAC;IACxC,KAAK,MAAM,IAAI,IAAI,WAAW,EAAE,CAAC;QAE/B,IAAI,eAAe,CAAC,IAAI,EAAE,YAAY,CAAC;YAAE,SAAS;QAClD,aAAa,CAAC,IAAI,CAAC,GAAG,SAAS,CAAC,aAAa,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC;IAC7D,CAAC;IAED,OAAO,aAAa,CAAC;AACvB,CAAC;AACD,SAAS,eAAe,CAEtB,GAAW,EACX,qBAAuC,EACvC,UAAgB,EAChB,GAAG,QAAmB;IAGtB,qBAAqB,aAArB,qBAAqB,uBAArB,qBAAqB,CAAE,IAAI,CAAC,IAAI,EAAE,GAAG,QAAQ,CAAC,CAAC;IAC/C,MAAM,aAAa,GAAG,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC;IAC/D,MAAM,QAAQ,GAAG,aAAa,CAAC,GAAG,CAAC,CAAC;IACpC,IAAI,SAAS,CAAC,QAAQ,EAAE,QAAQ,CAAC;QAAE,OAAO;IAC1C,aAAa,CAAC,GAAG,CAAC,GAAG,SAAS,CAAC,QAAQ,CAAC,CAAC;IACzC,UAAU,CAAC,IAAI,CAAC,IAAI,EAAE,GAAG,QAAQ,EAAE,GAAG,QAAQ,CAAC,CAAC;AAClD,CAAC;AASD,MAAM,UAAU,iBAAiB,CAC/B,wBAAiD;IAEjD,MAAM,EAAE,SAAS,EAAE,eAAe,EAAE,KAAK,EAAE,WAAW,EAAE,IAAI,EAAE,UAAU,EAAE,QAAQ,EAAE,cAAc,EAAE,GAClG,wBAAwB,CAAC;IAC3B,IAAI,CAAC,aAAa,CAAC,WAAW,CAAC,EAAE,CAAC;QAChC,MAAM,kBAAkB,GAAG,kBAAkB,CAAC,UAAU,CAAC,CAAC;QAC1D,MAAM,YAAY,GAAG,MAAM,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;QACjD,IAAI,CAAC,iBAAiB,GAAG,iCAAiC,iCACnD,IAAI,GAAK,kBAAkB,GAChC,WAAW,EACX,YAAY,CACb,CAAC;QACF,KAAK,MAAM,GAAG,IAAI,WAAW,EAAE,CAAC;YAC9B,MAAM,UAAU,GAAG,WAAW,CAAC,GAAG,CAAC,CAAC;YACpC,MAAM,qBAAqB,GAAG,eAAe,CAAC,GAAG,CAAqB,CAAC;YAEvE,eAAe,CAAC,GAAG,CAAC,GAAG,UAAyB,GAAG,QAAmB;;gBACpE,IAAI,IAAI,CAAC,IAAI,CAAC,kBAAkB,EAAE,CAAC;oBACjC,eAAe,CAAC,IAAI,CAAC,IAAI,EAAE,GAAG,EAAE,qBAAqB,EAAE,UAAU,EAAE,GAAG,QAAQ,CAAC,CAAC;gBAClF,CAAC;qBAAM,CAAC;oBACN,OAAC,IAAI,CAAC,IAAI,EAAC,kBAAkB,QAAlB,kBAAkB,GAAK,EAAE,EAAC,CAAC,IAAI,CACxC,eAAe,CAAC,IAAI,CAAC,IAAI,EAAE,GAAG,EAAE,qBAAqB,EAAE,UAAU,EAAE,GAAG,QAAQ,CAAC,CAChF,CAAC;gBACJ,CAAC;YACH,CAAC,CAAC;QACJ,CAAC;IACH,CAAC;AACH,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/api/DefineComponent/normalizeOptions/watchHandler/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAE,SAAS,EAAE,aAAa,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AAG5F,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAChD,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAC1D,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AAGpD,SAAS,iCAAiC,CACxC,IAAqC,EACrC,WAAmB,EACnB,YAAsB;IAEtB,MAAM,aAAa,GAAkB,EAAE,CAAC;IACxC,KAAK,MAAM,IAAI,IAAI,WAAW,EAAE,CAAC;QAE/B,IAAI,eAAe,CAAC,IAAI,EAAE,YAAY,CAAC;YAAE,SAAS;QAClD,aAAa,CAAC,IAAI,CAAC,GAAG,SAAS,CAAC,aAAa,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC;IAC7D,CAAC;IAED,OAAO,aAAa,CAAC;AACvB,CAAC;AACD,SAAS,eAAe,CAEtB,GAAW,EACX,qBAAuC,EACvC,UAAgB,EAChB,GAAG,QAAmB;IAGtB,qBAAqB,aAArB,qBAAqB,uBAArB,qBAAqB,CAAE,IAAI,CAAC,IAAI,EAAE,GAAG,QAAQ,CAAC,CAAC;IAC/C,MAAM,aAAa,GAAG,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC;IAC/D,MAAM,QAAQ,GAAG,aAAa,CAAC,GAAG,CAAC,CAAC;IACpC,IAAI,SAAS,CAAC,QAAQ,EAAE,QAAQ,CAAC;QAAE,OAAO;IAC1C,aAAa,CAAC,GAAG,CAAC,GAAG,SAAS,CAAC,QAAQ,CAAC,CAAC;IACzC,UAAU,CAAC,IAAI,CAAC,IAAI,EAAE,GAAG,QAAQ,EAAE,GAAG,QAAQ,CAAC,CAAC;AAClD,CAAC;AASD,MAAM,UAAU,iBAAiB,CAC/B,wBAAiD;IAEjD,MAAM,EAAE,SAAS,EAAE,eAAe,EAAE,KAAK,EAAE,WAAW,EAAE,IAAI,EAAE,UAAU,EAAE,QAAQ,EAAE,cAAc,EAAE,GAClG,wBAAwB,CAAC;IAC3B,IAAI,CAAC,aAAa,CAAC,WAAW,CAAC,EAAE,CAAC;QAChC,MAAM,kBAAkB,GAAG,kBAAkB,CAAC,UAAU,CAAC,CAAC;QAC1D,MAAM,YAAY,GAAG,MAAM,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;QAEjD,IAAI,CAAC,iBAAiB,GAAG,iCAAiC,iCACnD,IAAI,GAAK,kBAAkB,GAChC,WAAW,EACX,YAAY,CACb,CAAC;QACF,KAAK,MAAM,GAAG,IAAI,WAAW,EAAE,CAAC;YAC9B,MAAM,UAAU,GAAG,WAAW,CAAC,GAAG,CAAC,CAAC;YACpC,MAAM,qBAAqB,GAAG,eAAe,CAAC,GAAG,CAAqB,CAAC;YAEvE,eAAe,CAAC,GAAG,CAAC,GAAG,UAAyB,GAAG,MAAiB;;gBAElE,IAAI,IAAI,CAAC,IAAI,CAAC,kBAAkB,EAAE,CAAC;oBACjC,eAAe,CAAC,IAAI,CAAC,IAAI,EAAE,GAAG,EAAE,qBAAqB,EAAE,UAAU,EAAE,GAAG,MAAM,CAAC,CAAC;gBAChF,CAAC;qBAAM,CAAC;oBAEN,OAAC,IAAI,CAAC,IAAI,EAAC,kBAAkB,QAAlB,kBAAkB,GAAK,EAAE,EAAC,CAAC,IAAI,CACxC,eAAe,CAAC,IAAI,CAAC,IAAI,EAAE,GAAG,EAAE,qBAAqB,EAAE,UAAU,EAAE,GAAG,MAAM,CAAC,CAC9E,CAAC;gBACJ,CAAC;YACH,CAAC,CAAC;QACJ,CAAC;IACH,CAAC;AACH,CAAC"}

package/dist/api/DefineComponent/returnType/GenerateComponentDoc.d.ts

@@ -1,12 +1,12 @@
 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";
 type GetStopKeys<O> = {
     [k in keyof O]: k extends `${string}_${infer Key}_${string}_catch` ? Key : never;
 }[keyof O];
-export type GenerateComponentDoc<TRootDoc extends RootComponentDefinition, TName extends string, TSubComponentTuple extends CustomComponentDefinition[], AllPropertiesDoc extends unknown | object = TRootDoc["properties"], AllEventsDoc extends unknown | object = TRootDoc["customEvents"] & GetCustomEventDocOfSubDoc<TSubComponentTuple[number]>, StopKeys extends string = GetStopKeys<TRootDoc["events"]>, FinalEventsDoc extends object = Omit<AllEventsDoc, StopKeys>> = ComputeIntersection<IfExtends<unknown, AllPropertiesDoc, {}, {
+export type GenerateComponentDoc<TRootDoc extends RootComponentDefinition, TName extends string, TSubComponentTuple extends SubComponentDefinition[], AllPropertiesDoc extends unknown | object = TRootDoc["properties"], AllEventsDoc extends unknown | object = TRootDoc["customEvents"] & GetCustomEventDocOfSubDoc<TSubComponentTuple[number]>, StopKeys extends string = GetStopKeys<TRootDoc["events"]>, FinalEventsDoc extends object = Omit<AllEventsDoc, StopKeys>> = ComputeIntersection<IfExtends<unknown, AllPropertiesDoc, {}, {
     properties: {
         [k in keyof AllPropertiesDoc as `${TName}_${k & string}`]: AllPropertiesDoc[k];
     };

package/dist/api/DefineComponent/returnType/GetCustomEventDocOfSubDoc.d.ts

@@ -2,7 +2,7 @@ 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";
-type _GetCustomEventDocOfSubDoc<U extends CustomComponentDefinition, Result = {}, TLast extends CustomComponentDefinition = Assert<Last<U>, CustomComponentDefinition>> = IsNever<U> extends true ? Result : _GetCustomEventDocOfSubDoc<Exclude<U, TLast>, UnionTwoObject<Result, TLast["composedEvents"]>>;
-export type GetCustomEventDocOfSubDoc<UnionSubDoc extends CustomComponentDefinition> = IsUnion<UnionSubDoc> extends true ? _GetCustomEventDocOfSubDoc<UnionSubDoc> : UnionSubDoc["composedEvents"];
+import type { SubComponentDefinition } from "../../SubComponent/returnType";
+type _GetCustomEventDocOfSubDoc<U extends SubComponentDefinition, Result = {}, TLast extends SubComponentDefinition = Assert<Last<U>, SubComponentDefinition>> = IsNever<U> extends true ? Result : _GetCustomEventDocOfSubDoc<Exclude<U, TLast>, UnionTwoObject<Result, TLast["composedEvents"]>>;
+export type GetCustomEventDocOfSubDoc<UnionSubDoc extends SubComponentDefinition> = IsUnion<UnionSubDoc> extends true ? _GetCustomEventDocOfSubDoc<UnionSubDoc> : UnionSubDoc["composedEvents"];
 export {};

package/dist/api/InstanceInject/instanceConfig.d.ts

@@ -16,8 +16,8 @@ interface BaseInjectInfo {
 }
 export interface IInjectInfo extends BaseInjectInfo {
 }
-export type IInjectAllData = IfEquals<{}, injectData & IInjectStore, {}, ComputeIntersection<injectData & IInjectStore>>;
-type injectData = DataConstraint extends IInjectInfo["data"] ? {} : IInjectInfo["data"];
+export type InjectData = DataConstraint extends IInjectInfo["data"] ? {} : IInjectInfo["data"];
+export type IInjectAllData = IfEquals<{}, InjectData & IInjectStore, {}, ComputeIntersection<InjectData & IInjectStore>>;
 export type IInjectStore = StoreConstraint extends IInjectInfo["store"] ? {} : ReturnTypeInObject<IInjectInfo["store"]>;
 export type IInjectMethods = MethodsConstraint extends IInjectInfo["methods"] ? {} : IInjectInfo["methods"];
 declare class InstanceConfig {

package/dist/api/InstanceInject/instanceConfig.js.map

@@ -1 +1 @@
-{"version":3,"file":"instanceConfig.js","sourceRoot":"","sources":["../../../src/api/InstanceInject/instanceConfig.ts"],"names":[],"mappings":"AAuCA,MAAM,cAAc;IAApB;QACU,SAAI,GAAiC,EAAE,CAAC;IAOlD,CAAC;IANC,IAAW,UAAU;QACnB,OAAO,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC;IAC9B,CAAC;IACM,aAAa,CAAC,IAA6B;QAChD,IAAI,IAAI;YAAE,IAAI,CAAC,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC;IACxC,CAAC;CACF;AAED,MAAM,CAAC,MAAM,cAAc,GAAG,IAAI,cAAc,EAAE,CAAC"}
+{"version":3,"file":"instanceConfig.js","sourceRoot":"","sources":["../../../src/api/InstanceInject/instanceConfig.ts"],"names":[],"mappings":"AAsCA,MAAM,cAAc;IAApB;QACU,SAAI,GAAiC,EAAE,CAAC;IAOlD,CAAC;IANC,IAAW,UAAU;QACnB,OAAO,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC;IAC9B,CAAC;IACM,aAAa,CAAC,IAA6B;QAChD,IAAI,IAAI;YAAE,IAAI,CAAC,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC;IACxC,CAAC;CACF;AAED,MAAM,CAAC,MAAM,cAAc,GAAG,IAAI,cAAc,EAAE,CAAC"}

package/dist/api/RootComponent/PageLifetimes/PageLifetimesOption.d.ts

@@ -1,12 +1,10 @@
 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, false, {
     pageLifetimes?: Partial<WMCompPageLifetimes>;
 }, {
     pageLifetimes?: ComputeIntersection<Partial<Omit<WMPageLifetimes, "onLoad">> & {
-        onLoad?: (props: ComputeObject<RemoveNullOfRequired<PropertiesDoc>>) => void | Promise<void>;
+        onLoad?: (props: Required<PropertiesDoc>) => void | Promise<void>;
     }>;
 }>;

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

@@ -6,7 +6,7 @@ import type { ComputeObject } from "../../types/ComputeObject";
 import type { WMCompOtherOption } from "../../types/OfficialTypeAlias";
 import type { RemoveNullOfRequired } from "../../types/RemoveNullOfRequired";
 import type { ComponentDoc } from "../DefineComponent/returnType/ComponentDoc";
-import type { IInjectStore } from "../InstanceInject/instanceConfig";
+import type { IInjectAllData, IInjectMethods, IInjectStore, InjectData } from "../InstanceInject/instanceConfig";
 import type { ComputedConstraint } from "./Computed/ComputedConstraint";
 import type { ComputedOption } from "./Computed/ComputedOption";
 import type { GetComputedDef } from "./Computed/GetComputedDef";
@@ -30,8 +30,8 @@ import type { GetStoreDef } from "./Store/GetStoreDef";
 import type { StoreConstraint } from "./Store/StoreConstraint";
 import type { StoreOption } from "./Store/StoreOption";
 import type { WatchOption } from "./Watch/WatchOption";
-type RootComponentOptions<TEvents extends object, TIsPage extends boolean, TCustomEvents extends CustomEventConstraint, TMethods extends MethodsConstraint, TProperties extends PropertiesConstraint, TData extends object, TStore extends StoreConstraint, TComputed extends Record<string, Func>, EventsDef extends object, CustomEventsDef extends object, PropertiesDef extends object, DataDef extends object, StoreDef extends object, ComputedDef extends object> = MethodsOption<TMethods, keyof (EventsDef & CustomEventsDef)> & PropertiesOption<TProperties> & IsPageOption<TIsPage> & EventsOption<TEvents> & IfExtends<TIsPage, false, CustomEventsOption<TCustomEvents, keyof EventsDef>, {}> & DataOption<TData, keyof PropertiesDef> & StoreOption<TStore, keyof (PropertiesDef & DataDef)> & ComputedOption<TComputed, keyof (PropertiesDef & DataDef & StoreDef)> & PageLifetimesOption<TIsPage, PropertiesDef> & LifetimesOption & WatchOption<ComputedDef & Required<PropertiesDef> & DataDef & StoreDef & IInjectStore> & Partial<Omit<WMCompOtherOption, "pageLifetimes" | "definitionFilter" | "observers">> & ObserversOption<ComputedDef & Required<PropertiesDef> & DataDef & StoreDef & IInjectStore> & ThisType<RootComponentInstance<TIsPage, TMethods, DataDef, DataDef & Required<PropertiesDef> & StoreDef & ComputedDef, CustomEventsDef, StoreDef>>;
-type RootComponentConstructor<TComponentDocList extends ComponentDoc[]> = <TEvents extends EventsConstraint<TComponentDocList>, TStore extends StoreConstraint<PropertiesDef>, TIsPage extends boolean = false, const TProperties extends PropertiesConstraint = {}, TData extends object = {}, TComputed extends ComputedConstraint = {}, TCustomEvents extends IfExtends<TIsPage, false, CustomEventConstraint, EmptyObject> = {}, TMethods extends MethodsConstraint = {}, EventsDef extends object = IfExtends<EventsConstraint<TComponentDocList>, TEvents, {}, TEvents>, CustomEventsDef extends object = GetCustomEventsDef<TCustomEvents>, PropertiesDef extends object = GetPropertiesDef<TProperties>, DataDef extends object = TData, StoreDef extends object = StoreConstraint<PropertiesDef> extends TStore ? {} : GetStoreDef<TStore>, ComputedDef extends object = GetComputedDef<TComputed>>(options: RootComponentOptions<TEvents, TIsPage, TCustomEvents, TMethods, TProperties, TData, TStore, TComputed, EventsDef, CustomEventsDef, PropertiesDef, DataDef, StoreDef, ComputedDef>) => ComputeIntersection<IfExtends<TIsPage, false, {}, {
+type RootComponentOptions<TEvents extends object, TIsPage extends boolean, TCustomEvents extends CustomEventConstraint, TMethods extends MethodsConstraint, TProperties extends PropertiesConstraint, TData extends object, TStore extends StoreConstraint, TComputed extends Record<string, Func>, EventsDef extends object, CustomEventsDef extends object, PropertiesDef extends object, DataDef extends object, StoreDef extends object, ComputedDef extends object, SelfAllDatas extends object, ValidInjectDatas extends object> = MethodsOption<TMethods, keyof (EventsDef & CustomEventsDef)> & PropertiesOption<TProperties> & IsPageOption<TIsPage> & EventsOption<TEvents> & IfExtends<TIsPage, false, CustomEventsOption<TCustomEvents, keyof EventsDef>, {}> & DataOption<TData, keyof PropertiesDef> & StoreOption<TStore, keyof (PropertiesDef & DataDef)> & ComputedOption<TComputed, keyof (PropertiesDef & DataDef & StoreDef)> & PageLifetimesOption<TIsPage, PropertiesDef> & LifetimesOption & WatchOption<ComputedDef & Required<PropertiesDef> & DataDef & StoreDef & IInjectStore> & Partial<Omit<WMCompOtherOption, "pageLifetimes" | "definitionFilter" | "observers">> & ObserversOption<ComputedDef & Required<PropertiesDef> & DataDef & StoreDef & IInjectStore> & ThisType<RootComponentInstance<TIsPage, TMethods & Omit<IInjectMethods, keyof TMethods>, DataDef, SelfAllDatas & ValidInjectDatas, CustomEventsDef, StoreDef>>;
+type RootComponentConstructor<TComponentDocList extends ComponentDoc[]> = <TEvents extends EventsConstraint<TComponentDocList>, TStore extends StoreConstraint<ComputeIntersection<Required<PropertiesDef> & DataDef & Omit<InjectData, keyof (PropertiesDef & DataDef)>>>, TIsPage extends boolean = false, const TProperties extends PropertiesConstraint = {}, TData extends object = {}, TComputed extends ComputedConstraint = {}, TCustomEvents extends IfExtends<TIsPage, false, CustomEventConstraint, EmptyObject> = {}, TMethods extends MethodsConstraint = {}, EventsDef extends object = IfExtends<EventsConstraint<TComponentDocList>, TEvents, {}, TEvents>, CustomEventsDef extends object = GetCustomEventsDef<TCustomEvents>, PropertiesDef extends object = GetPropertiesDef<TProperties>, DataDef extends object = TData, StoreDef extends object = StoreConstraint<ComputeIntersection<Required<PropertiesDef> & DataDef & Omit<InjectData, keyof (PropertiesDef & DataDef)>>> extends TStore ? {} : GetStoreDef<TStore>, ComputedDef extends object = GetComputedDef<TComputed>, SelfAllDatas extends object = Required<PropertiesDef> & DataDef & StoreDef & ComputedDef, ValidInjectDatas extends object = Omit<IInjectAllData, keyof SelfAllDatas>>(options: RootComponentOptions<TEvents, TIsPage, TCustomEvents, TMethods, TProperties, TData, TStore, TComputed, EventsDef, CustomEventsDef, PropertiesDef, DataDef, StoreDef, ComputedDef, SelfAllDatas, ValidInjectDatas>) => ComputeIntersection<IfExtends<TIsPage, false, {}, {
     isPage: true;
 }> & IfExtends<EmptyObject, PropertiesDef, {}, {
     properties: IfExtends<false, TIsPage, PropertiesDef, RemoveNullOfRequired<PropertiesDef>>;

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

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/api/RootComponent/index.ts"],"names":[],"mappings":"AA8IA,MAAM,UAAU,aAAa;IAO3B,OAAO,CAAC,OAAY,EAAE,EAAE,CAAC,OAAO,CAAC;AACnC,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/api/RootComponent/index.ts"],"names":[],"mappings":"AAyJA,MAAM,UAAU,aAAa;IAO3B,OAAO,CAAC,OAAY,EAAE,EAAE,CAAC,OAAO,CAAC;AACnC,CAAC"}

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

@@ -0,0 +1,3 @@
+export type GetSubComputedDoc<TComputed extends Record<string, any>> = {
+    [k in keyof TComputed]: ReturnType<TComputed[k]>;
+};

package/dist/api/SubComponent/SubComputed/GetSubComputedDoc.js

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

package/dist/api/SubComponent/SubComputed/GetSubComputedDoc.js.map

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

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

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

package/dist/api/SubComponent/SubComputed/SubComputedConstraint.js

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

package/dist/api/SubComponent/SubComputed/SubComputedConstraint.js.map

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

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

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

package/dist/api/SubComponent/SubComputed/SubComputedOption.js

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

package/dist/api/SubComponent/SubComputed/SubComputedOption.js.map

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

package/dist/api/SubComponent/SubData/SubDataConstraint.d.ts

@@ -0,0 +1,3 @@
+export type SubDataConstraint<TComponentDoc extends object> = {
+    [k in keyof TComponentDoc]?: TComponentDoc[k];
+};

package/dist/api/SubComponent/SubData/SubDataConstraint.js

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

package/dist/api/SubComponent/SubData/SubDataConstraint.js.map

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

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

@@ -1,4 +1,4 @@
 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> = {
     data?: TData & G.IllegalFieldValidator<TData, legalKeys, 0, "", errMsg>;
 };

package/dist/api/SubComponent/SubData/SubDataOption.js

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

package/dist/api/SubComponent/SubData/SubDataOption.js.map

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

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

@@ -3,6 +3,6 @@ import type { IfExtends } from "hry-types/src/Any/IfExtends";
 import type { Detail, WMBaseEvent } from "../../../types/OfficialTypeAlias";
 import type { ComponentDoc } from "../../DefineComponent/returnType/ComponentDoc";
 import type { Bubbles, Capture, CustomEventsTags } from "../../RootComponent/CustomEvents/CustomEventsTag";
-export type CustomEventsConstraint<CompDoc extends ComponentDoc> = {
+export type SubEventsConstraint<CompDoc extends ComponentDoc> = {
     [k in keyof CompDoc["events"] as Contains<CompDoc["events"][k], Bubbles | Capture> extends true ? (k | `${k & string}_catch`) : k]?: (e: IfExtends<WMBaseEvent, CompDoc["events"][k], WMBaseEvent, Detail<Exclude<CompDoc["events"][k], CustomEventsTags>>>) => void;
 };

package/dist/api/SubComponent/SubEvents/SubEventsConstraint.js

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

package/dist/api/SubComponent/SubEvents/SubEventsConstraint.js.map

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

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

@@ -1,4 +1,4 @@
 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> = {
     events?: TSubEvents & G.IllegalFieldValidator<SubEventsDoc, legalKeys>;
 };

package/dist/api/SubComponent/SubEvents/SubEventsOption.js

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

package/dist/api/SubComponent/SubEvents/SubEventsOption.js.map

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

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

@@ -3,7 +3,7 @@ import type { RemoveInnerData } from "../../../types/RemoveInnerData";
 import type { ComponentDoc } from "../../DefineComponent/returnType/ComponentDoc";
 type WXMLSign = "wxml";
 type unionAddList<Keys extends string> = Keys | Keys[];
-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;
 };
 export {};

package/dist/api/SubComponent/SubInherit/SubInheritConstraint.js

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

package/dist/api/SubComponent/SubInherit/SubInheritConstraint.js.map

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

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

@@ -1,4 +1,4 @@
 import type { G } from "hry-types";
-export type CustomInheritOption<TInherit extends object, legalKeys extends PropertyKey> = {
+export type SubInheritOption<TInherit extends object, legalKeys extends PropertyKey> = {
     inherit?: TInherit & G.IllegalFieldValidator<TInherit, legalKeys>;
 };

package/dist/api/SubComponent/SubInherit/SubInheritOption.js

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

package/dist/api/SubComponent/SubInherit/SubInheritOption.js.map

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

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

@@ -0,0 +1,2 @@
+import type { RootComponentInstance } from "../../RootComponent/Instance/RootComponentInstance";
+export type SubInstance<TAllMethods extends object, TDataForSetData extends object, AllData extends object, AllCustomEventsDoc extends object, SubStoreDoc extends object> = RootComponentInstance<false, TAllMethods, TDataForSetData, AllData, AllCustomEventsDoc, SubStoreDoc>;

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

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

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

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

package/dist/api/SubComponent/SubLifetimes/SubLifetimesOption.js.map

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

package/dist/api/SubComponent/SubMethods/SubMethodsConstraint.d.ts

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

package/dist/api/SubComponent/SubMethods/SubMethodsConstraint.js

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

package/dist/api/SubComponent/SubMethods/SubMethodsConstraint.js.map

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

package/dist/api/SubComponent/SubMethods/SubMethodsOption.d.ts

@@ -0,0 +1,5 @@
+import type { G } from "hry-types";
+import type { SubMethodsConstraint } from "./SubMethodsConstraint";
+export type SubMethodsOption<TMethods extends SubMethodsConstraint, TPrefix extends string, ExcludedKeys extends PropertyKey> = {
+    methods?: TMethods & G.KeyValidator<TMethods, `${TPrefix}_${string}`> & G.DuplicateFieldValidator<TMethods, ExcludedKeys>;
+};

package/dist/api/SubComponent/SubMethods/SubMethodsOption.js

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

package/dist/api/SubComponent/SubMethods/SubMethodsOption.js.map

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

package/dist/api/SubComponent/SubObservers/SubObserversOption.d.ts

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

package/dist/api/SubComponent/SubObservers/SubObserversOption.js

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

package/dist/api/SubComponent/SubObservers/SubObserversOption.js.map

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

package/dist/api/SubComponent/SubPageLifetimes/SubPageLifetimesOption.d.ts

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

package/dist/api/SubComponent/SubPageLifetimes/SubPageLifetimesOption.js

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

package/dist/api/SubComponent/SubPageLifetimes/SubPageLifetimesOption.js.map

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

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

@@ -8,7 +8,7 @@ type SelectStopEvents<T extends object> = {
     [k in keyof T as k extends `${infer R}_catch` ? R : never]: unknown;
 };
 type GetComposedEvents<TCustomEventsDoc extends object> = Select<TCustomEventsDoc, Composed, "contains->">;
-export type CreatCustomComponentDoc<ComponentCustomEvents extends object, EventsDoc extends object, ComposedEvents extends object = ComputeObject<RemovePrefix<Omit<GetComposedEvents<ComponentCustomEvents>, keyof SelectStopEvents<EventsDoc>>>>, CustomCompDoc = ComputeIntersection<IfExtends<EmptyObject, ComposedEvents, {}, {
+export type CreatSubComponentDoc<ComponentCustomEvents extends object, EventsDoc extends object, ComposedEvents extends object = ComputeObject<RemovePrefix<Omit<GetComposedEvents<ComponentCustomEvents>, keyof SelectStopEvents<EventsDoc>>>>, CustomCompDoc = ComputeIntersection<IfExtends<EmptyObject, ComposedEvents, {}, {
     composedEvents: ComposedEvents;
 }>>> = IfExtends<EmptyObject, CustomCompDoc, never, CustomCompDoc>;
 export {};

package/dist/api/SubComponent/SubReturnType/CreateSubComponentDoc.js

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

package/dist/api/SubComponent/SubReturnType/CreateSubComponentDoc.js.map

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

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

@@ -1,5 +1,5 @@
 import type { AddNullForObject } from "../../../types/AddNullForObject";
 import type { Getter } from "../../RootComponent/Store/StoreConstraint";
-export type CustomStoreConstraint<PropertyDoc extends object, legal extends object> = {
+export type SubStoreConstraint<PropertyDoc extends object, legal extends object> = {
     [k in keyof legal]?: Getter<PropertyDoc, AddNullForObject<legal[k]> | undefined>;
 };

package/dist/api/SubComponent/SubStore/SubStoreConstraint.js

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

package/dist/api/SubComponent/SubStore/SubStoreConstraint.js.map

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

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

@@ -1,6 +1,6 @@
 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?: TStore & Validators<[
         G.IllegalFieldValidator<TStore, legalKeys, 0, "", "与inherit和data字段重复或前缀错误">
     ]>;

package/dist/api/SubComponent/SubStore/SubStoreOption.js

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

package/dist/api/SubComponent/SubStore/SubStoreOption.js.map

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

package/dist/api/SubComponent/SubWatch/SubWatchOption.d.ts

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

package/dist/api/SubComponent/SubWatch/SubWatchOption.js

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

package/dist/api/SubComponent/SubWatch/SubWatchOption.js.map

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