annil 1.0.7 → 1.1.0

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

@@ -1,5 +1,4 @@
 import { Checking, type Test } from "hry-types";
-import { type ComputeIntersectionDeep } from "hry-types/src/Object/ComputeIntersectionDeep";
 import { type DetailedType, RootComponent } from "../../../..";
 import type { CustomEventConstraint } from "../../../RootComponent/CustomEvents/CustomEventConstraint";
 import type {
@@ -12,6 +11,7 @@ import type {
   Composed,
 } from "../../../RootComponent/CustomEvents/CustomEventsTag";
 
+import type { ComputeIntersection } from "hry-types/src/Object/ComputeIntersection";
 import type { PropertiesConstraint } from "../../../RootComponent/Properties/PropertiesConstraint";
 import type { Mock_User } from "../../../RootComponent/Properties/test/normalRequired.test";
 import type { RootComponentDoc } from "../../../RootComponent/RootComponentDoc";
@@ -60,7 +60,7 @@ const customEvents = {
     options: { bubbles: true, capturePhase: true, composed: true },
   },
 } satisfies CustomEventConstraint;
-// 只有Properties字段
+
 const OnlyPropsRootDoc = RootComponent()({
   properties,
 });
@@ -70,10 +70,10 @@ const onlyProperties = DefineComponent({
   rootComponent: OnlyPropsRootDoc,
 });
 
