annil 1.3.0 → 1.5.0

package/dist/behaviors/BComputedAndWatch/types.d.ts

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

package/dist/index.d.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";
@@ -8,4 +9,4 @@ import type { GenerateDoc } from "./types/GenerateDoc";
 import type { ParamsEqual } from "./types/TwoParamsEqual";
 export type { Vant, Wm } from "./thirdLib";
 export type { CurrentTargetDataset, Dataset, Detail, Mark, TargetDataset, WMBaseEvent, WMCustomEvent, } from "./types/OfficialTypeAlias";
-export { type ComponentDocExtension, DefineComponent, type DetailedType, type GenerateDoc, navigateTo, type ParamsEqual, RootComponent, SubComponent, };
+export { type ComponentDocExtension, DefineComponent, type DetailedType, type GenerateDoc, type IInjectInfo, instanceConfig, navigateTo, type ParamsEqual, RootComponent, SubComponent, };

package/dist/index.js

@@ -1,6 +1,7 @@
 import { DefineComponent } from "./api/DefineComponent";
+import { instanceConfig } from "./api/InstanceInject/instanceConfig";
 import { navigateTo } from "./api/navigateTo";
 import { RootComponent } from "./api/RootComponent";
 import { SubComponent } from "./api/SubComponent";
-export { DefineComponent, navigateTo, RootComponent, SubComponent, };
+export { DefineComponent, instanceConfig, navigateTo, RootComponent, SubComponent, };
 //# sourceMappingURL=index.js.map

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AACxD,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAC9C,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AACpD,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAiBlD,OAAO,EAEL,eAAe,EAIf,UAAU,EAEV,aAAa,EACb,YAAY,GACb,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AACxD,OAAO,EAAoB,cAAc,EAAE,MAAM,qCAAqC,CAAC;AACvF,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAC9C,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AACpD,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAiBlD,OAAO,EAEL,eAAe,EAIf,cAAc,EAEd,UAAU,EAEV,aAAa,EACb,YAAY,GACb,CAAC"}

package/dist/inject.d.ts

@@ -0,0 +1,18 @@
+declare function injectMethod(data: string): string;
+declare const data: {
+    injectStr: string;
+};
+declare const methods: {
+    injectMethod: typeof injectMethod;
+};
+declare const store: {
+    injectTheme: () => "dark" | "light" | undefined;
+};
+declare module "./index" {
+    interface IInjectInfo {
+        data: typeof data;
+        store: typeof store;
+        methods: typeof methods;
+    }
+}
+export {};

package/dist/inject.js

@@ -0,0 +1,20 @@
+import { observable, runInAction } from "mobx";
+const themeStore = observable({ theme: wx.getSystemInfoSync().theme });
+wx.onThemeChange((Res) => {
+    runInAction(() => {
+        themeStore.theme = Res.theme;
+    });
+});
+function injectMethod(data) {
+    return data;
+}
+const data = {
+    injectStr: "injectStr",
+};
+const methods = {
+    injectMethod,
+};
+const store = {
+    injectTheme: () => themeStore.theme,
+};
+//# sourceMappingURL=inject.js.map

package/dist/inject.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"inject.js","sourceRoot":"","sources":["../src/inject.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,MAAM,CAAC;AAG/C,MAAM,UAAU,GAAG,UAAU,CAAC,EAAE,KAAK,EAAE,EAAE,CAAC,iBAAiB,EAAE,CAAC,KAAK,EAAE,CAAC,CAAC;AAEvE,EAAE,CAAC,aAAa,CAAC,CAAC,GAAG,EAAE,EAAE;IACvB,WAAW,CAAC,GAAG,EAAE;QACf,UAAU,CAAC,KAAK,GAAG,GAAG,CAAC,KAAK,CAAC;IAC/B,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC;AAGH,SAAS,YAAY,CAAC,IAAY;IAChC,OAAO,IAAI,CAAC;AACd,CAAC;AAED,MAAM,IAAI,GAAG;IACX,SAAS,EAAE,WAAW;CACvB,CAAC;AACF,MAAM,OAAO,GAAG;IACd,YAAY;CACb,CAAC;AACF,MAAM,KAAK,GAAG;IACZ,WAAW,EAAE,GAAG,EAAE,CAAC,UAAU,CAAC,KAAK;CACpC,CAAC"}

