annil 1.8.0 → 1.8.2

package/CHANGELOG.md

@@ -4,6 +4,20 @@
 
 * 解决DetailedType不接收接口类型的错误 ([ae8acbf](https://github.com/missannil/annil/commit/ae8acbfc2e62f99db565c448ad9253aa549e78bb))
 
+## [1.8.2](https://github.com/missannil/annil/compare/v1.8.1...v1.8.2) (2024-09-07)
+
+
+### Bug Fixes
+
+* 优化_SubComponentType类型,避免接口或类的类型由于无签名照成的报错 ([ab97097](https://github.com/missannil/annil/commit/ab970972717b08138c8438825a1e19f7e3dd7c38))
+
+## [1.8.1](https://github.com/missannil/annil/compare/v1.8.0...v1.8.1) (2024-09-07)
+
+
+### Bug Fixes
+
+* 1.8.0发布问题,加入throttleDebounce测试用例,优化computed,提高覆盖率,依赖优化 ([67cfc49](https://github.com/missannil/annil/commit/67cfc4909acce7f5d4fe2d58b2d3b1d54b81163e))
+
 ## [1.8.0](https://github.com/missannil/annil/compare/v1.7.8...v1.8.0) (2024-09-06)
 
 

package/dist/api/DefineComponent/NameOrPage/NameOrPathOption.d.ts

@@ -0,0 +1,16 @@
+import type { IfExtends } from "hry-types/src/Any/IfExtends";
+import type { Includes } from "../../../types/includes";
+/**
+ * 根据IsPage,生成name或path字段
+ */
+export type NameOrPathOption<TName extends string, TPath extends `/${string}`, IsPage extends boolean> = IsPage extends true ? {
+    /**
+     * 页面路径已'/'开头
+     */
+    path: TPath;
+} : {
+    /**
+     * 组件名不可为空串和含有下划线
+     */
+    name: TName & IfExtends<TName, "", () => "⚠️组件名不可为空⚠️", IfExtends<Includes<TName, "_">, true, () => "⚠️组件名不可包含下划线 _ ⚠️", unknown>>;
+};

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

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

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

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

package/dist/api/DefineComponent/ReturnType/ComponentType.d.ts

@@ -0,0 +1,18 @@
+type PrefixKeys = `${string}_${string}`;
+type _ComponentType = {
+    properties?: Record<PrefixKeys, unknown>;
+    customEvents?: Record<PrefixKeys, unknown>;
+};
+type Error = "{ properties?: Record<PrefixKeys, any>; customEvents?: Record<PrefixKeys, any>;}";
+type _Validator<O> = keyof O extends keyof _ComponentType ? keyof (O["properties"] & O["customEvents"]) extends PrefixKeys ? _ComponentType : Error : Error;
+/**
+ * RootComponent Api 返回的类型
+ * ```ts
+ * RootComponentDoc = {
+ * properties?: Record<PrefixKeys, any>;
+ * customEvents?: Record<PrefixKeys, any>;
+ * };
+ * ```
+ */
+export type ComponentType<O extends _Validator<O> = _ComponentType> = O;
+export {};

package/dist/api/DefineComponent/ReturnType/ComponentType.js

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

package/dist/api/DefineComponent/ReturnType/ComponentType.js.map

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

package/dist/api/DefineComponent/ReturnType/CreateComponentDoc.d.ts

@@ -0,0 +1,19 @@
+import type { IfExtends } from "hry-types/src/Any/IfExtends";
+import type { ComputeIntersection } from "hry-types/src/Object/ComputeIntersection";
+import type { AddNullForObject } from "../../../types/AddNullForObject";
+import type { RootComponentType } from "../../RootComponent/RootComponentType";
+import type { SubComponentType } from "../../SubComponent/SubComponentType";
+import type { GetCustomEventDocOfSubDoc } from "./GetCustomEventDocOfSubDoc";
+type GetStopKeys<O> = {
+    [k in keyof O]: k extends `${string}_${infer Key}_${string}_catch` ? Key : never;
+}[keyof O];
+export type CreateComponentDoc<TRootDoc extends RootComponentType, TName extends string, TSubComponentTuple extends SubComponentType[], AllPropertiesDoc extends unknown | object = TRootDoc["properties"], AllCustomEventsDoc extends unknown | object = TRootDoc["customEvents"] & GetCustomEventDocOfSubDoc<TSubComponentTuple[number]>, StopKeys extends string = GetStopKeys<TRootDoc["events"]>, FinalCustomEventDoc extends object = Omit<AllCustomEventsDoc, StopKeys>> = ComputeIntersection<IfExtends<unknown, AllPropertiesDoc, {}, {
+    properties: {
+        [k in keyof AllPropertiesDoc as `${TName}_${k & string}`]: AddNullForObject<AllPropertiesDoc[k]>;
+    };
+}> & IfExtends<{}, FinalCustomEventDoc, {}, {
+    customEvents: {
+        [k in keyof FinalCustomEventDoc as `${TName}_${k & string}`]: FinalCustomEventDoc[k];
+    };
+}>>;
+export {};

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

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

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

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

package/dist/api/DefineComponent/ReturnType/CreatePageDoc.d.ts

@@ -0,0 +1,8 @@
+import type { IfExtends } from "hry-types/src/Any/IfExtends";
+import type { ComputeIntersection } from "hry-types/src/Object/ComputeIntersection";
+import type { RootComponentType } from "../../RootComponent/RootComponentType";
+export type CreatePageDoc<TRootDoc extends RootComponentType, TPath extends string> = ComputeIntersection<{
+    path: TPath;
+} & IfExtends<unknown, TRootDoc["properties"], unknown, {
+    properties: TRootDoc["properties"];
+}>>;

package/dist/api/DefineComponent/ReturnType/CreatePageDoc.js

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

package/dist/api/DefineComponent/ReturnType/CreatePageDoc.js.map

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

package/dist/api/DefineComponent/ReturnType/GetCustomEventDocOfSubDoc.d.ts

@@ -0,0 +1,15 @@
+import type { IsNever, IsUnion } from "hry-types/src/Any/_api";
+import type { UnionTwoObject } from "hry-types/src/Object/UnionTwoObject";
+import type { Last } from "hry-types/src/Union/Last";
+import type { SubComponentType } from "../../SubComponent/SubComponentType";
+/**
+ * 因为子组件文档customEvents字段有可能相同(无前缀),所以使用UnionTwoObject
+ * 由于SubComponentDoc为空时返回never而不`{}`,所以`Exclude<U, TLast>`不影响结果。
+ */
+type _GetCustomEventDocOfSubDoc<U extends SubComponentType, Result = {}, TLast = Last<U>> = IsNever<U> extends true ? Result : _GetCustomEventDocOfSubDoc<Exclude<U, TLast>, UnionTwoObject<Result, TLast>>;
+/**
+ * 获取子组件自定义事件文档
+ * @remarks U 中 相同字段类型联合,所以使用元组推导不如Last性能好。
+ */
+export type GetCustomEventDocOfSubDoc<UnionSubDoc extends SubComponentType> = IsUnion<UnionSubDoc> extends true ? _GetCustomEventDocOfSubDoc<UnionSubDoc> : UnionSubDoc;
+export {};

package/dist/api/DefineComponent/ReturnType/GetCustomEventDocOfSubDoc.js

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

package/dist/api/DefineComponent/ReturnType/GetCustomEventDocOfSubDoc.js.map

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

package/dist/api/DefineComponent/ReturnType/PageDoc.d.ts

@@ -0,0 +1,17 @@
+type _PageDoc = {
+    path: `/${string}`;
+    properties?: object;
+};
+type Error = "{ path: `/${string}`; properties?: object;}";
+type _Validator<O> = keyof O extends keyof _PageDoc ? _PageDoc : Error;
+/**
+ * 页面文档类型
+ * ```ts
+ * PageDoc = {
+ *   path: `/${string}`;
+ *   properties?: object;
+ * };
+ * ```
+ */
+export type PageDoc<O extends _Validator<O> = _PageDoc> = O;
+export {};

package/dist/api/DefineComponent/ReturnType/PageDoc.js

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

package/dist/api/DefineComponent/ReturnType/PageDoc.js.map

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

package/dist/api/DefineComponent/RootComponent/RootComponentOption.d.ts

@@ -0,0 +1,10 @@
+import type { RootComponentType } from "../../RootComponent/RootComponentType";
+/**
+ * DefineComponent API`rootComponent`字段配置
+ */
+export type RootComponentOption<TRootComponent extends RootComponentType> = {
+    /**
+     * 根组件配置
+     */
+    rootComponent?: TRootComponent;
+};

package/dist/api/DefineComponent/RootComponent/RootComponentOption.js

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

package/dist/api/DefineComponent/RootComponent/RootComponentOption.js.map

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

package/dist/api/DefineComponent/SubComponents/SubComponentsOption.d.ts

@@ -0,0 +1,10 @@
+import type { SubComponentType } from "../../SubComponent/SubComponentType";
+/**
+ * RootComponent API 的`subComponents`字段配置
+ */
+export type SubComponentsOption<TSubComponentTuple extends SubComponentType[]> = {
+    /**
+     * 子组件列表
+     */
+    subComponents?: [...TSubComponentTuple];
+};

package/dist/api/DefineComponent/SubComponents/SubComponentsOption.js

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

package/dist/api/DefineComponent/SubComponents/SubComponentsOption.js.map

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

package/dist/api/DefineComponent/index.d.ts

@@ -0,0 +1,23 @@
+import type { IfExtends } from "hry-types/src/Any/IfExtends";
+import type { RootComponentTrueOptions } from "../RootComponent";
+import type { RootComponentType } from "../RootComponent/RootComponentType";
+import type { SubComponentType } from "../SubComponent/SubComponentType";
+import type { NameOrPathOption } from "./NameOrPage/NameOrPathOption";
+import type { CreateComponentDoc } from "./ReturnType/CreateComponentDoc";
+import type { CreatePageDoc } from "./ReturnType/CreatePageDoc";
+import type { RootComponentOption } from "./RootComponent/RootComponentOption";
+import type { SubComponentsOption } from "./SubComponents/SubComponentsOption";
+export type Path = `/${string}`;
+type RootOptions<TRootComponentDoc extends RootComponentType, TSubComponentTuple extends SubComponentType[], TName extends string, TPath extends Path> = NameOrPathOption<TName, TPath, TRootComponentDoc["isPage"] & {}> & RootComponentOption<TRootComponentDoc> & SubComponentsOption<TSubComponentTuple>;
+type DefineComponentConstructor = <TRootComponentDoc extends RootComponentType = {}, TSubComponentTuple extends SubComponentType[] = [], TName extends string = "", TPath extends Path = "/">(options: RootOptions<TRootComponentDoc, TSubComponentTuple, TName, TPath>) => IfExtends<"", TName, CreatePageDoc<TRootComponentDoc, TPath>, CreateComponentDoc<TRootComponentDoc, TName, TSubComponentTuple>>;
+export type DefineComponentOption = {
+    name?: string;
+    path?: string;
+    rootComponent?: RootComponentTrueOptions;
+    subComponents?: SubComponentType[];
+};
+/**
+ * 把根组件选项和子组件选项转化为原生Component API选项并执行
+ */
+export declare const DefineComponent: DefineComponentConstructor;
+export {};

package/dist/api/DefineComponent/index.js

@@ -0,0 +1,11 @@
+import { normalizeOptions } from "./normalizeOptions";
+/**
+ * 把根组件选项和子组件选项转化为原生Component API选项并执行
+ */
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+export const DefineComponent = function (options) {
+    Component(
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    normalizeOptions(options));
+};
+//# sourceMappingURL=index.js.map

package/dist/api/DefineComponent/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/api/DefineComponent/index.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AAyCtD;;GAEG;AACH,8DAA8D;AAC9D,MAAM,CAAC,MAAM,eAAe,GAA+B,UAAS,OAAO;IACzE,SAAS;IACP,8DAA8D;IAC9D,gBAAgB,CAAC,OAAgC,CAAQ,CAC1D,CAAC;AACJ,CAAC,CAAC"}

package/dist/api/DefineComponent/normalizeOptions/__throttleDebounce__FieldCheck.d.ts

@@ -0,0 +1,3 @@
+import type { RootComponentTrueOptions } from "../../RootComponent";
+import type { SubComponentType } from "../../SubComponent/SubComponentType";
+export declare function __throttleDebounce__FieldCheck(config: RootComponentTrueOptions | SubComponentType[]): void;

package/dist/api/DefineComponent/normalizeOptions/__throttleDebounce__FieldCheck.js

@@ -0,0 +1,26 @@
+export function __throttleDebounce__FieldCheck(config) {
+    if (Array.isArray(config)) {
+        for (const subComponent of config) {
+            __throttleDebounce__FieldCheck(subComponent);
+        }
+    }
+    else {
+        const dataKeys = [];
+        if (config.data) {
+            dataKeys.push(...Object.keys(config.data));
+        }
+        if (config.computed) {
+            dataKeys.push(...Object.keys(config.computed));
+        }
+        if (config.properties) {
+            dataKeys.push(...Object.keys(config.properties));
+        }
+        if (config.store) {
+            dataKeys.push(...Object.keys(config.store));
+        }
+        if (dataKeys.includes("__throttleDebounce__")) {
+            throw Error(`__throttleDebounce__字段已被内部字段占用`);
+        }
+    }
+}
+//# sourceMappingURL=__throttleDebounce__FieldCheck.js.map

package/dist/api/DefineComponent/normalizeOptions/__throttleDebounce__FieldCheck.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"__throttleDebounce__FieldCheck.js","sourceRoot":"","sources":["../../../../src/api/DefineComponent/normalizeOptions/__throttleDebounce__FieldCheck.ts"],"names":[],"mappings":"AAGA,MAAM,UAAU,8BAA8B,CAAC,MAAqD;IAClG,IAAI,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC;QAC1B,KAAK,MAAM,YAAY,IAAI,MAAM,EAAE,CAAC;YAClC,8BAA8B,CAAC,YAAY,CAAC,CAAC;QAC/C,CAAC;IACH,CAAC;SAAM,CAAC;QACN,MAAM,QAAQ,GAAa,EAAE,CAAC;QAC9B,IAAI,MAAM,CAAC,IAAI,EAAE,CAAC;YAChB,QAAQ,CAAC,IAAI,CAAC,GAAG,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC;QAC7C,CAAC;QACD,IAAI,MAAM,CAAC,QAAQ,EAAE,CAAC;YACpB,QAAQ,CAAC,IAAI,CAAC,GAAG,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC;QACjD,CAAC;QACD,IAAI,MAAM,CAAC,UAAU,EAAE,CAAC;YACtB,QAAQ,CAAC,IAAI,CAAC,GAAG,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,CAAC;QACnD,CAAC;QACD,IAAI,MAAM,CAAC,KAAK,EAAE,CAAC;YACjB,QAAQ,CAAC,IAAI,CAAC,GAAG,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC;QAC9C,CAAC;QACD,IAAI,QAAQ,CAAC,QAAQ,CAAC,sBAAsB,CAAC,EAAE,CAAC;YAC9C,MAAM,KAAK,CAAC,gCAAgC,CAAC,CAAC;QAChD,CAAC;IACH,CAAC;AACH,CAAC"}

package/dist/api/DefineComponent/normalizeOptions/computedWatchHandle/computedUpdater.d.ts

@@ -0,0 +1,6 @@
+import type { Instance } from "../../../RootComponent/Instance/RootComponentInstance";
+export type ComputedDependence = {
+    paths: string[];
+    val: unknown;
+};
+export declare function computedUpdater(this: Instance, isUpdated?: boolean): boolean;

package/dist/api/DefineComponent/normalizeOptions/computedWatchHandle/computedUpdater.js

@@ -0,0 +1,34 @@
+import { deepEqual } from "../../../../utils/deepEqual";
+import { deepProxy, getOriginalValue } from "./data-tracer";
+import { removeSubDependences } from "./dependencesOptimize";
+import { getPathsValue } from "./getPathsValue";
+export function computedUpdater(isUpdated = false) {
+    for (const key in this.data.__computedCache__) {
+        const itemCache = this.data.__computedCache__[key];
+        let changed = false;
+        for (const dep of itemCache.dependences) {
+            // getPathsValue返回的是数组
+            const curVal = getPathsValue(this.data, dep.paths.join("."))[0];
+            // 检查依赖是否改变了
+            if (!deepEqual(curVal, dep.val)) {
+                changed = true;
+                break;
+            }
+        }
+        if (changed) {
+            const newDependences = [];
+            const newValue = itemCache.method.call({ data: deepProxy(this.data, newDependences) });
+            // 更新值不会立即再次进入**函数,而是当前**函数运行完毕后触发**函数,\
+            this.setData({
+                [key]: getOriginalValue(newValue),
+            });
+            isUpdated = true;
+            // 更新依赖(优化)
+            this.data.__computedCache__[key].dependences = removeSubDependences(newDependences);
+            // 有一个计算属性更新就重新更新所有计算互相,避免后置依赖导致前置依赖错误
+            return computedUpdater.call(this, isUpdated);
+        }
+    }
+    return isUpdated;
+}
+//# sourceMappingURL=computedUpdater.js.map

package/dist/api/DefineComponent/normalizeOptions/computedWatchHandle/computedUpdater.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"computedUpdater.js","sourceRoot":"","sources":["../../../../../src/api/DefineComponent/normalizeOptions/computedWatchHandle/computedUpdater.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,6BAA6B,CAAC;AAExD,OAAO,EAAE,SAAS,EAAE,gBAAgB,EAAE,MAAM,eAAe,CAAC;AAC5D,OAAO,EAAE,oBAAoB,EAAE,MAAM,uBAAuB,CAAC;AAC7D,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAIhD,MAAM,UAAU,eAAe,CAAiB,SAAS,GAAG,KAAK;IAC/D,KAAK,MAAM,GAAG,IAAI,IAAI,CAAC,IAAI,CAAC,iBAAiB,EAAE,CAAC;QAC9C,MAAM,SAAS,GAAG,IAAI,CAAC,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,CAAC;QACnD,IAAI,OAAO,GAAG,KAAK,CAAC;QACpB,KAAK,MAAM,GAAG,IAAI,SAAS,CAAC,WAAW,EAAE,CAAC;YACxC,sBAAsB;YACtB,MAAM,MAAM,GAAG,aAAa,CAAC,IAAI,CAAC,IAAI,EAAE,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;YAEhE,YAAY;YACZ,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC;gBAChC,OAAO,GAAG,IAAI,CAAC;gBAEf,MAAM;YACR,CAAC;QACH,CAAC;QACD,IAAI,OAAO,EAAE,CAAC;YACZ,MAAM,cAAc,GAAyB,EAAE,CAAC;YAChD,MAAM,QAAQ,GAAG,SAAS,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,SAAS,CAAC,IAAI,CAAC,IAAI,EAAE,cAAc,CAAC,EAAE,CAAC,CAAC;YACvF,wCAAwC;YACxC,IAAI,CAAC,OAAO,CAAC;gBACX,CAAC,GAAG,CAAC,EAAE,gBAAgB,CAAC,QAAQ,CAAC;aAClC,CAAC,CAAC;YAEH,SAAS,GAAG,IAAI,CAAC;YAEjB,WAAW;YACX,IAAI,CAAC,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,CAAC,WAAW,GAAG,oBAAoB,CAAC,cAAc,CAAC,CAAC;YAEpF,sCAAsC;YACtC,OAAO,eAAe,CAAC,IAAI,CAAC,IAAI,EAAE,SAAS,CAAC,CAAC;QAC/C,CAAC;IACH,CAAC;IAED,OAAO,SAAS,CAAC;AACnB,CAAC"}

package/dist/api/DefineComponent/normalizeOptions/computedWatchHandle/data-tracer.d.ts

@@ -0,0 +1,5 @@
+import type { ComputedDependence } from "./computedUpdater";
+export declare function deepProxy(data: object, dependences: ComputedDependence[], basePath?: string[]): object;
+export declare function getOriginalValue(value: {
+    __original__?: unknown;
+}): unknown;

package/dist/api/DefineComponent/normalizeOptions/computedWatchHandle/data-tracer.js

@@ -0,0 +1,35 @@
+import { removePreviousDependence } from "./dependencesOptimize";
+export function deepProxy(data, dependences, basePath = []) {
+    const handler = {
+        get(target, prop) {
+            if (prop === "__original__") {
+                return target;
+            }
+            const val = target[prop];
+            // 自身没有但原型链上有的属性不收集依赖,比如数组上的方法 slice map forEach
+            if (prop in target && !Object.prototype.hasOwnProperty.call(target, prop)) {
+                return typeof val === "function" ? val.bind(target) : val; // : val 覆盖测试不到.
+            }
+            removePreviousDependence(dependences, basePath);
+            const curPath = basePath.concat(prop);
+            dependences.push({ paths: curPath, val });
+            // 非对象不代理
+            if (typeof val !== "object" || val === null)
+                return val;
+            // console.log(val, typeof val);
+            return deepProxy(val, dependences, curPath);
+        },
+        set(_target, prop) {
+            throw Error(`${prop}字段是只读的`);
+        },
+    };
+    return new Proxy(data, handler);
+}
+// 如果是代理对象可以从__original__中获取原始值,否则返回自身
+export function getOriginalValue(value) {
+    if (typeof value !== "object" || value === null || value.__original__ === undefined) {
+        return value;
+    }
+    return value.__original__;
+}
+//# sourceMappingURL=data-tracer.js.map

package/dist/api/DefineComponent/normalizeOptions/computedWatchHandle/data-tracer.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"data-tracer.js","sourceRoot":"","sources":["../../../../../src/api/DefineComponent/normalizeOptions/computedWatchHandle/data-tracer.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,wBAAwB,EAAE,MAAM,uBAAuB,CAAC;AAEjE,MAAM,UAAU,SAAS,CACvB,IAAY,EACZ,WAAiC,EACjC,WAAqB,EAAE;IAEvB,MAAM,OAAO,GAAG;QACd,GAAG,CAAmB,MAAS,EAAE,IAAsB;YACrD,IAAI,IAAI,KAAK,cAAc,EAAE,CAAC;gBAC5B,OAAO,MAAM,CAAC;YAChB,CAAC;YACD,MAAM,GAAG,GAAG,MAAM,CAAC,IAAI,CAAC,CAAC;YAEzB,gDAAgD;YAChD,IAAI,IAAI,IAAI,MAAM,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,cAAc,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,EAAE,CAAC;gBAC1E,OAAO,OAAO,GAAG,KAAK,UAAU,CAAC,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,gBAAgB;YAC7E,CAAC;YACD,wBAAwB,CAAC,WAAW,EAAE,QAAQ,CAAC,CAAC;YAEhD,MAAM,OAAO,GAAG,QAAQ,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;YAEtC,WAAW,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,OAAO,EAAE,GAAG,EAAE,CAAC,CAAC;YAE1C,SAAS;YACT,IAAI,OAAO,GAAG,KAAK,QAAQ,IAAI,GAAG,KAAK,IAAI;gBAAE,OAAO,GAAG,CAAC;YACxD,gCAAgC;YAChC,OAAO,SAAS,CAAC,GAAG,EAAE,WAAW,EAAE,OAAO,CAAC,CAAC;QAC9C,CAAC;QACD,GAAG,CAAC,OAAe,EAAE,IAAY;YAC/B,MAAM,KAAK,CAAC,GAAG,IAAI,QAAQ,CAAC,CAAC;QAC/B,CAAC;KACF,CAAC;IAEF,OAAO,IAAI,KAAK,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;AAClC,CAAC;AAED,sCAAsC;AACtC,MAAM,UAAU,gBAAgB,CAAC,KAAiC;IAChE,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,KAAK,IAAI,IAAI,KAAK,CAAC,YAAY,KAAK,SAAS,EAAE,CAAC;QACpF,OAAO,KAAK,CAAC;IACf,CAAC;IAED,OAAO,KAAK,CAAC,YAAY,CAAC;AAC5B,CAAC"}

package/dist/api/DefineComponent/normalizeOptions/computedWatchHandle/dependencesOptimize.d.ts

@@ -0,0 +1,3 @@
+import type { ComputedDependence } from "./computedUpdater";
+export declare function removeSubDependences(dependences: ComputedDependence[]): ComputedDependence[];
+export declare function removePreviousDependence(dependences: ComputedDependence[], basePath: string[]): ComputedDependence[];

package/dist/api/DefineComponent/normalizeOptions/computedWatchHandle/dependencesOptimize.js

@@ -0,0 +1,28 @@
+// 去除子依赖
+export function removeSubDependences(dependences) {
+    // 把dependences按照路径长度排序
+    dependences.sort((a, b) => a.paths.length - b.paths.length);
+    // 从最长的路径开始遍历,如果当前路径是上一个路径的子路径,则删除当前路径
+    for (let f = 0; f < dependences.length; f++) {
+        const sortPath = dependences[f].paths.toString();
+        // 从后往前遍历,删除子依赖,保留父依赖
+        for (let i = dependences.length - 1; i > f; i--) {
+            const curPath = dependences[i].paths.toString();
+            if (curPath.startsWith(sortPath)) {
+                dependences.splice(i, 1);
+            }
+        }
+    }
+    return dependences;
+}
+// 当前依赖是上一个依赖的子依赖时,去除上一个依赖
+export function removePreviousDependence(dependences, basePath) {
+    if (dependences.length === 0 || basePath.length === 0)
+        return dependences;
+    const lastDependence = dependences[dependences.length - 1];
+    if (lastDependence.paths.toString() === basePath.toString()) {
+        dependences.pop();
+    }
+    return dependences;
+}
+//# sourceMappingURL=dependencesOptimize.js.map

package/dist/api/DefineComponent/normalizeOptions/computedWatchHandle/dependencesOptimize.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"dependencesOptimize.js","sourceRoot":"","sources":["../../../../../src/api/DefineComponent/normalizeOptions/computedWatchHandle/dependencesOptimize.ts"],"names":[],"mappings":"AACA,QAAQ;AACR,MAAM,UAAU,oBAAoB,CAAC,WAAiC;IACpE,uBAAuB;IACvB,WAAW,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;IAE5D,sCAAsC;IACtC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,WAAW,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;QAC5C,MAAM,QAAQ,GAAG,WAAW,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,QAAQ,EAAE,CAAC;QACjD,qBAAqB;QACrB,KAAK,IAAI,CAAC,GAAG,WAAW,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;YAChD,MAAM,OAAO,GAAG,WAAW,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,QAAQ,EAAE,CAAC;YAChD,IAAI,OAAO,CAAC,UAAU,CAAC,QAAQ,CAAC,EAAE,CAAC;gBACjC,WAAW,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;YAC3B,CAAC;QACH,CAAC;IACH,CAAC;IAED,OAAO,WAAW,CAAC;AACrB,CAAC;AAED,0BAA0B;AAC1B,MAAM,UAAU,wBAAwB,CAAC,WAAiC,EAAE,QAAkB;IAC5F,IAAI,WAAW,CAAC,MAAM,KAAK,CAAC,IAAI,QAAQ,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,WAAW,CAAC;IAE1E,MAAM,cAAc,GAAG,WAAW,CAAC,WAAW,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;IAE3D,IAAI,cAAc,CAAC,KAAK,CAAC,QAAQ,EAAE,KAAK,QAAQ,CAAC,QAAQ,EAAE,EAAE,CAAC;QAC5D,WAAW,CAAC,GAAG,EAAE,CAAC;IACpB,CAAC;IAED,OAAO,WAAW,CAAC;AACrB,CAAC"}

package/dist/api/DefineComponent/normalizeOptions/computedWatchHandle/getPathsValue.d.ts

@@ -0,0 +1,7 @@
+/**
+ * 获取指定paths的值
+ * @param this  - 组件实例 Instance
+ * @param paths - 支持多字段(用`,`分开) 例如 'obj.xxx,a,b.**' 监控了3个字段
+ * @returns unknown[] 每项对应paths每项的值
+ */
+export declare function getPathsValue(data: object, paths: string): unknown[];

package/dist/api/DefineComponent/normalizeOptions/computedWatchHandle/getPathsValue.js

@@ -0,0 +1,30 @@
+/**
+ * 获取指定paths的值
+ * @param this  - 组件实例 Instance
+ * @param paths - 支持多字段(用`,`分开) 例如 'obj.xxx,a,b.**' 监控了3个字段
+ * @returns unknown[] 每项对应paths每项的值
+ */
+export function getPathsValue(data, paths) {
+    const valueList = [];
+    // ['obj.xxx','a','b.**'].forEach
+    paths.split(",").forEach(path => {
+        // path : 'obj.xxx' | 'a' | 'b.**'
+        if (path.includes(".**")) {
+            // "b.**" => 'b'
+            path = path.slice(0, -3);
+        }
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
+        const value = path.split(".").reduce((pre, path) => {
+            // pre有可能为undefined|null,比如obj是未初始化的计算属性(undefined),还有可能是properties的对象类型(默认为null)
+            try {
+                return pre[path];
+            }
+            catch (_a) {
+                return undefined;
+            }
+        }, data);
+        valueList.push(value);
+    });
+    return valueList;
+}
+//# sourceMappingURL=getPathsValue.js.map

package/dist/api/DefineComponent/normalizeOptions/computedWatchHandle/getPathsValue.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"getPathsValue.js","sourceRoot":"","sources":["../../../../../src/api/DefineComponent/normalizeOptions/computedWatchHandle/getPathsValue.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AACH,MAAM,UAAU,aAAa,CAAC,IAAY,EAAE,KAAa;IACvD,MAAM,SAAS,GAAc,EAAE,CAAC;IAEhC,iCAAiC;IACjC,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE;QAC9B,kCAAkC;QAClC,IAAI,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC;YACzB,gBAAgB;YAChB,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;QAC3B,CAAC;QACD,8DAA8D;QAC9D,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,MAAM,CAAC,CAAC,GAAQ,EAAE,IAAI,EAAE,EAAE;YACtD,iFAAiF;YACjF,IAAI,CAAC;gBACH,OAAO,GAAG,CAAC,IAAI,CAAC,CAAC;YACnB,CAAC;YAAC,WAAM,CAAC;gBACP,OAAO,SAAS,CAAC;YACnB,CAAC;QACH,CAAC,EAAE,IAAI,CAAC,CAAC;QAET,SAAS,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IACxB,CAAC,CAAC,CAAC;IAEH,OAAO,SAAS,CAAC;AACnB,CAAC"}

package/dist/api/DefineComponent/normalizeOptions/computedWatchHandle/getPropertiesValue.d.ts

@@ -0,0 +1,2 @@
+import type { PropertiesConstraint } from "../../../RootComponent/Properties/PropertiesConstraint";
+export declare function getPropertiesValue(propertiesOpt: PropertiesConstraint): object;

package/dist/api/DefineComponent/normalizeOptions/computedWatchHandle/getPropertiesValue.js

@@ -0,0 +1,44 @@
+/* istanbul ignore next */
+function getRequiredSingleValue(PropType) {
+    switch (PropType) {
+        case String:
+            return "";
+        case Number:
+            return 0;
+        case Array:
+            return [];
+        case Object:
+            return null;
+        case Boolean:
+            return false;
+        default:
+            /* istanbul ignore next */
+            throw Error("properties字段类型只能为 String | Number | Array | Object | Boolean ");
+    }
+}
+function IsRequiredSingle(config) {
+    return config instanceof Function;
+}
+function IsRequiredUnion(config) {
+    return !Reflect.has(config, "value");
+}
+export function getPropertiesValue(propertiesOpt) {
+    const result = {};
+    for (const key in propertiesOpt) {
+        const config = propertiesOpt[key];
+        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;
+        }
+    }
+    return result;
+}
+//# sourceMappingURL=getPropertiesValue.js.map

package/dist/api/DefineComponent/normalizeOptions/computedWatchHandle/getPropertiesValue.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"getPropertiesValue.js","sourceRoot":"","sources":["../../../../../src/api/DefineComponent/normalizeOptions/computedWatchHandle/getPropertiesValue.ts"],"names":[],"mappings":"AAQA,0BAA0B;AAC1B,SAAS,sBAAsB,CAC7B,QAAwB;IAExB,QAAQ,QAAQ,EAAE,CAAC;QACjB,KAAK,MAAM;YACT,OAAO,EAAE,CAAC;QACZ,KAAK,MAAM;YACT,OAAO,CAAC,CAAC;QACX,KAAK,KAAK;YACR,OAAO,EAAE,CAAC;QACZ,KAAK,MAAM;YACT,OAAO,IAAI,CAAC;QACd,KAAK,OAAO;YACV,OAAO,KAAK,CAAC;QACf;YACE,0BAA0B;YAC1B,MAAM,KAAK,CACT,+DAA+D,CAChE,CAAC;IACN,CAAC;AACH,CAAC;AACD,SAAS,gBAAgB,CAAC,MAAuB;IAC/C,OAAO,MAAM,YAAY,QAAQ,CAAC;AACpC,CAAC;AACD,SAAS,eAAe,CAAC,MAAuB;IAC9C,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;AACvC,CAAC;AACD,MAAM,UAAU,kBAAkB,CAAC,aAAmC;IACpE,MAAM,MAAM,GAAG,EAAE,CAAC;IAClB,KAAK,MAAM,GAAG,IAAI,aAAa,EAAE,CAAC;QAChC,MAAM,MAAM,GAAG,aAAa,CAAC,GAAG,CAAC,CAAC;QAClC,IAAI,gBAAgB,CAAC,MAAM,CAAC,EAAE,CAAC;YAC7B,kBAAkB;YAClB,MAAM,CAAC,GAAG,CAAC,GAAG,sBAAsB,CAAC,MAAM,CAAC,CAAC;QAC/C,CAAC;aAAM,IAAI,eAAe,CAAC,MAAM,CAAC,EAAE,CAAC;YACnC,kBAAkB;YAClB,MAAM,CAAC,GAAG,CAAC,GAAG,sBAAsB,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;QACpD,CAAC;aAAM,CAAC;YACN,kBAAkB;YAClB,MAAM,CAAC,GAAG,CAAC,GAAG,MAAM,CAAC,KAAK,CAAC;QAC7B,CAAC;IACH,CAAC;IAED,OAAO,MAAM,CAAC;AAChB,CAAC"}

package/dist/api/DefineComponent/normalizeOptions/computedWatchHandle/index.d.ts

@@ -0,0 +1,2 @@
+import type { FinalOptionsOfComponent } from "..";
+export declare function computedWatchHandle(options: FinalOptionsOfComponent): void;

package/dist/api/DefineComponent/normalizeOptions/computedWatchHandle/index.js

@@ -0,0 +1,60 @@
+import { deepEqual } from "../../../../utils/deepEqual";
+import { computedUpdater } from "./computedUpdater";
+import { getPathsValue } from "./getPathsValue";
+import { getPropertiesValue } from "./getPropertiesValue";
+import { initComputedAndGetCache } from "./initComputedAndGetCache";
+import { assertNonNullable } from "../../../../utils/assertNonNullable";
+import { deepClone } from "../../../../utils/deepClone";
+import { isEmptyObject } from "../../../../utils/isEmptyObject";
+function initWatchOldValue(data, watchConfig) {
+    const watchOldValue = {};
+    for (const key in watchConfig) {
+        // @ts-ignore 隐式索引
+        watchOldValue[key] = deepClone(getPathsValue(data, key));
+    }
+    return watchOldValue;
+}
+export function computedWatchHandle(options) {
+    // 计算属性初始化和首次依赖收集
+    const computedConfig = options.computed;
+    const rawPropertiesValue = getPropertiesValue(options.properties);
+    if (computedConfig && !isEmptyObject(computedConfig)) {
+        // 此时store已经初始化数据到data了(__storeConfig__)
+        const __computedInitCache__ = initComputedAndGetCache(options, computedConfig, Object.assign(Object.assign({}, options.data), rawPropertiesValue));
+        // 缓存放入data中
+        options.data.__computedCache__ = __computedInitCache__;
+        // 计算属性更新函数放入methods中 要做冲突判断,避免用户定义了同名methods字段
+        options.methods.__computedUpdater__ = computedUpdater;
+    }
+    const observersConfig = options.observers;
+    // 通过observers加入`**`字段来触发计算属性更新
+    const originalFunc = observersConfig["**"];
+    observersConfig["**"] = function () {
+        var _a;
+        // 任何setData都会触发计算属性更新(可能依赖数据并没变化)
+        (_a = this.__computedUpdater__) === null || _a === void 0 ? void 0 : _a.call(this);
+        originalFunc === null || originalFunc === void 0 ? void 0 : originalFunc.call(this);
+    };
+    // watch handle
+    const watchConfig = options.watch;
+    if (watchConfig && !isEmptyObject(watchConfig)) {
+        const data = options.data;
+        data.__watchOldValue__ = initWatchOldValue(Object.assign(Object.assign({}, data), rawPropertiesValue), watchConfig);
+        const observersConfig = options.observers;
+        for (const key in watchConfig) {
+            const watchHadle = watchConfig[key];
+            const originObserversHandle = observersConfig[key];
+            // 在监控多个数据时,参数是多个值
+            observersConfig[key] = function (...newValue) {
+                originObserversHandle === null || originObserversHandle === void 0 ? void 0 : originObserversHandle.call(this, ...newValue);
+                const watchOldValue = assertNonNullable(this.data.__watchOldValue__);
+                const oldValue = watchOldValue[key];
+                if (deepEqual(newValue, oldValue))
+                    return;
+                watchOldValue[key] = deepClone(newValue);
+                watchHadle.call(this, ...newValue, ...oldValue);
+            };
+        }
+    }
+}
+//# sourceMappingURL=index.js.map

package/dist/api/DefineComponent/normalizeOptions/computedWatchHandle/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/api/DefineComponent/normalizeOptions/computedWatchHandle/index.ts"],"names":[],"mappings":"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"}