annil 1.7.3 → 1.7.5-beta-3

package/src/api/DefineComponent/normalizeOptions/sameFuncOptionsHandle.ts

@@ -0,0 +1,37 @@
+import type { Func } from "hry-types/src/Misc/_api";
+import { isEmptyObject } from "../../../utils/isEmptyObject";
+import type { FinalOptionsOfComponent, SameFuncOptions } from ".";
+/**
+ * 把函数配置放入一个配置中依次运行
+ */
+function _sameFuncOptionsHandle(config: object, configList: Record<string, Func[]>) {
+  for (const key in configList) {
+    // @ts-ignore 隐式索引
+    config[key] = function(...args: unknown[]) {
+      configList[key].forEach(ele => ele.call(this, ...args));
+    };
+  }
+}
+/**
+ * 把函数列表配置放入一个配置中循环依次运行
+ */
+export function sameFuncOptionsHandle(
+  finalOptionsForComponent: FinalOptionsOfComponent,
+  isPage: boolean | undefined,
+  funcOptions: SameFuncOptions,
+) {
+  if (isPage) {
+    // 页面时 生命周期方法(即 on 开头的方法),(https://developers.weixin.qq.com/miniprogram/dev/framework/custom-component/component.html)
+    if (!isEmptyObject(funcOptions.pageLifetimes)) {
+      _sameFuncOptionsHandle(finalOptionsForComponent.methods, funcOptions.pageLifetimes);
+    }
+  } else {
+    // 组件时
+    if (!isEmptyObject(funcOptions.pageLifetimes)) {
+      _sameFuncOptionsHandle(finalOptionsForComponent.pageLifetimes, funcOptions.pageLifetimes);
+    }
+  }
+  if (funcOptions.lifetimes) _sameFuncOptionsHandle(finalOptionsForComponent.lifetimes ||= {}, funcOptions.lifetimes);
+
+  if (funcOptions.watch) _sameFuncOptionsHandle(finalOptionsForComponent.watch ||= {}, funcOptions.watch);
+}

package/src/api/DefineComponent/normalizeOptions/subComponentsOptionHandle.ts

@@ -0,0 +1,18 @@
+import type { SubComponentTrueOptions } from "../../SubComponent";
+import type { FinalOptionsOfComponent, SameFuncOptions } from ".";
+import { otherFieldsHandle } from "./otherFieldsHandle";
+import { sameFuncFieldsCollect } from "./sameFuncFieldsCollect";
+
+export function subComponentsOptionHandle(
+  componentOptions: FinalOptionsOfComponent,
+  subComponents: SubComponentTrueOptions[],
+  funcOptions: SameFuncOptions,
+) {
+  subComponents.forEach((subOption) => {
+    if (subOption.events) Object.assign(componentOptions.methods, subOption.events);
+
+    sameFuncFieldsCollect(subOption, funcOptions);
+
+    otherFieldsHandle(componentOptions, subOption);
+  });
+}

package/src/api/InstanceInject/inject.ts

@@ -1,3 +1,4 @@
+/* eslint-disable @typescript-eslint/no-unused-vars */
 import { observable, runInAction } from "mobx";
 
 // 注入的响应式数据;