package/dist/thirdLib/index.js

@@ -1,3 +1,2 @@
-import * as Vant from "./vant";
-import * as Wm from "./wm";
+export {};
 //# sourceMappingURL=index.js.map

package/dist/thirdLib/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/thirdLib/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,IAAI,MAAM,QAAQ,CAAC;AAC/B,OAAO,KAAK,EAAE,MAAM,MAAM,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/thirdLib/index.ts"],"names":[],"mappings":""}

package/dist/types/Assign.d.ts

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

package/dist/types/Assign.js

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

package/dist/types/Assign.js.map

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

package/dist/types/OfficialTypeAlias.d.ts

@@ -10,7 +10,7 @@ export type Mark<TMark extends object> = Required<WechatMiniprogram.CustomEvent<
 export type Detail<T> = WMCustomEvent<T>;
 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;
 export type WMCompPageLifetimes = WechatMiniprogram.Component.PageLifetimes;
 export type WMComponentInstance = WechatMiniprogram.Component.InstanceProperties;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "annil",
-  "version": "1.3.0",
+  "version": "1.5.0",
   "description": "微信小程序(原生开发)插件",
   "main": "dist/index.js",
   "types": "src/index.ts",
@@ -42,7 +42,8 @@
     "CHANGELOG.md",
     "README.md",
     "src",
-    "dist"
+    "dist",
+    "tsconfig.json"
   ],
   "keywords": [
     "mini",
@@ -52,8 +53,8 @@
   ],
   "author": "missannil",
   "license": "MIT",
-  "dependencies": {
+  "peerDependencies": {
     "hry-types": "^0.17.0",
-    "miniprogram-api-typings": "^3.12.1"
+    "miniprogram-api-typings": "^3.12.2"
   }
 }

package/src/api/DefineComponent/collectOptionsForComponent.ts

@@ -1,8 +1,10 @@
 import type { Func } from "hry-types/src/Misc/_api";
+import { instanceConfig } from "../..";
 import { BBeforeCreate } from "../../behaviors/BbeforeCreated";
 import { BComputedAndWatch } from "../../behaviors/BComputedAndWatch";
 import type { ComputedCache, Instance } from "../../behaviors/BComputedAndWatch/types";
 import { BStore } from "../../behaviors/BStore";
+import { Assign } from "../../types/Assign";
 import type { WMComponent } from "../../types/OfficialTypeAlias";
 import { INNERMARKER } from "../../utils/InnerMarker";
 import { isEmptyObject } from "../../utils/isEmptyObject";
