annil 1.8.1 → 1.8.3

package/CHANGELOG.md

@@ -4,6 +4,20 @@
 
 * 解决DetailedType不接收接口类型的错误 ([ae8acbf](https://github.com/missannil/annil/commit/ae8acbfc2e62f99db565c448ad9253aa549e78bb))
 
+## [1.8.3](https://github.com/missannil/annil/compare/v1.8.2...v1.8.3) (2024-09-08)
+
+
+### Bug Fixes
+
+* 为subComponents内部组件类型增加 prefix_isReady?:boolean 字段。 ([e78041d](https://github.com/missannil/annil/commit/e78041d5f151d71c1d45652b0508aa4c2430ecde))
+
+## [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)
 
 

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

@@ -3,9 +3,9 @@ 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";
+import { nonNullable } from "../../../../utils/nonNullable";
 function initWatchOldValue(data, watchConfig) {
     const watchOldValue = {};
     for (const key in watchConfig) {
@@ -47,7 +47,7 @@ export function computedWatchHandle(options) {
             // 在监控多个数据时,参数是多个值
             observersConfig[key] = function (...newValue) {
                 originObserversHandle === null || originObserversHandle === void 0 ? void 0 : originObserversHandle.call(this, ...newValue);
-                const watchOldValue = assertNonNullable(this.data.__watchOldValue__);
+                const watchOldValue = nonNullable(this.data.__watchOldValue__);
                 const oldValue = watchOldValue[key];
                 if (deepEqual(newValue, oldValue))
                     return;

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

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

package/dist/api/SubComponent/SubComponentType.d.ts

@@ -1,7 +1,7 @@
 import type { SelectKeys } from "hry-types/src/Object/_api";
 import type { Composed, CustomEventsTags } from "../RootComponent/CustomEvents/CustomEventsTag";
 type _SubComponentType = {
-    [k in string]: string | number | bigint | boolean | symbol | null | Record<string, unknown> | unknown[] | CustomEventsTags;
+    [k in string]: string | number | bigint | boolean | symbol | null | Record<string, any> | unknown[] | CustomEventsTags;
 };
 type _Validator<O, ErrKeys = Exclude<keyof O, SelectKeys<O, Composed, "contains->">>> = [ErrKeys] extends [never] ? _SubComponentType : `${ErrKeys & string} 不是穿透事件`;
 /**

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

@@ -3,6 +3,7 @@ import type { EmptyObject } from "hry-types/src/Misc/EmptyObject";
 import type { Func } from "hry-types/src/Misc/Func";
 import type { RequiredKeys } from "hry-types/src/Object/RequiredKeys";
 import type { ComputeObject } from "../../types/ComputeObj";
+import type { Extra } from "../../types/Extra";
 import type { GetComponentPrefix } from "../../types/GetComponentPrefix";
 import type { InnerFields } from "../../types/InnerData";
 import type { WMCompOtherOption } from "../../types/OfficialTypeAlias";
@@ -40,7 +41,12 @@ import type { SubWatchOption } from "./SubWatch/SubWatchOption";
 type Options<RootDoc extends RootComponentType, IsPage extends boolean, CurrentCompDoc extends ComponentType, Prefix extends string, AllRootDataDoc extends object, TInherit extends object, TSubData extends object, TSubStore extends object, TSubComputed extends object, TEvents extends object, TSubMethods extends SubMethodsConstraint, InheritDoc extends object, SubDataDoc extends object, SubStoreDoc extends object, SubComputedDoc extends object, SubEventsDoc extends object, SubMethodsDoc extends object, CompDocKeys extends PropertyKey = keyof CurrentCompDoc["properties"]> = SubInheritOption<TInherit, CompDocKeys> & SubDataOption<TSubData, Exclude<CompDocKeys, (keyof InheritDoc)> | InnerFields<Prefix>> & SubStoreOption<TSubStore, Exclude<CompDocKeys, (keyof (InheritDoc & SubDataDoc))> | InnerFields<Prefix>> & SubComputedOption<TSubComputed, Exclude<CompDocKeys, (keyof (InheritDoc & SubDataDoc & SubStoreDoc))> | InnerFields<Prefix>, {
     data: ComputeObject<AllRootDataDoc & Replace<SubComputedDoc, Required<CurrentCompDoc["properties"]>> & SubStoreDoc & SubDataDoc & IInjectAllData>;
 }> & SubEventsOption<TEvents, SubEventsDoc, keyof SubEventsConstraint<CurrentCompDoc>> & SubMethodsOption<TSubMethods, Prefix, keyof (CurrentCompDoc["customEvents"] & SubEventsDoc)> & SubPageLifetimesOption<IsPage, NonNullable<RootDoc["properties"]>> & SubLifetimesOption & SubWatchOption<SubComputedDoc & SubDataDoc & AllRootDataDoc & SubStoreDoc & IInjectStore> & Partial<Omit<WMCompOtherOption, "pageLifetimes" | "definitionFilter" | "export" | "observers" | "relations">> & SubObserversOption<SubComputedDoc & SubDataDoc & AllRootDataDoc & SubStoreDoc & IInjectStore> & ThisType<SubInstance<SubMethodsDoc & RootDoc["methods"], Replace<SubDataDoc, Required<CurrentCompDoc["properties"]>>, AllRootDataDoc & Replace<SubDataDoc & SubComputedDoc & SubStoreDoc, Required<CurrentCompDoc["properties"]>>, NonNullable<RootDoc["customEvents"]>, SubStoreDoc>>;
-type SubComponentConstructor<TRootDoc extends RootComponentType, TOriginalCompDoc extends ComponentType, TSupplementalPrefix extends string = "", IsPage extends boolean = TRootDoc["isPage"] extends true ? true : false, CurrentPrefix extends string = `${GetComponentPrefix<TOriginalCompDoc>}${Capitalize<TSupplementalPrefix>}`, CurrentCompDoc extends ComponentType = IfExtends<TSupplementalPrefix, "", TOriginalCompDoc, ReplacePrefix<TOriginalCompDoc, CurrentPrefix>>, AllRootDataDoc extends object = Required<TRootDoc["properties"]> & TRootDoc["data"] & TRootDoc["computed"] & TRootDoc["store"]> = <TInherit extends InheritConstraint<AllRootDataDoc, CurrentCompDoc>, TSubData extends SubDataConstraint<Omit<Required<CurrentCompDoc["properties"]>, keyof InheritDoc> & Record<InnerFields<CurrentPrefix>, unknown>>, TSubStore extends SubStoreConstraint<Omit<Required<CurrentCompDoc["properties"]>, keyof (InheritDoc & SubDataDoc)> & Record<InnerFields<CurrentPrefix>, unknown>>, TEvents extends SubEventsConstraint<CurrentCompDoc>, TSubComputed extends SubComputedConstraint<Omit<Required<CurrentCompDoc["properties"]>, keyof (InheritDoc & SubDataDoc & SubStoreDoc)> & Record<InnerFields<CurrentPrefix>, unknown>>, TSubMethods extends SubMethodsConstraint = {}, InheritDoc extends object = IfExtends<InheritConstraint<AllRootDataDoc, CurrentCompDoc>, TInherit, {}, TInherit>, SubDataDoc extends object = IfExtends<SubDataConstraint<Omit<Required<CurrentCompDoc["properties"]>, keyof InheritDoc> & Record<InnerFields<CurrentPrefix>, unknown>>, TSubData, {}, TSubData>, SubStoreDoc extends object = IfExtends<SubStoreConstraint<Omit<Required<CurrentCompDoc["properties"]>, keyof (InheritDoc & SubDataDoc)> & Record<InnerFields<CurrentPrefix>, unknown>>, TSubStore, {}, {
+type SubComponentConstructor<TRootDoc extends RootComponentType, TOriginalCompDoc extends ComponentType, TSupplementalPrefix extends string = "", IsPage extends boolean = TRootDoc["isPage"] extends true ? true : false, CurrentPrefix extends string = `${GetComponentPrefix<TOriginalCompDoc>}${Capitalize<TSupplementalPrefix>}`, CurrentCompDoc extends ComponentType = IfExtends<TSupplementalPrefix, "", TOriginalCompDoc & {
+    properties: Extra<CurrentPrefix>;
+}, // 为文档增加格外字段
+ReplacePrefix<TOriginalCompDoc & {
+    properties: Extra<CurrentPrefix>;
+}, CurrentPrefix>>, AllRootDataDoc extends object = Required<TRootDoc["properties"]> & TRootDoc["data"] & TRootDoc["computed"] & TRootDoc["store"]> = <TInherit extends InheritConstraint<AllRootDataDoc, CurrentCompDoc>, TSubData extends SubDataConstraint<Omit<Required<CurrentCompDoc["properties"]>, keyof InheritDoc> & Record<InnerFields<CurrentPrefix>, unknown>>, TSubStore extends SubStoreConstraint<Omit<Required<CurrentCompDoc["properties"]>, keyof (InheritDoc & SubDataDoc)> & Record<InnerFields<CurrentPrefix>, unknown>>, TEvents extends SubEventsConstraint<CurrentCompDoc>, TSubComputed extends SubComputedConstraint<Omit<Required<CurrentCompDoc["properties"]>, keyof (InheritDoc & SubDataDoc & SubStoreDoc)> & Record<InnerFields<CurrentPrefix>, unknown>>, TSubMethods extends SubMethodsConstraint = {}, InheritDoc extends object = IfExtends<InheritConstraint<AllRootDataDoc, CurrentCompDoc>, TInherit, {}, TInherit>, SubDataDoc extends object = IfExtends<SubDataConstraint<Omit<Required<CurrentCompDoc["properties"]>, keyof InheritDoc> & Record<InnerFields<CurrentPrefix>, unknown>>, TSubData, {}, TSubData>, SubStoreDoc extends object = IfExtends<SubStoreConstraint<Omit<Required<CurrentCompDoc["properties"]>, keyof (InheritDoc & SubDataDoc)> & Record<InnerFields<CurrentPrefix>, unknown>>, TSubStore, {}, {
     [k in keyof TSubStore]: ReturnType<NonNullable<TSubStore[k]>>;
 }>, SubComputedDoc extends object = IfExtends<SubComputedConstraint<Omit<Required<CurrentCompDoc["properties"]>, keyof (InheritDoc & SubDataDoc & SubStoreDoc)> & Record<InnerFields<CurrentPrefix>, unknown>>, TSubComputed, {}, GetSubComputedDoc<TSubComputed>>, SubEventsDoc extends object = IfExtends<SubEventsConstraint<CurrentCompDoc>, TEvents, {}, TEvents>, SubMethodsDoc extends object = TSubMethods, MissingRequiredField extends PropertyKey = Exclude<RequiredKeys<NonNullable<CurrentCompDoc["properties"]>>, keyof (InheritDoc & SubDataDoc & SubStoreDoc & IfExtends<SubComputedConstraint<Omit<Required<CurrentCompDoc["properties"]>, keyof (InheritDoc & SubDataDoc & SubStoreDoc)>>, TSubComputed, {}, GetSubComputedDoc<TSubComputed>>)>>(options: Options<TRootDoc, IsPage, CurrentCompDoc, CurrentPrefix, AllRootDataDoc, TInherit, TSubData, TSubStore, TSubComputed, TEvents, TSubMethods, InheritDoc, SubDataDoc, SubStoreDoc, SubComputedDoc, SubEventsDoc, SubMethodsDoc>) => CreateSubComponentDoc<NonNullable<CurrentCompDoc["customEvents"]>, SubEventsDoc, MissingRequiredField>;
 /**

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

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/api/SubComponent/index.ts"],"names":[],"mappings":"AA2OA;;;GAGG;AACH,MAAM,UAAU,YAAY;IAK1B,8DAA8D;IAC9D,OAAO,CAAC,CAAC,OAAY,EAAE,EAAE,CAAC,OAAkC,CAAQ,CAAC;AACvE,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/api/SubComponent/index.ts"],"names":[],"mappings":"AA4OA;;;GAGG;AACH,MAAM,UAAU,YAAY;IAK1B,8DAA8D;IAC9D,OAAO,CAAC,CAAC,OAAY,EAAE,EAAE,CAAC,OAAkC,CAAQ,CAAC;AACvE,CAAC"}

package/dist/types/Extra.d.ts

@@ -0,0 +1,3 @@
+export type Extra<Prefix extends string> = {
+    [K in `${Prefix}_isReady`]?: boolean;
+};

package/dist/types/Extra.js

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

package/dist/types/Extra.js.map

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

package/dist/utils/_utils.d.ts

@@ -1,7 +1,7 @@
-import { assertNonNullable } from "./assertNonNullable";
 import { debounce } from "./debounce";
 import { deepClone } from "./deepClone";
 import { deepEqual } from "./deepEqual";
 import { isEmptyObject } from "./isEmptyObject";
+import { nonNullable } from "./nonNullable";
 import { throttle } from "./throttle";
-export { assertNonNullable, debounce, deepClone, deepEqual, isEmptyObject, throttle };
+export { debounce, deepClone, deepEqual, isEmptyObject, nonNullable, throttle };

package/dist/utils/_utils.js

@@ -1,8 +1,8 @@
-import { assertNonNullable } from "./assertNonNullable";
 import { debounce } from "./debounce";
 import { deepClone } from "./deepClone";
 import { deepEqual } from "./deepEqual";
 import { isEmptyObject } from "./isEmptyObject";
+import { nonNullable } from "./nonNullable";
 import { throttle } from "./throttle";
-export { assertNonNullable, debounce, deepClone, deepEqual, isEmptyObject, throttle };
+export { debounce, deepClone, deepEqual, isEmptyObject, nonNullable, throttle };
 //# sourceMappingURL=_utils.js.map

package/dist/utils/_utils.js.map

@@ -1 +1 @@
-{"version":3,"file":"_utils.js","sourceRoot":"","sources":["../../src/utils/_utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AACxD,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AACtC,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AACxC,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AACxC,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAChD,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAEtC,OAAO,EAAE,iBAAiB,EAAE,QAAQ,EAAE,SAAS,EAAE,SAAS,EAAE,aAAa,EAAE,QAAQ,EAAE,CAAC"}
+{"version":3,"file":"_utils.js","sourceRoot":"","sources":["../../src/utils/_utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AACtC,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AACxC,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AACxC,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAChD,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAC5C,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAEtC,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,SAAS,EAAE,aAAa,EAAE,WAAW,EAAE,QAAQ,EAAE,CAAC"}

package/dist/utils/debounce.d.ts

@@ -1,6 +1,7 @@
 /**
  * 防抖函数
- * 应用在输入框输入时，只有在输入完成并delay后,才会触发搜索
+ * 注意 需要在tsconfig.json的types中添加"node",否则NodeJS.Timeout会报错
+ * 例如 应用在输入框输入时，只有在输入完成并delay后,才会触发搜索,
  * @param func
  * @param delay
  * @returns

package/dist/utils/debounce.js

@@ -1,11 +1,12 @@
-/* eslint-disable @typescript-eslint/no-explicit-any */
 /**
  * 防抖函数
- * 应用在输入框输入时，只有在输入完成并delay后,才会触发搜索
+ * 注意 需要在tsconfig.json的types中添加"node",否则NodeJS.Timeout会报错
+ * 例如 应用在输入框输入时，只有在输入完成并delay后,才会触发搜索,
  * @param func
  * @param delay
  * @returns
  */
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
 export function debounce(func, delay) {
     let timeoutId = null;
     return (...args) => {

package/dist/utils/debounce.js.map

@@ -1 +1 @@
-{"version":3,"file":"debounce.js","sourceRoot":"","sources":["../../src/utils/debounce.ts"],"names":[],"mappings":"AAAA,uDAAuD;AACvD;;;;;;GAMG;AACH,MAAM,UAAU,QAAQ,CAAoC,IAAO,EAAE,KAAa;IAChF,IAAI,SAAS,GAA0B,IAAI,CAAC;IAE5C,OAAO,CAAC,GAAG,IAAmB,EAAQ,EAAE;QACtC,IAAI,SAAS,EAAE,CAAC;YACd,YAAY,CAAC,SAAS,CAAC,CAAC;QAC1B,CAAC;QAED,SAAS,GAAG,UAAU,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,EAAE,KAAK,CAAC,CAAC;IACrD,CAAC,CAAC;AACJ,CAAC"}
+{"version":3,"file":"debounce.js","sourceRoot":"","sources":["../../src/utils/debounce.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AACH,8DAA8D;AAC9D,MAAM,UAAU,QAAQ,CAAoC,IAAO,EAAE,KAAa;IAChF,IAAI,SAAS,GAA0B,IAAI,CAAC;IAE5C,OAAO,CAAC,GAAG,IAAmB,EAAQ,EAAE;QACtC,IAAI,SAAS,EAAE,CAAC;YACd,YAAY,CAAC,SAAS,CAAC,CAAC;QAC1B,CAAC;QAED,SAAS,GAAG,UAAU,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,EAAE,KAAK,CAAC,CAAC;IACrD,CAAC,CAAC;AACJ,CAAC"}

package/dist/utils/deepClone.d.ts

@@ -1,4 +1,4 @@
 /**
- * 深度克隆 函数相同 原型一致
+ * 数组和普通对象的深度克隆,原型相同
  */
 export declare function deepClone<T>(value: T): T;

package/dist/utils/deepClone.js

@@ -1,8 +1,8 @@
 /**
- * 深度克隆 函数相同 原型一致
+ * 数组和普通对象的深度克隆,原型相同
  */
 export function deepClone(value) {
-    if (typeof value !== "object" || value === null || value instanceof RegExp) {
+    if (typeof value !== "object" || value === null) {
         return value;
     }
     const clone = (Array.isArray(value) ? [] : {});

package/dist/utils/deepClone.js.map

@@ -1 +1 @@
-{"version":3,"file":"deepClone.js","sourceRoot":"","sources":["../../src/utils/deepClone.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,MAAM,UAAU,SAAS,CAAI,KAAQ;IACnC,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,KAAK,IAAI,IAAI,KAAK,YAAY,MAAM,EAAE,CAAC;QAC3E,OAAO,KAAK,CAAC;IACf,CAAC;IAED,MAAM,KAAK,GAAG,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAM,CAAC;IAEpD,MAAM,CAAC,cAAc,CAAC,KAAK,EAAE,MAAM,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC,CAAC;IAE3D,KAAK,MAAM,GAAG,IAAI,KAAK,EAAE,CAAC;QACxB,IAAI,MAAM,CAAC,SAAS,CAAC,cAAc,CAAC,IAAI,CAAC,KAAK,EAAE,GAAG,CAAC,EAAE,CAAC;YACrD,KAAK,CAAC,GAAG,CAAC,GAAG,SAAS,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC;QACrC,CAAC;IACH,CAAC;IAED,OAAO,KAAK,CAAC;AACf,CAAC"}
+{"version":3,"file":"deepClone.js","sourceRoot":"","sources":["../../src/utils/deepClone.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,MAAM,UAAU,SAAS,CAAI,KAAQ;IACnC,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,KAAK,IAAI,EAAE,CAAC;QAChD,OAAO,KAAK,CAAC;IACf,CAAC;IAED,MAAM,KAAK,GAAG,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAM,CAAC;IAEpD,MAAM,CAAC,cAAc,CAAC,KAAK,EAAE,MAAM,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC,CAAC;IAE3D,KAAK,MAAM,GAAG,IAAI,KAAK,EAAE,CAAC;QACxB,IAAI,MAAM,CAAC,SAAS,CAAC,cAAc,CAAC,IAAI,CAAC,KAAK,EAAE,GAAG,CAAC,EAAE,CAAC;YACrD,KAAK,CAAC,GAAG,CAAC,GAAG,SAAS,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC;QACrC,CAAC;IACH,CAAC;IAED,OAAO,KAAK,CAAC;AACf,CAAC"}

package/dist/utils/deepEqual.js

@@ -3,7 +3,7 @@ function isNonNullObject(value) {
     return value !== null && typeof value === "object";
 }
 export function deepEqual(value1, value2) {
-    // 2个非对象类型相等或同引用对象的情况。
+    // 两个非对象类型相等或同引用对象的情况。
     if (Object.is(value1, value2)) {
         return true;
     }
@@ -11,16 +11,15 @@ export function deepEqual(value1, value2) {
     if (!isNonNullObject(value1) || !isNonNullObject(value2)) {
         return false;
     }
-    // 到此，2个都是对象类型。
-    const _value1 = value1;
-    const _value2 = value2;
-    const value1Keys = Object.keys(_value1);
-    const value2Keys = Object.keys(_value2);
-    if (value1Keys.length !== value2Keys.length) {
+    // 到此两个值都是对象类型。
+    const value1Keys = Object.keys(value1);
+    // 使用Set提高查找效率。
+    const value2KeysSet = new Set(Object.keys(value2));
+    if (value1Keys.length !== value2KeysSet.size) {
         return false;
     }
     for (const key of value1Keys) {
-        if (!value2Keys.includes(key) || !deepEqual(_value1[key], _value2[key])) {
+        if (!value2KeysSet.has(key) || !deepEqual(value1[key], value2[key])) {
             return false;
         }
     }

package/dist/utils/deepEqual.js.map

@@ -1 +1 @@
-{"version":3,"file":"deepEqual.js","sourceRoot":"","sources":["../../src/utils/deepEqual.ts"],"names":[],"mappings":"AACA,aAAa;AACb,SAAS,eAAe,CAAC,KAAc;IACrC,OAAO,KAAK,KAAK,IAAI,IAAI,OAAO,KAAK,KAAK,QAAQ,CAAC;AACrD,CAAC;AAED,MAAM,UAAU,SAAS,CAAC,MAAe,EAAE,MAAe;IACxD,sBAAsB;IACtB,IAAI,MAAM,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,CAAC;QAC9B,OAAO,IAAI,CAAC;IACd,CAAC;IACD,qBAAqB;IACrB,IAAI,CAAC,eAAe,CAAC,MAAM,CAAC,IAAI,CAAC,eAAe,CAAC,MAAM,CAAC,EAAE,CAAC;QACzD,OAAO,KAAK,CAAC;IACf,CAAC;IACD,eAAe;IACf,MAAM,OAAO,GAAG,MAAqB,CAAC;IACtC,MAAM,OAAO,GAAG,MAAqB,CAAC;IACtC,MAAM,UAAU,GAAG,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;IACxC,MAAM,UAAU,GAAG,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;IAExC,IAAI,UAAU,CAAC,MAAM,KAAK,UAAU,CAAC,MAAM,EAAE,CAAC;QAC5C,OAAO,KAAK,CAAC;IACf,CAAC;IAED,KAAK,MAAM,GAAG,IAAI,UAAU,EAAE,CAAC;QAC7B,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,OAAO,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC;YACxE,OAAO,KAAK,CAAC;QACf,CAAC;IACH,CAAC;IAED,OAAO,IAAI,CAAC;AACd,CAAC"}
+{"version":3,"file":"deepEqual.js","sourceRoot":"","sources":["../../src/utils/deepEqual.ts"],"names":[],"mappings":"AACA,aAAa;AACb,SAAS,eAAe,CAAC,KAAc;IACrC,OAAO,KAAK,KAAK,IAAI,IAAI,OAAO,KAAK,KAAK,QAAQ,CAAC;AACrD,CAAC;AAED,MAAM,UAAU,SAAS,CAAC,MAAe,EAAE,MAAe;IACxD,sBAAsB;IACtB,IAAI,MAAM,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,CAAC;QAC9B,OAAO,IAAI,CAAC;IACd,CAAC;IACD,qBAAqB;IACrB,IAAI,CAAC,eAAe,CAAC,MAAM,CAAC,IAAI,CAAC,eAAe,CAAC,MAAM,CAAC,EAAE,CAAC;QACzD,OAAO,KAAK,CAAC;IACf,CAAC;IACD,eAAe;IACf,MAAM,UAAU,GAAG,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IACvC,eAAe;IACf,MAAM,aAAa,GAAG,IAAI,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC;IAEnD,IAAI,UAAU,CAAC,MAAM,KAAK,aAAa,CAAC,IAAI,EAAE,CAAC;QAC7C,OAAO,KAAK,CAAC;IACf,CAAC;IAED,KAAK,MAAM,GAAG,IAAI,UAAU,EAAE,CAAC;QAC7B,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,MAAM,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC;YACpE,OAAO,KAAK,CAAC;QACf,CAAC;IACH,CAAC;IAED,OAAO,IAAI,CAAC;AACd,CAAC"}

package/dist/utils/isEmptyObject.d.ts

@@ -1,4 +1,5 @@
 /**
- * 判断一个值是否为空对象 `{}`
+ * 判断一个值是否为空的普通对象 `{}`
+ * 有symblo和非枚举属性的对象会返回 `false`
  */
-export declare function isEmptyObject(obj: object): boolean;
+export declare function isEmptyObject(value: unknown): boolean;

package/dist/utils/isEmptyObject.js

@@ -1,11 +1,12 @@
 /**
- * 判断一个值是否为空对象 `{}`
+ * 判断一个值是否为空的普通对象 `{}`
+ * 有symblo和非枚举属性的对象会返回 `false`
  */
-export function isEmptyObject(obj) {
-    if (typeof obj !== "object" || obj === null || Array.isArray(obj) || obj instanceof Set || obj instanceof Map
-        || obj instanceof WeakSet || obj instanceof WeakMap) {
+export function isEmptyObject(value) {
+    if (typeof value !== "object" || value === null || Array.isArray(value) || value instanceof Set || value instanceof Map
+        || value instanceof WeakSet || value instanceof WeakMap) {
         return false;
     }
-    return Reflect.ownKeys(obj).length === 0;
+    return Reflect.ownKeys(value).length === 0;
 }
 //# sourceMappingURL=isEmptyObject.js.map

package/dist/utils/isEmptyObject.js.map

@@ -1 +1 @@
-{"version":3,"file":"isEmptyObject.js","sourceRoot":"","sources":["../../src/utils/isEmptyObject.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,MAAM,UAAU,aAAa,CAAC,GAAW;IACvC,IACE,OAAO,GAAG,KAAK,QAAQ,IAAI,GAAG,KAAK,IAAI,IAAI,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,GAAG,YAAY,GAAG,IAAI,GAAG,YAAY,GAAG;WACtG,GAAG,YAAY,OAAO,IAAI,GAAG,YAAY,OAAO,EACnD,CAAC;QACD,OAAO,KAAK,CAAC;IACf,CAAC;IAED,OAAO,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,MAAM,KAAK,CAAC,CAAC;AAC3C,CAAC"}
+{"version":3,"file":"isEmptyObject.js","sourceRoot":"","sources":["../../src/utils/isEmptyObject.ts"],"names":[],"mappings":"AAAA;;;GAGG;AACH,MAAM,UAAU,aAAa,CAAC,KAAc;IAC1C,IACE,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,KAAK,IAAI,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,IAAI,KAAK,YAAY,GAAG,IAAI,KAAK,YAAY,GAAG;WAChH,KAAK,YAAY,OAAO,IAAI,KAAK,YAAY,OAAO,EACvD,CAAC;QACD,OAAO,KAAK,CAAC;IACf,CAAC;IAED,OAAO,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,MAAM,KAAK,CAAC,CAAC;AAC7C,CAAC"}

package/dist/utils/nonNullable.d.ts

@@ -0,0 +1,7 @@
+import type { IfContains } from "hry-types/src/Any/IfContains";
+/**
+ * 使用此函数代替!断言
+ * @param value 类型中必须包含 null 或 undefined
+ * @returns 去除 null 和 undefined 后的类型
+ */
+export declare function nonNullable<T>(value: IfContains<T, null | undefined, T, "参数类型必须包含 null 或 undefined">): NonNullable<T>;

package/dist/utils/nonNullable.js

@@ -0,0 +1,13 @@
+/**
+ * 使用此函数代替!断言
+ * @param value 类型中必须包含 null 或 undefined
+ * @returns 去除 null 和 undefined 后的类型
+ */
+export function nonNullable(value) {
+    /* istanbul ignore next  */
+    if (value === null || value === undefined) {
+        throw new Error(`${value} should not be null or undefined`);
+    }
+    return value;
+}
+//# sourceMappingURL=nonNullable.js.map

package/dist/utils/nonNullable.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"nonNullable.js","sourceRoot":"","sources":["../../src/utils/nonNullable.ts"],"names":[],"mappings":"AAEA;;;;GAIG;AACH,MAAM,UAAU,WAAW,CACzB,KAAsE;IAEtE,2BAA2B;IAC3B,IAAI,KAAK,KAAK,IAAI,IAAI,KAAK,KAAK,SAAS,EAAE,CAAC;QAC1C,MAAM,IAAI,KAAK,CAAC,GAAG,KAAK,kCAAkC,CAAC,CAAC;IAC9D,CAAC;IAED,OAAO,KAAuB,CAAC;AACjC,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "annil",
-  "version": "1.8.1",
+  "version": "1.8.3",
   "description": "微信小程序(原生开发)插件",
   "main": "dist/index.js",
   "types": "src/index.ts",
@@ -17,7 +17,7 @@
     "tsc": "tsc --watch",
     "test": "jest --watch",
     "build": "tsc -p tsconfig.build.json",
-    "check": "eslint . --fix --max-warnings 0 && (dprint check || (dprint fmt && exit 1)) "
+    "check": "tsc --noEmit &&  eslint . --fix --max-warnings 0 && (dprint check || (dprint fmt && exit 1)) "
   },
   "devDependencies": {
     "@commitlint/config-conventional": "^17.6.5",

package/src/api/DefineComponent/normalizeOptions/computedWatchHandle/index.ts

@@ -5,9 +5,9 @@ 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";
+import { nonNullable } from "../../../../utils/nonNullable";
 import type { Instance } from "../../../RootComponent/Instance/RootComponentInstance";
 import type { FinalOptionsOfComponent } from "..";
 
@@ -68,7 +68,7 @@ export function computedWatchHandle(options: FinalOptionsOfComponent) {
       observersConfig[key] = function(this: Instance, ...newValue: unknown[]) {
         originObserversHandle?.call(this, ...newValue);
 
-        const watchOldValue = assertNonNullable(this.data.__watchOldValue__);
+        const watchOldValue = nonNullable(this.data.__watchOldValue__);
         const oldValue = watchOldValue[key];
 
         if (deepEqual(newValue, oldValue)) return;

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

@@ -10,7 +10,7 @@ import type {
   WMBaseEvent,
   WMCustomEvent,
 } from "../../../../types/OfficialTypeAlias";
-import { assertNonNullable } from "../../../../utils/assertNonNullable";
+import { nonNullable } from "../../../../utils/nonNullable";
 import type { ComponentType } from "../../../DefineComponent/ReturnType/ComponentType";
 import { RootComponent } from "../..";
 import type { Bubbles, Capture } from "../../CustomEvents/CustomEventsTag";
@@ -42,7 +42,7 @@ RootComponent()({
     ) {
       Checking<typeof e.detail, string, Test.Pass>;
 
-      const markData = assertNonNullable(e.mark).markData;
+      const markData = nonNullable(e.mark).markData;
 
       Checking<typeof markData, { id: string }, Test.Pass>;
 

package/src/api/SubComponent/SubComponentType.ts

@@ -9,7 +9,8 @@ type _SubComponentType = {
     | boolean
     | symbol
     | null
-    | Record<string, unknown>
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    | Record<string, any>
     | unknown[]
     | CustomEventsTags;
 };

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

@@ -160,3 +160,11 @@ SubComponent<Root, $aaa>()({
     },
   },
 });
+// computed中可写 额外字段 isReady
+SubComponent<{ data: { _num: number } }, $aaa>()({
+  computed: {
+    aaa_isReady() {
+      return true;
+    },
+  },
+});

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

@@ -48,7 +48,7 @@ SubComponent<{}, CompDoc>()({
   },
   methods: {
     aaa_1() {
-      // 4 this.data中的data配置数据
+      // 4 this.data中的data配置数据类型应该与文档类型一致,比如aaa_str的类型为"a" | "b"而非string
       void Checking<
         typeof this.data,
         ComputeIntersection<
@@ -80,3 +80,9 @@ SubComponent<{ data: { _num: number } }, CompDoc>()({
     },
   },
 });
+// data中可写 额外字段 isReady
+SubComponent<{ data: { _num: number } }, CompDoc>()({
+  data: {
+    aaa_isReady: false,
+  },
+});

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

@@ -28,3 +28,9 @@ SubComponent<{}, DocA, "a">()({
     _aaaA_xxx: () => user.age,
   },
 });
+// store中可写 额外字段 isReady
+SubComponent<{ data: { _num: number } }, DocA, "a">()({
+  store: {
+    aaaA_isReady: () => false,
+  },
+});

package/src/api/SubComponent/index.ts

@@ -3,6 +3,7 @@ import type { EmptyObject } from "hry-types/src/Misc/EmptyObject";
 import type { Func } from "hry-types/src/Misc/Func";
 import type { RequiredKeys } from "hry-types/src/Object/RequiredKeys";
 import type { ComputeObject } from "../../types/ComputeObj";
+import type { Extra } from "../../types/Extra";
 import type { GetComponentPrefix } from "../../types/GetComponentPrefix";
 import type { InnerFields } from "../../types/InnerData";
 import type { WMCompOtherOption } from "../../types/OfficialTypeAlias";
@@ -125,8 +126,8 @@ type SubComponentConstructor<
   CurrentCompDoc extends ComponentType = IfExtends<
     TSupplementalPrefix,
     "",
-    TOriginalCompDoc,
-    ReplacePrefix<TOriginalCompDoc, CurrentPrefix>
+    TOriginalCompDoc & { properties: Extra<CurrentPrefix> }, // 为文档增加格外字段
+    ReplacePrefix<TOriginalCompDoc & { properties: Extra<CurrentPrefix> }, CurrentPrefix> // 为文档增加格外字段
   >,
   AllRootDataDoc extends object =
     // rootDoc中的properties是带有可选的,这是为了给使用者(上层组件)提示,而在自身组件实例中并不存在可选状态,故加了Required,正因加了Required使得最终结果不可能为unknown而是`{}`,满足object约束

package/src/types/Extra.ts

@@ -1 +1 @@
-// export type Extra<Prefix extends string> = Record<`${Prefix}_isReady`, boolean>;
+export type Extra<Prefix extends string> = { [K in `${Prefix}_isReady`]?: boolean };

package/src/utils/_utils.ts

@@ -1,8 +1,8 @@
-import { assertNonNullable } from "./assertNonNullable";
 import { debounce } from "./debounce";
 import { deepClone } from "./deepClone";
 import { deepEqual } from "./deepEqual";
 import { isEmptyObject } from "./isEmptyObject";
+import { nonNullable } from "./nonNullable";
 import { throttle } from "./throttle";
 
-export { assertNonNullable, debounce, deepClone, deepEqual, isEmptyObject, throttle };
+export { debounce, deepClone, deepEqual, isEmptyObject, nonNullable, throttle };

package/src/utils/debounce.ts

@@ -1,11 +1,12 @@
-/* eslint-disable @typescript-eslint/no-explicit-any */
 /**
  * 防抖函数
- * 应用在输入框输入时，只有在输入完成并delay后,才会触发搜索
+ * 注意 需要在tsconfig.json的types中添加"node",否则NodeJS.Timeout会报错
+ * 例如 应用在输入框输入时，只有在输入完成并delay后,才会触发搜索,
  * @param func
  * @param delay
  * @returns
  */
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
 export function debounce<F extends (...args: any[]) => any>(func: F, delay: number): (...args: Parameters<F>) => void {
   let timeoutId: NodeJS.Timeout | null = null;
 

package/src/utils/deepClone.ts

@@ -1,8 +1,8 @@
 /**
- * 深度克隆 函数相同 原型一致
+ * 数组和普通对象的深度克隆,原型相同
  */
 export function deepClone<T>(value: T): T {
-  if (typeof value !== "object" || value === null || value instanceof RegExp) {
+  if (typeof value !== "object" || value === null) {
     return value;
   }
 

package/src/utils/deepEqual.ts

@@ -1,11 +1,11 @@
 type PlainObject = Record<string, unknown>;
 // 非null的对象类型
-function isNonNullObject(value: unknown): boolean {
+function isNonNullObject(value: unknown): value is PlainObject {
   return value !== null && typeof value === "object";
 }
 
 export function deepEqual(value1: unknown, value2: unknown): boolean {
-  // 2个非对象类型相等或同引用对象的情况。
+  // 两个非对象类型相等或同引用对象的情况。
   if (Object.is(value1, value2)) {
     return true;
   }
@@ -13,18 +13,17 @@ export function deepEqual(value1: unknown, value2: unknown): boolean {
   if (!isNonNullObject(value1) || !isNonNullObject(value2)) {
     return false;
   }
-  // 到此，2个都是对象类型。
-  const _value1 = value1 as PlainObject;
-  const _value2 = value2 as PlainObject;
-  const value1Keys = Object.keys(_value1);
-  const value2Keys = Object.keys(_value2);
+  // 到此两个值都是对象类型。
+  const value1Keys = Object.keys(value1);
+  // 使用Set提高查找效率。
+  const value2KeysSet = new Set(Object.keys(value2));
 
-  if (value1Keys.length !== value2Keys.length) {
+  if (value1Keys.length !== value2KeysSet.size) {
     return false;
   }
 
   for (const key of value1Keys) {
-    if (!value2Keys.includes(key) || !deepEqual(_value1[key], _value2[key])) {
+    if (!value2KeysSet.has(key) || !deepEqual(value1[key], value2[key])) {
       return false;
     }
   }

package/src/utils/isEmptyObject.ts

@@ -1,13 +1,14 @@
 /**
- * 判断一个值是否为空对象 `{}`
+ * 判断一个值是否为空的普通对象 `{}`
+ * 有symblo和非枚举属性的对象会返回 `false`
  */
-export function isEmptyObject(obj: object): boolean {
+export function isEmptyObject(value: unknown): boolean {
   if (
-    typeof obj !== "object" || obj === null || Array.isArray(obj) || obj instanceof Set || obj instanceof Map
-    || obj instanceof WeakSet || obj instanceof WeakMap
+    typeof value !== "object" || value === null || Array.isArray(value) || value instanceof Set || value instanceof Map
+    || value instanceof WeakSet || value instanceof WeakMap
   ) {
     return false;
   }
 
-  return Reflect.ownKeys(obj).length === 0;
+  return Reflect.ownKeys(value).length === 0;
 }

package/src/utils/{assertNonNullable.ts → nonNullable.ts}

@@ -1,6 +1,11 @@
 import type { IfContains } from "hry-types/src/Any/IfContains";
 
-export function assertNonNullable<T>(
+/**
+ * 使用此函数代替!断言
+ * @param value 类型中必须包含 null 或 undefined
+ * @returns 去除 null 和 undefined 后的类型
+ */
+export function nonNullable<T>(
   value: IfContains<T, null | undefined, T, "参数类型必须包含 null 或 undefined">,
 ): NonNullable<T> {
   /* istanbul ignore next  */

package/dist/utils/assertNonNullable.d.ts

@@ -1,2 +0,0 @@
-import type { IfContains } from "hry-types/src/Any/IfContains";
-export declare function assertNonNullable<T>(value: IfContains<T, null | undefined, T, "参数类型必须包含 null 或 undefined">): NonNullable<T>;

package/dist/utils/assertNonNullable.js

@@ -1,8 +0,0 @@
-export function assertNonNullable(value) {
-    /* istanbul ignore next  */
-    if (value === null || value === undefined) {
-        throw new Error(`${value} should not be null or undefined`);
-    }
-    return value;
-}
-//# sourceMappingURL=assertNonNullable.js.map

package/dist/utils/assertNonNullable.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"assertNonNullable.js","sourceRoot":"","sources":["../../src/utils/assertNonNullable.ts"],"names":[],"mappings":"AAEA,MAAM,UAAU,iBAAiB,CAC/B,KAAsE;IAEtE,2BAA2B;IAC3B,IAAI,KAAK,KAAK,IAAI,IAAI,KAAK,KAAK,SAAS,EAAE,CAAC;QAC1C,MAAM,IAAI,KAAK,CAAC,GAAG,KAAK,kCAAkC,CAAC,CAAC;IAC9D,CAAC;IAED,OAAO,KAAuB,CAAC;AACjC,CAAC"}