annil 1.13.0 → 1.13.1

package/src/api/RootComponent/index.ts

@@ -2,17 +2,17 @@ import type { IfExtends } from "hry-types/src/Any/IfExtends";
 import type { EmptyObject } from "hry-types/src/Misc/EmptyObject";
 import type { Func } from "hry-types/src/Misc/Func";
 import type { ComputeIntersection } from "hry-types/src/Object/_api";
-import type { ComputeObject } from "../../types/ComputeObj";
+import type { ComputeObject } from "../../types/ComputeObject";
 import type { WMCompOtherOption } from "../../types/OfficialTypeAlias";
 import type { RemoveNullOfRequired } from "../../types/RemoveNullOfRequired";
 import type { ComponentDoc } from "../DefineComponent/returnType/ComponentDoc";
 import type { IInjectStore } from "../InstanceInject/instanceConfig";
 import type { ComputedConstraint } from "./Computed/ComputedConstraint";
 import type { ComputedOption } from "./Computed/ComputedOption";
-import type { GetComputedDoc } from "./Computed/GetComputedDoc";
+import type { GetComputedDef } from "./Computed/GetComputedDef";
 import type { CustomEventConstraint } from "./CustomEvents/CustomEventConstraint";
 import type { CustomEventsOption } from "./CustomEvents/CustomEventsOption";
-import type { GetCustomEventDoc } from "./CustomEvents/GetCustomEventDoc";
+import type { GetCustomEventsDef } from "./CustomEvents/GetCustomEventDef";
 import type { DataOption } from "./Data/DataOption";
 import type { EventsConstraint } from "./Events/EventsConstraint";
 import type { EventsOption } from "./Events/EventsOption";
@@ -23,10 +23,10 @@ import type { MethodsConstraint } from "./Methods/MethodsConstraint";
 import type { MethodsOption } from "./Methods/MethodsOption";
 import type { ObserversOption } from "./Observers/ObserversOption";
 import type { PageLifetimesOption } from "./PageLifetimes/PageLifetimesOption";
-import type { GetPropertiesDoc } from "./Properties/GetPropertiesDoc";
+import type { GetPropertiesDef } from "./Properties/GetPropertiesDef";
 import type { PropertiesConstraint } from "./Properties/PropertiesConstraint";
 import type { PropertiesOption } from "./Properties/PropertiesOption";
-import type { GetStoreDoc } from "./Store/GeTStoreDoc";
+import type { GetStoreDef } from "./Store/GetStoreDef";
 import type { StoreConstraint } from "./Store/StoreConstraint";
 import type { StoreOption } from "./Store/StoreOption";
 import type { WatchOption } from "./Watch/WatchOption";
@@ -40,55 +40,55 @@ type RootComponentOptions<
   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,
+  EventsDef extends object,
+  CustomEventsDef extends object,
+  PropertiesDef extends object,
+  DataDef extends object,
+  StoreDef extends object,
+  ComputedDef extends object,
 > =
-  & MethodsOption<TMethods, keyof (EventsDoc & CustomEventsDoc)>
+  & MethodsOption<TMethods, keyof (EventsDef & CustomEventsDef)>
   & PropertiesOption<TProperties>
   & IsPageOption<TIsPage>
   & EventsOption<TEvents>
-  & CustomEventsOption<TCustomEvents, keyof EventsDoc>
-  & DataOption<TData, keyof PropertiesDoc>
-  & StoreOption<TStore, keyof (PropertiesDoc & DataDoc)>
+  & IfExtends<TIsPage, false, CustomEventsOption<TCustomEvents, keyof EventsDef>, {}>
+  & DataOption<TData, keyof PropertiesDef>
+  & StoreOption<TStore, keyof (PropertiesDef & DataDef)>
   & ComputedOption<
     TComputed,
-    keyof (PropertiesDoc & DataDoc & StoreDoc)
-  > // { data: ComputeObject<DataDoc & Required<PropertiesDoc> & StoreDoc & ComputedDoc & IInjectAllData> }
-  & PageLifetimesOption<TIsPage, PropertiesDoc>
+    keyof (PropertiesDef & DataDef & StoreDef)
+  > // { data: ComputeObject<DataDef & Required<PropertiesDef> & StoreDef & ComputedDef & IInjectAllData> }
+  & PageLifetimesOption<TIsPage, PropertiesDef>
   & LifetimesOption
   & WatchOption<
-    & ComputedDoc
-    & Required<PropertiesDoc>
-    & DataDoc
-    & StoreDoc
+    & ComputedDef
+    & Required<PropertiesDef>
+    & DataDef
+    & StoreDef
     & IInjectStore
   >
   & Partial<Omit<WMCompOtherOption, "pageLifetimes" | "definitionFilter" | "observers">>
   & ObserversOption<
