annil 1.5.2 → 1.5.4

package/src/api/RootComponent/PageLifetimes/PageLifetimesOption.ts

@@ -6,9 +6,6 @@ export type PageLifetimesOption<TIsPage extends boolean, PropertiesDoc extends o
   TIsPage,
   false,
   {
-    /**
-     * 比官方定义新增load周期,发生在页面onLoad事件后
-     */
     pageLifetimes?: ComputeIntersection<
       // 官方组件页面生命周期
       & Partial<WMCompPageLifetimes>
@@ -17,7 +14,7 @@ export type PageLifetimesOption<TIsPage extends boolean, PropertiesDoc extends o
          * 周期发生在组件attached之后,页面onLoad之前,要求组件为同步组件
          * 最低基础库： `3.0.2`
          */
-        load?: (props: object) => void;
+        load?: (props?: object) => void;
       }
     >;
   },

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

@@ -7,16 +7,15 @@ import type { Mock_User } from "../../Properties/test/normalRequired.test";
  * 组件时
  */
 RootComponent()({
-  // 1  官方类型 加入load类型(同步组件时触发)
   pageLifetimes: {
     hide() {},
     resize(size) {
       Checking<typeof size, WechatMiniprogram.Page.IResizeOption, Test.Pass>;
     },
     show() {},
-    // 新增周期函数
+    // 1 glass-easel(最低版本库3.0.2)支持的周期函数
     load(obj) {
-      Checking<typeof obj, object, Test.Pass>;
+      Checking<typeof obj, object | undefined, Test.Pass>;
     },
   },
 });
