annil 1.4.0 → 1.5.0

package/src/api/InstanceInject/instanceConfig.ts

@@ -0,0 +1,39 @@
+/* eslint-disable @typescript-eslint/explicit-member-accessibility */
+
+import { ReturnTypeInObject } from "hry-types/src/Object/ReturnTypeInObject";
+import { WMComponentOption } from "../../types/OfficialTypeAlias";
+import { DataConstraint } from "../RootComponent/Data/DataConstraint";
+import { MethodsConstraint } from "../RootComponent/Methods/MethodsConstraint";
+import { StoreConstraint } from "../RootComponent/Store/StoreConstraint";
+
+// 利用继承的多态性 使得IInjectInfo类型可由使用者外部定义
+interface BaseInjectInfo {
+  options?: WMComponentOption;
+  methods?: MethodsConstraint;
+  data?: DataConstraint;
+  store?: StoreConstraint;
+  behaviors?: string[];
+}
+
+// eslint-disable-next-line @typescript-eslint/no-empty-interface
+export interface IInjectInfo extends BaseInjectInfo {
+}
+
+export type IInjectData = IInjectInfo["data"] & ReturnTypeInObject<IInjectInfo["store"]>;
+
+export type IInjectMethods = IInjectInfo["methods"];
+
+/**
+ * 实例配置接口
+ */
+class InstanceConfig {
+  private info: { injectInfo?: IInjectInfo } = {};
+  public get injectInfo() {
+    return this.info.injectInfo;
+  }
+  public setInjectInfo(info: IInjectInfo | undefined) {
+    info && (this.info.injectInfo = info);
+  }
+}
+
+export const instanceConfig = new InstanceConfig();

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

@@ -0,0 +1,40 @@
+import { Checking, Test } from "hry-types";
+import { RootComponent } from "../../RootComponent";
+
+// 1. 注入字段无重复时
+RootComponent()({
+  methods: {
+    testInjectTypes() {
+      Checking<typeof this.data.injectStr, string, Test.Pass>;
+
+      Checking<typeof this.data.injectTheme, "dark" | "light" | undefined, Test.Pass>;
+
+      Checking<typeof this.injectMethod, (data: string) => string, Test.Pass>;
+    },
+  },
+});
+
+// 2. 注入字段重复时,自身覆盖注入类型
+RootComponent()({
+  data: {
+    // 覆盖注入的数据类型
+    injectStr: 123,
+  },
+  store: {
+    // 覆盖注入的数据类型
+    injectTheme: (() => "aaa") as () => "aaa",
+  },
+  methods: {
+    // 覆盖注入的方法类型
+    injectMethod() {
+      return 123;
+    },
+    testInjectTypes() {
+      Checking<typeof this.data.injectStr, number, Test.Pass>;
+
+      Checking<typeof this.data.injectTheme, "aaa", Test.Pass>;
+
+      Checking<typeof this.injectMethod, () => 123, Test.Pass>;
+    },
+  },
+});

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

@@ -1,5 +1,6 @@
 import { Checking, type Test } from "hry-types";
 import type { ReadonlyDeep } from "hry-types/src/Any/_api";
+import { IInjectData } from "../../../InstanceInject/instanceConfig";
 import { RootComponent } from "../..";
 import type { Mock_User } from "../../Properties/test/normalRequired.test";
 
