annil 1.0.0 → 1.0.4

package/src/api/DefineComponent/index.ts

@@ -1,19 +1,7 @@
 import type { IfExtends } from "hry-types/src/Any/IfExtends";
 import type { Func } from "hry-types/src/Misc/Func";
-import { BBeforeCreate } from "../../behaviors/BbeforeCreated";
-import { BComputedAndWatch } from "../../behaviors/BComputedAndWatch";
-import { initComputed } from "../../behaviors/BComputedAndWatch/initComputed";
-import { BStore } from "../../behaviors/BStore";
 import type { WMComponent, WMCompPageLifetimes, WMPageLifetimes } from "../../types/OfficialTypeAlias";
-import { isEmptyObject } from "../../utils/isEmptyObject";
-import {
-  excludeFields,
-  funcConfigHandle,
-  onLoadHijack,
-  onLoadReceivedDataHandle,
-  rootComponentFieldHandle,
-  subComponentsHandle,
-} from "../../utils/preprocessingOptions";
+
 import type { LifetimesConstraint } from "../RootComponent/Lifetimes/LifetimesConstraint";
 import type { RootComponentDoc } from "../RootComponent/RootComponentDoc";
 import type { SubComponentDoc } from "../SubComponent/SubComponentDoc";
@@ -23,6 +11,11 @@ import type { CreatePageDoc } from "./ReturnType/CreatePageDoc";
 import type { RootComponentOption } from "./RootComponent/RootComponentOption";
 import type { SubComponentsOption } from "./SubComponents/SubComponentsOption";
 
+import type { RootComponentTrueOptions } from "../RootComponent";
+import { collectOptionsForComponent } from "./collectOptionsForComponent";
+
+type Path = `/${string}`;
+
 type RootOptions<
   TRootComponentDoc extends RootComponentDoc,
   TSubComponentTuple extends SubComponentDoc[],