-    & ComputedDoc
-    & Required<PropertiesDoc>
-    & DataDoc
-    & StoreDoc
+    & ComputedDef
+    & Required<PropertiesDef>
+    & DataDef
+    & StoreDef
     & IInjectStore
   >
   & ThisType<
     RootComponentInstance<
       TIsPage,
       TMethods,
-      DataDoc,
-      DataDoc & Required<PropertiesDoc> & StoreDoc & ComputedDoc,
-      CustomEventsDoc,
-      StoreDoc
+      DataDef,
+      DataDef & Required<PropertiesDef> & StoreDef & ComputedDef,
+      CustomEventsDef,
+      StoreDef
     >
   >;
 
 type RootComponentConstructor<TComponentDocList extends ComponentDoc[]> = <
   TEvents extends EventsConstraint<TComponentDocList>,
-  TStore extends StoreConstraint<PropertiesDoc>,
+  TStore extends StoreConstraint<PropertiesDef>,
   TIsPage extends boolean = false,
   const TProperties extends PropertiesConstraint = {},
   TData extends object = {},
@@ -96,12 +96,12 @@ type RootComponentConstructor<TComponentDocList extends ComponentDoc[]> = <
   // 页面时自定义事件无意义
   TCustomEvents extends IfExtends<TIsPage, false, CustomEventConstraint, EmptyObject> = {},
   TMethods extends MethodsConstraint = {},
-  EventsDoc extends object = IfExtends<EventsConstraint<TComponentDocList>, TEvents, {}, TEvents>,
-  CustomEventsDoc extends object = GetCustomEventDoc<TCustomEvents>,
-  PropertiesDoc extends object = GetPropertiesDoc<TProperties>,
-  DataDoc extends object = TData,
-  StoreDoc extends object = StoreConstraint<PropertiesDoc> extends TStore ? {} : GetStoreDoc<TStore>,
-  ComputedDoc extends object = GetComputedDoc<TComputed>,
+  EventsDef extends object = IfExtends<EventsConstraint<TComponentDocList>, TEvents, {}, TEvents>,
+  CustomEventsDef extends object = GetCustomEventsDef<TCustomEvents>,
+  PropertiesDef extends object = GetPropertiesDef<TProperties>,
+  DataDef extends object = TData,
+  StoreDef extends object = StoreConstraint<PropertiesDef> extends TStore ? {} : GetStoreDef<TStore>,
+  ComputedDef extends object = GetComputedDef<TComputed>,
 >(
   options: RootComponentOptions<
     TEvents,
@@ -113,28 +113,28 @@ type RootComponentConstructor<TComponentDocList extends ComponentDoc[]> = <
     TStore,
     TComputed,
     // TObservers,
-    EventsDoc,
-    CustomEventsDoc,
-    PropertiesDoc,
-    DataDoc,
-    StoreDoc,
-    ComputedDoc
+    EventsDef,
+    CustomEventsDef,
+    PropertiesDef,
+    DataDef,
+    StoreDef,
+    ComputedDef
   >,
 ) => // 生成RootComponentDefinition
 ComputeIntersection<
   & IfExtends<TIsPage, false, {}, { isPage: true }>
   & IfExtends<
     EmptyObject,
-    PropertiesDoc,
+    PropertiesDef,
     {},
-    { properties: IfExtends<false, TIsPage, PropertiesDoc, RemoveNullOfRequired<PropertiesDoc>> }
+    { properties: IfExtends<false, TIsPage, PropertiesDef, RemoveNullOfRequired<PropertiesDef>> }
   >
-  & IfExtends<EmptyObject, DataDoc, {}, { data: DataDoc }>
-  & IfExtends<EmptyObject, StoreDoc, {}, { store: ComputeObject<StoreDoc> }>
-  & IfExtends<EmptyObject, ComputedDoc, {}, { computed: ComputedDoc }>
+  & IfExtends<EmptyObject, DataDef, {}, { data: DataDef }>
+  & IfExtends<EmptyObject, StoreDef, {}, { store: ComputeObject<StoreDef> }>
+  & IfExtends<EmptyObject, ComputedDef, {}, { computed: ComputedDef }>
   & IfExtends<EmptyObject, TMethods, {}, { methods: TMethods }>
