annil 1.11.0-alpha.3 → 1.11.0-alpha.4

package/CHANGELOG.md

@@ -4,6 +4,25 @@
 
 * 解决DetailedType不接收接口类型的错误 ([ae8acbf](https://github.com/missannil/annil/commit/ae8acbfc2e62f99db565c448ad9253aa549e78bb))
 
+## [1.11.0-alpha.4](https://github.com/missannil/annil/compare/v1.11.0-alpha.3...v1.11.0-alpha.4) (2025-01-14)
+
+
+### Bug Fixes
+
+* 类型修改 ([278058c](https://github.com/missannil/annil/commit/278058ccc13cae016bfcc9678875ed8c79a35472))
+
+
+### Miscellaneous Chores
+
+* release alpha.4 ([433779f](https://github.com/missannil/annil/commit/433779f12e7a3549a77d87c2663d37405ea2692f))
+
+## [1.11.0-alpha.3](https://github.com/missannil/annil/compare/v1.11.0-alpha.3...v1.11.0-alpha.3) (2025-01-14)
+
+
+### Bug Fixes
+
+* 类型修改 ([278058c](https://github.com/missannil/annil/commit/278058ccc13cae016bfcc9678875ed8c79a35472))
+
 ## [1.11.0-alpha.3](https://github.com/missannil/annil/compare/v1.11.0-alpha.2...v1.11.0-alpha.3) (2025-01-13)
 
 

package/dist/api/InstanceInject/instanceConfig.d.ts

@@ -18,7 +18,7 @@ export interface IInjectInfo extends BaseInjectInfo {
 export type IInjectAllData = IfEquals<{}, injectData & IInjectStore, {}, ComputeIntersection<injectData & IInjectStore>>;
 type injectData = DataConstraint extends IInjectInfo["data"] ? {} : IInjectInfo["data"];
 export type IInjectStore = StoreConstraint extends IInjectInfo["store"] ? {} : ReturnTypeInObject<IInjectInfo["store"]>;
-export type IInjectMethods = IInjectInfo["methods"];
+export type IInjectMethods = MethodsConstraint extends IInjectInfo["methods"] ? {} : IInjectInfo["methods"];
 /**
  * 实例配置接口
  */

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

@@ -13,6 +13,7 @@ import type { RootComponentType } from "../RootComponent/RootComponentType";
 import type { GetStoreDoc } from "../RootComponent/Store/GeTStoreDoc";
 import type { StoreConstraint } from "../RootComponent/Store/StoreConstraint";
 import type { WatchOption } from "../RootComponent/Watch/WatchOption";
+import type { SubComponentType } from "../SubComponent/SubComponentType";
 import type { GetSlotComputedDoc } from "./SlotComputed/GetSlotComputedDoc";
 import type { SlotComputedOption } from "./SlotComputed/SlotComputedOption";
 import type { SlotDataOption } from "./SlotData/SlotDataOption";
@@ -25,10 +26,5 @@ type SoltComponentOptions<Prefix extends string, TSuperData extends PropertyKey[
     data: ComputeObject<TData & StoreDoc & AllSuperDatas & ComputedDoc & IInjectAllData>;
 }, Prefix> & SlotEventsOption<TEvents, keyof (AllSuperMethods & AllSuperEvents & IInjectMethods), `${Prefix}_${string}`> & SlotMethodsOption<TMethods, keyof (AllSuperMethods & AllSuperEvents & EventsDoc & IInjectMethods), `${Prefix}_${string}`> & PageLifetimesOption<TIsPage, PropertiesDoc> & LifetimesOption & WatchOption<ComputedDoc & Required<AllSuperDatas> & DataDoc & StoreDoc & IInjectStore> & Partial<Omit<WMCompOtherOption, "pageLifetimes" | "definitionFilter" | "observers">> & ObserversOption<ComputedDoc & Required<AllSuperDatas> & DataDoc & StoreDoc & IInjectStore> & ThisType<RootComponentInstance<TIsPage, TMethods & AllSuperMethods, DataDoc, DataDoc & StoreDoc & ComputedDoc & AllSuperDatas & IInjectAllData, {}, StoreDoc>>;
 type SlotComponentConstructor<RootDoc extends RootComponentType, SubDoc extends SubComponentType, Prefix extends string, IsPage extends boolean = RootDoc["isPage"] extends true ? true : false, AllSuperDatas extends object = Required<RootDoc["properties"]> & RootDoc["data"] & RootDoc["computed"] & RootDoc["store"] & SubDoc["allDatas"], AllSuperMethods extends object = RootDoc["methods"] & SubDoc["methods"] & {}, AllSuperEvents extends object = RootDoc["events"] & SubDoc["methods"] & SubDoc["events"] & {}> = <TSuperData extends (keyof AllSuperDatas)[], TEvents extends SlotEventsConstraint, TData extends object = {}, TStore extends StoreConstraint = {}, TComputed extends ComputedConstraint = {}, TMethods extends MethodsConstraint = {}, DataDoc extends object = TData, EventsDoc extends object = IfExtends<SlotEventsConstraint, TEvents, {}, TEvents>, PropertiesDoc extends object = RootDoc["properties"] & {}, StoreDoc extends object = GetStoreDoc<TStore>, ComputedDoc extends object = GetSlotComputedDoc<TComputed>>(options: SoltComponentOptions<Prefix, TSuperData, TEvents, IsPage, TMethods, TData, TStore, TComputed, EventsDoc, PropertiesDoc, DataDoc, StoreDoc, ComputedDoc, AllSuperDatas, AllSuperMethods, AllSuperEvents>) => never;
-type SubComponentType = {
-    allDatas?: Record<string, unknown>;
-    methods?: Record<string, () => unknown>;
-    events?: Record<string, () => unknown>;
-};
 export declare function SlotComponent<RootDoc extends RootComponentType, SubDoc extends SubComponentType, name extends string>(): SlotComponentConstructor<RootDoc, SubDoc, name>;
 export {};

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

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/api/SlotComponent/index.ts"],"names":[],"mappings":"AAkJA,MAAM,UAAU,aAAa;IAS3B,8DAA8D;IAC9D,OAAO,CAAC,OAAY,EAAE,EAAE,CAAC,OAAgB,CAAC;AAC5C,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/api/SlotComponent/index.ts"],"names":[],"mappings":"AA+IA,MAAM,UAAU,aAAa;IAS3B,8DAA8D;IAC9D,OAAO,CAAC,OAAY,EAAE,EAAE,CAAC,OAAgB,CAAC;AAC5C,CAAC"}

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

@@ -1,8 +1,10 @@
+import type { Func } from "hry-types/src/Misc/_api";
 import type { CustomEventsTags } from "../RootComponent/CustomEvents/CustomEventsTag";
 type _SubComponentType = {
     composedEvents?: Record<string, string | number | bigint | boolean | symbol | null | undefined | Record<string, any> | unknown[] | CustomEventsTags>;
     allDatas?: Record<string, unknown>;
-    methods?: Record<string, unknown>;
+    methods?: Record<string, Func>;
+    events?: Record<string, Func>;
 };
 /**
  * SubComponent API 返回类型

package/dist/api/SubComponent/SubReturnType/CreateSubComponentDoc.d.ts

@@ -15,5 +15,7 @@ export type CreateSubComponentDoc<OriginalCompDoc extends object, SubEventsDoc e
     methods: SubMethods;
 }> & IfExtends<EmptyObject, allDatas, {}, {
     allDatas: allDatas;
-}>>> = IfExtends<MissingRequiredField, never, IfExtends<EmptyObject, SubCompDoc, never, SubCompDoc>, `缺少必传的字段${UnionToComma<MissingRequiredField & string>}`>;
+}> & IfExtends<EmptyObject, SubEventsDoc, {}, {
+    events: SubEventsDoc;
+}>>> = IfExtends<MissingRequiredField, never, IfExtends<EmptyObject, SubCompDoc, {}, SubCompDoc>, `缺少必传的字段${UnionToComma<MissingRequiredField & string>}`>;
 export {};

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

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/api/SubComponent/index.ts"],"names":[],"mappings":"AAqSA;;;GAGG;AACH,MAAM,UAAU,YAAY;IAK1B,8DAA8D;IAC9D,OAAO,CAAC,CAAC,OAAY,EAAE,EAAE,CAAC,OAAkC,CAAQ,CAAC;AACvE,CAAC;AAiBD,uCAAuC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/api/SubComponent/index.ts"],"names":[],"mappings":"AAuSA;;;GAGG;AACH,MAAM,UAAU,YAAY;IAK1B,8DAA8D;IAC9D,OAAO,CAAC,CAAC,OAAY,EAAE,EAAE,CAAC,OAAkC,CAAQ,CAAC;AACvE,CAAC;AAiBD,uCAAuC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "annil",
-  "version": "1.11.0-alpha.3",
+  "version": "1.11.0-alpha.4",
   "description": "微信小程序(原生开发)插件",
   "main": "dist/index.js",
   "types": "src/index.ts",

package/src/api/InstanceInject/instanceConfig.ts

@@ -31,7 +31,7 @@ type injectData = DataConstraint extends IInjectInfo["data"] ? {} : IInjectInfo[
 export type IInjectStore = StoreConstraint extends IInjectInfo["store"] ? {}
   : ReturnTypeInObject<IInjectInfo["store"]>;
 
-export type IInjectMethods = IInjectInfo["methods"];
+export type IInjectMethods = MethodsConstraint extends IInjectInfo["methods"] ? {} : IInjectInfo["methods"];
 
 /**
  * 实例配置接口

package/src/api/SlotComponent/index.ts

@@ -13,6 +13,7 @@ import type { RootComponentType } from "../RootComponent/RootComponentType";
 import type { GetStoreDoc } from "../RootComponent/Store/GeTStoreDoc";
 import type { StoreConstraint } from "../RootComponent/Store/StoreConstraint";
 import type { WatchOption } from "../RootComponent/Watch/WatchOption";
+import type { SubComponentType } from "../SubComponent/SubComponentType";
 import type { GetSlotComputedDoc } from "./SlotComputed/GetSlotComputedDoc";
 import type { SlotComputedOption } from "./SlotComputed/SlotComputedOption";
 import type { SlotDataOption } from "./SlotData/SlotDataOption";
@@ -139,11 +140,7 @@ type SlotComponentConstructor<
     AllSuperEvents
   >,
 ) => never;
-type SubComponentType = {
-  allDatas?: Record<string, unknown>;
-  methods?: Record<string, () => unknown>;
-  events?: Record<string, () => unknown>;
-};
+
 export function SlotComponent<
   RootDoc extends RootComponentType,
   SubDoc extends SubComponentType,

package/src/api/SubComponent/SubComponentType.ts

@@ -1,3 +1,4 @@
+import type { Func } from "hry-types/src/Misc/_api";
 import type { CustomEventsTags } from "../RootComponent/CustomEvents/CustomEventsTag";
 
 type _SubComponentType = {
@@ -16,7 +17,8 @@ type _SubComponentType = {
     | CustomEventsTags
   >;
   allDatas?: Record<string, unknown>;
-  methods?: Record<string, unknown>;
+  methods?: Record<string, Func>;
+  events?: Record<string, Func>;
 };
 
 // type _Validator<O, ErrKeys = Exclude<keyof O, SelectKeys<O, Composed, "contains->">>> = [ErrKeys] extends [never]

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

@@ -61,6 +61,15 @@ type Sub1Expected = {
     CapturePhaseComposed: string | CaptureComposed;
     BubblesCapturePhaseComposed: string | BubblesCaptureComposed;
   };
+  events: {
+    aaa_str(e: Detail<string>): void;
+    aaa_bubbles(e: Detail<string>): void;
+    aaa_CapturePhase(e: Detail<string>): void;
+    aaa_BubblesCapturePhase(e: Detail<null>): void;
+    aaa_BubblesComposed(e: Detail<string>): void;
+    aaa_CapturePhaseComposed(e: Detail<string>): void;
+    aaa_BubblesCapturePhaseComposed(e: Detail<string>): void;
+  };
 };
 
 // 1.2 Composed事件会被返回
@@ -83,6 +92,10 @@ Checking<typeof sub2, {
   composedEvents: {
     BubblesCapturePhaseComposed: string | BubblesCaptureComposed;
   };
+  events: {
+    aaa_BubblesComposed_catch(e: Detail<string>): void;
+    aaa_CapturePhaseComposed_catch(e: Detail<string>): void;
+  };
 }, Test.Pass>;
 
 const sub3 = SubComponent<{}, CompDoc>()({
@@ -100,7 +113,13 @@ const sub3 = SubComponent<{}, CompDoc>()({
 });
 
 // 2.4 若Composed事件都被阻止则返回never
-Checking<typeof sub3, never, Test.Pass>;
+Checking<typeof sub3, {
+  events: {
+    aaa_BubblesComposed_catch(e: Detail<string>): void;
+    aaa_CapturePhaseComposed_catch(e: Detail<string>): void;
+    aaa_BubblesCapturePhaseComposed_catch(e: Detail<string>): void;
+  };
+}, Test.Pass>;
 
 // 3.1 基础组件基本事件参数为WMBaseEvent
 SubComponent<{}, Wm.View>()({

package/src/api/SubComponent/SubReturnType/CreateSubComponentDoc.ts

@@ -37,10 +37,11 @@ export type CreateSubComponentDoc<
     & IfExtends<EmptyObject, ComposedEvents, {}, { composedEvents: ComposedEvents }>
     & IfExtends<EmptyObject, SubMethods, {}, { methods: SubMethods }>
     & IfExtends<EmptyObject, allDatas, {}, { allDatas: allDatas }>
+    & IfExtends<EmptyObject, SubEventsDoc, {}, { events: SubEventsDoc }>
   >,
 > = IfExtends<
   MissingRequiredField,
   never,
-  IfExtends<EmptyObject, SubCompDoc, never, SubCompDoc>,
+  IfExtends<EmptyObject, SubCompDoc, {}, SubCompDoc>,
   `缺少必传的字段${UnionToComma<MissingRequiredField & string>}`
 >;

package/src/api/SubComponent/SubReturnType/test/error.test.ts

@@ -12,7 +12,7 @@ type CompDoc = ComponentType<{
 
 const SubDoc = SubComponent<{}, CompDoc>()({});
 void SubDoc;
-// 返回穿透的自定义事件,并去除了前缀
+// 返回穿透的自定义事件, 并去除了前缀
 type SubDocExpect = "缺少必传的字段aaa_str、aaa_bool";
 
 Checking<typeof SubDoc, SubDocExpect, Test.Pass>();

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

@@ -1,3 +1,4 @@
+/* eslint-disable @typescript-eslint/no-empty-function */
 import { Checking, type Test } from "hry-types";
 import type { ComponentType } from "../../../DefineComponent/ReturnType/ComponentType";
 import type {
@@ -48,14 +49,11 @@ const removeCatchedEvents = SubComponent<{}, CompDoc>()({
     aaa_str: "string",
   },
   events: {
-    aaa_bubblesCaptrueComposed_catch(e) {
-      console.log(e);
+    aaa_bubblesCaptrueComposed_catch() {
     },
-    aaa_bubblesComposed_catch(e) {
-      console.log(e);
+    aaa_bubblesComposed_catch() {
     },
-    aaa_captrueComposed_catch(e) {
-      console.log(e);
+    aaa_captrueComposed_catch() {
     },
   },
 });
@@ -65,6 +63,11 @@ type RemoveSubDoc = {
   allDatas: {
     aaa_str: "string";
   };
+  events: {
+    aaa_bubblesCaptrueComposed_catch(): void;
+    aaa_bubblesComposed_catch(): void;
+    aaa_captrueComposed_catch(): void;
+  };
 };
 
 Checking<typeof removeCatchedEvents, RemoveSubDoc, Test.Pass>();
@@ -74,15 +77,9 @@ const removeCatchedEventsOfSuffix = SubComponent<{}, CompDoc, "aa">()({
     aaaAa_str: "string",
   },
   events: {
-    aaaAa_bubblesCaptrueComposed_catch(e) {
-      console.log(e);
-    },
-    aaaAa_bubblesComposed_catch(e) {
-      console.log(e);
-    },
-    aaaAa_captrueComposed_catch(e) {
-      console.log(e);
-    },
+    aaaAa_bubblesCaptrueComposed_catch() {},
+    aaaAa_bubblesComposed_catch() {},
+    aaaAa_captrueComposed_catch() {},
   },
 });
 void removeCatchedEventsOfSuffix;
@@ -91,6 +88,11 @@ type RemoveCatchedEventsOfSuffix = {
   allDatas: {
     aaaAa_str: "string";
   };
+  events: {
+    aaaAa_bubblesCaptrueComposed_catch(): void;
+    aaaAa_bubblesComposed_catch(): void;
+    aaaAa_captrueComposed_catch(): void;
+  };
 };
 
 Checking<typeof removeCatchedEventsOfSuffix, RemoveCatchedEventsOfSuffix, Test.Pass>();

package/src/api/SubComponent/index.ts

@@ -283,13 +283,15 @@ type SubComponentConstructor<
     SubEventsDoc,
     SubMethodsDoc
   >,
-) => CreateSubComponentDoc<
+) => // SubComponentType<
+CreateSubComponentDoc<
   NonNullable<CurrentCompDoc["customEvents"]>,
   SubEventsDoc,
   MissingRequiredField,
   ComputeObject<SubDataDoc & SubComputedDoc & SubStoreDoc>, // allDatas
   SubMethodsDoc
->;
+> // >
+; // must satisfied SubComponentType
 
 /**
  * 子组件构建函数