@@ -56,19 +49,15 @@ interface DefineComponentConstructor {
  * 临时的函数配置项
  * 把根组件与子组件中配置类型为函数的相同字段配置收集在一起(数组)
  */
-export type FuncConfig = {
-  pageLifetimes?: Record<string, Func[]>;
-  lifetimes?: Record<string, Func[]>;
-  watch?: Record<string, Func[]>;
-};
+export type FuncOptions = Record<"pageLifetimes" | "lifetimes" | "watch", Record<string, Func[]>>;
 
 /**
- * 传入原生Component的配置项
+ * 最终传入原生Component的配置项
  */
-export type ComponentOptions = {
+export type FinalOptionsForComponent = {
   isPage?: boolean;
   options?: WMComponent.Options;
-  properties?: object;
+  properties?: Record<string, any>;
   data?: object;
   store?: object;
   computed?: Record<string, Func>;
@@ -80,65 +69,8 @@ export type ComponentOptions = {
   pageLifetimes?: Partial<WMCompPageLifetimes & { load: Func } & WMPageLifetimes>;
 };
 
-export type Path = `/${string}`;
-
-export type DefineComponentOptions = {
-  path?: Path;
-  name?: string;
-  rootComponent?: RootComponentDoc;
-  subComponents?: SubComponentDoc[];
-};
-
 export const DefineComponent: DefineComponentConstructor = function(options): any {
-  // console.log("------------------------------------------------分割线------------------------------------------------");
-
-  // 最终的配置
-  const componentOptions: ComponentOptions = {
-    options: {
-      // addGlobalClass: true,
-      multipleSlots: true,
-      pureDataPattern: /^_/,
-      virtualHost: true,
-    },
-    // default behaviors
-    behaviors: [BStore, BComputedAndWatch],
-  };
-  /**
-   * 有些选项配置是函数,且可能分布在根组件和子组件中,tempConfig 用于收集这些配置,最终再一起整合进componentOptions配置。rootComponentHandle和subComponentsHandle都会收集配置，funcConfigHandle整理配置。
-   */
-  const funcConfig: FuncConfig = {};
-
-  if (options.rootComponent && !isEmptyObject(options.rootComponent)) {
-    rootComponentFieldHandle(options.rootComponent, componentOptions, funcConfig);
-  }
-
-  if (options.subComponents && !isEmptyObject(options.subComponents)) {
-    subComponentsHandle(componentOptions, options.subComponents, funcConfig);
-  }
-  if (!isEmptyObject(funcConfig)) {
-    funcConfigHandle(componentOptions, options.rootComponent?.isPage, funcConfig);
-  }
-
-  componentOptions.methods && excludeFields(componentOptions.methods, ["disposer", "applySetData"]);
-
-  componentOptions.behaviors!.push(BBeforeCreate);
-
-  onLoadHijack(componentOptions, [onLoadReceivedDataHandle, initComputed], []);
-
-  if (componentOptions.isPage) {
-    Reflect.deleteProperty(componentOptions.options!, "virtualHost");
-  }
-  Component(componentOptions as any);
-};
-
-export type PageOptions = {
-  path: Path;
-  rootComponent: RootComponentDoc & { isPage: true };
-  subComponents: SubComponentDoc[];
-};
-
-export type CompOptions = {
-  name: string;
-  rootComponent: RootComponentDoc & { isPage: undefined };
-  subComponents: SubComponentDoc[];
+  Component(
+    collectOptionsForComponent(options.rootComponent as RootComponentTrueOptions | undefined, options.subComponents),
+  );
 };

package/src/api/RootComponent/Computed/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 { SpecificType } from "../../../../types/SpecificType";
 import { RootComponent } from "../..";
-import type { Mock_User } from "../../Properties/expected/normalRequired";
+import type { Mock_User } from "../../Properties/test/normalRequired.test";
 
 /**
  * computed字段约束为 [ComputedConstraint](../ComputedConstraint.ts)

package/src/api/RootComponent/CustomEvents/CustomEventConstraint.ts

@@ -47,4 +47,6 @@ export type FullCustomEvents = {
   options: OptionsFieldsConfigOfCustomEvents;
 };
 
-export type CustomEventConstraint = Record<string, FullCustomEvents | ShortCustomeEvents>;
+export type CustomEvents = FullCustomEvents | ShortCustomeEvents;
+
+export type CustomEventConstraint = Record<string, CustomEvents>;

package/src/api/RootComponent/Data/DataConstraint.ts

@@ -0,0 +1 @@
+export type DataConstraint = Record<string, any>;

package/src/api/RootComponent/IsPage/IsPageOption.ts

@@ -1 +1,6 @@
-export type IsPageOption<TIsPage extends boolean> = { isPage?: TIsPage };
+export type IsPageOption<TIsPage extends boolean> = {
+  /**
+   * 表示组件是否为页面,可选,默认false
+   */
+  isPage?: TIsPage;
+};

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

@@ -1,10 +1,11 @@
 import type { WMCompLifetimes } from "../../../types/OfficialTypeAlias";
+import type { FinalOptionsForComponent } from "../../DefineComponent";
 
 export type LifetimesConstraint = // 官方组件生命周期
-  WMCompLifetimes["lifetimes"];
-// & {
-//   /**
-//    * 建立组件时的真正配置对象
-//    */
-//   beforeCreate?: (options: WMTrivialOption<any, any, any, any, false>) => void;
-// };
+  & WMCompLifetimes["lifetimes"]
+  & {
+    /**
+     * 建立组件时的真正配置对象
+     */
+    beforeCreate?: (options: FinalOptionsForComponent) => void;
+  };

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

@@ -4,7 +4,7 @@ import { RootComponent } from "../..";
  */
 RootComponent()({
   lifetimes: {
-    // beforeCreate() {},
+    beforeCreate() {},
 
     created() {},
 

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

@@ -6,9 +6,9 @@ import { RootComponent } from "../../../..";
 RootComponent()({
   lifetimes: {
     // 新增声明周期用于查看实例初始化之前的配置文件
-    // beforeCreate(opitons) {
-    //   opitons;
-    // },
+    beforeCreate(opitons) {
+      opitons;
+    },
     created() {
     },
     attached() {

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

@@ -2,7 +2,7 @@ import { Checking, type Test } from "hry-types";
 import { RootComponent, type SpecificType } from "../../../..";
 
 import type { RemoveNullOfRequired } from "../../../../types/RemoveNullOfRequired";
-import type { Mock_User } from "../../Properties/expected/normalRequired";
+import type { Mock_User } from "../../Properties/test/normalRequired.test";
 
 /**
  * 组件时

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

@@ -73,3 +73,23 @@ type OptionalDocExpected = {
 };
 
 Checking<typeof OptionalDoc, OptionalDocExpected, Test.Pass>;
+
+// properties 使用SpecificType时,接受interface类型
+interface Foo {
+  name: string;
+}
+
+RootComponent()({
+  properties: {
+    xxx: Object as SpecificType<{ dd: Foo }>,
+    user: {
+      type: Object as SpecificType<Foo>,
+      value: { name: "zhao" },
+    },
+  },
+  computed: {
+    ddd() {
+      this.data.user?.name;
+    },
+  },
+});

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

@@ -2,7 +2,7 @@ import { Checking, type Test } from "hry-types";
 import type { ReadonlyDeep } from "hry-types/src/Any/_api";
 import type { SpecificType } from "../../../../types/SpecificType";
 import { RootComponent } from "../..";
-import { type Mock_User } from "../../Properties/expected/normalRequired";
+import type { Mock_User } from "../../Properties/test/normalRequired.test";
 
 /**
  *  1 computed字段时需要手写类型,可悬停鼠标到key查看类型,深度只读

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

@@ -3,7 +3,7 @@ import { Checking, type Test } from "hry-types";
 import type { ReadonlyDeep } from "hry-types/src/Any/_api";
 import { observable } from "mobx";
 import { RootComponent } from "../..";
-import type { Mock_User } from "../../Properties/expected/normalRequired";
+import type { Mock_User } from "../../Properties/test/normalRequired.test";
 
 const obj = observable({
   gender: <"male" | "female"> "male",

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

@@ -4,13 +4,19 @@ import type { ReadonlyDeep } from "hry-types/src/Any/_api";
 import { RootComponent } from "../..";
 
 import type { SpecificType } from "../../../..";
+// import {
+//   type Mock_Cart,
+//   mock_requiredTypes,
+//   mock_requiredUnion,
+//   type Mock_User,
+// } from "../../Properties/expected/normalRequired";
+import type { OptionalType } from "../../Properties/PropertiesConstraint";
 import {
   type Mock_Cart,
   mock_requiredTypes,
   mock_requiredUnion,
   type Mock_User,
-} from "../../Properties/expected/normalRequired";
-import type { OptionalType } from "../../Properties/PropertiesConstraint";
+} from "../../Properties/test/normalRequired.test";
 const mock_optional = {
   optional_num: {
     type: Number,

package/src/api/RootComponent/index.ts

@@ -3,7 +3,7 @@ import type { NoInfer } from "hry-types/src/Generic/NoInfer";
 import type { EmptyObject } from "hry-types/src/Misc/EmptyObject";
 import type { Func } from "hry-types/src/Misc/Func";
 import type { ComputeIntersectionDeep } from "hry-types/src/Object/_api";
-import type { WMCompOtherOption } from "../../types/OfficialTypeAlias";
+import type { WMCompOtherOption, WMCompPageLifetimes, WMPageLifetimes } from "../../types/OfficialTypeAlias";
 import type { ComponentDoc } from "../DefineComponent/ReturnType/ComponentDoc";
 import type { ComputedConstraint } from "./Computed/ComputedConstraint";
 import type { ComputedOption } from "./Computed/ComputedOption";
@@ -11,11 +11,13 @@ import type { GetComputedDoc } from "./Computed/GetComputedDoc";
 import type { CustomEventConstraint } from "./CustomEvents/CustomEventConstraint";
 import type { CustomEventsOption } from "./CustomEvents/CustomEventsOption";
 import type { GetCustomEventDoc } from "./CustomEvents/GetCustomEventDoc";
+import type { DataConstraint } from "./Data/DataConstraint";
 import type { DataOption } from "./Data/DataOption";
 import type { EventsConstraint } from "./Events/EventsConstraint";
 import type { EventsOption } from "./Events/EventsOption";
 import type { RootComponentInstance } from "./Instance/RootComponentInstance";
 import type { IsPageOption } from "./IsPage/IsPageOption";
+import type { LifetimesConstraint } from "./Lifetimes/LifetimesConstraint";
 import type { LifetimesOption } from "./Lifetimes/LifetimesOption";
 import type { MethodsConstraint } from "./Methods/MethodsConstraint";
 import type { MethodsOption } from "./Methods/MethodsOption";
@@ -81,7 +83,7 @@ type RootComponentConstructor<TReceivedComponentDoc extends ComponentDoc[] | Com
       | boolean
       | null
       | Literal[]
-      | Record<string, Literal>,
+      | object,
     // TEvents 不能有默认值 {} 会引起事件参数类型(e)失效
     TEvents extends EventsConstraint<TReceivedComponentDoc>,
     TIsPage extends boolean = false,
@@ -135,5 +137,19 @@ export function RootComponent<
 >(): RootComponentConstructor<
   TReceivedComponentDoc
 > {
-  return (options: any) => options;
+  return ((options: any) => options as RootComponentTrueOptions) as any;
 }
+
+export type RootComponentTrueOptions = {
+  isPage?: boolean;
+  properties?: PropertiesConstraint;
+  data?: DataConstraint;
+  computed?: ComputedConstraint;
+  customEvents?: CustomEventConstraint;
+  methods?: MethodsConstraint;
+  events?: EventsConstraint;
+  store?: StoreConstraint;
+  watch?: Record<string, Func>;
+  lifetimes?: LifetimesConstraint;
+  pageLifetimes?: Partial<WMCompPageLifetimes & { load: Func } & WMPageLifetimes>;
+};

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

@@ -1,7 +1,8 @@
 import { Checking, type Test } from "hry-types";
 import type { ReadonlyDeep } from "hry-types/src/Any/_api";
 import type { ComponentDoc } from "../../../DefineComponent/ReturnType/ComponentDoc";
-import type { Mock_User } from "../../../RootComponent/Properties/expected/normalRequired";
+
+import type { Mock_User } from "../../../RootComponent/Properties/test/normalRequired.test";
 import { SubComponent } from "../..";
 
 type OnlyCustomCompDoc = ComponentDoc<{

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

@@ -1,5 +1,6 @@
 import type { ComponentDoc } from "../../../DefineComponent/ReturnType/ComponentDoc";
-import type { Mock_User } from "../../../RootComponent/Properties/expected/normalRequired";
+
+import type { Mock_User } from "../../../RootComponent/Properties/test/normalRequired.test";
 import { SubComponent } from "../..";
 
 type OnlyCustomCompDoc = ComponentDoc<{

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

@@ -3,7 +3,8 @@ import type { ReadonlyDeep } from "hry-types/src/Any/_api";
 import type { Wm } from "../../../../thirdLib";
 import type { CompDocExtends } from "../../../../types/CompDocExtends";
 import type { ComponentDoc } from "../../../DefineComponent/ReturnType/ComponentDoc";
-import type { Mock_User } from "../../../RootComponent/Properties/expected/normalRequired";
+
+import type { Mock_User } from "../../../RootComponent/Properties/test/normalRequired.test";
 import { SubComponent } from "../..";
 
 type CompDoc = ComponentDoc<{

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

@@ -1,7 +1,8 @@
 import { Checking, type Test } from "hry-types";
 import type { ReadonlyDeep } from "hry-types/src/Any/_api";
 import type { ComponentDoc } from "../../../DefineComponent/ReturnType/ComponentDoc";
-import type { Mock_User } from "../../../RootComponent/Properties/expected/normalRequired";
+
+import type { Mock_User } from "../../../RootComponent/Properties/test/normalRequired.test";
 import type { RootComponentDoc } from "../../../RootComponent/RootComponentDoc";
 import { SubComponent } from "../..";
 

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

@@ -1,5 +1,6 @@
 import { Checking, type Test } from "hry-types";
-import type { Mock_User } from "../../../RootComponent/Properties/expected/normalRequired";
+
+import type { Mock_User } from "../../../RootComponent/Properties/test/normalRequired.test";
 import type { RootComponentDoc } from "../../../RootComponent/RootComponentDoc";
 import { SubComponent } from "../..";
 

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

@@ -2,7 +2,8 @@ import { Checking, type Test } from "hry-types";
 
 import type { ReadonlyDeep } from "hry-types/src/Any/_api";
 import type { ComponentDoc } from "../../../DefineComponent/ReturnType/ComponentDoc";
-import type { Mock_User } from "../../../RootComponent/Properties/expected/normalRequired";
+
+import type { Mock_User } from "../../../RootComponent/Properties/test/normalRequired.test";
 import { SubComponent } from "../..";
 
 type TestObj = {

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

@@ -1,4 +1,4 @@
-import type { Wm } from "../../../../thirdLib";
+import type { Wm } from "../../../..";
 import { SubComponent } from "../..";
 
 // 测试1

package/src/api/SubComponent/index.ts

@@ -153,7 +153,15 @@ type SubComponentConstructor<
         & InheritDoc
         & SubDataDoc
         & SubStoreDoc
-        & SubComputedDoc
+        // 改用SubComputedDoc是会报错的
+        & IfExtends<
+          SubComputedConstraint<
+            Omit<Required<CurrentCompDoc["properties"]>, keyof (InheritDoc & SubDataDoc & SubStoreDoc)>
+          >,
+          TSubComputed,
+          {},
+          GetSubComputedDoc<TSubComputed>
+        >
       )
     >,
   >(
@@ -188,11 +196,10 @@ export function SubComponent<
   CompDoc extends ComponentDoc,
   Prefix extends string = "",
 >(): IfExtends<EmptyObject, CompDoc, (opt: EmptyObject) => never, SubComponentConstructor<RootDoc, CompDoc, Prefix>> {
-  return ((options: any) => options) as any;
+  return ((options: any) => options as SubComponentTrueOptions) as any;
 }
 
-// 相比与 export type TrivialOption = Options<{},...>,更直观字段和类型,但断耦合,注意类型是否正确.这是为最终生成官方Component API 的options参数而生。
-export type SubComponentOptions = {
+export type SubComponentTrueOptions = {
   inhrit?: string;
   data?: Record<string, unknown>;
   computed?: Record<string, Func>;

package/src/{utils → behaviors/BComputedAndWatch}/computedUpdater.ts

@@ -1,9 +1,10 @@
-import { deepProxy, unwrap } from "../behaviors/BComputedAndWatch/data-tracer";
-import type { ComputedDependence } from "../behaviors/BComputedAndWatch/initComputed";
-import { isEqual } from "../behaviors/BComputedAndWatch/isEqual";
-import type { Instance } from "../behaviors/BComputedAndWatch/types";
+import { deepProxy, unwrap } from "./data-tracer";
 import { getPathsValue } from "./getPathsValue";
 
+import type { ComputedDependence } from "./initComputed";
+import { isEqual } from "./isEqual";
+import type { Instance } from "./types";
+
 export function computedUpdater(this: Instance, isUpdated = false): boolean {
   // console.log("computedUpdater开始");
 

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

@@ -6,9 +6,6 @@ export function deepProxy(
   basePath: string[] = [],
 ): object {
   const handler = {
-    set() {
-      throw Error("计算属性中不可以改变data对象的值");
-    },
     get(target: object, prop: string) {
       // // 得到原始的对象 在unwrap时使用
       // console.log(target, prop);

package/src/{utils → behaviors/BComputedAndWatch}/getPathsValue.ts

@@ -1,4 +1,4 @@
-import type { Instance } from "../behaviors/BComputedAndWatch/types";
+import type { Instance } from "./types";
 
 export function getPathsValue(this: Instance, paths: string[]) {
   return paths.reduce((pre: any, path) => {

package/src/behaviors/BComputedAndWatch/index.ts

@@ -1,13 +1,22 @@
 import type { Func } from "hry-types/src/Misc/Func";
-import type { ComponentOptions } from "../../api/DefineComponent";
+import type { FinalOptionsForComponent } from "../../api/DefineComponent";
 import { deepClone } from "../../utils/deepClone";
 import { deleteProtoField } from "../../utils/deleteProtoField";
-import { initWatchOldValue } from "../../utils/initWatchOldValue";
+
 import { isEmptyObject } from "../../utils/isEmptyObject";
+import { getPathsValue } from "./getPathsValue";
 import { initComputed } from "./initComputed";
 import { isEqual } from "./isEqual";
 import { isPage } from "./IsPage";
-import type { Instance } from "./types";
+import type { Instance, WatchOldValue } from "./types";
+function initWatchOldValue(this: Instance, watchConfig: object): WatchOldValue {
+  const watchOldValue = {};
+  for (const key in watchConfig) {
+    watchOldValue[key] = deepClone(getPathsValue.call(this, key.split(".")));
+  }
+
+  return watchOldValue;
+}
 /**
  * 实现
  * 1. 计算属性初始化在attached之后(前版本在beforeCreate)
@@ -23,12 +32,15 @@ import type { Instance } from "./types";
  */
 
 export const BComputedAndWatch = Behavior({
-  definitionFilter(options: ComponentOptions) {
+  definitionFilter(options: FinalOptionsForComponent) {
     const computedConfig = options.computed;
 
     // computed handle
     if (computedConfig && !isEmptyObject(computedConfig)) {
-      const methodsConfig = options.methods ||= {};
+      /* istanbul ignore next */
+      options.methods ||= {};
+
+      const methodsConfig = options.methods;
 
       // 把计算属性配置保留在methods的__computedConfig__字段下带入到组件实例中。
       methodsConfig.__computedConfig__ = () => computedConfig;
@@ -42,7 +54,7 @@ export const BComputedAndWatch = Behavior({
         switch (computedStatus) {
           case undefined:
             // 1 触发来自attach时或没有计算属性时
-            originalFunc && originalFunc.call(this);
+            originalFunc && /* istanbul ignore next */ originalFunc.call(this);
 
             break;
           case "初始化中":
@@ -58,7 +70,7 @@ export const BComputedAndWatch = Behavior({
                 this.__computedStatus__ = "更新完毕";
               } else {
                 // 无需更新计算属性
-                originalFunc && originalFunc.call(this);
+                originalFunc && /* istanbul ignore next */ originalFunc.call(this);
               }
             }
             break;
@@ -68,7 +80,7 @@ export const BComputedAndWatch = Behavior({
               // console.log("来自计算属性更新后的自身回调");
               this.__computedStatus__ = "待更新";
 
-              originalFunc && originalFunc.call(this);
+              originalFunc && /* istanbul ignore next */ originalFunc.call(this);
             }
             break;
         }
@@ -78,6 +90,7 @@ export const BComputedAndWatch = Behavior({
     // watch handle
     const watchConfig = options.watch;
     if (watchConfig && !isEmptyObject(watchConfig)) {
+      /* istanbul ignore next */
       const methodsConfig = options.methods ||= {};
 
       // 把watch配置保留在methods的__watchConfig__字段下带入到组件实例中。

package/src/behaviors/BComputedAndWatch/initComputed.ts

@@ -2,8 +2,8 @@
 // import type { IsDependOnOthers } from "./data-tracer";
 
 import type { Func } from "hry-types/src/Misc/Func";
-import { computedUpdater } from "../../utils/computedUpdater";
 import { deleteProtoField } from "../../utils/deleteProtoField";
+import { computedUpdater } from "./computedUpdater";
 import { deepProxy, unwrap } from "./data-tracer";
 import type { ComputedCache, Instance } from "./types";
 export type ComputedDependence = { paths: string[]; val: unknown };
@@ -37,19 +37,21 @@ export function getComputedInfo(
   // 建立当前计算字段的依赖
   const dependences: ComputedDependence[] = [];
   let initValue: unknown;
-  try {
-    initValue = computedFunc.call({
-      data: deepProxy(this.data, dependences),
-    });
-  } catch (error) {
-    // 为js开发考虑使用了 this.data.xxx.age 当xxx为undefined时
-    if (!isValidDependences(dependences, computedKeys)) {
-      // 情况2 依赖了未初始化的计算属性的子属性(会报错) 见computed测试文件
-      return false;
-    }
-    // 其他错误正常报错
-    throw error;
-  }
+  // try {
+  initValue = computedFunc.call({
+    data: deepProxy(this.data, dependences),
+  });
+  // } catch (error) {
+  //   // 为js开发考虑使用了 this.data.xxx.age 当xxx为undefined时
+  //   if (!isValidDependences(dependences, computedKeys)) {
+  //     console.log(222);
+
+  //     // 情形2 依赖了未初始化的计算属性的子属性(会报错) 对应测试文件[NoOptionalProperties.ts](../../../jest/computed/NoOptionalProperties/NoOptionalProperties.test.ts)的age字段
+  //     return false;
+  //   }
+  //   // 其他错误正常报错
+  //   throw error;
+  // }
   if (isValidDependences(dependences, computedKeys)) {
     // 有效的依赖
     initValue = unwrap(initValue);
@@ -60,7 +62,9 @@ export function getComputedInfo(
 
     return { dependences, value: initValue };
   } else {
-    // 情况1 依赖了其他未初始化的计算属性(不报错) 见computed测试文件
+    /**
+     * 情形1 依赖了其他未初始化的计算属性(不报错) 对应测试文件[NoOptionalProperties.ts](../../../jest/computed/NoOptionalProperties/NoOptionalProperties.test.ts)的copyPropUser字段
+     */
     return false;
   }
 }
@@ -76,6 +80,7 @@ export function getComputedInfo(
  */
 function uniqueDependences(dependences: ComputedDependence[]): ComputedDependence[] {
   if (dependences.length === 1) return dependences;
+  // console.log(dependences);
 
   for (let f = 0; f < dependences.length; f++) {
     const firstPath = dependences[f].paths.join(".") + ".";
@@ -83,15 +88,17 @@ function uniqueDependences(dependences: ComputedDependence[]): ComputedDependenc
       const curPath = dependences[i].paths.join(".") + ".";
       // console.log(firstPath,curPath)
       if (firstPath.startsWith(curPath)) {
-        // console.log('删除:',f)
-        // 例如 path[0] = 'a.b.c',curPath = 'a.b'
+        // console.log("删除:", curPath, f);
+
+        // 例如 path[0] = 'a.b.c.',curPath = 'a.b.'
         dependences.splice(f, 1);
 
         return uniqueDependences(dependences);
       }
       if (curPath.startsWith(firstPath)) {
-        // console.log('删除:',i)
-        // 例如 curPath = 'a.b.c' path[0] = 'a.b',
+        // console.log("删除:", firstPath, i);
+
+        // 例如 curPath = 'a.b.' path[0] = 'a.b.c.',
         dependences.splice(i, 1);
 
         return uniqueDependences(dependences);

package/src/behaviors/BComputedAndWatch/isEqual.ts

@@ -12,6 +12,7 @@ export function isEqual(value: unknown, other: unknown) {
   const keys1 = Object.keys(value);
   const keys2 = Object.keys(other);
   // 对象类型长度不等，一定不相等
+  /* istanbul ignore next */
   if (keys1.length !== keys2.length) {
     return false;
   }