@@ -124,8 +126,10 @@ function loadReceivedDataHandle(
  */
 /* istanbul ignore next: miniprogram-simulate(当前版本 1.6.1) 无法测试页面 */
 function hijack(config: object, field: string, before: Func[] = [], after: Func[] = []) {
+  // @ts-ignore 隐式索引
   const originalFunc: Func | undefined = config[field];
 
+  // @ts-ignore 隐式索引
   config[field] = function(...args: any[]) {
     before.forEach(func => func.call(this, ...args));
 
@@ -155,6 +159,7 @@ function InternalFieldProtection(config: object | undefined, keys: string[]) {
  */
 function _funcOptionsHandle(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));
     };
@@ -191,8 +196,11 @@ function funcFieldsCollect(
 ) {
   for (const key in funcOptions) {
     // key = "pageLifetimes" | "lifetimes" | "watch"
+    // @ts-ignore 隐式索引
     if (options[key]) {
+      // @ts-ignore 隐式索引
       for (const _key in options[key]) {
+        // @ts-ignore 隐式索引
         (funcOptions[key][_key] ||= []).push(options[key][_key]);
       }
     }
@@ -207,11 +215,13 @@ function otherFieldsHandle(
   rootComponentOptions: RootComponentTrueOptions,
 ) {
   for (const key in rootComponentOptions) {
+    // @ts-ignore 隐式索引
     const config = rootComponentOptions[key];
     if (key === "behaviors") {
       // 是不是只有behaviors是数组
       finalOptions[key].push(...config);
     } else {
+      // @ts-ignore 隐式索引
       Object.assign(finalOptions[key] ||= {}, config);
     }
   }
@@ -284,6 +294,44 @@ function collectRootComponentOption(
   otherFieldsHandle(finalOptions, rootComponentOptions);
 }
 
+/**
+ * 合并 source 对象字段到 target字段
+ * @remarks 规则：
+ * 1. behaviors字段 源对象在前
+ * 2. 对象字段 源覆盖目标
+ * @param target - 目标对象
+ * @param source - 源对象
+ * @returns 按规则合并后的对象
+ */
+function merge<Target extends object, Source extends object>(target: Target, source: Source): Assign<Target, Source> {
+  for (const key in source) {
+    const sourceVal = source[key];
+    if (key in target) {
+      // @ts-ignore
+      const targetVal = target[key];
+      switch (key) {
+        case "behaviors":
+          {
+            // @ts-ignore
+            target[key] = [...sourceVal, ...targetVal];
+          }
+          break;
+
+        default:
+          {
+            // @ts-ignore 源覆盖目标
+            target[key] = Object.assign(targetVal, sourceVal);
+          }
+          break;
+      }
+    } else {
+      // @ts-ignore
+      target[key] = sourceVal;
+    }
+  }
+
+  return target as unknown as Assign<Target, Source>;
+}
 /**
  * 返回一个由rootComponentOption和subComponentsList配置整合的对象
  * @param rootComponentOption -
@@ -295,18 +343,14 @@ export function collectOptionsForComponent(
 ): FinalOptionsOfComponent {
   const rootComponentOption = defineComponentOption.rootComponent;
   const subComponentsList = defineComponentOption.subComponents;
-  const finalOptionsForComponent: FinalOptionsOfComponent = {
-    options: {
-      addGlobalClass: true, // "styleIsolation": "apply-shared"
-      multipleSlots: true,
-      pureDataPattern: /^_/,
-      virtualHost: true,
-    },
-    behaviors: [BStore, BComputedAndWatch],
-    methods: {},
+
+  const finalOptionsForComponent: FinalOptionsOfComponent = merge(instanceConfig.injectInfo || {}, {
     observers: {},
     data: {},
-  };
+    methods: {},
+    behaviors: [BStore, BComputedAndWatch],
+  });
+
   /**
    * 有些字段配置同时存在根组件和子组件当中(如pageLifetimes，lifetimes,watch字段), 且key相同值类型为函数。funcConfig对象用于收集这些配置为数组形式,最终再一起整合进finalOptionsForComponent配置中。即funcConfig是一个临时中介对象。
    */
@@ -342,7 +386,7 @@ export function collectOptionsForComponent(
   /* istanbul ignore next: miniprogram-simulate(当前版本 1.6.1) 无法测试页面 */
   finalOptionsForComponent.isPage
     // 页面时删除预设的虚拟组件字段
-    && Reflect.deleteProperty(finalOptionsForComponent.options!, "virtualHost");
+    && finalOptionsForComponent.options && Reflect.deleteProperty(finalOptionsForComponent.options, "virtualHost");
 
   // BBeforeCreate在最后面,让BeforeCreate生命周期运行在最终建立组件时。
   finalOptionsForComponent.behaviors!.push(BBeforeCreate);

package/src/api/DefineComponent/index.ts

@@ -54,6 +54,7 @@ export type DefineComponentOption = {
  */
 export const DefineComponent: DefineComponentConstructor = function(options): any {
   // console.log("---------------------------");
+
   Component(
     collectOptionsForComponent(options as DefineComponentOption) as any,
   );

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/Lifetimes/test/error.test.ts

@@ -8,7 +8,7 @@ RootComponent()({
     ready() {},
     detached() {},
     error(err) {
-      err.cause;
+      err.message;
     },
     moved() {},
     // @ts-expect-error  1 错误的声明周期字段报错

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

@@ -18,7 +18,7 @@ RootComponent()({
     detached() {
     },
     error(err) {
-      err.cause;
+      err.message;
     },
     moved() {
     },

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>;
     },
   },
 });