@@ -40,7 +39,7 @@ RootComponent()({
   },
   // 2 官方是把事件写在methods字段中,更改为写在pageLifetimes字段下
   pageLifetimes: {
-    // 3 重写onLoad周期参数props的类型. (propertiesDoc中必传字段去除null后去除可选字段)
+    // 3 重写onLoad周期参数props的类型(同页面properties定义类型).
     onLoad(props) {
       Checking<
         typeof props,
@@ -56,5 +55,15 @@ RootComponent()({
     onHide() {
       console.log("onHide");
     },
+    // onReady
+    // onResize
+    // onUnload
+    // onPageScroll
+    // onPullDownRefresh
+    // onReachBottom
+    // onShareAppMessage
+    // onShareTimeline
+    // onTabItemTap
+    // ...
   },
 });

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

@@ -1,6 +1,6 @@
 import { Checking, type Test } from "hry-types";
-import { ReadonlyDeep } from "hry-types/src/Any/_api";
-import { IInjectData } from "../../../InstanceInject/instanceConfig";
+import type { ReadonlyDeep } from "hry-types/src/Any/_api";
+import type { IInjectData } from "../../../InstanceInject/instanceConfig";
 import { RootComponent } from "../..";
 
 /**

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

@@ -1,7 +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 type { IInjectData } from "../../../InstanceInject/instanceConfig";
 import { RootComponent } from "../..";
 import { type Mock_User } from "./normalRequired.test";
 

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

@@ -2,7 +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 type { IInjectData } from "../../../InstanceInject/instanceConfig";
 import { RootComponent } from "../..";
 import type { RequiredSingle, RequiredType, RequiredUnion } from "../PropertiesConstraint";
 

package/src/api/RootComponent/RootComponentDoc.ts

@@ -1,4 +1,3 @@
-import type { Func } from "hry-types/src/Misc/Func";
 import type { WMCompPageLifetimes, WMPageLifetimes } from "../../types/OfficialTypeAlias";
 import type { LifetimesConstraint } from "./Lifetimes/LifetimesConstraint";
 
@@ -11,10 +10,11 @@ type _RootComponentDoc = {
   methods?: object;
   events?: object;
   store?: object;
-  watch?: Record<string, Func>;
+  watch?: Record<string, AnyFunction>;
   lifetimes?: LifetimesConstraint;
-  pageLifetimes?: Partial<WMCompPageLifetimes & { load: Func }>;
+  pageLifetimes?: Partial<WMCompPageLifetimes & { load: AnyFunction }> | Partial<WMPageLifetimes>;
   externalClasses?: string[];
+  export?: () => void; // behaviors 'wx://component-export' 使用
 };
 
 // 验证key是否合法
@@ -24,32 +24,20 @@ type _Validator<O, Doc, ErrKeys = Exclude<keyof O, keyof Doc>> = [ErrKeys] exten
 /**
  * RootComponent Api 返回的类型
  * ```ts
- * RootComponentDoc = {
- * isPage?: true;
+ * isPage?: boolean;
  * properties?: object;
  * data?: object;
- * store?:object;
  * computed?: object;
  * customEvents?: object;
  * methods?: object;
  * events?: object;
+ * store?: object;
+ * watch?: Record<string, AnyFunction>;
+ * lifetimes?: LifetimesConstraint;
+ * pageLifetimes?: Partial<WMCompPageLifetimes & { load: AnyFunction }> | Partial<WMPageLifetimes>;
+ * export?:AnyFunction
+ * externalClasses?: string[];
  * };
  * ```
  */
 export type RootComponentDoc<O extends _Validator<O, _RootComponentDoc> = _RootComponentDoc> = O;
-
-type _RootPageDoc = {
-  isPage?: boolean;
-  properties?: object;
-  data?: object;
-  computed?: object;
-  customEvents?: object;
-  methods?: object;
-  events?: object;
-  store?: object;
-  watch?: Record<string, Func>;
-  lifetimes?: LifetimesConstraint;
-  pageLifetimes?: Partial<WMPageLifetimes>;
-};
-
-export type RootPageDoc<O extends _Validator<O, _RootPageDoc> = _RootPageDoc> = O;

package/src/api/RootComponent/Watch/test/WtachInject.test.ts

@@ -1,8 +1,8 @@
-import { Checking, Test } from "hry-types";
+import { Checking, type Test } from "hry-types";
 import { RootComponent } from "../..";
-
 /**
  * watch 只能监控 注入的store字段
+ * 注入文件 https://github.com/missannil/annil/blob/main/src/api/InstanceInject/inject.ts
  */
 RootComponent()({
   watch: {

package/src/api/RootComponent/index.ts

@@ -5,7 +5,7 @@ import type { ComputeIntersection } from "hry-types/src/Object/_api";
 import type { ComputeObject } from "../../types/ComputeObj";
 import type { WMCompOtherOption } from "../../types/OfficialTypeAlias";
 import type { ComponentDoc } from "../DefineComponent/ReturnType/ComponentDoc";
-import { IInjectStore } from "../InstanceInject/instanceConfig";
+import type { IInjectStore } from "../InstanceInject/instanceConfig";
 import type { ComputedConstraint } from "./Computed/ComputedConstraint";
 import type { ComputedOption } from "./Computed/ComputedOption";
 import type { GetComputedDoc } from "./Computed/GetComputedDoc";
@@ -22,7 +22,7 @@ import type { LifetimesConstraint } from "./Lifetimes/LifetimesConstraint";
 import type { LifetimesOption } from "./Lifetimes/LifetimesOption";
 import type { MethodsConstraint } from "./Methods/MethodsConstraint";
 import type { MethodsOption } from "./Methods/MethodsOption";
-import { ObserversOption } from "./Observers/ObserversOption";
+import type { ObserversOption } from "./Observers/ObserversOption";
 import type { PageLifetimesOption } from "./PageLifetimes/PageLifetimesOption";
 import type { GetPropertiesDoc } from "./Properties/GetPropertiesDoc";
 import type { PropertiesConstraint } from "./Properties/PropertiesConstraint";
@@ -57,7 +57,7 @@ type RootComponentOptions<
   & StoreOption<TStore, keyof (PropertiesDoc & DataDoc)>
   & ComputedOption<TComputed, keyof (PropertiesDoc & DataDoc & StoreDoc)>
   & PageLifetimesOption<TIsPage, PropertiesDoc>
-  & LifetimesOption<TIsPage>
+  & LifetimesOption
   & WatchOption<
     & ComputedDoc
     & Required<PropertiesDoc>
@@ -65,7 +65,7 @@ type RootComponentOptions<
     & StoreDoc
     & IInjectStore
   >
-  & Partial<Omit<WMCompOtherOption, "pageLifetimes" | "definitionFilter" | "export" | "observers">>
+  & Partial<Omit<WMCompOtherOption, "pageLifetimes" | "definitionFilter" | "observers">>
   & ObserversOption<
     & ComputedDoc
     & Required<PropertiesDoc>

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

@@ -2,7 +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 { IInjectData } from "../../../InstanceInject/instanceConfig";
 import type { Mock_User } from "../../../RootComponent/Properties/test/normalRequired.test";
 import { SubComponent } from "../..";
 

package/src/api/SubComponent/SubData/SubDataConstraint.ts

@@ -1,6 +1,6 @@
 /**
  * 子组件Data字段约束
- * @returns 当剩余对象不为空对象,约束对象的key为剩余key,类型为剩余key对应的文档类型或函数返回类型。
+ * @returns 当剩余对象不为空对象,约束对象的key为剩余key,类型为剩余key对应的文档类型.
  */
 export type SubDataConstraint<
   TComponentDoc extends object,

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

@@ -2,7 +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 { IInjectData } from "../../../InstanceInject/instanceConfig";
 import type { Mock_User } from "../../../RootComponent/Properties/test/normalRequired.test";
 import { SubComponent } from "../..";
 

package/src/api/SubComponent/SubInherit/SubInheritConstraint.ts

@@ -5,7 +5,7 @@ import type { ComponentDoc } from "../../DefineComponent/ReturnType/ComponentDoc
 type WXMLSign = "wxml";
 
 /**
- * 子组件inherit字段约束,key为子组件所需key,根组件数据的key或`WXMLSign`。要求根数据类型为子数据类型的子类型。当key的值来自wxml(循环产生的子数据等情况)时用`WXMLSign`表示。
+ * 子组件inherit字段约束,key为构建组件所需的properties字段,类型为根组件数据的key或`WXMLSign`。要求根数据类型为子数据类型的子类型。当key的值来自wxml(循环产生的子数据等情况)时用`WXMLSign`表示。
  * @returns object
  */
 export type InheritConstraint<AllRootData extends object, TComponentDoc extends ComponentDoc> = {

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

@@ -2,7 +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 { IInjectData } from "../../../InstanceInject/instanceConfig";
 import type { Mock_User } from "../../../RootComponent/Properties/test/normalRequired.test";
 import type { RootComponentDoc } from "../../../RootComponent/RootComponentDoc";
 import { SubComponent } from "../..";
@@ -43,9 +43,6 @@ SubComponent<RootDoc, CompDoc>()({
   data: {
     aaa_str: "str",
   },
-  store: {
-    _aaa_SubReactive: () => 123,
-  },
   computed: {},
   methods: {
     aaa_SubM() {},
@@ -68,7 +65,6 @@ SubComponent<RootDoc, CompDoc>()({
             Cnum: number;
             // 自身Data
             aaa_str: "str";
-            _aaa_SubReactive: 123;
           } & IInjectData
         >,
         Test.Pass

package/src/api/SubComponent/SubLifetimes/SubLifetimesOption.ts

@@ -1,3 +1,3 @@
-import type { WMCompLifetimes } from "../../../types/OfficialTypeAlias";
+import type { LifetimesOption } from "../../RootComponent/Lifetimes/LifetimesOption";
 
-export type SubLifetimesOption = Partial<WMCompLifetimes>;
+export type SubLifetimesOption = LifetimesOption;

package/src/api/SubComponent/SubObservers/SubObserversOption.ts

@@ -1,3 +1,3 @@
-import { ObserversOption } from "../../RootComponent/Observers/ObserversOption";
+import type { ObserversOption } from "../../RootComponent/Observers/ObserversOption";
 
 export type SubObserversOption<TObserversData extends object> = ObserversOption<TObserversData>;

package/src/api/SubComponent/SubStore/SubStoreOption.ts

@@ -1,6 +1,6 @@
 import type { V } from "hry-types";
 
-export type SubStoreOption<TSubStore extends object, legalKeys extends PropertyKey, TPrefix extends string> = {
+export type SubStoreOption<TSubStore extends object, legalKeys extends PropertyKey> = {
   /**
    * 全局响应式数据字段,全局store对应数据变化实例对应数据自动setData。
    * 约束为组件properties字段去除inherit和data的剩余字段和内部字段
@@ -19,7 +19,8 @@ export type SubStoreOption<TSubStore extends object, legalKeys extends PropertyK
     & TSubStore
     & V.IllegalFieldValidator<
       TSubStore,
-      legalKeys | `_${TPrefix}_${string}`,
+      legalKeys,
+      // legalKeys | `_${TPrefix}_${string}`,
       0,
       "",
       "与inherit和data字段重复或前缀错误"

package/src/api/SubComponent/SubStore/test/error.test.ts

@@ -31,9 +31,7 @@ SubComponent<{
     aaa_str: () => user.name,
     // @ts-expect-error 2 与 data 字段重复
     aaa_num: () => user.age,
-    // @ts-expect-error 3 内部字段前缀错误
-    _num: () => user.age,
-    // @ts-expect-error 4 超出约束字段
+    // @ts-expect-error 3 超出约束字段
     num: () => user.age,
   },
 });

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

@@ -19,7 +19,17 @@ SubComponent<{}, DocA>()({
     aaa_str: () => user.name,
 
     aaa_num: () => user.age,
-    // 运行内部字段(暂定)
-    _aaa_ddd: () => user.age,
+    // 内部字段
+    // _aaa_ddd: () => user.age,
+  },
+});
+
+SubComponent<{}, DocA, "a">()({
+  store: {
+    aaaA_str: () => user.name,
+
+    aaaA_num: () => user.age,
+    // 内部字段
+    // _aaaA_ddd: () => user.age,
   },
 });

package/src/api/SubComponent/SubWatch/test/WatchProperties.test.ts

@@ -0,0 +1,161 @@
+import { Checking, type Test } from "hry-types";
+import type { ReadonlyDeep } from "hry-types/src/Any/ReadonlyDeep";
+import { type DetailedType, RootComponent, SubComponent } from "../../../..";
+import type { OptionalType } from "../../../RootComponent/Properties/PropertiesConstraint";
+import {
+  type Mock_Cart,
+  mock_requiredTypes,
+  mock_requiredUnion,
+  type Mock_User,
+} from "../../../RootComponent/Properties/test/normalRequired.test";
+
+const mock_optional = {
+  optional_num: {
+    type: Number,
+    value: 123,
+  },
+  optional_gender: {
+    type: String as DetailedType<"male" | "female">,
+    value: "male" as const,
+  },
+  optional_obj: {
+    type: Object as DetailedType<Mock_User>,
+    value: {
+      id: "id",
+      name: "name",
+      age: 20,
+    },
+  },
+  optional_objOrNull: {
+    type: Object as DetailedType<Mock_User | null>, // 可选类型定义null默认值方可为null
+    value: null,
+  },
+} satisfies Record<string, OptionalType>;
+
+const rootComponent = RootComponent()({
+  properties: {
+    ...mock_requiredTypes,
+    ...mock_requiredUnion,
+    ...mock_optional,
+  },
+});
+
+type Root = typeof rootComponent;
+
+/**
+ * watch properties字段 深度只读, 必传对象字段newValue去除null
+ */
+SubComponent<Root, { properties: { aaa_num: number } }>()({
+  watch: {
+    // 必传单一字段
+    str(newValue, oldValue) {
+      Checking<string, typeof newValue, Test.Pass>;
+
+      Checking<string, typeof oldValue, Test.Pass>;
+    },
+    num(newValue, oldValue) {
+      Checking<number, typeof newValue, Test.Pass>;
+
+      Checking<number, typeof oldValue, Test.Pass>;
+    },
+    bool(newValue, oldValue) {
+      Checking<boolean, typeof newValue, Test.Pass>;
+
+      Checking<boolean, typeof oldValue, Test.Pass>;
+    },
+    arr(newValue, oldValue) {
+      newValue; // readonly ReadonlyDeep<unknown>[]
+
+      oldValue; // readonly ReadonlyDeep<unknown>[]
+
+      // ts中很多不是错误的错误,写 typeof newValue 结果是错误
+      Checking<unknown[], typeof newValue, Test.Fail>;
+
+      // ts中很多不是错误的错误,写 readonly ReadonlyDeep<unknown>[] 结果是正确的
+      Checking<readonly unknown[], readonly ReadonlyDeep<unknown>[], Test.Pass>;
+    },
+    obj(newValue, oldValue) {
+      Checking<object, typeof newValue, Test.Pass>;
+
+      Checking<object | null, typeof oldValue, Test.Pass>;
+    },
+    tuple(newValue, oldValue) {
+      Checking<readonly [string, number, boolean], typeof newValue, Test.Pass>;
+
+      Checking<readonly [string, number, boolean], typeof oldValue, Test.Pass>;
+    },
+    union_str(newValue, oldValue) {
+      Checking<"male" | "female", typeof newValue, Test.Pass>;
+
+      Checking<"male" | "female", typeof oldValue, Test.Pass>;
+    },
+    union_num(newValue, oldValue) {
+      Checking<0 | 1 | 2, typeof newValue, Test.Pass>;
+
+      Checking<0 | 1 | 2, typeof oldValue, Test.Pass>;
+    },
+    union_bool(newValue, oldValue) {
+      Checking<false | true, typeof newValue, Test.Pass>;
+
+      Checking<false | true, typeof oldValue, Test.Pass>;
+    },
+    union_arr(newValue, oldValue) {
+      Checking<readonly number[] | readonly string[], typeof newValue, Test.Pass>;
+
+      Checking<readonly number[] | readonly string[], typeof oldValue, Test.Pass>;
+    },
+    union_obj(newValue, oldValue) {
+      Checking<ReadonlyDeep<Mock_User | Mock_Cart>, typeof newValue, Test.Pass>;
+
+      Checking<ReadonlyDeep<Mock_User | Mock_Cart | null>, typeof oldValue, Test.Pass>;
+    },
+    // 必传多类型联合
+    union_str_num_bool(newValue, oldValue) {
+      Checking<string | number | boolean, typeof newValue, Test.Pass>;
+
+      Checking<string | number | boolean, typeof oldValue, Test.Pass>;
+    },
+    union_literalStr_Literalnum(newValue, oldValue) {
+      Checking<0 | 1 | 2 | "male" | "female", typeof newValue, Test.Pass>;
+
+      Checking<0 | 1 | 2 | "male" | "female", typeof oldValue, Test.Pass>;
+    },
+    union_mockUser_num(newValue, oldValue) {
+      Checking<ReadonlyDeep<number | Mock_User>, typeof newValue, Test.Pass>;
+
+      Checking<ReadonlyDeep<number | Mock_User | null>, typeof oldValue, Test.Pass>;
+    },
+    // 可选字段
+    optional_gender(newValue, oldValue) {
+      Checking<"male" | "female", typeof newValue, Test.Pass>;
+
+      Checking<"male" | "female", typeof oldValue, Test.Pass>;
+    },
+    optional_num(newValue, oldValue) {
+      Checking<number, typeof newValue, Test.Pass>;
+
+      Checking<number, typeof oldValue, Test.Pass>;
+    },
+    optional_obj(newValue, oldValue) {
+      Checking<ReadonlyDeep<Mock_User>, typeof newValue, Test.Pass>;
+
+      Checking<ReadonlyDeep<Mock_User | null>, typeof oldValue, Test.Pass>;
+    },
+    // 对象的二段key
+    "optional_obj.age"(newValue, oldValue) {
+      Checking<number, typeof newValue, Test.Pass>;
+
+      Checking<number | undefined, typeof oldValue, Test.Pass>;
+    },
+    "optional_obj.**"(newValue, oldValue) {
+      Checking<ReadonlyDeep<Mock_User>, typeof newValue, Test.Pass>;
+
+      Checking<ReadonlyDeep<Mock_User | null>, typeof oldValue, Test.Pass>;
+    },
+    "optional_obj.id"(newValue, oldValue) {
+      Checking<string, typeof newValue, Test.Pass>;
+
+      Checking<string, typeof oldValue, Test.Pass>;
+    },
+  },
+});

package/src/api/SubComponent/SubWatch/test/WtachInject.test.ts

@@ -1,4 +1,4 @@
-import { Checking, Test } from "hry-types";
+import { Checking, type Test } from "hry-types";
 import { SubComponent } from "../..";
 
 /**

package/src/api/SubComponent/index.ts

@@ -7,7 +7,7 @@ import type { ComponentDoc } from "../DefineComponent/ReturnType/ComponentDoc";
 
 import type { Func } from "hry-types/src/Misc/Func";
 import type { WMCompOtherOption } from "../../types/OfficialTypeAlias";
-import { IInjectStore } from "../InstanceInject/instanceConfig";
+import type { IInjectStore } from "../InstanceInject/instanceConfig";
 import type { ComputedConstraint } from "../RootComponent/Computed/ComputedConstraint";
 import type { DataConstraint } from "../RootComponent/Data/DataConstraint";
 import type { EventsConstraint } from "../RootComponent/Events/EventsConstraint";
@@ -29,10 +29,10 @@ import type { SubInstance } from "./SubInstance/SubInstance";
 import type { SubLifetimesOption } from "./SubLifetimes/SubLifetimesOption";
 import type { SubMethodsConstraint } from "./SubMethods/SubMethodsConstraint";
 import type { SubMethodsOption } from "./SubMethods/SubMethodsOption";
-import { SubObserversOption } from "./SubObservers/SubObserversOption";
+import type { SubObserversOption } from "./SubObservers/SubObserversOption";
 import type { SubPageLifetimesOption } from "./SubPageLifetimes/SubPageLifetimesOption";
 import type { CreateSubComponentDoc } from "./SubReturnType/CreateSubComponentDoc";
-import type { SubStoreConstraint } from "./SubStore/SubDataConstraint";
+import type { SubStoreConstraint } from "./SubStore/SubStoreConstraint";
 import type { SubStoreOption } from "./SubStore/SubStoreOption";
 import type { SubWatchOption } from "./SubWatch/SubWatchOption";
 
@@ -63,8 +63,7 @@ type Options<
   >
   & SubStoreOption<
     TSubStore,
-    Exclude<keyof CurrentCompDoc["properties"], (keyof (InheritDoc & SubDataDoc))>,
-    Prefix
+    Exclude<keyof CurrentCompDoc["properties"], (keyof (InheritDoc & SubDataDoc))>
   >
   & SubComputedOption<
     TSubComputed,
@@ -84,7 +83,7 @@ type Options<
     & SubStoreDoc
     & IInjectStore
   >
-  & Partial<Omit<WMCompOtherOption, "pageLifetimes" | "definitionFilter" | "export" | "observers">>
+  & Partial<Omit<WMCompOtherOption, "pageLifetimes" | "definitionFilter" | "export" | "observers" | "relations">>
   & SubObserversOption<
     & SubComputedDoc
     & SubDataDoc

package/src/behaviors/BComputedAndWatch/isEqual.ts

@@ -11,7 +11,8 @@ function isSameSize(a: object, b: object) {
 
 // 定义一个辅助函数，用于判断两个函数的代码是否相同
 function isSameCode(a: Function, b: Function) {
-  return a.toString() === b.toString();
+  // 去除空格比较函数字符串
+  return a.toString().split(" ").join("") === b.toString().split(" ").join("");
 }
 
 // 定义一个辅助函数，用于判断两个日期的时间戳是否相同

package/tsconfig.json

@@ -18,7 +18,9 @@
     // "noUnusedParameters": false, // 报告函数中未使用参数的错误
     // "suppressImplicitAnyIndexErrors": true, // 为true关闭隐式索引错误,但很激进,建议使用@ts-ignore
     "isolatedModules": true, // 模块化(.ts文件必须有导入或导出) 默认false
-    // "verbatimModuleSyntax": true,不能开启.jset会报错,在vscode中设置代替它要求ts版本>5.3
+    "preserveValueImports": true, // 引入类型加type
+    "ignoreDeprecations": "5.0",
+    // "verbatimModuleSyntax": true, // 强制导入类型前缀type检测,在vscode中设置"typescript.preferences.preferTypeOnlyAutoImports":true
     // 默认加载所有@types下的包 types指定具体的包,其他拒绝。包含上级目录
     "types": ["hry-types", "mobx", "jest", "miniprogram-api-typings"]
   },

package/dist/jest/common.d.ts

@@ -1,15 +0,0 @@
-import type { ComponentDoc } from "../src/api/DefineComponent/ReturnType/ComponentDoc";
-export type User = {
-    name: string;
-    age?: number;
-};
-export type CompDoc = ComponentDoc<{
-    properties: {
-        compA_num: number;
-        compA_user?: User | null;
-    };
-    customEvents: {
-        compA_str: string;
-    };
-}>;
-export declare const user: User;

package/dist/jest/common.js

@@ -1,2 +0,0 @@
-export const user = { name: "lili", age: 30 };
-//# sourceMappingURL=common.js.map

package/dist/jest/common.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"common.js","sourceRoot":"","sources":["../../jest/common.ts"],"names":[],"mappings":"AAQA,MAAM,CAAC,MAAM,IAAI,GAAS,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,EAAE,EAAE,EAAE,CAAC"}

package/dist/src/api/DefineComponent/NameOrPage/NameOrPathOption.js.map

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

package/dist/src/api/DefineComponent/NameOrPage/test/error.test.d.ts

@@ -1 +0,0 @@
-export {};

package/dist/src/api/DefineComponent/NameOrPage/test/error.test.js

@@ -1,22 +0,0 @@
-import { DefineComponent } from "../..";
-DefineComponent({
-    name: "test",
-    rootComponent: { isPage: true },
-});
-DefineComponent({
-    path: "/pages/index/index",
-    rootComponent: {},
-});
-DefineComponent({
-    path: "pages/index/index",
-    rootComponent: { isPage: true },
-});
-DefineComponent({
-    name: "",
-    rootComponent: {},
-});
-DefineComponent({
-    name: "ddd_ddd",
-    rootComponent: {},
-});
-//# sourceMappingURL=error.test.js.map

package/dist/src/api/DefineComponent/NameOrPage/test/error.test.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"error.test.js","sourceRoot":"","sources":["../../../../../../src/api/DefineComponent/NameOrPage/test/error.test.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,eAAe,EAAE,MAAM,OAAO,CAAC;AAExC,eAAe,CAAC;IAEd,IAAI,EAAE,MAAM;IACZ,aAAa,EAAE,EAAE,MAAM,EAAE,IAAI,EAA6B;CAC3D,CAAC,CAAC;AAEH,eAAe,CAAC;IAEd,IAAI,EAAE,oBAAoB;IAC1B,aAAa,EAAE,EAA6B;CAC7C,CAAC,CAAC;AAEH,eAAe,CAAC;IAEd,IAAI,EAAE,mBAAmB;IACzB,aAAa,EAAE,EAAE,MAAM,EAAE,IAAI,EAA6B;CAC3D,CAAC,CAAC;AAEH,eAAe,CAAC;IAEd,IAAI,EAAE,EAAE;IACR,aAAa,EAAE,EAA6B;CAC7C,CAAC,CAAC;AAEH,eAAe,CAAC;IAEd,IAAI,EAAE,SAAS;IACf,aAAa,EAAE,EAA6B;CAC7C,CAAC,CAAC"}

package/dist/src/api/DefineComponent/NameOrPage/test/normal.test.d.ts

@@ -1 +0,0 @@
-export {};

package/dist/src/api/DefineComponent/NameOrPage/test/normal.test.js

@@ -1,10 +0,0 @@
-import { DefineComponent } from "../..";
-DefineComponent({
-    path: "/pages/index/index",
-    rootComponent: { isPage: true },
-});
-DefineComponent({
-    name: "test",
-    rootComponent: {},
-});
-//# sourceMappingURL=normal.test.js.map

package/dist/src/api/DefineComponent/NameOrPage/test/normal.test.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"normal.test.js","sourceRoot":"","sources":["../../../../../../src/api/DefineComponent/NameOrPage/test/normal.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,OAAO,CAAC;AAGxC,eAAe,CAAC;IACd,IAAI,EAAE,oBAAoB;IAC1B,aAAa,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE;CAChC,CAAC,CAAC;AAGH,eAAe,CAAC;IACd,IAAI,EAAE,MAAM;IACZ,aAAa,EAAE,EAAE;CAClB,CAAC,CAAC"}

package/dist/src/api/DefineComponent/ReturnType/ComponentDoc.js.map

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

package/dist/src/api/DefineComponent/ReturnType/CreateComponentDoc.js.map

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