annil 1.3.0 → 1.5.0

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/api/navigateTo.ts

@@ -56,6 +56,7 @@ function _encodeURIComponent(
 export function navigateTo<TPageDoc extends PageDoc = never>(
   option: NoInfer<NavigateToOption<TPageDoc>>,
 ) {
+  // @ts-ignore 隐式索引
   if (!option["data"]) {
     return wx.navigateTo(option);
   } else {

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

@@ -11,7 +11,7 @@ export function deepProxy(
       // console.log(target, prop);
 
       if (prop === "__rawObject__") return target;
-
+      // @ts-ignore 隐式索引
       const val = target[prop];
 
       // console.log("获取依赖", prop, val);
@@ -42,6 +42,10 @@ export function deepProxy(
 
       return deepProxy(val, dependences, curPath);
     },
+    /* istanbul ignore next */
+    set(_target: object, prop: string) {
+      throw Error(`${prop}字段是只读的`);
+    },
   };
 
   return new Proxy(data, handler);

package/src/behaviors/BComputedAndWatch/getPropertiesValue.ts

@@ -42,10 +42,13 @@ export function getPropertiesValue(propertiesOpt: PropertiesConstraint | undefin
     const config = propertiesOpt[key];
     /* istanbul ignore next */
     if (IsRequiredSingle(config)) {
+      // @ts-ignore 隐式索引
       result[key] = getRequiredSingleValue(config);
     } else if (IsRequiredUnion(config)) {
+      // @ts-ignore 隐式索引
       result[key] = getRequiredSingleValue(config.type);
     } else {
+      // @ts-ignore 隐式索引
       result[key] = config.value;
     }
   }

package/src/behaviors/BComputedAndWatch/index.ts

@@ -12,6 +12,7 @@ import type { Instance, WatchOldValue } from "./types";
 function initWatchOldValue(this: Instance, watchConfig: object): WatchOldValue {
   const watchOldValue = {};
   for (const key in watchConfig) {
+    // @ts-ignore 隐式索引
     watchOldValue[key] = deepClone(getPathsValue(this.data, key));
   }
 

package/src/behaviors/BComputedAndWatch/initComputed.ts

@@ -113,6 +113,7 @@ export function initComputed(
 
       dataOpt[key] = itemCache.value;
 
+      // @ts-ignore 隐式索引
       initAllData[key] = itemCache.value;
 
       computedCache[key] = itemCache;

package/src/behaviors/BComputedAndWatch/isEqual.ts

@@ -18,6 +18,7 @@ export function isEqual(value: unknown, other: unknown) {
   }
   // 递归比较存在的相同key是否相等
   for (const key of keys1) {
+    // @ts-ignore 隐式索引
     if (!keys2.includes(key) || !isEqual(value[key], other[key])) {
       return false;
     }

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/tsconfig.json

@@ -0,0 +1,26 @@
+{
+  "compilerOptions": {
+    "lib": ["ES2022", "DOM"], // jest中用到了DOM类型
+    "target": "ES2017",
+    "module": "ES2022",
+    "strict": true,
+    "strictFunctionTypes": false, // e: Dataset<{ id: string }>会报错。
+    "exactOptionalPropertyTypes": true, // 带有?标志的属性类型不在包含undefined
+    "skipLibCheck": true, // 跳过声明文件的类型检查(.d.ts),除了你引用的, 默认false(不跳过)。
+    "moduleResolution": "Bundler", // 模块解析策略 //5.0 新值 bundler
+    "noImplicitAny": true, // 不允许隐式的any类型
+    "esModuleInterop": true, // 默认false 将 CommonJS/AMD/UMD 模块视为类似于 ES6 模块,jest需要。
+    "removeComments": true, // 去除注释
+    "noEmit": true,
+    "noImplicitReturns": true, // 隐式函数返回
+    "forceConsistentCasingInFileNames": true, // 区分文件名的大小写
+    // "noUnusedLocals": true, // 报告未使用局部变量的错误
+    // "noUnusedParameters": false, // 报告函数中未使用参数的错误
+    // "suppressImplicitAnyIndexErrors": true, // 为true关闭隐式索引错误,但很激进,建议使用@ts-ignore
+    "isolatedModules": true, // 模块化(.ts文件必须有导入或导出) 默认false
+    // "verbatimModuleSyntax": true,不能开启.jset会报错,在vscode中设置代替它要求ts版本>5.3
+    // 默认加载所有@types下的包 types指定具体的包,其他拒绝。包含上级目录
+    "types": ["hry-types", "mobx", "jest", "miniprogram-api-typings"]
+  },
+  "include": ["**/*.ts"]
+}

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;
-//   }
-// }