annil 1.1.1 → 1.2.0-beta.0

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

@@ -1,10 +1,9 @@
 import type { IfExtends } from "hry-types/src/Any/IfExtends";
-import type { NoInfer } from "hry-types/src/Generic/NoInfer";
 import type { EmptyObject } from "hry-types/src/Misc/EmptyObject";
 import type { Func } from "hry-types/src/Misc/Func";
 import type { ComputeIntersection } from "hry-types/src/Object/_api";
 import type { ComputeObject } from "../../types/ComputeObj";
-import type { WMCompOtherOption, WMCompPageLifetimes, WMPageLifetimes } from "../../types/OfficialTypeAlias";
+import type { WMCompOtherOption } from "../../types/OfficialTypeAlias";
 import type { ComponentDoc } from "../DefineComponent/ReturnType/ComponentDoc";
 import type { ComputedConstraint } from "./Computed/ComputedConstraint";
 import type { ComputedOption } from "./Computed/ComputedOption";
@@ -26,13 +25,13 @@ import type { PageLifetimesOption } from "./PageLifetimes/PageLifetimesOption";
 import type { GetPropertiesDoc } from "./Properties/GetPropertiesDoc";
 import type { PropertiesConstraint } from "./Properties/PropertiesConstraint";
 import type { PropertiesOption } from "./Properties/PropertiesOption";
-import type { GeTStoreDoc } from "./Store/GeTStoreDoc";
+import type { GetStoreDoc } from "./Store/GeTStoreDoc";
 import type { StoreConstraint } from "./Store/StoreConstraint";
 import type { StoreOption } from "./Store/StoreOption";
 import type { WatchOption } from "./Watch/WatchOption";
-type RootComponentOptions<TReceivedComponentDoc extends object, 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>, EventsDoc extends object, CustomEventsDoc extends object, PropertiesDoc extends object, DataDoc extends object, StoreDoc extends object, ComputedDoc extends object> = MethodsOption<TMethods, keyof (EventsDoc & CustomEventsDoc)> & PropertiesOption<TProperties> & IsPageOption<TIsPage> & CustomEventsOption<TCustomEvents, EventsDoc> & EventsOption<TEvents, EventsConstraint<TReceivedComponentDoc>> & DataOption<TData, PropertiesDoc> & StoreOption<TStore, PropertiesDoc & DataDoc> & ComputedOption<TComputed, Required<PropertiesDoc> & DataDoc & StoreDoc> & PageLifetimesOption<TIsPage, NoInfer<PropertiesDoc>> & LifetimesOption<TIsPage> & WatchOption<ComputedDoc & Required<PropertiesDoc> & DataDoc & StoreDoc> & Partial<Omit<WMCompOtherOption, "pageLifetimes">> & ThisType<RootComponentInstance<TIsPage, TMethods, DataDoc, DataDoc & Required<PropertiesDoc> & StoreDoc & ComputedDoc, CustomEventsDoc, StoreDoc>>;
-type RootComponentConstructor<TReceivedComponentDoc extends ComponentDoc[] | ComponentDoc> = {
-    <TEvents extends EventsConstraint<TReceivedComponentDoc>, TIsPage extends boolean = false, const TProperties extends PropertiesConstraint = {}, TData extends object = {}, TStore extends StoreConstraint = {}, TComputed extends ComputedConstraint = {}, TCustomEvents extends IfExtends<TIsPage, false, CustomEventConstraint, EmptyObject> = {}, TMethods extends MethodsConstraint = {}, EventsDoc extends object = IfExtends<EventsConstraint<TReceivedComponentDoc>, TEvents, {}, TEvents>, CustomEventsDoc extends object = GetCustomEventDoc<TCustomEvents>, PropertiesDoc extends object = GetPropertiesDoc<TProperties, TIsPage>, DataDoc extends object = TData, StoreDoc extends object = GeTStoreDoc<TStore>, ComputedDoc extends object = GetComputedDoc<TComputed>>(options: RootComponentOptions<TReceivedComponentDoc, TEvents, TIsPage, TCustomEvents, TMethods, TProperties, TData, TStore, TComputed, EventsDoc, CustomEventsDoc, PropertiesDoc, DataDoc, StoreDoc, ComputedDoc>): 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>, EventsDoc extends object, CustomEventsDoc extends object, PropertiesDoc extends object, DataDoc extends object, StoreDoc extends object, ComputedDoc extends object> = MethodsOption<TMethods, keyof (EventsDoc & CustomEventsDoc)> & PropertiesOption<TProperties> & IsPageOption<TIsPage> & EventsOption<TEvents> & CustomEventsOption<TCustomEvents, keyof EventsDoc> & DataOption<TData, keyof PropertiesDoc> & StoreOption<TStore, keyof (PropertiesDoc & DataDoc)> & ComputedOption<TComputed, keyof (PropertiesDoc & DataDoc & StoreDoc)> & PageLifetimesOption<TIsPage, PropertiesDoc> & LifetimesOption<TIsPage> & WatchOption<ComputedDoc & Required<PropertiesDoc> & DataDoc & StoreDoc> & Partial<Omit<WMCompOtherOption, "pageLifetimes">> & ThisType<RootComponentInstance<TIsPage, TMethods, DataDoc, DataDoc & Required<PropertiesDoc> & StoreDoc & ComputedDoc, CustomEventsDoc, StoreDoc>>;
+type RootComponentConstructor<TComponentDocList extends ComponentDoc[]> = {
+    <TEvents extends EventsConstraint<TComponentDocList>, TIsPage extends boolean = false, const TProperties extends PropertiesConstraint = {}, TData extends object = {}, TStore extends StoreConstraint = {}, TComputed extends ComputedConstraint = {}, TCustomEvents extends IfExtends<TIsPage, false, CustomEventConstraint, EmptyObject> = {}, TMethods extends MethodsConstraint = {}, EventsDoc extends object = IfExtends<EventsConstraint<TComponentDocList>, TEvents, {}, TEvents>, CustomEventsDoc extends object = GetCustomEventDoc<TCustomEvents>, PropertiesDoc extends object = GetPropertiesDoc<TProperties, TIsPage>, DataDoc extends object = TData, StoreDoc extends object = GetStoreDoc<TStore>, ComputedDoc extends object = GetComputedDoc<TComputed>>(options: RootComponentOptions<TEvents, TIsPage, TCustomEvents, TMethods, TProperties, TData, TStore, TComputed, EventsDoc, CustomEventsDoc, PropertiesDoc, DataDoc, StoreDoc, ComputedDoc>): ComputeIntersection<IfExtends<TIsPage, false, {}, {
         isPage: true;
     }> & IfExtends<EmptyObject, PropertiesDoc, {}, {
         properties: PropertiesDoc;
@@ -50,20 +49,20 @@ type RootComponentConstructor<TReceivedComponentDoc extends ComponentDoc[] | Com
         customEvents: ComputeObject<CustomEventsDoc>;
     }>>;
 };
-export declare function RootComponent<TReceivedComponentDoc extends ComponentDoc[] | ComponentDoc = {}>(): RootComponentConstructor<TReceivedComponentDoc>;
+export declare function RootComponent<TComponentDocList extends ComponentDoc[] = []>(): RootComponentConstructor<TComponentDocList>;
 export type RootComponentTrueOptions = {
     isPage?: boolean;
     properties?: PropertiesConstraint;
     data?: DataConstraint;
     computed?: ComputedConstraint;
     customEvents?: CustomEventConstraint;
+    observers?: Record<string, Func>;
     methods?: MethodsConstraint;
+    behaviors?: string[];
     events?: EventsConstraint;
     store?: StoreConstraint;
     watch?: Record<string, Func>;
     lifetimes?: LifetimesConstraint;
-    pageLifetimes?: Partial<WMCompPageLifetimes & {
-        load: Func;
-    } & WMPageLifetimes>;
+    pageLifetimes?: PageLifetimesOption<false, object>["pageLifetimes"] | PageLifetimesOption<true, object>["pageLifetimes"];
 };
 export {};

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

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/api/RootComponent/index.ts"],"names":[],"mappings":"AA+HA,MAAM,UAAU,aAAa;IAM3B,OAAO,CAAC,CAAC,OAAY,EAAE,EAAE,CAAC,OAAmC,CAAQ,CAAC;AACxE,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/api/RootComponent/index.ts"],"names":[],"mappings":"AA4HA,MAAM,UAAU,aAAa;IAM3B,OAAO,CAAC,CAAC,OAAY,EAAE,EAAE,CAAC,OAAmC,CAAQ,CAAC;AACxE,CAAC"}

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

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

package/dist/api/SubComponent/SubData/test/normal.test.js

@@ -10,19 +10,6 @@ SubComponent()({
         _aaa_template: "internal",
     },
 });