-  & IfExtends<EmptyObject, EventsDoc, {}, { events: EventsDoc }>
-  & IfExtends<EmptyObject, CustomEventsDoc, {}, { customEvents: ComputeObject<CustomEventsDoc> }>
+  & IfExtends<EmptyObject, EventsDef, {}, { events: EventsDef }>
+  & IfExtends<EmptyObject, CustomEventsDef, {}, { customEvents: ComputeObject<CustomEventsDef> }>
 >;
 /**
  * RootComponent API

package/src/api/wxSugar.ts

@@ -1,7 +1,7 @@
 import type { IfEquals } from "hry-types/src/Any/IfEquals";
 import type { IfExtends } from "hry-types/src/Any/IfExtends";
 import type { NoInfer } from "hry-types/src/Generic/NoInfer";
-import type { ComputeObject } from "../types/ComputeObj";
+import type { ComputeObject } from "../types/ComputeObject";
 import type { WMNavigateToOption } from "../types/OfficialTypeAlias";
 import type { RequiredKeys } from "../types/RequiredKeys";
 import { INNERMARKER } from "../utils/InnerMarker";

package/src/index.ts

@@ -7,7 +7,7 @@ import { navigateBack, navigateTo, redirectTo } from "./api/wxSugar";
 import type { CreateComponentType } from "./types/CreateComponentType";
 import type { DetailedType } from "./types/DetailedType";
 import type { ExtendComponentType } from "./types/ExtendComponentType";
-import type { ParamsEqual } from "./types/TwoParamsEqual";
+
 export * from "./utils/_utils";
 
 export type {
@@ -43,7 +43,6 @@ export {
   instanceConfig,
   navigateBack,
   navigateTo,
-  type ParamsEqual,
   redirectTo,
   RootComponent,
 };

package/src/thirdLib/wm/swiper.test.ts

@@ -1,8 +1,7 @@
 import { CustomComponent, typeEqual } from "../../index";
 import type { Wm } from "../index";
 
-// eslint-disable-next-line @typescript-eslint/no-unused-vars
-const swiper = CustomComponent<{}, Wm.Swiper>()({
+CustomComponent<{}, Wm.Swiper>()({
   data: {
     swiper_style: "16/9",
   },
@@ -12,13 +11,12 @@ const swiper = CustomComponent<{}, Wm.Swiper>()({
     },
   },
   events: {
-    // eslint-disable-next-line @typescript-eslint/no-unused-vars
     swiper_change(e) {
-      typeEqual<typeof e.detail.current, number>();
+      typeEqual<number>(e.detail.current);
     },
-    // eslint-disable-next-line @typescript-eslint/no-unused-vars
+
     swiper_animationfinish(e) {
-      typeEqual<typeof e.detail.current, number>();
+      typeEqual<number>(e.detail.current);
     },
   },
 });

package/src/utils/typeEqual.ts

@@ -1,16 +1,19 @@
 import type { Equals } from "hry-types/src/Any/Equals";
-
 /**
- * 类型相等验证,用于测试。
+ * 类型相等验证
  * @example
  * ```ts
- * Checking<1, 1> // no error;
- * Checking<1, 0> // error at 0;
+ * const a = 1;
+ * type A = typeof a;
+ * const b = 2;
+ * type B = typeof b;
+ * typeEqual<A, B>(); // B位置报错
+ * typeEqual<A>(a); // 不报错
  * ```
  */
 export function typeEqual<
