annil 1.14.0 → 1.16.0

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> = {
-    [k in keyof legal]?: Getter<PropertyDoc, AddNullForObject<legal[k]>>;
+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":""}

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

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

package/dist/api/SubComponent/index.js

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

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

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

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

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

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

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

package/dist/index.d.ts

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

package/dist/index.js

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

package/dist/index.js.map

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

package/dist/thirdLib/index.js

@@ -1,2 +1,3 @@
-export {};
+import * as Vant from "./vant";
+import * as Wm from "./wm";
 //# sourceMappingURL=index.js.map

package/dist/thirdLib/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/thirdLib/index.ts"],"names":[],"mappings":""}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/thirdLib/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,IAAI,MAAM,QAAQ,CAAC;AAC/B,OAAO,KAAK,EAAE,MAAM,MAAM,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "annil",
-  "version": "1.14.0",
+  "version": "1.16.0",
   "description": "微信小程序(原生开发)插件",
   "main": "dist/index.js",
   "types": "src/index.ts",
@@ -12,6 +12,7 @@
   "scripts": {
     "coverage": "jest --coverage",
     "prepare": "husky install",
+    "ship": "node scripts/ship.mjs",
     "lint": "eslint . --max-warnings 0",
     "fmt": "dprint fmt",
     "tsc": "tsc --watch",
@@ -35,9 +36,9 @@
     "jest-environment-jsdom": "^29.7.0",
     "miniprogram-simulate": "^1.6.1",
     "mobx": "^6.9.0",
-    "ts-jest": "^29.1.1",
-    "typescript": "^5.9.3",
-    "typescript-eslint": "^8.57.0",
+    "ts-jest": "^29.4.11",
+    "typescript": "^6.0.3",
+    "typescript-eslint": "^8.60.1",
     "vitepress": "^1.6.4"
   },
   "files": [

package/src/api/DefineComponent/{NameOrPage → NameOrPath}/NameOrPathOption.ts

@@ -1,4 +1,4 @@
-import type { IfExtends } from "hry-types/src/Any/IfExtends";
+import type { IfEquals, IfExtends } from "hry-types/src/Any/_api";
 import type { Includes } from "../../../types/includes";
 
 /**
@@ -18,7 +18,7 @@ export type NameOrPathOption<
   : {
     /**
      * 组件名
-     * @remarks 不可为空串和含有下划线
+     * @remarks 不可为空串或包含下划线或空格
      */
     name:
       & TName
@@ -26,6 +26,6 @@ export type NameOrPathOption<
         TName,
         "",
         () => "⚠️组件名不可为空⚠️",
-        IfExtends<Includes<TName, "_">, true, () => "⚠️组件名不可包含下划线 _ ⚠️", unknown>
+        IfEquals<Includes<TName, "_" | " ">, true, () => "⚠️组件名不可包含下划线或空格⚠️", unknown>
       >;
   };

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

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

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

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

package/src/api/DefineComponent/index.ts

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

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

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

package/src/api/DefineComponent/normalizeOptions/handleStore/reactionRegister.ts

@@ -1,31 +1,70 @@
 import type mobx from "mobx";
 import type { Instance } from "../../../RootComponent/Instance/RootComponentInstance";
 import type { StoreConstraint } from "../../../RootComponent/Store/StoreConstraint";
+
+/**
+ * 为store字段注册reaction,以实现响应式更新。
+ * 注意:如果getter函数返回undefined,则不会注册reaction,该字段将不可响应式,但不报错(有警告)。如果getter函数没有依赖任何响应式数据,则不会注册reaction,该字段将不可响应式,并抛出错误。
+ * @param this
+ * @param storeConfig
+ */
 export function reactionRegister(this: Instance, storeConfig: StoreConstraint) {
   // eslint-disable-next-line @typescript-eslint/no-require-imports
-  const { comparer, reaction, toJS } = require("mobx") as typeof mobx;
-  // 存储reaction的disposer 需要保护内部字段验证
+  const { comparer, getDependencyTree, reaction, toJS } = require("mobx") as typeof mobx;
+  // 1. 清理旧的reaction,避免重复注册(组件detached),虽然在detached时加入了清理reaction的逻辑,但在某些极端情况下可能无法触发(如组件未调用detached周期,就又运行了attached周期),因此在这里先清理一次,确保不会重复注册。
+  if (this.disposer) {
+    for (const key of Object.keys(this.disposer)) {
+      this.disposer[key]();
+    }
+  }
   this.disposer = {};
-  const peddingSetData: Record<string, unknown> = {};
-  for (const key in storeConfig) {
+  const pendingSetData: Record<string, unknown> = {};
+
+  for (const key of Object.keys(storeConfig)) {
     const getter = storeConfig[key];
-    const value = getter(this.data);
-    if (value === undefined) {
-      throw new Error(`store配置中 ${key} 字段的返回值不可为undefined`);
+
+    // 1. 临时 reaction：只用来检测依赖
+    let hasObservableDependency = false;
+    let firstRunValue: unknown;
+
+    const tempDisposer = reaction(
+      () => {
+        const value = getter(this.data);
+        firstRunValue = value; // 顺便获取初始值
+        return value;
+      },
+      () => void 0, // 空回调，零副作用
+      { fireImmediately: true },
+    );
+
+    // 2. 检查依赖
+    const deps = getDependencyTree(tempDisposer).dependencies ?? [];
+    hasObservableDependency = deps.length > 0;
+    // 3. 清理临时 reaction
+    tempDisposer();
+
+    // 4. 验证
+    if (firstRunValue === undefined) {
+      console.warn(`store字段 ${key} 的getter函数返回了undefined，该字段将不会被注册为响应式字段。`);
+      continue;
+    }
+
+    if (!hasObservableDependency) {
+      throw new Error(`store字段 ${key} 的getter函数没有依赖任何响应式数据。`);
     }
-    // 添加响应式逻辑
-    peddingSetData[key] = toJS(value);
-    this.disposer[key] = reaction(
+
+    // 5. 正式绑定
+    const disposer = reaction(
       () => getter(this.data),
       (value: unknown) => {
-        this.setData({
-          [key]: toJS(value),
-        });
-      },
-      {
-        equals: comparer.structural,
+        this.setData({ [key]: toJS(value) });
       },
+      { equals: comparer.structural },
     );
+
+    pendingSetData[key] = toJS(firstRunValue);
+    this.disposer[key] = disposer;
   }
-  this.setData(peddingSetData);
+
+  this.setData(pendingSetData);
 }

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

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

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

@@ -7,7 +7,7 @@ import { computedUpdater } from "../initComputed/computedUpdater";
 import { addDetachedData } from "./addDetachedData";
 import { hijack } from "./hijack";
 import { isPageCheck } from "./isPageCheck";
-import { loadReceivedDataHandle } from "./loadReceivedDataHandle";
+// import { loadReceivedDataHandle } from "./loadReceivedDataHandle";
 import { onLoadReceivedDataHandle } from "./onLoadReceivedDataHandle";
 import { pagePathCheck } from "./pagePathCheck";
 
@@ -16,10 +16,9 @@ export function hijackHandle(
   isPage: boolean | undefined,
   path: string | undefined,
 ) {
-  // 对页面传入参数进行处理 老框架劫持页面methods.onLoad,新框架劫持页面pageLifetimes.load
-  if (finalOptionsForComponent.isPage) {
-    hijack(finalOptionsForComponent.pageLifetimes, "load", [loadReceivedDataHandle]);
-  }
+  // if (finalOptionsForComponent.isPage) {
+  //   hijack(finalOptionsForComponent.pageLifetimes, "load", [loadReceivedDataHandle]);
+  // }
 
   hijack(finalOptionsForComponent.methods, "onLoad", [onLoadReceivedDataHandle]);
   hijack(finalOptionsForComponent.observers, "**", [
@@ -37,6 +36,7 @@ export function hijackHandle(
       initStore(finalOptionsForComponent.store),
       // 计算属性的初始化应该在store初始化之后,因为计算属性可能依赖store。
       initComputed(finalOptionsForComponent.computed, finalOptionsForComponent.watch),
+      // 在初始化计算属性后,再让构建组件时的observers的回调函数被调用.避免回调函数中用到了计算属性的值时报错。
       function(this: Instance) {
         const observerhandlers = this.data.__oberverHandler__;
         if (observerhandlers) {