-const res = SubComponent()({
-    inherit: {
-        view_style: "wxml",
-    },
-    data: {
-        view_class: "h-full",
-        view_hover_class: "none",
-        view_obj: {},
-        view_str: "a",
-        view_ddd: 123,
-    },
-});
-Checking;
 SubComponent()({
     inherit: {
         aaa_str: "wxml",
@@ -33,8 +20,6 @@ SubComponent()({
         _aaa_str: "str",
     },
 });
-const res1 = SubComponent()({});
-Checking;
 SubComponent()({
     data: {
         aaa_str: "a",

package/dist/api/SubComponent/SubData/test/normal.test.js.map

@@ -1 +1 @@
-{"version":3,"file":"normal.test.js","sourceRoot":"","sources":["../../../../../src/api/SubComponent/SubData/test/normal.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAa,MAAM,WAAW,CAAC;AAOhD,OAAO,EAAE,YAAY,EAAE,MAAM,OAAO,CAAC;AAWrC,YAAY,EAAe,CAAC;IAC1B,OAAO,EAAE;QACP,OAAO,EAAE,MAAM;KAChB;IACD,IAAI,EAAE;QACJ,OAAO,EAAE,GAAG;QACZ,OAAO,EAAE,GAAG;QACZ,aAAa,EAAE,UAAU;KAC1B;CACF,CAAC,CAAC;AAQH,MAAM,GAAG,GAAG,YAAY,EAAmB,CAAC;IAC1C,OAAO,EAAE;QACP,UAAU,EAAE,MAAM;KACnB;IACD,IAAI,EAAE;QAEJ,UAAU,EAAE,QAAQ;QACpB,gBAAgB,EAAE,MAAM;QAExB,QAAQ,EAAE,EAAsB;QAChC,QAAQ,EAAE,GAAG;QACb,QAAQ,EAAE,GAAG;KACd;CACF,CAAC,CAAC;AAEH,QAAsC,CAAC;AAGvC,YAAY,EAAe,CAAC;IAC1B,OAAO,EAAE;QACP,OAAO,EAAE,MAAM;QACf,OAAO,EAAE,MAAM;QACf,OAAO,EAAE,MAAM;KAChB;IACD,IAAI,EAAE;QACJ,QAAQ,EAAE,KAAK;KAChB;CACF,CAAC,CAAC;AAMH,MAAM,IAAI,GAAG,YAAY,EAAoB,CAAC,EAAE,CAAC,CAAC;AAElD,QAAuC,CAAC;AAExC,YAAY,EAAe,CAAC;IAC1B,IAAI,EAAE;QACJ,OAAO,EAAE,GAAG;QACZ,OAAO,EAAE,GAAG;QACZ,OAAO,EAAE,IAAI;QACb,QAAQ,EAAE,KAAK;KAChB;IACD,OAAO,EAAE;QACP,KAAK;YAEH,QASC,CAAC;QACJ,CAAC;KACF;CACF,CAAC,CAAC"}
+{"version":3,"file":"normal.test.js","sourceRoot":"","sources":["../../../../../src/api/SubComponent/SubData/test/normal.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAa,MAAM,WAAW,CAAC;AAKhD,OAAO,EAAE,YAAY,EAAE,MAAM,OAAO,CAAC;AAUrC,YAAY,EAAe,CAAC;IAC1B,OAAO,EAAE;QACP,OAAO,EAAE,MAAM;KAChB;IACD,IAAI,EAAE;QAEJ,OAAO,EAAE,GAAG;QACZ,OAAO,EAAE,GAAG;QAEZ,aAAa,EAAE,UAAU;KAC1B;CACF,CAAC,CAAC;AAGH,YAAY,EAAuC,CAAC;IAClD,OAAO,EAAE;QACP,OAAO,EAAE,MAAM;QACf,OAAO,EAAE,MAAM;QACf,OAAO,EAAE,MAAM;KAChB;IACD,IAAI,EAAE;QAEJ,QAAQ,EAAE,KAAK;KAChB;CACF,CAAC,CAAC;AAEH,YAAY,EAAe,CAAC;IAC1B,IAAI,EAAE;QACJ,OAAO,EAAE,GAAG;QACZ,OAAO,EAAE,GAAG;QACZ,OAAO,EAAE,IAAI;QACb,QAAQ,EAAE,KAAK;KAChB;IACD,OAAO,EAAE;QACP,KAAK;YAEH,QASC,CAAC;QACJ,CAAC;KACF;CACF,CAAC,CAAC"}

package/dist/api/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 SubEventsConstraint<CompDoc extends ComponentDoc, keys extends keyof CompDoc["customEvents"] = keyof CompDoc["customEvents"]> = {
-    [k in keys as Contains<CompDoc["customEvents"][k], Bubbles | Capture> extends true ? (k | `${k & string}_catch`) : k]?: (e: IfExtends<WMBaseEvent, CompDoc["customEvents"][k], WMBaseEvent, Detail<Exclude<CompDoc["customEvents"][k], CustomEventsTags>>>) => void;
+export type SubEventsConstraint<CompDoc extends ComponentDoc> = {
+    [k in keyof CompDoc["customEvents"] as Contains<CompDoc["customEvents"][k], Bubbles | Capture> extends true ? (k | `${k & string}_catch`) : k]?: (e: IfExtends<WMBaseEvent, CompDoc["customEvents"][k], WMBaseEvent, Detail<Exclude<CompDoc["customEvents"][k], CustomEventsTags>>>) => void;
 };

package/dist/api/SubComponent/SubEvents/SubEventsOptions.d.ts

@@ -1,4 +1,4 @@
 import type { V } from "hry-types";
-export type SubEventsOption<TSubEvents, SubEventsDoc extends object, xxx extends PropertyKey> = {
-    events?: TSubEvents & V.IllegalFieldValidator<SubEventsDoc, xxx>;
+export type SubEventsOption<TSubEvents, SubEventsDoc extends object, legalKeys extends PropertyKey> = {
+    events?: TSubEvents & V.IllegalFieldValidator<SubEventsDoc, legalKeys>;
 };

package/dist/api/SubComponent/SubEvents/test/error.test.js.map

@@ -1 +1 @@
-{"version":3,"file":"error.test.js","sourceRoot":"","sources":["../../../../../src/api/SubComponent/SubEvents/test/error.test.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,OAAO,CAAC;AASrC,YAAY,EAAe,CAAC;IAC1B,MAAM,EAAE;QAEN,GAAG,EAAE,GAAG;KACT;CACF,CAAC,CAAC;AASH,YAAY,EAAgB,CAAC;IAC3B,MAAM,EAAE;QACN,OAAO,CAAC,CAAC;YACP,CAAC,CAAC;QACJ,CAAC;QAED,SAAS,KAAI,CAAC;KACf;CACF,CAAC,CAAC"}
+{"version":3,"file":"error.test.js","sourceRoot":"","sources":["../../../../../src/api/SubComponent/SubEvents/test/error.test.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,YAAY,EAAE,MAAM,OAAO,CAAC;AASrC,YAAY,EAAe,CAAC;IAC1B,MAAM,EAAE;QAEN,GAAG,EAAE,GAAG;KACT;CACF,CAAC,CAAC;AASH,YAAY,EAAgB,CAAC;IAC3B,MAAM,EAAE;QACN,OAAO,CAAC,CAAC;YACP,CAAC,CAAC;QACJ,CAAC;QAED,SAAS,KAAI,CAAC;KACf;CACF,CAAC,CAAC"}

package/dist/api/SubComponent/SubEvents/test/normal.test.js

@@ -68,4 +68,24 @@ SubComponent()({
         },
     },
 });
+SubComponent()({
+    events: {
+        view_tap(e) {
+            Checking;
+        },
+        view_longtap(e) {
+            Checking;
+        },
+    },
+});
+SubComponent()({
+    events: {
+        view_tap(e) {
+            Checking;
+        },
+        view_longtap(e) {
+            Checking;
+        },
+    },
+});
 //# sourceMappingURL=normal.test.js.map

package/dist/api/SubComponent/SubEvents/test/normal.test.js.map

@@ -1 +1 @@
-{"version":3,"file":"normal.test.js","sourceRoot":"","sources":["../../../../../src/api/SubComponent/SubEvents/test/normal.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAa,MAAM,WAAW,CAAC;AAYhD,OAAO,EAAE,YAAY,EAAE,MAAM,OAAO,CAAC;AAerC,MAAM,IAAI,GAAG,YAAY,EAAe,CAAC;IACvC,MAAM,EAAE;QACN,OAAO,CAAC,CAAC;YACP,QAA4C,CAAC;QAC/C,CAAC;QACD,WAAW,CAAC,CAAC;YACX,QAA4C,CAAC;QAC/C,CAAC;QACD,gBAAgB,CAAC,CAAC;YAChB,QAA4C,CAAC;QAC/C,CAAC;QACD,uBAAuB,CAAC,CAAC;YACvB,QAA0C,CAAC;QAC7C,CAAC;QACD,mBAAmB,CAAC,CAAC;YACnB,QAA4C,CAAC;QAC/C,CAAC;QACD,wBAAwB,CAAC,CAAC;YACxB,QAA4C,CAAC;QAC/C,CAAC;QACD,+BAA+B,CAAC,CAAC;YAC/B,QAA4C,CAAC;QAC/C,CAAC;KACF;CACF,CAAC,CAAC;AASH,QAA8C,CAAC;AAG/C,MAAM,IAAI,GAAG,YAAY,EAAe,CAAC;IACvC,MAAM,EAAE;QACN,yBAAyB,CAAC,CAAC;YACzB,QAA4C,CAAC;QAC/C,CAAC;QACD,8BAA8B,CAAC,CAAC;YAC9B,QAA4C,CAAC;QAC/C,CAAC;KACF;CACF,CAAC,CAAC;AAGH,QAAkG,CAAC;AAGnG,MAAM,IAAI,GAAG,YAAY,EAAe,CAAC;IACvC,MAAM,EAAE;QACN,yBAAyB,CAAC,CAAC;YACzB,QAA4C,CAAC;QAC/C,CAAC;QACD,8BAA8B,CAAC,CAAC;YAC9B,QAA4C,CAAC;QAC/C,CAAC;QACD,qCAAqC,CAAC,CAAC;YACrC,QAA4C,CAAC;QAC/C,CAAC;KACF;CACF,CAAC,CAAC;AAGH,QAAuC,CAAC;AAGxC,YAAY,EAAe,CAAC;IAC1B,MAAM,EAAE;QACN,QAAQ,CAAC,CAAC;YACR,QAA0C,CAAC;QAC7C,CAAC;QACD,YAAY,CAAC,CAAC;YACZ,QAA0C,CAAC;QAC7C,CAAC;KAEF;CACF,CAAC,CAAC;AAGH,YAAY,EAAqB,CAAC;IAChC,MAAM,EAAE;QACN,qBAAqB,CAAC,CAAC;YACrB,QAWC,CAAC;QACJ,CAAC;KAEF;CACF,CAAC,CAAC"}
+{"version":3,"file":"normal.test.js","sourceRoot":"","sources":["../../../../../src/api/SubComponent/SubEvents/test/normal.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAa,MAAM,WAAW,CAAC;AAchD,OAAO,EAAE,YAAY,EAAE,MAAM,OAAO,CAAC;AAerC,MAAM,IAAI,GAAG,YAAY,EAAe,CAAC;IACvC,MAAM,EAAE;QACN,OAAO,CAAC,CAAC;YACP,QAA4C,CAAC;QAC/C,CAAC;QACD,WAAW,CAAC,CAAC;YACX,QAA4C,CAAC;QAC/C,CAAC;QACD,gBAAgB,CAAC,CAAC;YAChB,QAA4C,CAAC;QAC/C,CAAC;QACD,uBAAuB,CAAC,CAAC;YACvB,QAA0C,CAAC;QAC7C,CAAC;QACD,mBAAmB,CAAC,CAAC;YACnB,QAA4C,CAAC;QAC/C,CAAC;QACD,wBAAwB,CAAC,CAAC;YACxB,QAA4C,CAAC;QAC/C,CAAC;QACD,+BAA+B,CAAC,CAAC;YAC/B,QAA4C,CAAC;QAC/C,CAAC;KACF;CACF,CAAC,CAAC;AASH,QAA8C,CAAC;AAG/C,MAAM,IAAI,GAAG,YAAY,EAAe,CAAC;IACvC,MAAM,EAAE;QACN,yBAAyB,CAAC,CAAC;YACzB,QAA4C,CAAC;QAC/C,CAAC;QACD,8BAA8B,CAAC,CAAC;YAC9B,QAA4C,CAAC;QAC/C,CAAC;KACF;CACF,CAAC,CAAC;AAGH,QAAkG,CAAC;AAEnG,MAAM,IAAI,GAAG,YAAY,EAAe,CAAC;IACvC,MAAM,EAAE;QACN,yBAAyB,CAAC,CAAC;YACzB,QAA4C,CAAC;QAC/C,CAAC;QACD,8BAA8B,CAAC,CAAC;YAC9B,QAA4C,CAAC;QAC/C,CAAC;QACD,qCAAqC,CAAC,CAAC;YACrC,QAA4C,CAAC;QAC/C,CAAC;KACF;CACF,CAAC,CAAC;AAGH,QAAuC,CAAC;AAGxC,YAAY,EAAe,CAAC;IAC1B,MAAM,EAAE;QACN,QAAQ,CAAC,CAAC;YACR,QAA0C,CAAC;QAC7C,CAAC;QACD,YAAY,CAAC,CAAC;YACZ,QAA0C,CAAC;QAC7C,CAAC;KAEF;CACF,CAAC,CAAC;AAGH,YAAY,EAAqB,CAAC;IAChC,MAAM,EAAE;QACN,qBAAqB,CAAC,CAAC;YACrB,QAWC,CAAC;QACJ,CAAC;KAEF;CACF,CAAC,CAAC;AAGH,YAAY,EAAe,CAAC;IAC1B,MAAM,EAAE;QACN,QAAQ,CAAC,CAAiB;YACxB,QAA4C,CAAC;QAC/C,CAAC;QACD,YAAY,CAAC,CAAkB;YAC7B,QAA6C,CAAC;QAChD,CAAC;KAEF;CACF,CAAC,CAAC;AAGH,YAAY,EAAe,CAAC;IAC1B,MAAM,EAAE;QACN,QAAQ,CAAC,CAAiB;YACxB,QAA4C,CAAC;QAC/C,CAAC;QACD,YAAY,CAAC,CAAkB;YAC7B,QAA6C,CAAC;QAChD,CAAC;KAEF;CACF,CAAC,CAAC"}

package/dist/api/SubComponent/SubInherit/SubInheritConstraint.d.ts

@@ -1,7 +1,8 @@
 import type { SelectKeys } from "hry-types/src/Object/_api";
+import type { RemoveInnerData } from "../../../types/RemoveInnerData";
 import type { ComponentDoc } from "../../DefineComponent/ReturnType/ComponentDoc";
 type WXMLSign = "wxml";
-export type InheritConstraint<RootData extends object, TComponentDoc extends ComponentDoc> = {
-    [k in keyof TComponentDoc["properties"]]?: SelectKeys<RootData, TComponentDoc["properties"][k]> | WXMLSign;
+export type InheritConstraint<AllRootData extends object, TComponentDoc extends ComponentDoc> = {
+    [k in keyof TComponentDoc["properties"]]?: RemoveInnerData<SelectKeys<AllRootData, TComponentDoc["properties"][k]> & string> | WXMLSign;
 };
 export {};

package/dist/api/SubComponent/SubInherit/SubInheritOption.d.ts

@@ -0,0 +1,3 @@
+export type SubInheritOption<TInherit> = {
+    inherit?: TInherit;
+};

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/SubInherit/test/error.test.js

@@ -5,7 +5,7 @@ SubComponent()({
     inherit: {
         aaa_num: "unionStrNum",
         aaa_literal_num: "optional_literal_num",
-        aaa_str: "",
+        aaa_str: "_str",
     },
 });
 const subDoc = SubComponent()({

package/dist/api/SubComponent/SubInherit/test/error.test.js.map

@@ -1 +1 @@
-{"version":3,"file":"error.test.js","sourceRoot":"","sources":["../../../../../src/api/SubComponent/SubInherit/test/error.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAa,MAAM,WAAW,CAAC;AAChD,OAAO,EAAE,eAAe,EAAE,MAAM,0BAA0B,CAAC;AAG3D,OAAO,EAAE,YAAY,EAAE,MAAM,OAAO,CAAC;AAiCrC,YAAY,EAA8B,CAAC;IACzC,OAAO,EAAE;QAEP,OAAO,EAAE,aAAa;QAEtB,eAAe,EAAE,sBAAsB;QAEvC,OAAO,EAAE,EAAmB;KAC7B;CACF,CAAC,CAAC;AAGH,MAAM,MAAM,GAAG,YAAY,EAA8B,CAAC;IACxD,IAAI,EAAE;QACJ,OAAO,EAAE,GAAG;KACb;CACF,CAAC,CAAC;AAEH,QAAmD,CAAC;AAEpD,eAAe,CAAC;IACd,IAAI,EAAE,KAAK;IAEX,aAAa,EAAE,CAAC,MAAM,CAAC;CACxB,CAAC,CAAC"}
+{"version":3,"file":"error.test.js","sourceRoot":"","sources":["../../../../../src/api/SubComponent/SubInherit/test/error.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAa,MAAM,WAAW,CAAC;AAChD,OAAO,EAAE,eAAe,EAAE,MAAM,0BAA0B,CAAC;AAG3D,OAAO,EAAE,YAAY,EAAE,MAAM,OAAO,CAAC;AAmCrC,YAAY,EAA8B,CAAC;IACzC,OAAO,EAAE;QAEP,OAAO,EAAE,aAAa;QAEtB,eAAe,EAAE,sBAAsB;QAEvC,OAAO,EAAE,MAAM;KAChB;CACF,CAAC,CAAC;AAGH,MAAM,MAAM,GAAG,YAAY,EAA8B,CAAC;IACxD,IAAI,EAAE;QACJ,OAAO,EAAE,GAAG;KACb;CACF,CAAC,CAAC;AAEH,QAAmD,CAAC;AAEpD,eAAe,CAAC;IACd,IAAI,EAAE,KAAK;IAEX,aAAa,EAAE,CAAC,MAAM,CAAC;CACxB,CAAC,CAAC"}

package/dist/api/SubComponent/SubInherit/test/normal.test.js.map

@@ -1 +1 @@
-{"version":3,"file":"normal.test.js","sourceRoot":"","sources":["../../../../../src/api/SubComponent/SubInherit/test/normal.test.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,YAAY,EAAE,MAAM,OAAO,CAAC;AAgCrC,YAAY,EAAoB,CAAC;IAC/B,OAAO,EAAE;QACP,OAAO,EAAE,MAAM;QACf,OAAO,EAAE,MAAM;QACf,SAAS,EAAE,MAAM;QACjB,OAAO,EAAE,MAAM;QACf,QAAQ,EAAE,MAAM;KACjB;CACF,CAAC,CAAC;AAGH,YAAY,EAA8B,CAAC;IACzC,OAAO,EAAE;QACP,OAAO,EAAE,EAAsD;QAC/D,OAAO,EAAE,EAAoC;QAC7C,OAAO,EAAE,EAA8C;QACvD,QAAQ,EAAE,EAA8C;KACzD;CACF,CAAC,CAAC"}
+{"version":3,"file":"normal.test.js","sourceRoot":"","sources":["../../../../../src/api/SubComponent/SubInherit/test/normal.test.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,YAAY,EAAE,MAAM,OAAO,CAAC;AAmCrC,YAAY,EAAoB,CAAC;IAC/B,OAAO,EAAE;QACP,OAAO,EAAE,MAAM;QACf,OAAO,EAAE,MAAM;QACf,SAAS,EAAE,MAAM;QACjB,OAAO,EAAE,MAAM;QACf,QAAQ,EAAE,MAAM;KACjB;CACF,CAAC,CAAC;AAGH,YAAY,EAA8B,CAAC;IACzC,OAAO,EAAE;QACP,OAAO,EAAE,EAAsD;QAC/D,OAAO,EAAE,EAAoC;QAC7C,OAAO,EAAE,EAA8C;QACvD,QAAQ,EAAE,EAA8C;KACzD;CACF,CAAC,CAAC"}

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

@@ -1,5 +1,6 @@
 import type { V } from "hry-types";
 import type { PrefixValidator } from "hry-types/src/Generic/PrefixValidator";
-export type SubMethodsOption<TSubMethods extends object, TPrefix extends string, CompCustomEventsKeys extends PropertyKey> = {
-    methods?: TSubMethods & PrefixValidator<TSubMethods, TPrefix> & V.DuplicateFieldValidator<TSubMethods, CompCustomEventsKeys>;
+import type { SubMethodsConstraint } from "./SubMethodsConstraint";
+export type SubMethodsOption<TSubMethods extends SubMethodsConstraint, TPrefix extends string, ExcludedKeys extends PropertyKey> = {
+    methods?: TSubMethods & PrefixValidator<TSubMethods, TPrefix> & V.DuplicateFieldValidator<TSubMethods, ExcludedKeys>;
 };

package/dist/api/SubComponent/SubMethods/test/error.test.js

@@ -5,8 +5,14 @@ SubComponent()({
     },
 });
 SubComponent()({
+    events: {
+        aaa_str_catch() {
+        },
+    },
     methods: {
         aaa_str() { },
+        aaa_str_catch() {
+        },
     },
 });
 //# sourceMappingURL=error.test.js.map

package/dist/api/SubComponent/SubMethods/test/error.test.js.map

@@ -1 +1 @@
-{"version":3,"file":"error.test.js","sourceRoot":"","sources":["../../../../../src/api/SubComponent/SubMethods/test/error.test.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,YAAY,EAAE,MAAM,OAAO,CAAC;AAqBrC,YAAY,EAAoB,CAAC;IAC/B,OAAO,EAAE;QAEP,OAAO,KAAI,CAAC;KACb;CACF,CAAC,CAAC;AAGH,YAAY,EAAoB,CAAC;IAC/B,OAAO,EAAE;QAEP,OAAO,KAAI,CAAC;KACb;CACF,CAAC,CAAC"}
+{"version":3,"file":"error.test.js","sourceRoot":"","sources":["../../../../../src/api/SubComponent/SubMethods/test/error.test.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,YAAY,EAAE,MAAM,OAAO,CAAC;AAqBrC,YAAY,EAAoB,CAAC;IAC/B,OAAO,EAAE;QAEP,OAAO,KAAI,CAAC;KACb;CACF,CAAC,CAAC;AAGH,YAAY,EAAoB,CAAC;IAC/B,MAAM,EAAE;QACN,aAAa;QACb,CAAC;KACF;IACD,OAAO,EAAE;QAEP,OAAO,KAAI,CAAC;QAEZ,aAAa;QACb,CAAC;KACF;CACF,CAAC,CAAC"}

package/dist/api/SubComponent/SubMethods/test/normarl.test.js

@@ -1,11 +1,11 @@
 import { SubComponent } from "../..";
-SubComponent()({
-    methods: {},
-});
 SubComponent()({
     methods: {
         aaa_xxx() { },
         aaa_yyy() { },
     },
 });
+SubComponent()({
+    methods: {},
+});
 //# sourceMappingURL=normarl.test.js.map

package/dist/api/SubComponent/SubMethods/test/normarl.test.js.map

@@ -1 +1 @@
-{"version":3,"file":"normarl.test.js","sourceRoot":"","sources":["../../../../../src/api/SubComponent/SubMethods/test/normarl.test.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,YAAY,EAAE,MAAM,OAAO,CAAC;AAqBrC,YAAY,EAAoB,CAAC;IAC/B,OAAO,EAAE,EAAE;CACZ,CAAC,CAAC;AAGH,YAAY,EAAoB,CAAC;IAC/B,OAAO,EAAE;QACP,OAAO,KAAI,CAAC;QACZ,OAAO,KAAI,CAAC;KAEb;CACF,CAAC,CAAC"}
+{"version":3,"file":"normarl.test.js","sourceRoot":"","sources":["../../../../../src/api/SubComponent/SubMethods/test/normarl.test.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,YAAY,EAAE,MAAM,OAAO,CAAC;AAerC,YAAY,EAAoB,CAAC;IAC/B,OAAO,EAAE;QACP,OAAO,KAAI,CAAC;QACZ,OAAO,KAAI,CAAC;KAEb;CACF,CAAC,CAAC;AAGH,YAAY,EAAoB,CAAC;IAC/B,OAAO,EAAE,EAAE;CACZ,CAAC,CAAC"}

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

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

package/dist/api/SubComponent/SubPageLifetimes/test/error.test.d.ts

@@ -1 +0,0 @@
-export {};

package/dist/api/SubComponent/SubPageLifetimes/test/error.test.js

@@ -1,12 +1,2 @@
-import { SubComponent } from "../..";
-SubComponent()({
-    pageLifetimes: {
-        onShow() { },
-    },
-});
-SubComponent()({
-    pageLifetimes: {
-        onLoadd() { },
-    },
-});
+"use strict";
 //# sourceMappingURL=error.test.js.map

package/dist/api/SubComponent/SubPageLifetimes/test/error.test.js.map

@@ -1 +1 @@
-{"version":3,"file":"error.test.js","sourceRoot":"","sources":["../../../../../src/api/SubComponent/SubPageLifetimes/test/error.test.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,OAAO,CAAC;AAerC,YAAY,EAAe,CAAC;IAC1B,aAAa,EAAE;QAEb,MAAM,KAAI,CAAC;KACZ;CACF,CAAC,CAAC;AAKH,YAAY,EAA4B,CAAC;IACvC,aAAa,EAAE;QAEb,OAAO,KAAI,CAAC;KACb;CACF,CAAC,CAAC"}
+{"version":3,"file":"error.test.js","sourceRoot":"","sources":["../../../../../src/api/SubComponent/SubPageLifetimes/test/error.test.ts"],"names":[],"mappings":""}

package/dist/api/SubComponent/SubPageLifetimes/test/normal.test.d.ts

@@ -1 +0,0 @@
-export {};

package/dist/api/SubComponent/SubPageLifetimes/test/normal.test.js

@@ -1,26 +1,2 @@
-import { Checking } from "hry-types";
-import { SubComponent } from "../..";
-SubComponent()({
-    pageLifetimes: {
-        hide() { },
-        load() { },
-        resize(size) {
-            Checking;
-        },
-        show() { },
-    },
-});
-SubComponent()({
-    pageLifetimes: {
-        onLoad(props) {
-            Checking;
-        },
-        onHide() {
-            console.log("onHide");
-        },
-        onResize(options) {
-            console.log("onResize", options);
-        },
-    },
-});
+"use strict";
 //# sourceMappingURL=normal.test.js.map

package/dist/api/SubComponent/SubPageLifetimes/test/normal.test.js.map

@@ -1 +1 @@
-{"version":3,"file":"normal.test.js","sourceRoot":"","sources":["../../../../../src/api/SubComponent/SubPageLifetimes/test/normal.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAa,MAAM,WAAW,CAAC;AAIhD,OAAO,EAAE,YAAY,EAAE,MAAM,OAAO,CAAC;AAiCrC,YAAY,EAAwB,CAAC;IACnC,aAAa,EAAE;QACb,IAAI,KAAI,CAAC;QACT,IAAI,KAAI,CAAC;QACT,MAAM,CAAC,IAAI;YACT,QAAsE,CAAC;QACzE,CAAC;QACD,IAAI,KAAI,CAAC;KACV;CACF,CAAC,CAAC;AAKH,YAAY,EAA4B,CAAC;IACvC,aAAa,EAAE;QACb,MAAM,CAAC,KAAK;YAEV,QASC,CAAC;QACJ,CAAC;QACD,MAAM;YACJ,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;QACxB,CAAC;QACD,QAAQ,CAAC,OAAO;YACd,OAAO,CAAC,GAAG,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC;QACnC,CAAC;KACF;CACF,CAAC,CAAC"}
+{"version":3,"file":"normal.test.js","sourceRoot":"","sources":["../../../../../src/api/SubComponent/SubPageLifetimes/test/normal.test.ts"],"names":[],"mappings":""}

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

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

package/dist/api/SubComponent/SubStore/SubStoreOption.d.ts

@@ -1,4 +1,4 @@
 import type { V } from "hry-types";
 export type SubStoreOption<TSubStore extends object, legalKeys extends PropertyKey, TPrefix extends string> = {
-    store?: TSubStore & V.IllegalFieldValidator<TSubStore, legalKeys | `_${TPrefix}_${string}`, 0, "", "⚠️ 子组件无需此字段或为字段重复 ⚠️">;
+    store?: TSubStore & V.IllegalFieldValidator<TSubStore, legalKeys | `_${TPrefix}_${string}`, 0, "", "与inherit和data字段重复或前缀错误">;
 };

package/dist/api/SubComponent/SubStore/test/error.test.js

@@ -14,6 +14,8 @@ SubComponent()({
     store: {
         aaa_str: () => user.name,
         aaa_num: () => user.age,
+        _num: () => user.age,
+        num: () => user.age,
     },
 });
 //# sourceMappingURL=error.test.js.map

package/dist/api/SubComponent/SubStore/test/error.test.js.map

@@ -1 +1 @@
-{"version":3,"file":"error.test.js","sourceRoot":"","sources":["../../../../../src/api/SubComponent/SubStore/test/error.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,MAAM,CAAC;AAGlC,OAAO,EAAE,YAAY,EAAE,MAAM,OAAO,CAAC;AACrC,MAAM,IAAI,GAAG,UAAU,CAAC;IACtB,IAAI,EAAE,MAAM;IACZ,GAAG,EAAE,EAAE;CACR,CAAC,CAAC;AASH,YAAY,EAKF,CAAC;IACT,OAAO,EAAE;QACP,OAAO,EAAE,SAAS;KACnB;IACD,IAAI,EAAE;QACJ,OAAO,EAAE,EAAE;KACZ;IACD,KAAK,EAAE;QAEL,OAAO,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,IAAI;QAExB,OAAO,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,GAAG;KACxB;CACF,CAAC,CAAC"}
+{"version":3,"file":"error.test.js","sourceRoot":"","sources":["../../../../../src/api/SubComponent/SubStore/test/error.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,MAAM,CAAC;AAGlC,OAAO,EAAE,YAAY,EAAE,MAAM,OAAO,CAAC;AACrC,MAAM,IAAI,GAAG,UAAU,CAAC;IACtB,IAAI,EAAE,MAAM;IACZ,GAAG,EAAE,EAAE;CACR,CAAC,CAAC;AASH,YAAY,EAKF,CAAC;IACT,OAAO,EAAE;QACP,OAAO,EAAE,SAAS;KACnB;IACD,IAAI,EAAE;QACJ,OAAO,EAAE,EAAE;KACZ;IACD,KAAK,EAAE;QAEL,OAAO,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,IAAI;QAExB,OAAO,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,GAAG;QAEvB,IAAI,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,GAAG;QAEpB,GAAG,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,GAAG;KACpB;CACF,CAAC,CAAC"}

package/dist/api/SubComponent/SubStore/test/normal.test.js

@@ -8,6 +8,7 @@ SubComponent()({
     store: {
         aaa_str: () => user.name,
         aaa_num: () => user.age,
+        _aaa_ddd: () => user.age,
     },
 });
 //# sourceMappingURL=normal.test.js.map

package/dist/api/SubComponent/SubStore/test/normal.test.js.map

@@ -1 +1 @@
-{"version":3,"file":"normal.test.js","sourceRoot":"","sources":["../../../../../src/api/SubComponent/SubStore/test/normal.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,MAAM,CAAC;AAGlC,OAAO,EAAE,YAAY,EAAE,MAAM,OAAO,CAAC;AACrC,MAAM,IAAI,GAAG,UAAU,CAAC;IACtB,IAAI,EAAE,MAAM;IACZ,GAAG,EAAE,EAAE;CACR,CAAC,CAAC;AASH,YAAY,EAAY,CAAC;IACvB,KAAK,EAAE;QACL,OAAO,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,IAAI;QAExB,OAAO,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,GAAG;KACxB;CACF,CAAC,CAAC"}
+{"version":3,"file":"normal.test.js","sourceRoot":"","sources":["../../../../../src/api/SubComponent/SubStore/test/normal.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,MAAM,CAAC;AAGlC,OAAO,EAAE,YAAY,EAAE,MAAM,OAAO,CAAC;AACrC,MAAM,IAAI,GAAG,UAAU,CAAC;IACtB,IAAI,EAAE,MAAM;IACZ,GAAG,EAAE,EAAE;CACR,CAAC,CAAC;AASH,YAAY,EAAY,CAAC;IACvB,KAAK,EAAE;QACL,OAAO,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,IAAI;QAExB,OAAO,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,GAAG;QAEvB,QAAQ,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,GAAG;KACzB;CACF,CAAC,CAAC"}

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

@@ -1,2 +1,3 @@
+import type { NoInfer } from "hry-types/src/Generic/NoInfer";
 import type { WatchOption } from "../../RootComponent/Watch/WatchOption";
-export type SubWatchOption<TWatchData extends object> = WatchOption<TWatchData>;
+export type SubWatchOption<TWatchData extends object> = WatchOption<NoInfer<TWatchData>>;

package/dist/api/SubComponent/SubWatch/test/WatchComputed.test.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/api/SubComponent/SubWatch/test/WatchComputed.test.js

@@ -1,2 +1,45 @@
-"use strict";
+import { Checking } from "hry-types";
+import { SubComponent } from "../..";
+SubComponent()({
+    computed: {
+        aaa_str() {
+            return this.data.aaa_num.toString();
+        },
+        aaa_num() {
+            return 123;
+        },
+        aaa_bool() {
+            return this.data.bool;
+        },
+        aaa_obj() {
+            return {};
+        },
+    },
+    watch: {
+        aaa_num(newValue, oldValue) {
+            Checking;
+            Checking;
+        },
+        aaa_str(newValue, oldValue) {
+            Checking;
+            Checking;
+        },
+        aaa_bool(newValue, oldValue) {
+            Checking;
+            Checking;
+        },
+        aaa_obj(newValue, oldValue) {
+            Checking;
+            Checking;
+        },
+        "aaa_obj.id"(newValue, oldValue) {
+            Checking;
+            Checking;
+        },
+        "aaa_obj.age"(newValue, oldValue) {
+            Checking;
+            Checking;
+        },
+    },
+});
 //# sourceMappingURL=WatchComputed.test.js.map

package/dist/api/SubComponent/SubWatch/test/WatchComputed.test.js.map

@@ -1 +1 @@
-{"version":3,"file":"WatchComputed.test.js","sourceRoot":"","sources":["../../../../../src/api/SubComponent/SubWatch/test/WatchComputed.test.ts"],"names":[],"mappings":""}
+{"version":3,"file":"WatchComputed.test.js","sourceRoot":"","sources":["../../../../../src/api/SubComponent/SubWatch/test/WatchComputed.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAa,MAAM,WAAW,CAAC;AAIhD,OAAO,EAAE,YAAY,EAAE,MAAM,OAAO,CAAC;AA0BrC,YAAY,EAAoB,CAAC;IAC/B,QAAQ,EAAE;QACR,OAAO;YACL,OAAO,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,QAAQ,EAAE,CAAC;QACtC,CAAC;QACD,OAAO;YACL,OAAO,GAAG,CAAC;QACb,CAAC;QACD,QAAQ;YACN,OAAO,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC;QACxB,CAAC;QACD,OAAO;YACL,OAAO,EAAe,CAAC;QACzB,CAAC;KACF;IACD,KAAK,EAAE;QACL,OAAO,CAAC,QAAgB,EAAE,QAAgB;YACxC,QAA4C,CAAC;YAE7C,QAA4C,CAAC;QAC/C,CAAC;QACD,OAAO,CAAC,QAAgB,EAAE,QAAgB;YACxC,QAA4C,CAAC;YAE7C,QAA4C,CAAC;QAC/C,CAAC;QACD,QAAQ,CAAC,QAAiB,EAAE,QAAiB;YAC3C,QAA6C,CAAC;YAE9C,QAA6C,CAAC;QAChD,CAAC;QACD,OAAO,CAAC,QAAmB,EAAE,QAA0B;YACrD,QAA+C,CAAC;YAEhD,QAAsD,CAAC;QACzD,CAAC;QACD,YAAY,CAAC,QAAgB,EAAE,QAAgB;YAC7C,QAA4C,CAAC;YAE7C,QAA4C,CAAC;QAC/C,CAAC;QACD,aAAa,CAAC,QAAgB,EAAE,QAAgB;YAC9C,QAA4C,CAAC;YAE7C,QAA4C,CAAC;QAC/C,CAAC;KACF;CACF,CAAC,CAAC"}

package/dist/api/SubComponent/SubWatch/test/error.test.js

@@ -1,12 +1,20 @@
 import { SubComponent } from "../..";
 SubComponent()({
     watch: {
-        xxx() { },
+        nothing() { },
     },
 });
 SubComponent()({
     data: {
-        view_classdd: "",
+        view_style: "",
+    },
+    watch: {
+        view_style(newValue, oldValue) {
+            newValue;
+            oldValue;
+        },
+        view_XXstyle() {
+        },
     },
 });
 //# sourceMappingURL=error.test.js.map

package/dist/api/SubComponent/SubWatch/test/error.test.js.map

@@ -1 +1 @@
-{"version":3,"file":"error.test.js","sourceRoot":"","sources":["../../../../../src/api/SubComponent/SubWatch/test/error.test.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,OAAO,CAAC;AAGrC,YAAY,EAAsC,CAAC;IACjD,KAAK,EAAE;QAEL,GAAG,KAAI,CAAC;KACT;CACF,CAAC,CAAC;AAKH,YAAY,EAAsC,CAAC;IACjD,IAAI,EAAE;QAEJ,YAAY,EAAE,EAAE;KACjB;CACF,CAAC,CAAC"}
+{"version":3,"file":"error.test.js","sourceRoot":"","sources":["../../../../../src/api/SubComponent/SubWatch/test/error.test.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,OAAO,CAAC;AAGrC,YAAY,EAAsC,CAAC;IACjD,KAAK,EAAE;QAEL,OAAO,KAAI,CAAC;KACb;CACF,CAAC,CAAC;AAKH,YAAY,EAAsC,CAAC;IACjD,IAAI,EAAE;QACJ,UAAU,EAAE,EAAE;KACf;IACD,KAAK,EAAE;QACL,UAAU,CAAC,QAAQ,EAAE,QAAQ;YAC3B,QAAQ,CAAC;YAET,QAAQ,CAAC;QACX,CAAC;QAED,YAAY;QACZ,CAAC;KACF;CACF,CAAC,CAAC"}

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

@@ -5,8 +5,15 @@ import type { GetComponentPrefix } from "../../types/GetComponentPrefix";
 import type { ReplacePrefix } from "../../types/ReplacePrefix";
 import type { ComponentDoc } from "../DefineComponent/ReturnType/ComponentDoc";
 import type { Func } from "hry-types/src/Misc/Func";
-import type { WMCompLifetimes, WMCompOtherOption, WMCompPageLifetimes, WMPageLifetimes } from "../../types/OfficialTypeAlias";
+import type { WMCompOtherOption } from "../../types/OfficialTypeAlias";
+import type { ComputedConstraint } from "../RootComponent/Computed/ComputedConstraint";
+import type { DataConstraint } from "../RootComponent/Data/DataConstraint";
+import type { EventsConstraint } from "../RootComponent/Events/EventsConstraint";
+import type { LifetimesConstraint } from "../RootComponent/Lifetimes/LifetimesConstraint";
+import type { MethodsConstraint } from "../RootComponent/Methods/MethodsConstraint";
+import type { PageLifetimesOption } from "../RootComponent/PageLifetimes/PageLifetimesOption";
 import type { RootComponentDoc } from "../RootComponent/RootComponentDoc";
+import type { StoreConstraint } from "../RootComponent/Store/StoreConstraint";
 import type { GetSubComputedDoc } from "./SubComputed/GetSubComputedDoc";
 import type { SubComputedConstraint } from "./SubComputed/SubComputedConstraint";
 import type { SubComputedOption } from "./SubComputed/SubComputedOption";
@@ -15,6 +22,7 @@ import type { SubDataOption } from "./SubData/SubDataOption";
 import type { SubEventsConstraint } from "./SubEvents/SubEventsConstraint";
 import type { SubEventsOption } from "./SubEvents/SubEventsOptions";
 import type { InheritConstraint } 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";
@@ -24,25 +32,23 @@ import type { CreateSubComponentDoc } from "./SubReturnType/CreateSubComponentDo
 import type { SubStoreConstraint } from "./SubStore/SubDataConstraint";
 import type { SubStoreOption } from "./SubStore/SubStoreOption";
 import type { SubWatchOption } from "./SubWatch/SubWatchOption";
-type Options<RootDoc extends RootComponentDoc, 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 object, InheritDoc extends object, SubDataDoc extends object, SubStoreDoc extends object, SubComputedDoc extends object, SubEventsDoc extends object, SubMethodsDoc extends object> = {
-    inherit?: TInherit;
-} & SubDataOption<TSubData, Exclude<keyof CurrentCompDoc["properties"], (keyof InheritDoc)>, Prefix> & SubStoreOption<TSubStore, Exclude<keyof CurrentCompDoc["properties"], (keyof (InheritDoc & SubDataDoc))>, Prefix> & SubComputedOption<TSubComputed, Omit<CurrentCompDoc["properties"], (keyof (InheritDoc & SubDataDoc & SubStoreDoc))>> & SubEventsOption<TEvents, SubEventsDoc, keyof SubEventsConstraint<CurrentCompDoc>> & SubMethodsOption<TSubMethods, Prefix, keyof CurrentCompDoc["customEvents"]> & SubPageLifetimesOption<IsPage, RootDoc["properties"] & {}> & SubLifetimesOption & SubWatchOption<SubComputedDoc & SubDataDoc & AllRootDataDoc & SubStoreDoc> & Partial<Omit<WMCompOtherOption, "pageLifetimes">> & ThisType<SubInstance<SubMethodsDoc & RootDoc["methods"], TSubData, AllRootDataDoc & SubDataDoc & SubComputedDoc & SubStoreDoc, RootDoc["customEvents"] & {}, SubStoreDoc>>;
+type Options<RootDoc extends RootComponentDoc, 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> = SubInheritOption<TInherit> & SubDataOption<TSubData, Exclude<keyof CurrentCompDoc["properties"], (keyof InheritDoc)>, Prefix> & SubStoreOption<TSubStore, Exclude<keyof CurrentCompDoc["properties"], (keyof (InheritDoc & SubDataDoc))>, Prefix> & SubComputedOption<TSubComputed, Omit<CurrentCompDoc["properties"], (keyof (InheritDoc & SubDataDoc & SubStoreDoc))>> & SubEventsOption<TEvents, SubEventsDoc, keyof SubEventsConstraint<CurrentCompDoc>> & SubMethodsOption<TSubMethods, Prefix, keyof (CurrentCompDoc["customEvents"] & SubEventsDoc)> & SubPageLifetimesOption<IsPage, RootDoc["properties"] & {}> & SubLifetimesOption & SubWatchOption<SubComputedDoc & SubDataDoc & AllRootDataDoc & SubStoreDoc> & Partial<Omit<WMCompOtherOption, "pageLifetimes">> & ThisType<SubInstance<SubMethodsDoc & RootDoc["methods"], TSubData, AllRootDataDoc & SubDataDoc & SubComputedDoc & SubStoreDoc, RootDoc["customEvents"] & {}, SubStoreDoc>>;
 type SubComponentConstructor<TRootDoc extends RootComponentDoc, 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, ReplacePrefix<TOriginalCompDoc, CurrentPrefix>>, AllRootDataDoc extends object = Required<TRootDoc["properties"]> & TRootDoc["data"] & TRootDoc["computed"] & TRootDoc["store"]> = {
-    <TInherit extends InheritConstraint<AllRootDataDoc, CurrentCompDoc>, TSubData extends SubDataConstraint<Omit<Required<CurrentCompDoc["properties"]>, keyof InheritDoc>>, TSubStore extends SubStoreConstraint<Omit<Required<CurrentCompDoc["properties"]>, keyof (InheritDoc & SubDataDoc)>>, TEvents extends SubEventsConstraint<CurrentCompDoc>, TSubComputed extends SubComputedConstraint<Omit<Required<CurrentCompDoc["properties"]>, keyof (InheritDoc & SubDataDoc & SubStoreDoc)>>, TSubMethods extends SubMethodsConstraint = {}, InheritDoc extends object = IfExtends<InheritConstraint<AllRootDataDoc, CurrentCompDoc>, TInherit, {}, TInherit>, SubDataDoc extends object = IfExtends<SubDataConstraint<Omit<Required<CurrentCompDoc["properties"]>, keyof InheritDoc>>, TSubData, {}, TSubData>, SubStoreDoc extends object = IfExtends<SubStoreConstraint<Omit<Required<CurrentCompDoc["properties"]>, keyof (InheritDoc & SubDataDoc)>>, TSubStore, {}, {
+    <TInherit extends InheritConstraint<AllRootDataDoc, CurrentCompDoc>, TSubData extends SubDataConstraint<Omit<Required<CurrentCompDoc["properties"]>, keyof InheritDoc>>, TSubStore extends SubStoreConstraint<Omit<Required<CurrentCompDoc["properties"]>, keyof (InheritDoc & SubDataDoc)>>, TEvents extends SubEventsConstraint<CurrentCompDoc>, TSubComputed extends SubComputedConstraint<Omit<Required<CurrentCompDoc["properties"]>, keyof (InheritDoc & SubDataDoc & SubStoreDoc)>> = {}, TSubMethods extends SubMethodsConstraint = {}, InheritDoc extends object = IfExtends<InheritConstraint<AllRootDataDoc, CurrentCompDoc>, TInherit, {}, TInherit>, SubDataDoc extends object = IfExtends<SubDataConstraint<Omit<Required<CurrentCompDoc["properties"]>, keyof InheritDoc>>, TSubData, {}, TSubData>, SubStoreDoc extends object = IfExtends<SubStoreConstraint<Omit<Required<CurrentCompDoc["properties"]>, keyof (InheritDoc & SubDataDoc)>>, TSubStore, {}, {
         [k in keyof TSubStore]: ReturnType<TSubStore[k] & {}>;
     }>, SubComputedDoc extends object = IfExtends<SubComputedConstraint<Omit<Required<CurrentCompDoc["properties"]>, keyof (InheritDoc & SubDataDoc & SubStoreDoc)>>, TSubComputed, {}, GetSubComputedDoc<TSubComputed>>, SubEventsDoc extends object = IfExtends<SubEventsConstraint<CurrentCompDoc>, TEvents, {}, TEvents>, SubMethodsDoc extends object = TSubMethods, MissingRequiredField extends PropertyKey = Exclude<RequiredKeys<CurrentCompDoc["properties"] & {}>, keyof (InheritDoc & SubDataDoc & SubStoreDoc & IfExtends<SubComputedConstraint<Omit<Required<CurrentCompDoc["properties"]>, keyof (InheritDoc & SubDataDoc & SubStoreDoc)>>, TSubComputed, {}, GetSubComputedDoc<TSubComputed>>)>>(options: Options<TRootDoc, IsPage, CurrentCompDoc, CurrentPrefix, AllRootDataDoc, TInherit, TSubData, TSubStore, TSubComputed, TEvents, TSubMethods, InheritDoc, SubDataDoc, SubStoreDoc, SubComputedDoc, SubEventsDoc, SubMethodsDoc>): CreateSubComponentDoc<TOriginalCompDoc["customEvents"] & {}, SubEventsDoc, MissingRequiredField>;
 };
 export declare function SubComponent<RootDoc extends RootComponentDoc, CompDoc extends ComponentDoc, Prefix extends string = "">(): IfExtends<EmptyObject, CompDoc, (opt: EmptyObject) => never, SubComponentConstructor<RootDoc, CompDoc, Prefix>>;
 export type SubComponentTrueOptions = {
     inhrit?: string;
-    data?: Record<string, unknown>;
-    computed?: Record<string, Func>;
-    events?: Record<string, Func>;
-    methods?: Record<string, Func>;
+    data?: DataConstraint;
+    computed?: ComputedConstraint;
+    store?: StoreConstraint;
+    events?: EventsConstraint;
+    methods?: MethodsConstraint;
+    observers?: Record<string, Func>;
     watch?: Record<string, Func>;
-    lifetimes?: WMCompLifetimes["lifetimes"];
-    pageLifetimes?: Partial<WMCompPageLifetimes & {
-        load: Func;
-    } & WMPageLifetimes>;
+    lifetimes?: LifetimesConstraint;
+    pageLifetimes?: PageLifetimesOption<false, object>["pageLifetimes"] | PageLifetimesOption<true, object>["pageLifetimes"];
 };
 export {};

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

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/api/SubComponent/index.ts"],"names":[],"mappings":"AAkMA,MAAM,UAAU,YAAY;IAK1B,OAAO,CAAC,CAAC,OAAY,EAAE,EAAE,CAAC,OAAkC,CAAQ,CAAC;AACvE,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/api/SubComponent/index.ts"],"names":[],"mappings":"AAwMA,MAAM,UAAU,YAAY;IAK1B,OAAO,CAAC,CAAC,OAAY,EAAE,EAAE,CAAC,OAAkC,CAAQ,CAAC;AACvE,CAAC"}

package/dist/behaviors/BComputedAndWatch/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/behaviors/BComputedAndWatch/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/behaviors/BComputedAndWatch/index.ts"],"names":[],"mappings":"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"}

package/dist/behaviors/BComputedAndWatch/types.d.ts

@@ -10,6 +10,7 @@ export type InstanceCustomFields = {
     __computedCache__?: ComputedCache;
     __watchOldValue__?: WatchOldValue;
     __watchConfig__?: () => Record<string, Func>;
+    __compLoadList__?: Func[];
     disposer: Record<string, Func>;
 };
 export type Instance = (ComponentInstance | PageInstance) & InstanceCustomFields;

package/dist/behaviors/BStore.js.map

@@ -1 +1 @@
-{"version":3,"file":"BStore.js","sourceRoot":"","sources":["../../src/behaviors/BStore.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,gBAAgB,EAAE,MAAM,2BAA2B,CAAC;AAG7D,MAAM,CAAC,MAAM,MAAM,GAAG,QAAQ,CAAC;IAC7B,gBAAgB,CAAC,OAAiC;QAEhD,MAAM,WAAW,GAAG,OAAO,CAAC,KAAK,CAAC;QAClC,IAAI,CAAC,WAAW;YAAE,OAAO;QACzB,MAAM,EAAE,IAAI,EAAE,GAAG,OAAO,CAAC,MAAM,CAAgB,CAAC;QAChD,KAAK,MAAM,GAAG,IAAI,WAAW,EAAE,CAAC;YAC9B,OAAO,CAAC,IAAI,KAAZ,OAAO,CAAC,IAAI,GAAK,EAAE,EAAC;YAEpB,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;YAI7C,OAAO,CAAC,OAAO,KAAf,OAAO,CAAC,OAAO,GAAK,EAAE,EAAC;YAEvB,OAAO,CAAC,OAAO,CAAC,eAAe,GAAG,GAAG,EAAE,CAAC,WAAW,CAAC;YAEpD,OAAO,OAAO,CAAC,KAAK,CAAC;QACvB,CAAC;IACH,CAAC;IAED,SAAS,EAAE;QACT,OAAO;;YAEL,MAAM,WAAW,GAAG,MAAA,IAAI,CAAC,eAAe,oDAAI,CAAC;YAC7C,IAAI,CAAC,WAAW;gBAAE,OAAO;YACzB,MAAM,EAAE,QAAQ,EAAE,QAAQ,EAAE,IAAI,EAAE,GAAG,OAAO,CAAC,MAAM,CAAgB,CAAC;YAEpE,IAAI,CAAC,QAAQ,GAAG,EAAE,CAAC;YAEnB,KAAK,MAAM,GAAG,IAAI,WAAW,EAAE,CAAC;gBAE9B,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,GAAG,QAAQ,CAC3B,WAAW,CAAC,GAAG,CAAC,EAChB,CAAC,KAAc,EAAE,EAAE;oBAEjB,IAAI,CAAC,OAAO,CAAC;wBACX,CAAC,GAAG,CAAC,EAAE,IAAI,CAAC,KAAK,CAAC;qBACnB,CAAC,CAAC;gBACL,CAAC,EACD;oBACE,MAAM,EAAE,QAAQ,CAAC,UAAU;iBAC5B,CACF,CAAC;YACJ,CAAC;YACD,gBAAgB,CAAC,IAAI,EAAE,iBAAiB,CAAC,CAAC;QAC5C,CAAC;QACD,QAAQ;YAGN,KAAK,MAAM,GAAG,IAAI,IAAI,CAAC,QAAQ,EAAE,CAAC;gBAChC,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;YACvB,CAAC;QACH,CAAC;KACF;CACF,CAAC,CAAC"}
+{"version":3,"file":"BStore.js","sourceRoot":"","sources":["../../src/behaviors/BStore.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,gBAAgB,EAAE,MAAM,2BAA2B,CAAC;AAG7D,MAAM,CAAC,MAAM,MAAM,GAAG,QAAQ,CAAC;IAC7B,gBAAgB,CAAC,OAAgC;QAE/C,MAAM,WAAW,GAAG,OAAO,CAAC,KAAK,CAAC;QAClC,IAAI,CAAC,WAAW;YAAE,OAAO;QACzB,MAAM,EAAE,IAAI,EAAE,GAAG,OAAO,CAAC,MAAM,CAAgB,CAAC;QAChD,KAAK,MAAM,GAAG,IAAI,WAAW,EAAE,CAAC;YAC9B,OAAO,CAAC,IAAI,KAAZ,OAAO,CAAC,IAAI,GAAK,EAAE,EAAC;YAEpB,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;YAG7C,OAAO,CAAC,OAAO,KAAf,OAAO,CAAC,OAAO,GAAK,EAAE,EAAC;YAEvB,OAAO,CAAC,OAAO,CAAC,eAAe,GAAG,GAAG,EAAE,CAAC,WAAW,CAAC;YAEpD,OAAO,OAAO,CAAC,KAAK,CAAC;QACvB,CAAC;IACH,CAAC;IACD,SAAS,EAAE;QACT,OAAO;;YAEL,MAAM,WAAW,GAAG,MAAA,IAAI,CAAC,eAAe,oDAAI,CAAC;YAC7C,IAAI,CAAC,WAAW;gBAAE,OAAO;YACzB,MAAM,EAAE,QAAQ,EAAE,QAAQ,EAAE,IAAI,EAAE,GAAG,OAAO,CAAC,MAAM,CAAgB,CAAC;YAEpE,IAAI,CAAC,QAAQ,GAAG,EAAE,CAAC;YAEnB,KAAK,MAAM,GAAG,IAAI,WAAW,EAAE,CAAC;gBAE9B,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,GAAG,QAAQ,CAC3B,WAAW,CAAC,GAAG,CAAC,EAChB,CAAC,KAAc,EAAE,EAAE;oBAEjB,IAAI,CAAC,OAAO,CAAC;wBACX,CAAC,GAAG,CAAC,EAAE,IAAI,CAAC,KAAK,CAAC;qBACnB,CAAC,CAAC;gBACL,CAAC,EACD;oBACE,MAAM,EAAE,QAAQ,CAAC,UAAU;iBAC5B,CACF,CAAC;YACJ,CAAC;YACD,gBAAgB,CAAC,IAAI,EAAE,iBAAiB,CAAC,CAAC;QAC5C,CAAC;QAED,QAAQ;YAEN,KAAK,MAAM,GAAG,IAAI,IAAI,CAAC,QAAQ,EAAE,CAAC;gBAChC,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;YACvB,CAAC;QACH,CAAC;KACF;CACF,CAAC,CAAC"}