-  A,
-  B extends Equals<A, B> extends true ? unknown : never,
->() {
-  void 0;
+  const A,
+  const B extends Equals<A, B> extends true ? unknown : never = never,
+>(a?: NoInfer<A>): void {
+  void a;
 }

package/src/utils/typeNotEqual.ts

@@ -0,0 +1,48 @@
+import type { Equals } from "hry-types/src/Any/Equals";
+export type InqualityCall<A> = <const B>(b: B, ...nullable: Equals<A, B> extends false ? [] : [never]) => void;
+
+/**
+ * 类型和变量不等验证
+ * @example
+ * ```ts
+ * const a = { a: 1 } as const;
+ * type B = { a: number };
+ * typeNotEqual<B>()(a); 不报错
+ * ```
+ */
+export function typeNotEqual<
+  const A,
+>(): InqualityCall<A>;
+
+/**
+ * 二个类型不等验证
+ * @example
+ * ```ts
+ * const a = 1;
+ * type A = typeof a;
+ * const b = 2;
+ * type B = typeof b;
+ * typeNotEqual<A, B>(); 不报错
+ */
+export function typeNotEqual<
+  const A,
+  const B extends Equals<A, B> extends false ? unknown : never = never,
+>(): void;
+/**
+ * 类型不等验证
+ * @example
+ * ```ts
+ * const a = 1;
+ * type A = typeof a;
+ * const b = 2;
+ * type B = typeof b;
+ * typeNotEqual<A, B>(); // 不报错
+ * typeNotEqual<A>()(b); // 不报错
+ * typeNotEqual<A>()(a); // 报错
+ * ```
+ */
+export function typeNotEqual<
+  const A,
+>(): void | InqualityCall<A> {
+  void 0;
+}

package/dist/api/RootComponent/Computed/GetComputedDoc.js

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

package/dist/api/RootComponent/Computed/GetComputedDoc.js.map

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

package/dist/api/RootComponent/CustomEvents/GetCustomEventDoc.d.ts

@@ -1,10 +0,0 @@
-import type { IfExtends } from "hry-types/src/Any/IfExtends";
-import type { DetailedType } from "../../../types/DetailedType";
-import type { InferDetailedType } from "../../../types/InferDetailedType";
-import type { CustomEventConstraint, FullCustomEvents, ShortCustomeEvents, SimpleCustomeEventsList } from "./CustomEventConstraint";
-import type { AddTagForCustomEventsDoc } from "./CustomEventsTag";
-export type GetShortCustomEventsDoc<T extends ShortCustomeEvents> = T extends DetailedType ? InferDetailedType<T> : T extends null ? null : T extends undefined ? undefined : T extends SimpleCustomeEventsList ? GetShortCustomEventsDoc<T[number]> : never;
-export type GetFullCustomEventsDoc<T extends FullCustomEvents> = GetShortCustomEventsDoc<T["detail"]> | IfExtends<unknown, T["options"], never, AddTagForCustomEventsDoc<T["options"] & {}>>;
-export type GetCustomEventDoc<T extends CustomEventConstraint> = {
-    [k in keyof T]: T[k] extends ShortCustomeEvents ? GetShortCustomEventsDoc<T[k]> : GetShortCustomEventsDoc<T[k]["detail"]> | IfExtends<unknown, T[k]["options"], never, AddTagForCustomEventsDoc<T[k]["options"] & {}>>;
-};

package/dist/api/RootComponent/CustomEvents/GetCustomEventDoc.js

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

package/dist/api/RootComponent/CustomEvents/GetCustomEventDoc.js.map

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

package/dist/api/RootComponent/Properties/GetOptionalDoc.js

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

package/dist/api/RootComponent/Properties/GetOptionalDoc.js.map

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

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

@@ -1,8 +0,0 @@
-import type { Select } from "hry-types/src/Object/Select";
-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, OptionalDoc extends object = GetOptionalDoc<Select<TProperties, OptionalType>>, RequiredDoc extends object = GetRequiredDoc<Omit<TProperties, keyof OptionalDoc>>> = ComputeIntersection<OptionalDoc & RequiredDoc>;
-export type GetPropertiesDoc<TProperties extends PropertiesConstraint> = _GetPropertiesDoc<TProperties>;
-export {};

package/dist/api/RootComponent/Properties/GetPropertiesDoc.js

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

package/dist/api/RootComponent/Properties/GetPropertiesDoc.js.map

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

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

@@ -1,6 +0,0 @@
-import type { IfExtends } from "hry-types/src/Any/IfExtends";
-import type { InferDetailedType } from "../../../types/InferDetailedType";
-import type { RequiredSingle, RequiredType } from "./PropertiesConstraint";
-export type GetRequiredDoc<TProperties extends Record<string, RequiredType>> = {
-    -readonly [k in keyof TProperties]: IfExtends<TProperties[k], RequiredSingle, InferDetailedType<TProperties[k]>, InferDetailedType<TProperties[k]["type"]> | InferDetailedType<TProperties[k]["optionalTypes"][number]>>;
-};

package/dist/api/RootComponent/Properties/GetRequiredDoc.js

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

package/dist/api/RootComponent/Properties/GetRequiredDoc.js.map

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

package/dist/api/RootComponent/Store/GeTStoreDoc.js

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

package/dist/api/RootComponent/Store/GeTStoreDoc.js.map

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

package/dist/types/ComputeObj.js

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

package/dist/types/ComputeObj.js.map

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

package/dist/types/TwoParamsEqual.d.ts

@@ -1,2 +0,0 @@
-import type { Equals } from "hry-types/src/Any/_api";
-export type ParamsEqual<A, B extends Equals<A, B> extends true ? unknown : never> = true;

package/dist/types/TwoParamsEqual.js

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

package/dist/types/TwoParamsEqual.js.map

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

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

@@ -1,24 +0,0 @@
-import type { Select } from "hry-types/src/Object/Select";
-
-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,
-  // @ts-ignore
-  OptionalDoc extends object = GetOptionalDoc<Select<TProperties, OptionalType>>,
-  // @ts-ignore
-  RequiredDoc extends object = GetRequiredDoc<Omit<TProperties, keyof OptionalDoc>>,
-> = ComputeIntersection<OptionalDoc & RequiredDoc>;
-
-/**
- * properties字段的文档类型
- * @remarks 必传的字段如果是object,要联合上null类型,选传的object根据是否是页面来决定是否加null
- */
-export type GetPropertiesDoc<
-  TProperties extends PropertiesConstraint,
-> // TisPage extends boolean,
- = _GetPropertiesDoc<TProperties>;

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

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