@@ -29,15 +30,17 @@ const RootDoc = RootComponent()({
       // 3 this.data 类型是深度只读的
       Checking<
         typeof this.data,
-        ReadonlyDeep<{
-          firstName: string;
-          lastName: string;
-          fullName: string;
-          user: Mock_User;
-          prefix: string;
-          id_fullName: string;
-          readOnly: "str";
-        }>,
+        ReadonlyDeep<
+          {
+            firstName: string;
+            lastName: string;
+            fullName: string;
+            user: Mock_User;
+            prefix: string;
+            id_fullName: string;
+            readOnly: "str";
+          } & IInjectData
+        >,
         Test.Pass
       >;
 
@@ -66,7 +69,7 @@ const noComputedFieldDoc = RootComponent()({
   methods: {
     M1() {
       // 5.1 无computed,this.data中为{}
-      Checking<typeof this.data, {}, Test.Pass>;
+      Checking<typeof this.data, ReadonlyDeep<IInjectData>, Test.Pass>;
     },
   },
 });
@@ -81,7 +84,7 @@ const EmptyComputedFieldDoc = RootComponent()({
   methods: {
     M1() {
       // 6.1 computed为{},this.data中为{}
-      Checking<typeof this.data, {}, Test.Pass>;
+      Checking<typeof this.data, ReadonlyDeep<IInjectData>, Test.Pass>;
     },
   },
 });

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

@@ -1,6 +1,7 @@
 import { Checking, type Test } from "hry-types";
 
 import type { ReadonlyDeep } from "hry-types/src/Any/_api";
+import { IInjectData } from "../../../InstanceInject/instanceConfig";
 import { RootComponent } from "../..";
 
 type Gender = "male" | "female";
@@ -15,7 +16,7 @@ const RootDoc = RootComponent()({
     foo() {
       Checking<
         typeof this.data,
-        ReadonlyDeep<{ gender: Gender; num: number; _innernalFields: number }>,
+        ReadonlyDeep<{ gender: Gender; num: number; _innernalFields: number } & IInjectData>,
         Test.Pass
       >;
     },
@@ -36,7 +37,7 @@ const EmptyDataRootDoc = RootComponent()({
   methods: {
     M1() {
       // 3.1 data为空对象时 this.data为{}类型
-      Checking<typeof this.data, {}, Test.Pass>;
+      Checking<typeof this.data, ReadonlyDeep<IInjectData>, Test.Pass>;
     },
   },
 });
@@ -51,7 +52,7 @@ const noDataRootDoc = RootComponent()({
   methods: {
     M1() {
       // 4.1 data为空对象时 this.data为{}类型
-      Checking<typeof this.data, {}, Test.Pass>;
+      Checking<typeof this.data, ReadonlyDeep<IInjectData>, Test.Pass>;
     },
   },
 });

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

@@ -1,10 +1,11 @@
 import type { ReadonlyDeep } from "hry-types/src/Any/_api";
 import type { IfExtends } from "hry-types/src/Any/IfExtends";
-import type { Func } from "hry-types/src/Misc/Func";
 import type { ComputeIntersection } from "hry-types/src/Object/ComputeIntersection";
 import type { IReactionDisposer } from "mobx";
 
+import { Assign } from "../../../types/Assign";
 import type { WMComponentInstance, WMInstanceMethods, WMPageInstance } from "../../../types/OfficialTypeAlias";
+import { IInjectData, IInjectMethods } from "../../InstanceInject/instanceConfig";
 import type { CustomEventMethods } from "./CustomEventMethods";
 import type { CustomSetData } from "./CustomSetData";
 export type RootComponentInstance<
@@ -23,11 +24,9 @@ export type RootComponentInstance<
   & CustomSetData<TData>
   & IfExtends<{}, StoreDoc, unknown, {
     disposer?: { [k in keyof StoreDoc]: IReactionDisposer };
-    applySetData: Func;
   }>
-  & TMethods
-  & CustomEventMethods<CustomEventsDoc>
-  & { data: ReadonlyDeep<ComputeIntersection<AllData>> };
+  & Assign<IInjectMethods, TMethods & CustomEventMethods<CustomEventsDoc>>
+  & { data: ReadonlyDeep<Assign<IInjectData, ComputeIntersection<AllData>>> };
 
 export type ComponentInstance = RootComponentInstance<false, {}, {}, {}, {}, {}>;
 

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

@@ -1,6 +1,7 @@
 import { Checking, type Test } from "hry-types";
 import type { ReadonlyDeep } from "hry-types/src/Any/ReadonlyDeep";
 import { type DetailedType, RootComponent } from "../../../../..";
+import { IInjectData } from "../../../../InstanceInject/instanceConfig";
 
 // 组件时
 RootComponent()({
@@ -14,7 +15,11 @@ RootComponent()({
   lifetimes: {
     attached() {
       // 组件实例对象格外添加null类型
-      Checking<typeof this.data, ReadonlyDeep<{ optionalObj: { name: string } | null; obj: object | null }>, Test.Pass>;
+      Checking<
+        typeof this.data,
+        ReadonlyDeep<{ optionalObj: { name: string } | null; obj: object | null } & IInjectData>,
+        Test.Pass
+      >;
     },
   },
 });

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

@@ -63,13 +63,3 @@ RootComponent()({
     },
   },
 });
-
-RootComponent()({
-  store: {},
-  lifetimes: {
-    attached() {
-      // @ts-expect-error 没有store字段时不可以调用applySetData
-      this.applySetData();
-    },
-  },
-});

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

@@ -46,9 +46,6 @@ RootComponent()({
       runInAction(() => {
         store.name = "liil";
       });
-
-      // 有store字段时可以调用applySetData
-      this.applySetData();
     },
   },
 });

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

@@ -1,4 +1,6 @@
 import { Checking, type Test } from "hry-types";
+import { ReadonlyDeep } from "hry-types/src/Any/_api";
+import { IInjectData } from "../../../InstanceInject/instanceConfig";
 import { RootComponent } from "../..";
 
 /**
@@ -9,7 +11,7 @@ const emptyObj = RootComponent()({
   methods: {
     foo() {
       // 1 this.data 为空对象类型
-      Checking<typeof this.data, {}, Test.Pass>;
+      Checking<typeof this.data, ReadonlyDeep<IInjectData>, Test.Pass>;
     },
   },
 });
@@ -28,7 +30,7 @@ const noProperties = RootComponent()({
   methods: {
     foo() {
       // 3 this.data 为空对象类型
-      Checking<typeof this.data, {}, Test.Pass>;
+      Checking<typeof this.data, ReadonlyDeep<IInjectData>, Test.Pass>;
     },
   },
 });

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

@@ -1,6 +1,7 @@
 import { Checking, type Test } from "hry-types";
 import type { ReadonlyDeep } from "hry-types/src/Any/_api";
 import type { DetailedType } from "../../../../types/DetailedType";
+import { IInjectData } from "../../../InstanceInject/instanceConfig";
 import { RootComponent } from "../..";
 import { type Mock_User } from "./normalRequired.test";
 
@@ -43,14 +44,16 @@ const OptionalDoc = RootComponent()({
       // 1. 内部this.data中的类型(去除可选)
       Checking<
         typeof this.data,
-        ReadonlyDeep<{
-          optional_num: number;
-          optional_gender: "male" | "female";
-          optional_tuple: [number, string, boolean];
-          optional_obj: Mock_User | null;
-          optional_objOrNull: Mock_User | null;
-          optional_union: string | number;
-        }>,
+        ReadonlyDeep<
+          {
+            optional_num: number;
+            optional_gender: "male" | "female";
+            optional_tuple: [number, string, boolean];
+            optional_obj: Mock_User | null;
+            optional_objOrNull: Mock_User | null;
+            optional_union: string | number;
+          } & IInjectData
+        >,
         Test.Pass
       >;
     },

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

@@ -2,6 +2,7 @@ import { Checking, type Test } from "hry-types";
 import type { DetailedType } from "../../../../types/DetailedType";
 
 import type { ReadonlyDeep } from "hry-types/src/Any/_api";
+import { IInjectData } from "../../../InstanceInject/instanceConfig";
 import { RootComponent } from "../..";
 import type { RequiredSingle, RequiredType, RequiredUnion } from "../PropertiesConstraint";
 
@@ -91,7 +92,7 @@ const RequiredDoc = RootComponent()({
   methods: {
     foo() {
       // 1 this.data中的类型(对象类型加null)
-      Checking<typeof this.data, ReadonlyDeep<RequiredTypeExpected>, Test.Pass>;
+      Checking<typeof this.data, ReadonlyDeep<RequiredTypeExpected & IInjectData>, Test.Pass>;
     },
   },
 });

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

@@ -2,6 +2,7 @@ import { Checking, type Test } from "hry-types";
 import type { ReadonlyDeep } from "hry-types/src/Any/_api";
 import type { ComponentDoc } from "../../../DefineComponent/ReturnType/ComponentDoc";
 
+import { IInjectData } from "../../../InstanceInject/instanceConfig";
 import type { Mock_User } from "../../../RootComponent/Properties/test/normalRequired.test";
 import { SubComponent } from "../..";
 
@@ -80,17 +81,19 @@ SubComponent<Root, OnlyPropsCompDoc>()({
       // 5 this.data
       Checking<
         typeof this.data,
-        ReadonlyDeep<{
-          num: number;
-          user: User | null;
-          SNum: number;
-          str: string;
-          bool: boolean;
-          aaa_num: number;
-          aaa_num123: 123;
-          aaa_str: "a";
-          aaa_obj: Mock_User;
-        }>,
+        ReadonlyDeep<
+          {
+            num: number;
+            user: User | null;
+            SNum: number;
+            str: string;
+            bool: boolean;
+            aaa_num: number;
+            aaa_num123: 123;
+            aaa_str: "a";
+            aaa_obj: Mock_User;
+          } & IInjectData
+        >,
         Test.Pass
       >;
 
@@ -102,17 +105,19 @@ SubComponent<Root, OnlyPropsCompDoc>()({
       // 5 this.data 深度只读
       Checking<
         typeof this.data,
-        ReadonlyDeep<{
-          num: number;
-          user: User | null;
-          str: string;
-          SNum: number;
-          bool: boolean;
-          aaa_num: number;
-          aaa_num123: 123;
-          aaa_str: "a";
-          aaa_obj: Mock_User;
-        }>,
+        ReadonlyDeep<
+          {
+            num: number;
+            user: User | null;
+            str: string;
+            SNum: number;
+            bool: boolean;
+            aaa_num: number;
+            aaa_num123: 123;
+            aaa_str: "a";
+            aaa_obj: Mock_User;
+          } & IInjectData
+        >,
         Test.Pass
       >;
     },

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

@@ -2,6 +2,7 @@ import { Checking, type Test } from "hry-types";
 import type { ReadonlyDeep } from "hry-types/src/Any/_api";
 import type { ComponentDoc } from "../../../DefineComponent/ReturnType/ComponentDoc";
 
+import { IInjectData } from "../../../InstanceInject/instanceConfig";
 import type { Mock_User } from "../../../RootComponent/Properties/test/normalRequired.test";
 import { SubComponent } from "../..";
 
@@ -51,12 +52,14 @@ SubComponent<{}, CompDoc>()({
       // 4 this.data中的data配置数据
       Checking<
         typeof this.data,
-        ReadonlyDeep<{
-          aaa_str: "a";
-          aaa_num: 123;
-          aaa_obj: null;
-          _aaa_str: string;
-        }>,
+        ReadonlyDeep<
+          {
+            aaa_str: "a";
+            aaa_num: 123;
+            aaa_obj: null;
+            _aaa_str: string;
+          } & IInjectData
+        >,
         Test.Pass
       >;
     },

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

@@ -2,6 +2,7 @@ import { Checking, type Test } from "hry-types";
 import type { ReadonlyDeep } from "hry-types/src/Any/_api";
 import type { ComponentDoc } from "../../../DefineComponent/ReturnType/ComponentDoc";
 
+import { IInjectData } from "../../../InstanceInject/instanceConfig";
 import type { Mock_User } from "../../../RootComponent/Properties/test/normalRequired.test";
 import type { RootComponentDoc } from "../../../RootComponent/RootComponentDoc";
 import { SubComponent } from "../..";
@@ -57,17 +58,19 @@ SubComponent<RootDoc, CompDoc>()({
       // this.data
       Checking<
         typeof this.data,
-        ReadonlyDeep<{
-          // RootData
-          Pstr: string;
-          Pobj: Mock_User | null;
-          PoptionalObj: Mock_User;
-          Dnum: number;
-          Cnum: number;
-          // 自身Data
-          aaa_str: "str";
-          _aaa_SubReactive: 123;
-        }>,
+        ReadonlyDeep<
+          {
+            // RootData
+            Pstr: string;
+            Pobj: Mock_User | null;
+            PoptionalObj: Mock_User;
+            Dnum: number;
+            Cnum: number;
+            // 自身Data
+            aaa_str: "str";
+            _aaa_SubReactive: 123;
+          } & IInjectData
+        >,
         Test.Pass
       >;
 

package/src/behaviors/BComputedAndWatch/data-tracer.ts

@@ -42,6 +42,7 @@ export function deepProxy(
 
       return deepProxy(val, dependences, curPath);
     },
+    /* istanbul ignore next */
     set(_target: object, prop: string) {
       throw Error(`${prop}字段是只读的`);
     },

package/src/behaviors/BComputedAndWatch/types.ts

@@ -3,7 +3,6 @@ import type { ComponentInstance, PageInstance } from "../../api/RootComponent/In
 import type { ComputedDependence } from "./initComputed";
 
 export type InstanceCustomFields = {
-  __pendingSetData__?: object | null;
   __storeConfig__?: () => Record<string, () => unknown>;
   __computedStatus__?: "待更新" | "更新完毕";
   __computedUpdater__: Func;

package/src/index.ts

@@ -1,4 +1,5 @@
 import { DefineComponent } from "./api/DefineComponent";
+import { type IInjectInfo, instanceConfig } from "./api/InstanceInject/instanceConfig";
 import { navigateTo } from "./api/navigateTo";
 import { RootComponent } from "./api/RootComponent";
 import { SubComponent } from "./api/SubComponent";
@@ -23,6 +24,8 @@ export {
   DefineComponent,
   type DetailedType,
   type GenerateDoc,
+  type IInjectInfo,
+  instanceConfig,
   /* istanbul ignore next */
   navigateTo,
   type ParamsEqual,

package/src/inject.ts

@@ -0,0 +1,34 @@
+import { observable, runInAction } from "mobx";
+
+// 注入的响应式数据;
+const themeStore = observable({ theme: wx.getSystemInfoSync().theme });
+
+wx.onThemeChange((Res) => {
+  runInAction(() => {
+    themeStore.theme = Res.theme;
+  });
+});
+
+// 注入的方法;
+function injectMethod(data: string) {
+  return data;
+}
+
+const data = {
+  injectStr: "injectStr",
+};
+const methods = {
+  injectMethod,
+};
+const store = {
+  injectTheme: () => themeStore.theme,
+};
+
+// 声明注入类型 js开发可以忽略
+declare module "./index" {
+  interface IInjectInfo {
+    data: typeof data;
+    store: typeof store;
+    methods: typeof methods;
+  }
+}

package/src/types/Assign.ts

@@ -0,0 +1 @@
+export type Assign<O1, O2> = Omit<O1, keyof O2> & O2;

package/src/types/OfficialTypeAlias.ts

@@ -55,7 +55,7 @@ export type CurrentTargetDataset<T extends object> = WMCustomEvent<{}, {}, T>;
  */
 export type TargetDataset<TargetDataset extends object> = WMCustomEvent<{}, {}, {}, TargetDataset>;
 
-export type WMComponentOption = WechatMiniprogram.Component.TrivialOption;
+export type WMComponentOption = WechatMiniprogram.Component.ComponentOptions;
 
 export type WMNavigateToSuccessCallbackResult = WechatMiniprogram.NavigateToSuccessCallbackResult;
 

package/dist/api/InstanceInject/InstanceInject.js

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

package/dist/api/InstanceInject/InstanceInject.js.map

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

package/dist/api/InstanceInject/test/InjectConfig.js

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

package/dist/api/InstanceInject/test/InjectConfig.js.map

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

package/src/api/InstanceInject/InstanceInject.ts

@@ -1,25 +0,0 @@
-// import type { WMComponentOption } from "../../types/officialAlias";
-
-// // export type InjectMethodConstraint = Record<string, Func>;
-
-// // export type InjectDataConstraint = Record<string, unknown>;
-
-// export abstract class Inject {
-//   public options?: WMComponentOption;
-//   // public methods?: InjectMethodConstraint;
-//   // public data?: InjectDataConstraint;
-// }
-
-// /**
-//  * 实例注入接口,加入数据到所有实例中(当前仅支持data,methods,options字段),可在this上获取对应数据 响应式需函数返回方式
-//  * @example
-//  */
-// export class InstanceInject extends Inject {
-//   private static _injectOption = new InstanceInject();
-//   public static get InjectOption(): InstanceInject {
-//     return this._injectOption;
-//   }
-//   public static set InjectOption(options: InstanceInject) {
-//     this._injectOption = options;
-//   }
-// }

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

@@ -1,50 +0,0 @@
-// import { InstanceInject } from "../../..";
-
-// import { observable } from "mobx";
-// import type { InjectDataConstraint, InjectMethodConstraint } from "../InstanceInject";
-
-// const reactiveUser = observable({
-//   name: "zhao",
-//   age: 18,
-// });
-
-// /**
-//  *  @description 注入的data
-//  */
-// const data = {
-//   // 响应式数据
-//   reactiveUser: () => reactiveUser,
-//   // 非响应式数据
-//   injectStr: "injectStr",
-// } satisfies InjectDataConstraint;
-// /**
-//  * @description 注入的方法
-//  */
-// const methods = {
-//   injectMethod(data: string) {
-//     console.log(data);
-//   },
-// } satisfies InjectMethodConstraint;
-/**
- * 注入的配置
- */
-// const options = {
-//   addGlobalClass: true,
-//   multipleSlots: true,
-//   pureDataPattern: /^_/,
-//   virtualHost: true,
-// };
-
-// InstanceInject.InjectOption = {
-//   // data,
-//   options,
-//   // methods,
-// };
-
-// 声明注入类型
-// declare module "../../.." {
-//   interface InstanceInject {
-//     data: typeof data;
-//     methods: typeof methods;
-//   }
-// }