annil 1.5.12 → 1.5.13

package/CHANGELOG.md

@@ -4,6 +4,13 @@
 
 * 解决DetailedType不接收接口类型的错误 ([ae8acbf](https://github.com/missannil/annil/commit/ae8acbfc2e62f99db565c448ad9253aa549e78bb))
 
+## [1.5.13](https://github.com/missannil/annil/compare/v1.5.12...v1.5.13) (2024-01-12)
+
+
+### Bug Fixes
+
+* 修改自定义事件detail类型为ReadOnlyDeep,以便调用时可传入实例中的data类型(都是ReadOnlyDeep的) ([428710e](https://github.com/missannil/annil/commit/428710ea84717c45361d1e6c9c7db46c693026a9))
+
 ## [1.5.12](https://github.com/missannil/annil/compare/v1.5.11...v1.5.12) (2024-01-12)
 
 

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

@@ -1,8 +1,9 @@
+import type { ReadonlyDeep } from "hry-types/src/Any/ReadonlyDeep";
 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 GetShortCustomEventsDoc<T extends ShortCustomeEvents> = T extends DetailedType ? ReadonlyDeep<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"]> | AddTagForCustomEventsDoc<T["options"]>;
 export type GetCustomEventDoc<T extends CustomEventConstraint> = {
     [k in keyof T]: T[k] extends ShortCustomeEvents ? GetShortCustomEventsDoc<T[k]> : GetShortCustomEventsDoc<T[k]["detail"]> | AddTagForCustomEventsDoc<T[k]["options"]>;

package/package.json

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

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

@@ -1,3 +1,4 @@
+import type { ReadonlyDeep } from "hry-types/src/Any/ReadonlyDeep";
 import type { DetailedType } from "../../../types/DetailedType";
 import type { InferDetailedType } from "../../../types/InferDetailedType";
 import type {
@@ -8,7 +9,8 @@ import type {
 } from "./CustomEventConstraint";
 import type { AddTagForCustomEventsDoc } from "./CustomEventsTag";
 
-export type GetShortCustomEventsDoc<T extends ShortCustomeEvents> = T extends DetailedType ? InferDetailedType<T>
+export type GetShortCustomEventsDoc<T extends ShortCustomeEvents> = T extends DetailedType
+  ? ReadonlyDeep<InferDetailedType<T>>
   : T extends null ? null
   : T extends undefined ? undefined
   : T extends SimpleCustomeEventsList ? GetShortCustomEventsDoc<T[number]>

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

@@ -9,7 +9,13 @@ import {
   type CapturePhaseComposedExpected,
   type CapturePhaseExpected,
 } from "./GetFullEventDoc.test";
-import { type ListExpected, type NullExpected, type StrExpected, type UnionStrExpected } from "./GetShortEventDoc.test";
+import {
+  type ListExpected,
+  type NullExpected,
+  type ObjExpected,
+  type StrExpected,
+  type UnionStrExpected,
+} from "./GetShortEventDoc.test";
 import { mock_customEvents } from "./normal.test";
 
 type Mock_CustomEventsDoc = GetCustomEventDoc<typeof mock_customEvents>;
@@ -20,6 +26,7 @@ export type Mock_CustomEventsDocExpected = {
   nothing: undefined;
   unionStr: UnionStrExpected;
   union: ListExpected;
+  obj: ObjExpected;
   bubbles: bubblesExpected;
   capturePhase: CapturePhaseExpected;
   bubbles_capturePhase: BubblesCapturePhaseExpected;

package/src/api/RootComponent/CustomEvents/test/GetShortEventDoc.test.ts

@@ -1,5 +1,7 @@
 import { Checking, type Test } from "hry-types";
 
+import type { ReadonlyDeep } from "hry-types/src/Any/ReadonlyDeep";
+import type { Mock_User } from "../../Properties/test/normalRequired.test";
 import type { GetShortCustomEventsDoc } from "../GetCustomEventDoc";
 import { mock_shortCustomEvents } from "./normal.test";
 
@@ -26,3 +28,9 @@ type ListResult = GetShortCustomEventsDoc<typeof mock_shortCustomEvents["union"]
 export type ListExpected = string | 0 | 1 | 2 | null;
 
 Checking<ListResult, ListExpected, Test.Pass>;
+
+type ObjResult = GetShortCustomEventsDoc<typeof mock_shortCustomEvents["obj"]>;
+
+export type ObjExpected = ReadonlyDeep<Mock_User>;
+
+Checking<ObjResult, ObjExpected, Test.Pass>;

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

@@ -1,5 +1,7 @@
 import { Checking, type Test } from "hry-types";
+import type { ReadonlyDeep } from "hry-types/src/Any/ReadonlyDeep";
 import { type DetailedType, RootComponent } from "../../../..";
+import type { Mock_User } from "../../Properties/test/normalRequired.test";
 import type { CustomEventConstraint, FullCustomEvents, ShortCustomeEvents } from "../CustomEventConstraint";
 import type {
   Bubbles,
@@ -19,6 +21,7 @@ export const mock_shortCustomEvents = {
   null: null,
   unionStr: String as DetailedType<"male" | "female">,
   union: [String, Number as DetailedType<0 | 1 | 2>, null],
+  obj: Object as DetailedType<Mock_User>,
 } satisfies Record<string, ShortCustomeEvents>;
 
 /**
@@ -68,6 +71,7 @@ type RootDoc = {
     nothing: undefined;
     unionStr: "male" | "female";
     union: string | 0 | 1 | 2 | null;
+    obj: ReadonlyDeep<Mock_User>;
     // 带options字段 通过联合类型加入。
     bubbles: string | Bubbles;
     capturePhase: null | Capture;
@@ -92,3 +96,22 @@ const rootDocNoFields = RootComponent()({});
 
 // 3. 无customEvents字段时,Doc中无customEvents字段
 Checking<typeof rootDocNoFields, {}, Test.Pass>;
+
+// 4 实例中的对象数组都是readOnlyDeep类型,可以传递给自定义做参数
+RootComponent()({
+  properties: {
+    obj: Object as DetailedType<Mock_User>,
+  },
+  data: {
+    obj1: {} as Mock_User,
+    _ddd: {} as Mock_User,
+  },
+  customEvents: mock_customEvents,
+  events: {
+    ddd() {
+      this.obj(this.data.obj!);
+
+      this.obj(this.data.obj1);
+    },
+  },
+});