-// 可传对象字段加入null,(rootDoc中必传对象加入null了)
+// 1. 类型为typeof OnlyPropsRootDoc加前缀(组件名)
 type OnlyPropertiesExpected = {
   properties: {
-    test_optionalObj?: Mock_User | null; // 多了null
+    test_optionalObj?: Mock_User | null;
     test_optionalObjOrNull?: Mock_User | null;
     test_str: string;
     test_obj: Mock_User | null;
@@ -82,7 +82,6 @@ type OnlyPropertiesExpected = {
 
 Checking<typeof onlyProperties, OnlyPropertiesExpected, Test.Pass>;
 
-// 只有customEvents字段
 const OnlyCustomEventsRootDoc = RootComponent()({
   customEvents,
 });
@@ -92,6 +91,7 @@ const compOnlyCustomEvents = DefineComponent({
   rootComponent: OnlyCustomEventsRootDoc,
 });
 
+// 2 rootComponent中只有customEvents字段时 加前缀(组件名) 无properties字段
 type CompOnlyCustomEventsExpected = {
   customEvents: {
     test_str: string;
@@ -99,7 +99,7 @@ type CompOnlyCustomEventsExpected = {
     test_unionStr: "male" | "female";
     test_list: string | 0 | 1 | 2 | null;
     test_bubbles: string | Bubbles;
-    test_capturePhase: Capture | null;
+    test_capturePhase: null | Capture;
     test_bubbles_capturePhase: string | number | BubblesCapture;
     test_bubbles_composed: "male" | "female" | BubblesComposed;
     test_capturePhase_composed: string | 0 | 1 | 2 | CaptureComposed | null;
@@ -109,48 +109,19 @@ type CompOnlyCustomEventsExpected = {
 
 Checking<typeof compOnlyCustomEvents, CompOnlyCustomEventsExpected, Test.Pass>;
 
-// 都有
 const rootComponent = RootComponent()({
   properties,
   customEvents,
 });
-
+// 3. properties和customEvents字段都有时
 const compDoc = DefineComponent({
   name: "test",
   rootComponent,
 });
 
-Checking<typeof compDoc, ComputeIntersectionDeep<CompOnlyCustomEventsExpected & OnlyPropertiesExpected>, Test.Pass>;
-
-// rootComponent字段和SubComponents字段同时具有properties字段时
-// const A = {} as { properties: { str: string; obj: { age: number } } };
-
-// const B = {} as { properties: { num: number } };
-
-// const C = {} as { properties: { bool: boolean } };
-
-// const CompDoc = DefineComponent({
-//   name: "test",
-//   subComponents: [A, B, C],
-// });
-
-// // 因为子组件中properties不存在相同key,所以返回类型是交叉的。
-// type CompDocExpect = ComputeIntersectionDeep<
-//   {
-//     properties: {
-//       test_str: string;
-//       test_obj: {
-//         age: number;
-//       } | null;
-//       test_num: number;
-//       test_bool: boolean;
-//     };
-//   }
-// >;
-
-// Checking<typeof CompDoc, CompDocExpect, Test.Pass>;
+Checking<typeof compDoc, ComputeIntersection<CompOnlyCustomEventsExpected & OnlyPropertiesExpected>, Test.Pass>;
 
-type D = SubComponentDoc<{
+type SubA = SubComponentDoc<{
   str: string | Bubbles | Composed;
   num: number | Capture | Composed;
   null: null | Bubbles | Capture | Composed;
@@ -158,10 +129,10 @@ type D = SubComponentDoc<{
 
 const customEventsRootDoc = DefineComponent({
   name: "test",
-  subComponents: [{} as D],
+  subComponents: [{} as SubA],
 });
 
-// 预期添加组件名做为前缀
+// 4 子组件返回的事件类型是必带Composed的
 type customEventsRootDocExpect = {
   customEvents: {
     test_str: string | Bubbles | Composed;
@@ -172,19 +143,19 @@ type customEventsRootDocExpect = {
 
 Checking<typeof customEventsRootDoc, customEventsRootDocExpect, Test.Pass>;
 
-type E = SubComponentDoc<{
+type SubB = SubComponentDoc<{
   str: number | Bubbles | Composed;
   num: string | Capture | Composed;
   null: boolean | Bubbles | Capture | Composed;
 }>;
 
-// 子组件有相同自定义字段时
+//
 const WhenSameKeyOfCustomEventsRootDoc = DefineComponent({
   name: "test",
-  subComponents: [{} as D, {} as E],
+  subComponents: [{} as SubA, {} as SubB],
 });
 
-// customEvents相同key类型联合
+// 5 子组件中存在相同自定义事件字段时,类型联合
 type WhenSameKeyOfCustomEventsRootDocExpect = {
   customEvents: {
     test_str: string | number | Bubbles | Composed;
@@ -201,15 +172,16 @@ type RootDocCatch = RootComponentDoc<{
   };
 }>;
 
-// 根组件有阻止(catch)子组件事件时
 const whenRootDocCatch = DefineComponent({
   name: "test",
   rootComponent: {} as RootDocCatch,
-  subComponents: [{} as D],
+  subComponents: [{} as SubA],
 });
 
+// 6 根组件有阻止(catch)子组件事件时(子组件aaa的str事件是阻止事件,不会被继续传递),去除对应的事件
 type whenRootDocCatchExpect = {
   customEvents: {
+    // 少了str事件
     test_num: number | Composed | Capture;
     test_null: Bubbles | Composed | Capture | null;
   };
@@ -217,7 +189,7 @@ type whenRootDocCatchExpect = {
 
 Checking<typeof whenRootDocCatch, whenRootDocCatchExpect, Test.Pass>;
 
-// ComponetDoc可能返回类型为{}
+// 7 根组件和子组件都没有事件和properties时 返回组件类型为 {}
 const ComponetDoc = DefineComponent({
   name: "test",
   rootComponent: {},

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

@@ -26,7 +26,7 @@ const compDocOnlyProperties = DefineComponent({
   rootComponent: OnlyPropsRootDoc,
 });
 
-// 页面时返回的propertiesDoc无前缀
+// 1 页面时返回的propertiesDoc无前缀
 type CompDocOnlyPropertiesExpected = {
   path: "/pages/index/index";
   properties: {
@@ -39,11 +39,11 @@ type CompDocOnlyPropertiesExpected = {
 
 Checking<typeof compDocOnlyProperties, CompDocOnlyPropertiesExpected, Test.Pass>;
 
-// 页面类型不受subComponents是[never,never]时影响
+// 2 页面类型不受subComponents是[never,never]时影响
 const whenSubIsAllNever = DefineComponent({
   path: "/pages/index/index",
   rootComponent: OnlyPropsRootDoc,
-  subComponents: [{} as never],
+  subComponents: [{} as never, {} as never],
 });
 
 Checking<typeof whenSubIsAllNever, CompDocOnlyPropertiesExpected, Test.Pass>;

package/src/api/DefineComponent/RootComponent/RootComponentOption.ts

@@ -4,5 +4,8 @@ import type { RootComponentDoc } from "../../RootComponent/RootComponentDoc";
  * DefineComponent API`rootComponent`字段配置
  */
 export type RootComponentOption<TRootComponent extends RootComponentDoc> = {
+  /**
+   * 根组件配置
+   */
   rootComponent?: TRootComponent;
 };

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

@@ -10,15 +10,9 @@ import type { SubComponentDoc } from "../../SubComponent/SubComponentDoc";
  */
 export type SubComponentsOption<
   TSubComponentTuple extends SubComponentDoc[],
-> // // 子组件中properties字段重复的key,用做验证(报错)
- = // PropertiesDuplicatedKeys extends string = Extends<TSubComponentTuple["length"], 0 | 1> extends true ? never
-  //   : GetPropertiesDuplicatedKeys<Shift<TSubComponentTuple>, keyof TSubComponentTuple[0]["properties"]>,
-  {
-    subComponents?: [...TSubComponentTuple];
-    // & IfExtends<
-    //   PropertiesDuplicatedKeys,
-    //   never,
-    //   unknown,
-    //   `⚠️重复的字段:${UnionToComma<PropertiesDuplicatedKeys>}⚠️`
-    // >;
-  };
+> = {
+  /**
+   * 子组件列表
+   */
+  subComponents?: [...TSubComponentTuple];
+};

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

@@ -11,13 +11,13 @@ const NonEmptyRootDoc = {} as SubComponentDoc<{
   a: string | Bubbles | Composed;
 }>;
 
-// 组件时
+// 1 组件时
 DefineComponent({
   name: "test",
   subComponents: [SubDocIsAny, NonEmptyRootDoc],
 });
 
-// 页面时
+// 2 页面时
 DefineComponent({
   path: "/test/index/index",
   rootComponent: { isPage: true },
@@ -30,10 +30,9 @@ const B = {} as { a: string | Composed; b: string | Composed };
 
 const C = {} as { a: boolean | Composed; c: boolean | Composed };
 
-// subComponents字段支持最多999个子组件
 const aaa = DefineComponent({
   name: "test",
-  // 支持999个子项
+  // 3 subComponents字段支持最多999个子组件
   subComponents: [
     A,
     B,

package/src/api/DefineComponent/index.ts

@@ -22,7 +22,7 @@ type RootOptions<
   TName extends string,
   TPath extends Path,
 > =
-  & NameOrPathOption<TName, TPath, TRootComponentDoc>
+  & NameOrPathOption<TName, TPath, TRootComponentDoc["isPage"] & {}>
   & RootComponentOption<TRootComponentDoc>
   & SubComponentsOption<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/src/types/includes.ts

@@ -0,0 +1,3 @@
+export type Includes<S extends string, searchString extends string> = S extends `${string}${searchString}${string}`
+  ? true
+  : false;

package/dist/api/DefineComponent/SubComponents/test/error.test.js

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

package/dist/api/DefineComponent/SubComponents/test/error.test.js.map

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