@@ -27,6 +28,7 @@ const store = {
 // 声明注入类型 js开发可以忽略
 declare module "../.." {
   interface IInjectInfo {
+    [key: string]: unknown;
     data: typeof data;
     store: typeof store;
     methods: typeof methods;

package/src/api/InstanceInject/instanceConfig.ts

@@ -1,5 +1,3 @@
-/* eslint-disable @typescript-eslint/explicit-member-accessibility */
-
 import type { IfEquals } from "hry-types/src/Any/IfEquals";
 import type { ComputeIntersection } from "hry-types/src/Object/ComputeIntersection";
 import type { ReturnTypeInObject } from "hry-types/src/Object/ReturnTypeInObject";
@@ -10,6 +8,7 @@ import type { StoreConstraint } from "../RootComponent/Store/StoreConstraint";
 
 // 利用继承的多态性 使得IInjectInfo类型可由使用者外部定义
 interface BaseInjectInfo {
+  [key: string]: unknown;
   options?: WMComponentOption;
   methods?: MethodsConstraint;
   data?: DataConstraint;
@@ -17,7 +16,6 @@ interface BaseInjectInfo {
   behaviors?: string[];
 }
 
-// eslint-disable-next-line @typescript-eslint/no-empty-interface
 export interface IInjectInfo extends BaseInjectInfo {
 }
 
@@ -44,7 +42,7 @@ class InstanceConfig {
     return this.info.injectInfo;
   }
   public setInjectInfo(info: IInjectInfo | undefined) {
-    info && (this.info.injectInfo = info);
+    if (info) this.info.injectInfo = info;
   }
 }
 

package/src/api/InstanceInject/test/normal.test.ts

@@ -1,3 +1,4 @@
+/* eslint-disable @typescript-eslint/no-unused-expressions */
 import { Checking, type Test } from "hry-types";
 import { RootComponent } from "../../RootComponent";
 

package/src/api/RootComponent/Computed/ComputedConstraint.ts

@@ -1,4 +1,4 @@
 /**
  * RootComponent API Computed 字段约束
  */
-export type ComputedConstraint = Record<string, () => any>;
+export type ComputedConstraint = Record<string, () => void>;

package/src/api/RootComponent/Computed/test/GetComputedDoc.test.ts

@@ -1,3 +1,4 @@
+/* eslint-disable @typescript-eslint/no-unused-expressions */
 import { Checking, type Test } from "hry-types";
 import type { GetComputedDoc } from "../GetComputedDoc";
 

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

@@ -1,3 +1,5 @@
+/* eslint-disable @typescript-eslint/no-unused-expressions */
+/* eslint-disable @typescript-eslint/no-unused-vars */
 import { Checking, type Test } from "hry-types";
 import type { ComputeIntersection } from "hry-types/src/Object/_api";
 import type { IInjectAllData } from "../../../InstanceInject/instanceConfig";

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

@@ -16,7 +16,7 @@ import {
   type StrExpected,
   type UnionStrExpected,
 } from "./GetShortEventDoc.test";
-import { mock_customEvents } from "./normal.test";
+import { type mock_customEvents } from "./normal.test";
 
 type Mock_CustomEventsDoc = GetCustomEventDoc<typeof mock_customEvents>;
 
@@ -35,4 +35,4 @@ export type Mock_CustomEventsDocExpected = {
   bubbles_capturePhase_composed: BubblesCapturePhaseComposedExpected;
 };
 
-Checking<Mock_CustomEventsDoc, Mock_CustomEventsDocExpected, Test.Pass>;
+void Checking<Mock_CustomEventsDoc, Mock_CustomEventsDocExpected, Test.Pass>;

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

@@ -1,3 +1,4 @@
+/* eslint-disable @typescript-eslint/no-unused-expressions */
 import { Checking, type Test } from "hry-types";
 import type {
   Bubbles,
@@ -9,7 +10,7 @@ import type {
 } from "../CustomEventsTag";
 
 import type { GetFullCustomEventsDoc } from "../GetCustomEventDoc";
-import { mock_fullCustomEvents } from "./normal.test";
+import { type mock_fullCustomEvents } from "./normal.test";
 
 // bubbles
 type bubblesResult = GetFullCustomEventsDoc<typeof mock_fullCustomEvents["bubbles"]>;

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

@@ -1,8 +1,9 @@
+/* eslint-disable @typescript-eslint/no-unused-expressions */
 import { Checking, type Test } from "hry-types";
 
 import type { Mock_User } from "../../Properties/test/normalRequired.test";
 import type { GetShortCustomEventsDoc } from "../GetCustomEventDoc";
-import { mock_shortCustomEvents } from "./normal.test";
+import { type mock_shortCustomEvents } from "./normal.test";
 
 type StrResult = GetShortCustomEventsDoc<typeof mock_shortCustomEvents["str"]>;
 

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

@@ -38,7 +38,7 @@ RootComponent()({
 RootComponent()({
   events: {
     aaa() {
-      1;
+      void 0;
     },
   },
   customEvents: {
@@ -85,7 +85,7 @@ RootComponent()({
 RootComponent()({
   events: {
     aaa() {
-      1;
+      void 0;
     },
   },
   customEvents: {

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

@@ -1,3 +1,5 @@
+/* eslint-disable @typescript-eslint/no-unused-vars */
+/* eslint-disable @typescript-eslint/no-unused-expressions */
 import { Checking, type Test } from "hry-types";
 import { type DetailedType, RootComponent } from "../../../..";
 import type { Mock_User } from "../../Properties/test/normalRequired.test";

package/src/api/RootComponent/Data/test/GetDataDoc.test.ts

@@ -22,11 +22,11 @@ type Test1Expected = {
   str: string;
 };
 
-Checking<Test1, Test1Expected, Test.Pass>;
+void Checking<Test1, Test1Expected, Test.Pass>;
 
 // 测试空对象
 type Test4 = GetDataDoc<{}>;
 
 type Test4Expected = {};
 
-Checking<Test4, Test4Expected, Test.Pass>;
+void Checking<Test4, Test4Expected, Test.Pass>;

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

@@ -1,3 +1,4 @@
+/* eslint-disable @typescript-eslint/no-unused-expressions */
 import { Checking, type Test } from "hry-types";
 import type { IInjectAllData } from "../../../InstanceInject/instanceConfig";
 import { RootComponent } from "../..";
@@ -12,7 +13,7 @@ const EmptyDataRootDoc = RootComponent()({
     },
   },
 });
-
+void EmptyDataRootDoc;
 // 3.2 data为空对象时 返回文档中无data字段
 Checking<typeof EmptyDataRootDoc, { methods: { M1: () => void } }, Test.Pass>;
 
@@ -27,6 +28,6 @@ const noDataRootDoc = RootComponent()({
     },
   },
 });
-
+void noDataRootDoc;
 // 4.2 data为空对象时 返回文档中无data字段
 Checking<typeof noDataRootDoc, { methods: { M1: () => void } }, Test.Pass>;

package/src/api/RootComponent/Events/EventsConstraint.ts

@@ -61,7 +61,7 @@ type GetAllSubCustomEventsConstraint<
   >
 >;
 
-type BaseEvent = Record<string, (e: WMBaseEvent) => any>;
+type BaseEvent = Record<string, (e: WMBaseEvent) => unknown>;
 
 /**
  * events字段约束 由自身事件和冒泡的子组件事件组成。带前缀是子组件事件,带后缀(_catch)表示阻止冒泡

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

@@ -1,3 +1,5 @@
+/* eslint-disable @typescript-eslint/no-unused-vars */
+/* eslint-disable @typescript-eslint/no-unused-expressions */
 import { Checking, type Test } from "hry-types";
 import type {
   CurrentTargetDataset,
@@ -8,6 +10,7 @@ import type {
   WMBaseEvent,
   WMCustomEvent,
 } from "../../../../types/OfficialTypeAlias";
+import { assertNonNullable } from "../../../../utils/assertNonNullable";
 import type { ComponentDoc } from "../../../DefineComponent/ReturnType/ComponentDoc";
 import { RootComponent } from "../..";
 import type { Bubbles, Capture } from "../../CustomEvents/CustomEventsTag";
@@ -39,7 +42,7 @@ RootComponent()({
     ) {
       Checking<typeof e.detail.detailData, string, Test.Pass>;
 
-      const markData = e.mark!.markData;
+      const markData = assertNonNullable(e.mark).markData;
 
       Checking<typeof markData, { id: string }, Test.Pass>;
 
@@ -53,7 +56,7 @@ RootComponent()({
     },
     // 2.3 通过Mark定义mark类型
     ccc(e: Mark<{ id: string }>) {
-      const markId = e.mark!.id;
+      const markId = e.mark.id;
 
       Checking<typeof markId, string, Test.Pass>;
     },

package/src/api/RootComponent/Instance/RootComponentInstance.ts

@@ -2,9 +2,11 @@ import type { IfExtends } from "hry-types/src/Any/IfExtends";
 import type { ComputeIntersection } from "hry-types/src/Object/ComputeIntersection";
 import type { IReactionDisposer } from "mobx";
 
+import type { Func } from "hry-types/src/Misc/Func";
 import type { Assign } from "../../../types/Assign";
 import type { ComputeObject } from "../../../types/ComputeObj";
 import type { WMComponentInstance, WMInstanceMethods, WMPageInstance } from "../../../types/OfficialTypeAlias";
+import type { OptionsInnerFields } from "../../DefineComponent/normalizeOptions";
 import type { IInjectAllData, IInjectMethods } from "../../InstanceInject/instanceConfig";
 import type { CustomEventMethods } from "./CustomEventMethods";
 import type { CustomSetData } from "./CustomSetData";
@@ -33,3 +35,10 @@ export type RootComponentInstance<
 export type ComponentInstance = RootComponentInstance<false, {}, {}, {}, {}, {}>;
 
 export type PageInstance = RootComponentInstance<true, {}, {}, {}, {}, {}>;
+
+type InstanceInnerFields = {
+  data: OptionsInnerFields["data"];
+  disposer: Record<string, Func>;
+  cloneData: OptionsInnerFields["data"];
+} & OptionsInnerFields["methods"];
+export type Instance = (ComponentInstance | PageInstance) & InstanceInnerFields;

package/src/api/RootComponent/Instance/test/CustomEventsDoc.test.ts

@@ -1,3 +1,4 @@
+/* eslint-disable @typescript-eslint/no-unused-expressions */
 import { Checking, type Test } from "hry-types";
 import type { DetailedType } from "../../../..";
 import { RootComponent } from "../..";

package/src/api/RootComponent/Instance/test/customEvents/normal.test.ts

@@ -1,3 +1,4 @@
+/* eslint-disable @typescript-eslint/no-unused-expressions */
 import { Checking, type Test } from "hry-types";
 import type { DetailedType } from "../../../../..";
 import { RootComponent } from "../../..";

package/src/api/RootComponent/Instance/test/methods/mormal.test.ts

@@ -8,9 +8,9 @@ RootComponent()({
     },
 
     M2(str: string) {
-      Checking<typeof this.M1, () => 1, Test.Pass>;
+      void Checking<typeof this.M1, () => 1, Test.Pass>;
 
-      Checking<typeof this.M2, (str: string) => string, Test.Pass>;
+      void Checking<typeof this.M2, (str: string) => string, Test.Pass>;
 
       return str;
     },

package/src/api/RootComponent/Instance/test/properties/mormal.test.ts

@@ -1,3 +1,5 @@
+/* eslint-disable @typescript-eslint/no-unused-vars */
+/* eslint-disable @typescript-eslint/no-unused-expressions */
 import { Checking, type Test } from "hry-types";
 import type { ComputeIntersection } from "hry-types/src/Object/ComputeIntersection";
 import { type DetailedType, RootComponent } from "../../../../..";

package/src/api/RootComponent/Instance/test/setData/error.test.ts

@@ -7,7 +7,7 @@ RootComponent()({
   data: {
     str: "str",
     num: 123,
-    literal: <456 | 789> 456,
+    literal: 456 as 456 | 789,
     bool: true,
     arr: [1, 2, 3],
     obj: { num: 1, str: "str" },

package/src/api/RootComponent/Instance/test/setData/normal.test.ts

@@ -6,7 +6,7 @@ RootComponent()({
   data: {
     str: "str",
     num: 123,
-    literal: <456 | 789> 456,
+    literal: 456 as 456 | 789,
     bool: true,
     arr: [1, 2, 3],
     obj: { a: 1, b: "str" },

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

@@ -1,3 +1,5 @@
+/* eslint-disable @typescript-eslint/no-unused-vars */
+/* eslint-disable @typescript-eslint/no-unused-expressions */
 import { Checking, type Test } from "hry-types";
 import { RootComponent } from "../..";
 

package/src/api/RootComponent/Lifetimes/LifetimesConstraint.ts

@@ -1,6 +1,6 @@
 import type { ComputeIntersection } from "hry-types/src/Object/ComputeIntersection";
 import type { WMCompLifetimes } from "../../../types/OfficialTypeAlias";
-import type { FinalOptionsOfComponent } from "../../DefineComponent/assignOptions";
+import type { FinalOptionsOfComponent } from "../../DefineComponent/normalizeOptions";
 
 export type LifetimesConstraint = // 官方组件生命周期
   ComputeIntersection<
@@ -9,6 +9,6 @@ export type LifetimesConstraint = // 官方组件生命周期
       /**
        * 建立组件时的真正配置对象
        */
-      beforeCreate?: (this: void, options: FinalOptionsOfComponent) => void;
+      beforeCreate?: (this: undefined, options: FinalOptionsOfComponent) => void;
     }
   >;

package/src/api/RootComponent/Lifetimes/test/error.test.ts

@@ -2,16 +2,30 @@ import { RootComponent } from "../..";
 
 RootComponent()({
   lifetimes: {
-    beforeCreate() {},
-    created() {},
-    attached() {},
-    ready() {},
-    detached() {},
+    beforeCreate() {
+      void 0;
+    },
+    created() {
+      void 0;
+    },
+    attached() {
+      void 0;
+    },
+    ready() {
+      void 0;
+    },
+    detached() {
+      void 0;
+    },
     error(err) {
-      err.message;
+      void err.message;
+    },
+    moved() {
+      void 0;
     },
-    moved() {},
     // @ts-expect-error  1 错误的生命周期字段报错
-    xxx() {},
+    xxx() {
+      void 0;
+    },
   },
 });

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

@@ -8,22 +8,27 @@ RootComponent()({
   lifetimes: {
     // 新增声明周期可用于查看或拓展配置文件
     beforeCreate(opitons) {
-      Checking<typeof this, void, Test.Pass>;
+      void Checking<typeof this, undefined, Test.Pass>;
 
-      opitons;
+      void opitons;
     },
     created() {
+      void 0;
     },
     attached() {
+      void 0;
     },
     ready() {
+      void 0;
     },
     detached() {
+      void 0;
     },
     error(err) {
-      err.message;
+      void err.message;
     },
     moved() {
+      void 0;
     },
   },
 });

package/src/api/RootComponent/Methods/test/error.test.ts

@@ -6,7 +6,7 @@ import { RootComponent } from "../..";
 RootComponent()({
   events: {
     eventField() {
-      1;
+      void 0;
     },
   },
   customEvents: {
@@ -15,11 +15,11 @@ RootComponent()({
   methods: {
     // @ts-expect-error "⚠️与events字段重复⚠️"
     eventField() {
-      1;
+      void 0;
     },
     // @ts-expect-error "⚠️与customEvents字段重复⚠️"
     customField() {
-      2;
+      void 0;
     },
   },
 });
@@ -30,7 +30,7 @@ RootComponent()({
 RootComponent()({
   methods: {
     M1() {
-      1;
+      void 0;
     },
 
     M2() {

package/src/api/RootComponent/Methods/test/mormal.test.ts

@@ -14,7 +14,7 @@ const RootDoc = RootComponent()({
     },
   },
 });
-
+void RootDoc;
 type RootDocExpected = {
   methods: {
     num: () => 1;
@@ -22,4 +22,4 @@ type RootDocExpected = {
   };
 };
 
-Checking<typeof RootDoc, RootDocExpected, Test.Pass>;
+void Checking<typeof RootDoc, RootDocExpected, Test.Pass>;

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

@@ -9,16 +9,20 @@ RootComponent()({
   },
   observers: {
     obj(a) {
-      Checking<typeof a, User | null, Test.Pass>;
+      void a;
+      void Checking<typeof a, User | null, Test.Pass>;
     },
     "obj.**"(a) {
-      Checking<typeof a, User | null, Test.Pass>;
+      void a;
+      void Checking<typeof a, User | null, Test.Pass>;
     },
     "obj.age"(a) {
-      Checking<typeof a, number, Test.Pass>;
+      void a;
+      void Checking<typeof a, number, Test.Pass>;
     },
     "obj.name"(a) {
-      Checking<typeof a, string, Test.Pass>;
+      void a;
+      void Checking<typeof a, string, Test.Pass>;
     },
   },
 });

package/src/api/RootComponent/PageLifetimes/test/error.test.ts

@@ -4,14 +4,22 @@ import { RootComponent } from "../..";
  */
 RootComponent()({
   pageLifetimes: {
-    show() {},
-    hide() {},
-    resize() {},
+    show() {
+      void 0;
+    },
+    hide() {
+      void 0;
+    },
+    resize() {
+      void 0;
+    },
     load(props) {
-      props;
+      void props;
     },
     // @ts-expect-error 1 错误的声明周期
-    xxx() {},
+    xxx() {
+      void 0;
+    },
   },
 });
 
@@ -22,9 +30,11 @@ RootComponent()({
   isPage: true,
   pageLifetimes: {
     onLoad(props) {
-      props;
+      void props;
     },
     // @ts-expect-error 2 错误的声明周期
-    xxx() {},
+    xxx() {
+      void 0;
+    },
   },
 });

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

@@ -8,14 +8,20 @@ import type { Mock_User } from "../../Properties/test/normalRequired.test";
  */
 RootComponent()({
   pageLifetimes: {
-    hide() {},
+    hide() {
+      void 0;
+    },
     resize(size) {
-      Checking<typeof size, WechatMiniprogram.Page.IResizeOption, Test.Pass>;
+      void size;
+      void Checking<typeof size, WechatMiniprogram.Page.IResizeOption, Test.Pass>;
+    },
+    show() {
+      void 0;
     },
-    show() {},
     // 1 glass-easel(最低版本库3.0.2)支持的周期函数
     load(obj) {
-      Checking<typeof obj, object | undefined, Test.Pass>;
+      void obj;
+      void Checking<typeof obj, object | undefined, Test.Pass>;
     },
   },
 });
@@ -41,7 +47,8 @@ RootComponent()({
   pageLifetimes: {
     // 3 重写onLoad周期参数props的类型(同页面properties定义类型).
     onLoad(props) {
-      Checking<
+      void props;
+      void Checking<
         typeof props,
         {
           union?: Mock_User;

package/src/api/RootComponent/Properties/test/normalEmpty.test.ts

@@ -10,13 +10,13 @@ const emptyObj = RootComponent()({
   methods: {
     foo() {
       // 1 this.data 为注入数据类型
-      Checking<typeof this.data, IInjectAllData, Test.Pass>;
+      void Checking<typeof this.data, IInjectAllData, Test.Pass>;
     },
   },
 });
-
+void emptyObj;
 // 2 返回文档类型无properties字段
-Checking<typeof emptyObj, {
+void Checking<typeof emptyObj, {
   methods: {
     foo(): void;
   };
@@ -29,13 +29,13 @@ const noProperties = RootComponent()({
   methods: {
     foo() {
       // 3 this.data 为注入数据类型
-      Checking<typeof this.data, IInjectAllData, Test.Pass>;
+      void Checking<typeof this.data, IInjectAllData, Test.Pass>;
     },
   },
 });
-
+void noProperties;
 // 4 返回文档类型无properties字段
-Checking<typeof noProperties, {
+void Checking<typeof noProperties, {
   methods: {
     foo(): void;
   };