annil 1.0.6 → 1.0.8

package/CHANGELOG.md

@@ -4,6 +4,20 @@
 
 * 解决DetailedType不接收接口类型的错误 ([ae8acbf](https://github.com/missannil/annil/commit/ae8acbfc2e62f99db565c448ad9253aa549e78bb))
 
+## [1.0.8](https://github.com/missannil/annil/compare/v1.0.7...v1.0.8) (2023-12-03)
+
+
+### Bug Fixes
+
+* 组件类型中别名被解析的问题 ([67e4886](https://github.com/missannil/annil/commit/67e48868b55853c41f5ad4c713dab12e31380f64))
+
+## [1.0.7](https://github.com/missannil/annil/compare/v1.0.6...v1.0.7) (2023-12-02)
+
+
+### Bug Fixes
+
+* 修复DefinedComponent的subComonsnts字段为[never]类型时,生成page类型错误的情况 ([a8aec74](https://github.com/missannil/annil/commit/a8aec74bbe964585f71d96bebdc85a32241271aa))
+
 ## [1.0.6](https://github.com/missannil/annil/compare/v1.0.5...v1.0.6) (2023-12-02)
 
 

package/dist/api/DefineComponent/ReturnType/CreateComponentDoc.d.ts

@@ -1,5 +1,5 @@
 import type { IfExtends } from "hry-types/src/Any/IfExtends";
-import type { ComputeIntersectionDeep } from "hry-types/src/Object/ComputeIntersectionDeep";
+import type { ComputeIntersection } from "hry-types/src/Object/ComputeIntersection";
 import type { AddNullForObject } from "../../../types/AddNullForObject";
 import type { RootComponentDoc } from "../../RootComponent/RootComponentDoc";
 import type { SubComponentDoc } from "../../SubComponent/SubComponentDoc";
@@ -7,7 +7,7 @@ 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 CreateComponentDoc<TRootDoc extends RootComponentDoc, TName extends string, TSubComponentTuple extends SubComponentDoc[], AllPropertiesDoc extends unknown | object = TRootDoc["properties"], AllCustomEventsDoc extends unknown | object = TRootDoc["customEvents"] & GetCustomEventDocOfSubDoc<TSubComponentTuple[number]>, StopKeys extends string = GetStopKeys<TRootDoc["events"]>, FinalCustomEventDoc extends object = Omit<AllCustomEventsDoc, StopKeys>> = ComputeIntersectionDeep<IfExtends<unknown, AllPropertiesDoc, {}, {
+export type CreateComponentDoc<TRootDoc extends RootComponentDoc, TName extends string, TSubComponentTuple extends SubComponentDoc[], AllPropertiesDoc extends unknown | object = TRootDoc["properties"], AllCustomEventsDoc extends unknown | object = TRootDoc["customEvents"] & GetCustomEventDocOfSubDoc<TSubComponentTuple[number]>, StopKeys extends string = GetStopKeys<TRootDoc["events"]>, FinalCustomEventDoc extends object = Omit<AllCustomEventsDoc, StopKeys>> = ComputeIntersection<IfExtends<unknown, AllPropertiesDoc, {}, {
     properties: {
         [k in keyof AllPropertiesDoc as `${TName}_${k & string}`]: AddNullForObject<AllPropertiesDoc[k]>;
     };

package/dist/api/DefineComponent/ReturnType/CreatePageDoc.d.ts

@@ -1,11 +1,8 @@
 import type { IfExtends } from "hry-types/src/Any/IfExtends";
-import type { ComputeIntersectionDeep } from "hry-types/src/Object/ComputeIntersectionDeep";
-import type { RemoveNullOfRequired } from "../../../types/RemoveNullOfRequired";
+import type { ComputeIntersection } from "hry-types/src/Object/ComputeIntersection";
 import type { RootComponentDoc } from "../../RootComponent/RootComponentDoc";
-import type { SubComponentDoc } from "../../SubComponent/SubComponentDoc";
-import type { GetPropertiesDocOfSubDoc } from "./GetPropertiesDocOfSubDoc";
-export type CreatePageDoc<TRootDoc extends RootComponentDoc, TPath extends string, TSubComponentTuple extends SubComponentDoc[], AllPropertiesDoc = TRootDoc["properties"] & GetPropertiesDocOfSubDoc<TSubComponentTuple>> = ComputeIntersectionDeep<{
+export type CreatePageDoc<TRootDoc extends RootComponentDoc, TPath extends string> = ComputeIntersection<{
     path: TPath;
-} & IfExtends<unknown, AllPropertiesDoc, unknown, {
-    properties: RemoveNullOfRequired<AllPropertiesDoc>;
+} & IfExtends<unknown, TRootDoc["properties"], unknown, {
+    properties: TRootDoc["properties"];
 }>>;

package/dist/api/DefineComponent/ReturnType/test/normalPageDoc.test.js

@@ -22,4 +22,10 @@ const compDocOnlyProperties = DefineComponent({
     rootComponent: OnlyPropsRootDoc,
 });
 Checking;
+const whenSubIsAllNever = DefineComponent({
+    path: "/pages/index/index",
+    rootComponent: OnlyPropsRootDoc,
+    subComponents: [{}],
+});
+Checking;
 //# sourceMappingURL=normalPageDoc.test.js.map

package/dist/api/DefineComponent/ReturnType/test/normalPageDoc.test.js.map

@@ -1 +1 @@
-{"version":3,"file":"normalPageDoc.test.js","sourceRoot":"","sources":["../../../../../src/api/DefineComponent/ReturnType/test/normalPageDoc.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAa,MAAM,WAAW,CAAC;AAChD,OAAO,EAAqB,aAAa,EAAE,MAAM,aAAa,CAAC;AAG/D,OAAO,EAAE,eAAe,EAAE,MAAM,OAAO,CAAC;AAExC,MAAM,gBAAgB,GAAG,aAAa,EAAE,CAAC;IACvC,MAAM,EAAE,IAAI;IACZ,UAAU,EAAE;QACV,GAAG,EAAE,MAAM;QACX,GAAG,EAAE,MAAiC;QACtC,WAAW,EAAE;YACX,IAAI,EAAE,MAAiC;YACvC,KAAK,EAAE,EAAe;SACvB;QACD,iBAAiB,EAAE;YACjB,IAAI,EAAE,MAAwC;YAC9C,KAAK,EAAE,IAAI;SACZ;KACF;IACD,YAAY,EAAE,EAAE;CACjB,CAAC,CAAC;AAEH,MAAM,qBAAqB,GAAG,eAAe,CAAC;IAC5C,IAAI,EAAE,oBAAoB;IAC1B,aAAa,EAAE,gBAAgB;CAChC,CAAC,CAAC;AAaH,QAAgF,CAAC"}
+{"version":3,"file":"normalPageDoc.test.js","sourceRoot":"","sources":["../../../../../src/api/DefineComponent/ReturnType/test/normalPageDoc.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAa,MAAM,WAAW,CAAC;AAChD,OAAO,EAAqB,aAAa,EAAE,MAAM,aAAa,CAAC;AAG/D,OAAO,EAAE,eAAe,EAAE,MAAM,OAAO,CAAC;AAExC,MAAM,gBAAgB,GAAG,aAAa,EAAE,CAAC;IACvC,MAAM,EAAE,IAAI;IACZ,UAAU,EAAE;QACV,GAAG,EAAE,MAAM;QACX,GAAG,EAAE,MAAiC;QACtC,WAAW,EAAE;YACX,IAAI,EAAE,MAAiC;YACvC,KAAK,EAAE,EAAe;SACvB;QACD,iBAAiB,EAAE;YACjB,IAAI,EAAE,MAAwC;YAC9C,KAAK,EAAE,IAAI;SACZ;KACF;IACD,YAAY,EAAE,EAAE;CACjB,CAAC,CAAC;AAEH,MAAM,qBAAqB,GAAG,eAAe,CAAC;IAC5C,IAAI,EAAE,oBAAoB;IAC1B,aAAa,EAAE,gBAAgB;CAChC,CAAC,CAAC;AAaH,QAAgF,CAAC;AAGjF,MAAM,iBAAiB,GAAG,eAAe,CAAC;IACxC,IAAI,EAAE,oBAAoB;IAC1B,aAAa,EAAE,gBAAgB;IAC/B,aAAa,EAAE,CAAC,EAAW,CAAC;CAC7B,CAAC,CAAC;AAEH,QAA4E,CAAC"}

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

@@ -12,7 +12,7 @@ import type { SubComponentsOption } from "./SubComponents/SubComponentsOption";
 type Path = `/${string}`;
 type RootOptions<TRootComponentDoc extends RootComponentDoc, TSubComponentTuple extends SubComponentDoc[], TName extends string, TPath extends Path> = NameOrPathOption<TName, TPath, TRootComponentDoc> & RootComponentOption<TRootComponentDoc> & SubComponentsOption<TSubComponentTuple>;
 interface DefineComponentConstructor {
-    <TRootComponentDoc extends RootComponentDoc = {}, TSubComponentTuple extends SubComponentDoc[] = [], TName extends string = "", TPath extends Path = "/">(options: RootOptions<TRootComponentDoc, TSubComponentTuple, TName, TPath>): IfExtends<"", TName, CreatePageDoc<TRootComponentDoc, TPath, TSubComponentTuple>, CreateComponentDoc<TRootComponentDoc, TName, TSubComponentTuple>>;
+    <TRootComponentDoc extends RootComponentDoc = {}, TSubComponentTuple extends SubComponentDoc[] = [], TName extends string = "", TPath extends Path = "/">(options: RootOptions<TRootComponentDoc, TSubComponentTuple, TName, TPath>): IfExtends<"", TName, CreatePageDoc<TRootComponentDoc, TPath>, CreateComponentDoc<TRootComponentDoc, TName, TSubComponentTuple>>;
 }
 export type FuncOptions = Record<"pageLifetimes" | "lifetimes" | "watch", Record<string, Func[]>>;
 export type FinalOptionsForComponent = {

package/dist/api/RootComponent/Properties/GetOptionalDoc.d.ts

@@ -1,8 +1,7 @@
 import type { IfExtends } from "hry-types/src/Any/IfExtends";
-import type { Select } from "hry-types/src/Object/Select";
 import type { AddNullForObject } from "../../../types/AddNullForObject";
 import type { InferDetailedType } from "../../../types/InferDetailedType";
-import type { OptionalType, PropertiesConstraint } from "./PropertiesConstraint";
-export type GetOptionalDoc<TProperties extends PropertiesConstraint, TIsPage extends boolean, Optional extends Record<string, OptionalType> = Select<TProperties, OptionalType>> = {
-    [k in keyof Optional]?: IfExtends<unknown, Optional[k]["optionalTypes"], IfExtends<false, TIsPage, AddNullForObject<InferDetailedType<Optional[k]["type"]>>, InferDetailedType<Optional[k]["type"]>>, IfExtends<false, TIsPage, AddNullForObject<InferDetailedType<Optional[k]["type"]> | InferDetailedType<(Optional[k]["optionalTypes"] & {})[number]>>, InferDetailedType<Optional[k]["type"]> | InferDetailedType<(Optional[k]["optionalTypes"] & {})[number]>>>;
+import type { OptionalType } from "./PropertiesConstraint";
+export type GetOptionalDoc<TOptionalProperties extends Record<string, OptionalType>, TIsPage extends boolean> = {
+    -readonly [k in keyof TOptionalProperties]?: IfExtends<unknown, TOptionalProperties[k]["optionalTypes"], IfExtends<false, TIsPage, AddNullForObject<InferDetailedType<TOptionalProperties[k]["type"]>>, InferDetailedType<TOptionalProperties[k]["type"]>>, IfExtends<false, TIsPage, AddNullForObject<InferDetailedType<TOptionalProperties[k]["type"]> | InferDetailedType<(TOptionalProperties[k]["optionalTypes"] & {})[number]>>, InferDetailedType<TOptionalProperties[k]["type"]> | InferDetailedType<(TOptionalProperties[k]["optionalTypes"] & {})[number]>>>;
 };

package/dist/api/RootComponent/Properties/GetPropertiesDoc.d.ts

@@ -1,9 +1,8 @@
-import type { IfExtends } from "hry-types/src/Any/IfExtends";
 import type { Select } from "hry-types/src/Object/Select";
-import type { ComputeIntersection, NonReadonlyDeep } from "hry-types/src/Object/_api";
+import type { ComputeIntersection } from "hry-types/src/Object/_api";
 import type { GetOptionalDoc } from "./GetOptionalDoc";
 import type { GetRequiredDoc } from "./GetRequiredDoc";
 import type { OptionalType, PropertiesConstraint } from "./PropertiesConstraint";
-type _GetPropertiesDoc<TProperties extends PropertiesConstraint, TIsPage extends boolean, Type extends "Required" | "Optional" | "all" = "all", OptionalDoc = NonReadonlyDeep<GetOptionalDoc<Select<TProperties, OptionalType>, TIsPage>>, RequiredDoc = NonReadonlyDeep<GetRequiredDoc<Omit<TProperties, keyof OptionalDoc>, TIsPage>>> = IfExtends<Type, "all", ComputeIntersection<OptionalDoc & RequiredDoc>, IfExtends<Type, "Optional", OptionalDoc, RequiredDoc>>;
-export type GetPropertiesDoc<TProperties extends PropertiesConstraint, TisPage extends boolean, Type extends "Required" | "Optional" | "all" = "all"> = _GetPropertiesDoc<TProperties, TisPage, Type>;
+type _GetPropertiesDoc<TProperties extends PropertiesConstraint, TIsPage extends boolean, OptionalDoc extends object = GetOptionalDoc<Select<TProperties, OptionalType>, TIsPage>, RequiredDoc extends object = GetRequiredDoc<Omit<TProperties, keyof OptionalDoc>, TIsPage>> = ComputeIntersection<OptionalDoc & RequiredDoc>;
+export type GetPropertiesDoc<TProperties extends PropertiesConstraint, TisPage extends boolean> = _GetPropertiesDoc<TProperties, TisPage>;
 export {};

package/dist/api/RootComponent/Properties/GetRequiredDoc.d.ts

@@ -1,8 +1,7 @@
 import type { IfExtends } from "hry-types/src/Any/IfExtends";
-import type { Select } from "hry-types/src/Object/Select";
 import type { AddNullForObject } from "../../../types/AddNullForObject";
 import type { InferDetailedType } from "../../../types/InferDetailedType";
-import type { PropertiesConstraint, RequiredSingle, RequiredType } from "./PropertiesConstraint";
-export type GetRequiredDoc<TProperties extends PropertiesConstraint, TIsPage extends boolean, Required extends Record<string, RequiredType> = Select<TProperties, RequiredType>> = {
-    [k in keyof Required]: IfExtends<Required[k], RequiredSingle, IfExtends<false, TIsPage, AddNullForObject<InferDetailedType<Required[k]>>, InferDetailedType<Required[k]>>, IfExtends<false, TIsPage, AddNullForObject<InferDetailedType<Required[k]["type"]>> | AddNullForObject<InferDetailedType<Required[k]["optionalTypes"][number]>>, InferDetailedType<Required[k]["type"]> | InferDetailedType<Required[k]["optionalTypes"][number]>>>;
+import type { RequiredSingle, RequiredType } from "./PropertiesConstraint";
+export type GetRequiredDoc<TProperties extends Record<string, RequiredType>, TIsPage extends boolean> = {
+    -readonly [k in keyof TProperties]: IfExtends<TProperties[k], RequiredSingle, IfExtends<false, TIsPage, AddNullForObject<InferDetailedType<TProperties[k]>>, InferDetailedType<TProperties[k]>>, IfExtends<false, TIsPage, AddNullForObject<InferDetailedType<TProperties[k]["type"]> | InferDetailedType<TProperties[k]["optionalTypes"][number]>>, InferDetailedType<TProperties[k]["type"]> | InferDetailedType<TProperties[k]["optionalTypes"][number]>>>;
 };

package/dist/api/RootComponent/Store/test/normal.test.js

@@ -1,13 +1,15 @@
+import { Checking } from "hry-types";
 import { observable } from "mobx";
 import { RootComponent } from "../..";
 const user = observable({
     name: "zhao",
     age: 20,
 });
-RootComponent()({
+const storeDoc = RootComponent()({
     store: {
         userName: () => user.name,
         userAge: () => user.age,
     },
 });
+Checking;
 //# sourceMappingURL=normal.test.js.map

package/dist/api/RootComponent/Store/test/normal.test.js.map

@@ -1 +1 @@
-{"version":3,"file":"normal.test.js","sourceRoot":"","sources":["../../../../../src/api/RootComponent/Store/test/normal.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,MAAM,CAAC;AAClC,OAAO,EAAE,aAAa,EAAE,MAAM,OAAO,CAAC;AACtC,MAAM,IAAI,GAAG,UAAU,CAAC;IACtB,IAAI,EAAE,MAAM;IACZ,GAAG,EAAE,EAAE;CACR,CAAC,CAAC;AAEH,aAAa,EAAE,CAAC;IACd,KAAK,EAAE;QACL,QAAQ,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,IAAI;QACzB,OAAO,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,GAAG;KACxB;CACF,CAAC,CAAC"}
+{"version":3,"file":"normal.test.js","sourceRoot":"","sources":["../../../../../src/api/RootComponent/Store/test/normal.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAa,MAAM,WAAW,CAAC;AAChD,OAAO,EAAE,UAAU,EAAE,MAAM,MAAM,CAAC;AAClC,OAAO,EAAE,aAAa,EAAE,MAAM,OAAO,CAAC;AACtC,MAAM,IAAI,GAAG,UAAU,CAAC;IACtB,IAAI,EAAE,MAAM;IACZ,GAAG,EAAE,EAAE;CACR,CAAC,CAAC;AAEH,MAAM,QAAQ,GAAG,aAAa,EAAE,CAAC;IAC/B,KAAK,EAAE;QACL,QAAQ,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,IAAI;QACzB,OAAO,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,GAAG;KACxB;CACF,CAAC,CAAC;AASH,QAAsD,CAAC"}

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

@@ -2,7 +2,8 @@ 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 { ComputeIntersectionDeep } from "hry-types/src/Object/_api";
+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 { ComponentDoc } from "../DefineComponent/ReturnType/ComponentDoc";
 import type { ComputedConstraint } from "./Computed/ComputedConstraint";
@@ -31,14 +32,14 @@ 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>): ComputeIntersectionDeep<IfExtends<TIsPage, false, {}, {
+    <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, {}, {
         isPage: true;
     }> & IfExtends<EmptyObject, PropertiesDoc, {}, {
         properties: PropertiesDoc;
     }> & IfExtends<EmptyObject, DataDoc, {}, {
         data: DataDoc;
     }> & IfExtends<EmptyObject, StoreDoc, {}, {
-        store: StoreDoc;
+        store: ComputeObject<StoreDoc>;
     }> & IfExtends<EmptyObject, ComputedDoc, {}, {
         computed: ComputedDoc;
     }> & IfExtends<EmptyObject, TMethods, {}, {
@@ -46,7 +47,7 @@ type RootComponentConstructor<TReceivedComponentDoc extends ComponentDoc[] | Com
     }> & IfExtends<EmptyObject, EventsDoc, {}, {
         events: EventsDoc;
     }> & IfExtends<EmptyObject, CustomEventsDoc, {}, {
-        customEvents: CustomEventsDoc;
+        customEvents: ComputeObject<CustomEventsDoc>;
     }>>;
 };
 export declare function RootComponent<TReceivedComponentDoc extends ComponentDoc[] | ComponentDoc = {}>(): RootComponentConstructor<TReceivedComponentDoc>;

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

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

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;AAKH,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;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"}

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

@@ -1,7 +1,7 @@
 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 { ExtractDocPrefix } from "../../types/GetComponentPrefix";
+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";
@@ -27,7 +27,7 @@ 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 SubComponentConstructor<TRootDoc extends RootComponentDoc, TOriginalCompDoc extends ComponentDoc, TSupplementalPrefix extends string = "", IsPage extends boolean = TRootDoc["isPage"] extends true ? true : false, CurrentPrefix extends string = `${ExtractDocPrefix<TOriginalCompDoc>}${Capitalize<TSupplementalPrefix>}`, CurrentCompDoc extends ComponentDoc = IfExtends<TSupplementalPrefix, "", TOriginalCompDoc, ReplacePrefix<TOriginalCompDoc, CurrentPrefix>>, AllRootDataDoc extends object = Required<TRootDoc["properties"]> & TRootDoc["data"] & TRootDoc["computed"] & TRootDoc["store"]> = {
+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, {}, {
         [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>;

package/dist/index.d.ts

@@ -1,10 +1,11 @@
-export type { Vant, Wm } from "./thirdLib";
-export type { Dataset, Detail, WMBaseEvent, WMCustomEvent } from "./types/OfficialTypeAlias";
 import { navigateTo } from "./api/navigateTo";
 import { DefineComponent } from "./api/DefineComponent";
 import { RootComponent } from "./api/RootComponent";
 import { SubComponent } from "./api/SubComponent";
 import type { DetailedType } from "./types/DetailedType";
+import type { ComponentDocExtension } from "./types/ComponentDocExtension";
 import type { GenerateDoc } from "./types/GenerateDoc";
 import type { ParamsEqual } from "./types/TwoParamsEqual";
-export { DefineComponent, type DetailedType, type GenerateDoc, navigateTo, type ParamsEqual, RootComponent, SubComponent, };
+export type { Vant, Wm } from "./thirdLib";
+export type { Dataset, Detail, WMBaseEvent, WMCustomEvent } from "./types/OfficialTypeAlias";
+export { type ComponentDocExtension, DefineComponent, type DetailedType, type GenerateDoc, navigateTo, type ParamsEqual, RootComponent, SubComponent, };

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAE9C,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAExD,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AAEpD,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAOlD,OAAO,EACL,eAAe,EAGf,UAAU,EAEV,aAAa,EACb,YAAY,GACb,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAE9C,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAExD,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AAEpD,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAWlD,OAAO,EAEL,eAAe,EAGf,UAAU,EAEV,aAAa,EACb,YAAY,GACb,CAAC"}

package/dist/types/ComponentDocExtension.d.ts

@@ -0,0 +1,7 @@
+import type { IfExtends } from "hry-types/src/Any/IfExtends";
+import type { ComputeIntersectionDeep } from "hry-types/src/Object/ComputeIntersectionDeep";
+import type { ComponentDoc } from "../api/DefineComponent/ReturnType/ComponentDoc";
+import type { GetComponentPrefix } from "./GetComponentPrefix";
+type Validator<TOriginalComponentDoc extends ComponentDoc, TExtensionDoc extends ComponentDoc, TOriginalPrefix extends PropertyKey = GetComponentPrefix<TOriginalComponentDoc>, TExtenstionPrefix extends PropertyKey = GetComponentPrefix<TExtensionDoc>, DuplicateKeys extends PropertyKey = Extract<keyof TExtensionDoc["properties"], keyof TOriginalComponentDoc["properties"]> | Extract<keyof TExtensionDoc["customEvents"], keyof TOriginalComponentDoc["customEvents"]>> = IfExtends<TOriginalPrefix, TExtenstionPrefix, IfExtends<DuplicateKeys, never, ComponentDoc, `${DuplicateKeys & string}字段重复`>, `前缀错误,应为${TOriginalPrefix & string}`>;
+export type ComponentDocExtension<TOriginalComponentDoc extends ComponentDoc, TExtensionDoc extends Validator<TOriginalComponentDoc, TExtensionDoc>> = ComputeIntersectionDeep<TOriginalComponentDoc & TExtensionDoc>;
+export {};

package/dist/types/ComponentDocExtension.js

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

package/dist/types/ComponentDocExtension.js.map

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

package/dist/types/ComputeObj.d.ts

@@ -0,0 +1,3 @@
+export type ComputeObject<T> = T extends unknown ? {
+    [k in keyof T]: T[k];
+} : never;

package/dist/types/ComputeObj.js

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

package/dist/types/ComputeObj.js.map

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

package/dist/types/GetComponentPrefix.d.ts

@@ -1,3 +1,4 @@
 import type { IfExtends } from "hry-types/src/Any/IfExtends";
+import type { EmptyObject } from "hry-types/src/Misc/EmptyObject";
 import type { ComponentDoc } from "../api/DefineComponent/ReturnType/ComponentDoc";
-export type ExtractDocPrefix<TComponentDoc extends ComponentDoc> = keyof IfExtends<unknown, TComponentDoc["properties"], TComponentDoc["customEvents"], TComponentDoc["properties"]> extends `${infer P}_${string}` ? P : "";
+export type GetComponentPrefix<TComponentDoc extends ComponentDoc> = EmptyObject extends TComponentDoc ? never : keyof IfExtends<unknown, TComponentDoc["properties"], TComponentDoc["customEvents"], TComponentDoc["properties"]> extends `${infer P}_${string}` ? P : never;

package/package.json

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

package/src/api/DefineComponent/ReturnType/CreateComponentDoc.ts

@@ -1,5 +1,5 @@
 import type { IfExtends } from "hry-types/src/Any/IfExtends";
-import type { ComputeIntersectionDeep } from "hry-types/src/Object/ComputeIntersectionDeep";
+import type { ComputeIntersection } from "hry-types/src/Object/ComputeIntersection";
 import type { AddNullForObject } from "../../../types/AddNullForObject";
 import type { RootComponentDoc } from "../../RootComponent/RootComponentDoc";
 import type { SubComponentDoc } from "../../SubComponent/SubComponentDoc";
@@ -19,7 +19,7 @@ export type CreateComponentDoc<
     & GetCustomEventDocOfSubDoc<TSubComponentTuple[number]>,
   StopKeys extends string = GetStopKeys<TRootDoc["events"]>,
   FinalCustomEventDoc extends object = Omit<AllCustomEventsDoc, StopKeys>,
-> = ComputeIntersectionDeep<
+> = ComputeIntersection<
   & IfExtends<
     unknown,
     AllPropertiesDoc,

package/src/api/DefineComponent/ReturnType/CreatePageDoc.ts

@@ -1,26 +1,18 @@
 import type { IfExtends } from "hry-types/src/Any/IfExtends";
-import type { ComputeIntersectionDeep } from "hry-types/src/Object/ComputeIntersectionDeep";
-import type { RemoveNullOfRequired } from "../../../types/RemoveNullOfRequired";
+import type { ComputeIntersection } from "hry-types/src/Object/ComputeIntersection";
 import type { RootComponentDoc } from "../../RootComponent/RootComponentDoc";
-import type { SubComponentDoc } from "../../SubComponent/SubComponentDoc";
-import type { GetPropertiesDocOfSubDoc } from "./GetPropertiesDocOfSubDoc";
 
 export type CreatePageDoc<
   TRootDoc extends RootComponentDoc,
   TPath extends string,
-  TSubComponentTuple extends SubComponentDoc[],
-  // 获取所有properties字段
-  AllPropertiesDoc = TRootDoc["properties"] & GetPropertiesDocOfSubDoc<TSubComponentTuple>,
-> = ComputeIntersectionDeep<
+> = ComputeIntersection<
   & { path: TPath }
   & IfExtends<
     unknown,
-    AllPropertiesDoc,
+    TRootDoc["properties"],
     unknown,
     {
-      // @ts-ignore AllPropertiesDoc 必为 object
-      //  RemoveNullOfRequired 页面传值时必传字段不需要RootComponent返回时为对象加入的null类型
-      properties: RemoveNullOfRequired<AllPropertiesDoc>;
+      properties: TRootDoc["properties"];
     }
   >
 >;

package/src/api/DefineComponent/ReturnType/test/normalPageDoc.test.ts

@@ -38,3 +38,12 @@ type CompDocOnlyPropertiesExpected = {
 };
 
 Checking<typeof compDocOnlyProperties, CompDocOnlyPropertiesExpected, Test.Pass>;
+
+// 页面类型不受subComponents是[never,never]时影响
+const whenSubIsAllNever = DefineComponent({
+  path: "/pages/index/index",
+  rootComponent: OnlyPropsRootDoc,
+  subComponents: [{} as never],
+});
+
+Checking<typeof whenSubIsAllNever, CompDocOnlyPropertiesExpected, Test.Pass>;

package/src/api/DefineComponent/index.ts

@@ -39,7 +39,7 @@ interface DefineComponentConstructor {
     "",
     TName,
     // 生成页面文档
-    CreatePageDoc<TRootComponentDoc, TPath, TSubComponentTuple>,
+    CreatePageDoc<TRootComponentDoc, TPath>,
     // 生成组件文档
     CreateComponentDoc<TRootComponentDoc, TName, TSubComponentTuple>
   >;

package/src/api/RootComponent/CustomEvents/GetCustomEventDoc.ts

@@ -42,5 +42,3 @@ export type GetCustomEventDoc<T extends CustomEventConstraint> =
         | AddTagForCustomEventsDoc<T[k]["options"]>;
   }
 ;
-
-// type ddd = IsUnion

package/src/api/RootComponent/Properties/GetOptionalDoc.ts

@@ -1,38 +1,37 @@
 import type { IfExtends } from "hry-types/src/Any/IfExtends";
-import type { Select } from "hry-types/src/Object/Select";
 import type { AddNullForObject } from "../../../types/AddNullForObject";
 import type { InferDetailedType } from "../../../types/InferDetailedType";
-import type { OptionalType, PropertiesConstraint } from "./PropertiesConstraint";
+import type { OptionalType } from "./PropertiesConstraint";
 
 /**
  * 获取properties可传字段文档类型
  */
 export type GetOptionalDoc<
-  TProperties extends PropertiesConstraint,
+  TOptionalProperties extends Record<string, OptionalType>,
   TIsPage extends boolean,
-  // @ts-ignore
-  Optional extends Record<string, OptionalType> = Select<TProperties, OptionalType>,
 > = {
-  [k in keyof Optional]?: IfExtends<
+  -readonly [k in keyof TOptionalProperties]?: IfExtends<
     unknown,
-    Optional[k]["optionalTypes"],
+    TOptionalProperties[k]["optionalTypes"],
     IfExtends<
       false,
       TIsPage,
       // 组件时 对象加null
-      AddNullForObject<InferDetailedType<Optional[k]["type"]>>,
+      AddNullForObject<InferDetailedType<TOptionalProperties[k]["type"]>>,
       // 页面时 对象不加
-      InferDetailedType<Optional[k]["type"]>
+      InferDetailedType<TOptionalProperties[k]["type"]>
     >,
     IfExtends<
       false,
       TIsPage,
       // 组件时 对象加null
       AddNullForObject<
-        InferDetailedType<Optional[k]["type"]> | InferDetailedType<(Optional[k]["optionalTypes"] & {})[number]>
+        | InferDetailedType<TOptionalProperties[k]["type"]>
+        | InferDetailedType<(TOptionalProperties[k]["optionalTypes"] & {})[number]>
       >,
       // 页面时 对象不加
-      InferDetailedType<Optional[k]["type"]> | InferDetailedType<(Optional[k]["optionalTypes"] & {})[number]>
+      | InferDetailedType<TOptionalProperties[k]["type"]>
+      | InferDetailedType<(TOptionalProperties[k]["optionalTypes"] & {})[number]>
     >
   >;
 };

package/src/api/RootComponent/Properties/GetPropertiesDoc.ts

@@ -1,7 +1,6 @@
-import type { IfExtends } from "hry-types/src/Any/IfExtends";
 import type { Select } from "hry-types/src/Object/Select";
 
-import type { ComputeIntersection, NonReadonlyDeep } from "hry-types/src/Object/_api";
+import type { ComputeIntersection } from "hry-types/src/Object/_api";
 import type { GetOptionalDoc } from "./GetOptionalDoc";
 import type { GetRequiredDoc } from "./GetRequiredDoc";
 import type { OptionalType, PropertiesConstraint } from "./PropertiesConstraint";
@@ -9,25 +8,16 @@ import type { OptionalType, PropertiesConstraint } from "./PropertiesConstraint"
 type _GetPropertiesDoc<
   TProperties extends PropertiesConstraint,
   TIsPage extends boolean,
-  Type extends "Required" | "Optional" | "all" = "all",
-  OptionalDoc = NonReadonlyDeep<GetOptionalDoc<Select<TProperties, OptionalType>, TIsPage>>,
-  RequiredDoc = NonReadonlyDeep<GetRequiredDoc<Omit<TProperties, keyof OptionalDoc>, TIsPage>>,
-> = IfExtends<
-  Type,
-  "all",
   // @ts-ignore
-  ComputeIntersection<OptionalDoc & RequiredDoc>,
-  IfExtends<Type, "Optional", OptionalDoc, RequiredDoc>
->;
+  OptionalDoc extends object = GetOptionalDoc<Select<TProperties, OptionalType>, TIsPage>,
+  // @ts-ignore
+  RequiredDoc extends object = GetRequiredDoc<Omit<TProperties, keyof OptionalDoc>, TIsPage>,
+> = ComputeIntersection<OptionalDoc & RequiredDoc>;
 
 /**
  * properties字段的文档类型
- * @param TProperties - `PropertiesConstraint`
- * @param Type - "Required" | "Optional" | "all"
- * @returns  `GetRequiredDoc` | `GetOptionalDoc` | (`GetOptionalDoc` & `GetRequiredDoc`)
  */
 export type GetPropertiesDoc<
   TProperties extends PropertiesConstraint,
   TisPage extends boolean,
-  Type extends "Required" | "Optional" | "all" = "all",
-> = _GetPropertiesDoc<TProperties, TisPage, Type>;
+> = _GetPropertiesDoc<TProperties, TisPage>;

package/src/api/RootComponent/Properties/GetRequiredDoc.ts

@@ -1,32 +1,42 @@
 import type { IfExtends } from "hry-types/src/Any/IfExtends";
-import type { Select } from "hry-types/src/Object/Select";
 import type { AddNullForObject } from "../../../types/AddNullForObject";
 import type { InferDetailedType } from "../../../types/InferDetailedType";
-import type { PropertiesConstraint, RequiredSingle, RequiredType } from "./PropertiesConstraint";
+import type { RequiredSingle, RequiredType } from "./PropertiesConstraint";
 
 /**
  * 获取properties必传字段的文档类型
- * @remarks 小程序中必传字段如果是object,默认类型为null,所以文档类型要联合上null类型
+ * @remarks 小程序中必传字段如果是object,默认类型为null,所以组件文档对象类型要联合上null类型
  */
 export type GetRequiredDoc<
-  TProperties extends PropertiesConstraint,
+  TProperties extends Record<string, RequiredType>,
   TIsPage extends boolean,
-  // @ts-ignore
-  Required extends Record<string, RequiredType> = Select<TProperties, RequiredType>,
 > = {
-  [k in keyof Required]: IfExtends<
-    Required[k],
+  -readonly [k in keyof TProperties]: IfExtends<
+    TProperties[k],
+    // 非对象写法
     RequiredSingle,
-    IfExtends<false, TIsPage, AddNullForObject<InferDetailedType<Required[k]>>, InferDetailedType<Required[k]>>,
     IfExtends<
       false,
       TIsPage,
-      // @ts-ignore Required[k] 必为 RequiredUnion
-      | AddNullForObject<InferDetailedType<Required[k]["type"]>>
-      // @ts-ignore Required[k] 必为 RequiredUnion
-      | AddNullForObject<InferDetailedType<Required[k]["optionalTypes"][number]>>,
-      // @ts-ignore Required[k] 必为 RequiredUnion
-      InferDetailedType<Required[k]["type"]> | InferDetailedType<Required[k]["optionalTypes"][number]>
+      // 组件的对象类型加null
+      AddNullForObject<InferDetailedType<TProperties[k]>>,
+      // 页面的对象类型不加null
+      InferDetailedType<TProperties[k]>
+    >,
+    // 对象写法 RequiredUnion
+    IfExtends<
+      false,
+      TIsPage,
+      // 组件的对象类型加null
+      AddNullForObject<
+        // @ts-ignore TProperties[k] 必为 RequiredUnion
+        | InferDetailedType<TProperties[k]["type"]>
+        // @ts-ignore TProperties[k] 必为 RequiredUnion
+        | InferDetailedType<TProperties[k]["optionalTypes"][number]>
+      >,
+      // 页面的对象类型不加null
+      // @ts-ignore TProperties[k] 必为 RequiredUnion
+      InferDetailedType<TProperties[k]["type"]> | InferDetailedType<TProperties[k]["optionalTypes"][number]>
     >
   >;
 };

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

@@ -1,3 +1,4 @@
+import { Checking, type Test } from "hry-types";
 import { observable } from "mobx";
 import { RootComponent } from "../..";
 const user = observable({
@@ -5,9 +6,18 @@ const user = observable({
   age: 20,
 });
 
-RootComponent()({
+const storeDoc = RootComponent()({
   store: {
     userName: () => user.name,
     userAge: () => user.age,
   },
 });
+
+type StoreDocExpected = {
+  store: {
+    userName: string;
+    userAge: number;
+  };
+};
+
+Checking<typeof storeDoc, StoreDocExpected, Test.Pass>;

package/src/api/RootComponent/index.ts

@@ -2,7 +2,8 @@ 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 { ComputeIntersectionDeep } from "hry-types/src/Object/_api";
+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 { ComponentDoc } from "../DefineComponent/ReturnType/ComponentDoc";
 import type { ComputedConstraint } from "./Computed/ComputedConstraint";
@@ -111,16 +112,16 @@ type RootComponentConstructor<TReceivedComponentDoc extends ComponentDoc[] | Com
       StoreDoc,
       ComputedDoc
     >,
-  ): // 返回类型 RootComponentDoc
-  ComputeIntersectionDeep<
+  ): // 返回类型 satisfies RootComponentDoc
+  ComputeIntersection<
     & IfExtends<TIsPage, false, {}, { isPage: true }>
     & IfExtends<EmptyObject, PropertiesDoc, {}, { properties: PropertiesDoc }>
     & IfExtends<EmptyObject, DataDoc, {}, { data: DataDoc }>
-    & IfExtends<EmptyObject, StoreDoc, {}, { store: StoreDoc }>
+    & IfExtends<EmptyObject, StoreDoc, {}, { store: ComputeObject<StoreDoc> }>
     & IfExtends<EmptyObject, ComputedDoc, {}, { computed: ComputedDoc }>
     & IfExtends<EmptyObject, TMethods, {}, { methods: TMethods }>
     & IfExtends<EmptyObject, EventsDoc, {}, { events: EventsDoc }>
-    & IfExtends<EmptyObject, CustomEventsDoc, {}, { customEvents: CustomEventsDoc }>
+    & IfExtends<EmptyObject, CustomEventsDoc, {}, { customEvents: ComputeObject<CustomEventsDoc> }>
   >;
 };
 

package/src/api/SubComponent/SubData/test/normal.test.ts

@@ -1,7 +1,7 @@
 import { Checking, type Test } from "hry-types";
 import type { ReadonlyDeep } from "hry-types/src/Any/_api";
 import type { Wm } from "../../../../thirdLib";
-import type { CompDocExtends } from "../../../../types/CompDocExtends";
+import type { ComponentDocExtension } from "../../../../types/ComponentDocExtension";
 import type { ComponentDoc } from "../../../DefineComponent/ReturnType/ComponentDoc";
 
 import type { Mock_User } from "../../../RootComponent/Properties/test/normalRequired.test";
@@ -28,7 +28,10 @@ SubComponent<{}, CompDoc>()({
 });
 
 // 2. 使用CompDocExtends泛型拓展组件文档,满足内部组件内部包含一些slot或基本组件数据
-type viewExtends = CompDocExtends<Wm.View, { view_obj: Mock_User | null; view_str: string; view_ddd: number }>;
+type viewExtends = ComponentDocExtension<
+  Wm.View,
+  { properties: { view_obj: Mock_User | null; view_str: string; view_ddd: number } }
+>;
 
 const res = SubComponent<{}, viewExtends>()({
   inherit: {

package/src/api/SubComponent/index.ts

@@ -1,7 +1,7 @@
 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 { ExtractDocPrefix } from "../../types/GetComponentPrefix";
+import type { GetComponentPrefix } from "../../types/GetComponentPrefix";
 import type { ReplacePrefix } from "../../types/ReplacePrefix";
 import type { ComponentDoc } from "../DefineComponent/ReturnType/ComponentDoc";
 
@@ -95,7 +95,7 @@ type SubComponentConstructor<
   TSupplementalPrefix extends string = "",
   IsPage extends boolean = TRootDoc["isPage"] extends true ? true : false,
   // 重构子组件的前缀
-  CurrentPrefix extends string = `${ExtractDocPrefix<TOriginalCompDoc>}${Capitalize<TSupplementalPrefix>}`,
+  CurrentPrefix extends string = `${GetComponentPrefix<TOriginalCompDoc>}${Capitalize<TSupplementalPrefix>}`,
   // 更新原始文档的前缀为Prefix
   CurrentCompDoc extends ComponentDoc = IfExtends<
     TSupplementalPrefix,

package/src/index.ts

@@ -1,7 +1,3 @@
-export type { Vant, Wm } from "./thirdLib";
-
-export type { Dataset, Detail, WMBaseEvent, WMCustomEvent } from "./types/OfficialTypeAlias";
-
 import { navigateTo } from "./api/navigateTo";
 
 import { DefineComponent } from "./api/DefineComponent";
@@ -12,10 +8,15 @@ import { SubComponent } from "./api/SubComponent";
 
 import type { DetailedType } from "./types/DetailedType";
 
+import type { ComponentDocExtension } from "./types/ComponentDocExtension";
 import type { GenerateDoc } from "./types/GenerateDoc";
 import type { ParamsEqual } from "./types/TwoParamsEqual";
+export type { Vant, Wm } from "./thirdLib";
+
+export type { Dataset, Detail, WMBaseEvent, WMCustomEvent } from "./types/OfficialTypeAlias";
 
 export {
+  type ComponentDocExtension,
   DefineComponent,
   type DetailedType,
   type GenerateDoc,

package/src/types/ComponentDocExtension.ts

@@ -0,0 +1,36 @@
+import type { IfExtends } from "hry-types/src/Any/IfExtends";
+import type { ComputeIntersectionDeep } from "hry-types/src/Object/ComputeIntersectionDeep";
+import type { ComponentDoc } from "../api/DefineComponent/ReturnType/ComponentDoc";
+import type { GetComponentPrefix } from "./GetComponentPrefix";
+
+type Validator<
+  TOriginalComponentDoc extends ComponentDoc,
+  TExtensionDoc extends ComponentDoc,
+  TOriginalPrefix extends PropertyKey = GetComponentPrefix<TOriginalComponentDoc>,
+  TExtenstionPrefix extends PropertyKey = GetComponentPrefix<TExtensionDoc>,
+  DuplicateKeys extends PropertyKey =
+    | Extract<keyof TExtensionDoc["properties"], keyof TOriginalComponentDoc["properties"]>
+    | Extract<keyof TExtensionDoc["customEvents"], keyof TOriginalComponentDoc["customEvents"]>,
+> = IfExtends<
+  TOriginalPrefix,
+  TExtenstionPrefix,
+  IfExtends<DuplicateKeys, never, ComponentDoc, `${DuplicateKeys & string}字段重复`>,
+  `前缀错误,应为${TOriginalPrefix & string}`
+>;
+
+/**
+ * 有时组件文档内部包含一些slot或基本组件,可通过CompDocExtends泛型拓展组件文档,使得类型更安全
+ */
+export type ComponentDocExtension<
+  TOriginalComponentDoc extends ComponentDoc,
+  // @ts-ignore
+  TExtensionDoc extends Validator<TOriginalComponentDoc, TExtensionDoc>,
+> = ComputeIntersectionDeep<TOriginalComponentDoc & TExtensionDoc>;
+
+// type test0 = ComponentDocExtension<{ properties: { aaa_xxx: string } }, { properties: { aaa_xxx: string } }>; // => "aaa_xxx字段重复"
+
+// type test1 = ComponentDocExtension<{ customEvents: { aaa_xxx: string } }, { customEvents: { aaa_xxx: string } }>; // => "aaa_xxx字段重复"
+
+// type test2 = ComponentDocExtension<{ properties: { aaa_xxx: string } }, { properties: { ddd_xxx: string } }>; // => "前缀错误,应为aaa"
+
+// type test3 = ComponentDocExtension<{ customEvents: { aaa_xxx: string } }, { customEvents: { ddd_xxx: string } }>; // => "前缀错误,应为aaa"

package/src/types/ComputeObj.ts

@@ -0,0 +1 @@
+export type ComputeObject<T> = T extends unknown ? { [k in keyof T]: T[k] } : never;

package/src/types/GetComponentPrefix.ts

@@ -1,34 +1,36 @@
 // import { Checking, type Test } from "hry-types";
 import type { IfExtends } from "hry-types/src/Any/IfExtends";
+import type { EmptyObject } from "hry-types/src/Misc/EmptyObject";
 import type { ComponentDoc } from "../api/DefineComponent/ReturnType/ComponentDoc";
 
 /**
  * 提取文档前缀名
- * @param TComponentDoc - ComponentDoc
  */
-export type ExtractDocPrefix<TComponentDoc extends ComponentDoc> = keyof IfExtends<
-  unknown,
-  TComponentDoc["properties"],
-  TComponentDoc["customEvents"],
-  TComponentDoc["properties"]
-> extends `${infer P}_${string}` ? P
-  : "";
+export type GetComponentPrefix<TComponentDoc extends ComponentDoc> = EmptyObject extends TComponentDoc ? never
+  : keyof IfExtends<
+    unknown,
+    TComponentDoc["properties"],
+    TComponentDoc["customEvents"],
+    TComponentDoc["properties"]
+  > extends `${infer P}_${string}` ? P
+  : never;
 
-// type Test1 = ExtractDocPrefix<{ properties: { xxx_name: string } }>;
+// type Test1 = GetComponentPrefix<{ properties: { xxx_name: string } }>;
 
 // type Test1Expect = "xxx";
 
 // Checking<Test1, Test1Expect, Test.Pass>;
 
-// type Test2 = ExtractDocPrefix<{ customEvents: { xxx_name: string } }>;
+// type Test2 = GetComponentPrefix<{ customEvents: { xxx_name: string } }>;
 
 // type Test2Expect = "xxx";
 
 // Checking<Test2, Test2Expect, Test.Pass>;
 
-// // type lll = never extends `${infer P}_${string}` ? P: ""; // => string bug?
-// type Test3 = ExtractDocPrefix<{}>;
+// type demo = never extends `${infer P}_${string}` ? P : ""; // => string why?
 
-// type Test3Expect = string;
+// type Test3 = GetComponentPrefix<{}>;
+
+// type Test3Expect = never;
 
 // Checking<Test3, Test3Expect, Test.Pass>;

package/dist/types/CompDocExtends.d.ts

@@ -1,8 +0,0 @@
-import type { ComputeIntersectionDeep } from "hry-types/src/Object/ComputeIntersectionDeep";
-import type { ComponentDoc } from "../api/DefineComponent/ReturnType/ComponentDoc";
-import type { UnionToComma } from "./UnionToComma.test";
-type _Validator<T, ExistingKeys extends PropertyKey, DuplicateKeys extends PropertyKey = Extract<keyof T, ExistingKeys>> = [DuplicateKeys] extends [never] ? object : `重复的字段${UnionToComma<DuplicateKeys & string>}`;
-export type CompDocExtends<TSubComp extends ComponentDoc, Ext extends _Validator<Ext, keyof (TSubComp["properties"])> = {}> = ComputeIntersectionDeep<TSubComp & {
-    properties: Ext;
-}>;
-export {};

package/dist/types/CompDocExtends.js

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

package/dist/types/CompDocExtends.js.map

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

package/dist/types/Drop.d.ts

@@ -1,2 +0,0 @@
-import type { Equals } from "hry-types/src/Any/Equals";
-export type Drop<T extends unknown[], A> = T extends [infer Head, ...infer Rest] ? Equals<A, Head> extends true ? Rest : Drop<[...Rest, Head], A> : T;

package/dist/types/Drop.js

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

package/dist/types/Drop.js.map

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

package/dist/types/DropStr.d.ts

@@ -1 +0,0 @@
-export type DropStr<S1 extends string, S2 extends string> = S1 extends `${infer Head}${S2}${infer Tail}` ? DropStr<`${Head}${Tail}`, S2> : S1;

package/dist/types/DropStr.js

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

package/dist/types/DropStr.js.map

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

package/dist/types/RestorePropertiesDoc.js

@@ -1,2 +0,0 @@
-"use strict";
-//# sourceMappingURL=RestorePropertiesDoc.js.map

package/dist/types/RestorePropertiesDoc.js.map

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

package/src/types/CompDocExtends.ts

@@ -1,14 +0,0 @@
-import type { ComputeIntersectionDeep } from "hry-types/src/Object/ComputeIntersectionDeep";
-import type { ComponentDoc } from "../api/DefineComponent/ReturnType/ComponentDoc";
-import type { UnionToComma } from "./UnionToComma.test";
-
-type _Validator<
-  T,
-  ExistingKeys extends PropertyKey,
-  DuplicateKeys extends PropertyKey = Extract<keyof T, ExistingKeys>,
-> = [DuplicateKeys] extends [never] ? object : `重复的字段${UnionToComma<DuplicateKeys & string>}`;
-
-export type CompDocExtends<
-  TSubComp extends ComponentDoc,
-  Ext extends _Validator<Ext, keyof (TSubComp["properties"])> = {},
-> = ComputeIntersectionDeep<TSubComp & { properties: Ext }>;

package/src/types/Drop.ts

@@ -1,18 +0,0 @@
-import type { Equals } from "hry-types/src/Any/Equals";
-
-/**
- * 从' T '中删除' A '项
- * @param T - 元组类型
- * @param A - 任意类型
- * @returns [[unknown[]]]
- * @example
- */
-export type Drop<T extends unknown[], A> = T extends [infer Head, ...infer Rest]
-  ? Equals<A, Head> extends true ? Rest : Drop<[...Rest, Head], A>
-  : T;
-
-// // type Test = Drop<[1, 2, 3, 4, 5, 6, 7, 8, 9, 10], 3>[number];
-
-// // type TestExpect = [4, 5, 6, 8, 7, 9, 10, 1, 2][number];
-
-// // Checking<Test, TestExpect, Test.Pass>;

package/src/types/DropStr.ts

@@ -1,5 +0,0 @@
-export type DropStr<S1 extends string, S2 extends string> = S1 extends `${infer Head}${S2}${infer Tail}`
-  ? DropStr<`${Head}${Tail}`, S2>
-  : S1;
-
-// type lll = DropStr<"CatchAAACatchff", "Catch">; //=> "AAAff"

package/src/types/RestorePropertiesDoc.ts

@@ -1,26 +0,0 @@
-// import type { ComponentDoc } from "../api/DefineComponent/CreateDoc/ComponentDoc";
-// import type { Drop } from "./Drop";
-
-// import type { ListOfSamePrimitive } from "./ListOfSamePrimitive";
-// import type { ReStorePropTypeOfList } from "./ReStorePropTypeOfList";
-// import type { DetailedType } from "./DetailedType";
-
-/**
- * 还原properties描述
- * @example
- * ```ts
- * type doc = {properties:{a:'1'|'2',b:boolean,c:string[],d:{name:string}}}
- * type test = ReStorePropertiesDoc<doc>
- * //=> {a: "1" | "2" | {type: "1" | "2"; value?: "1" | "2";}; b: boolean | {type: boolean; value?: boolean;}; c: string[] | {type: string[]; value?: string[];}; d: {name: string;} | {type: {name: string;}; value?: {name: string;};}}
- * ```
- */
-// type ReStorePropertiesDoc<T extends ComponentDoc> = {
-//   [k in keyof T]?: ListOfSamePrimitive<T[k]> extends infer R extends unknown[]
-//     ? R["length"] extends 1 ? DetailedType<R[0]> | { type: DetailedType<R[0]>; value: R[0] }
-//     : {
-//       type: DetailedType<R[0]>;
-//       value?: R[0];
-//       optionalTypes?: ReStorePropTypeOfList<Drop<R, R[0]>>[number][];
-//     }
-//     : never;
-// };