annil 1.8.3 → 1.9.0

package/CHANGELOG.md

@@ -4,6 +4,18 @@
 
 * 解决DetailedType不接收接口类型的错误 ([ae8acbf](https://github.com/missannil/annil/commit/ae8acbfc2e62f99db565c448ad9253aa549e78bb))
 
+## [1.9.0](https://github.com/missannil/annil/compare/v1.8.3...v1.9.0) (2024-10-23)
+
+
+### Features
+
+* api/navigateTo 改为wxSugar 增加导出redirectTo ([f5a6141](https://github.com/missannil/annil/commit/f5a61411fa903545de8460052ca3512923905388))
+
+
+### Bug Fixes
+
+* 增加对DefinedComponent 的 path字段检测(与实例的is比较) ([8460e4e](https://github.com/missannil/annil/commit/8460e4eb29ad21a2df7adf53bffeb4c887a122e9))
+
 ## [1.8.3](https://github.com/missannil/annil/compare/v1.8.2...v1.8.3) (2024-09-08)
 
 

package/README.md

@@ -137,7 +137,7 @@ annil(安奈儿)是微信小程序原生开发插件。她会给您更佳的开
 
 - **常用API**
 
-  [navigateTo](./doc/api/navigateTo.md)
+  [navigateTo](./doc/api/wxSugar.md)
 
 - 实用泛型
 

package/dist/api/DefineComponent/normalizeOptions/hijackHandle/pagePathCheck.d.ts

@@ -0,0 +1,2 @@
+import type { Instance } from "../../../RootComponent/Instance/RootComponentInstance";
+export declare function pagePathCheck(path?: string): (this: Instance) => void;

package/dist/api/DefineComponent/normalizeOptions/hijackHandle/pagePathCheck.js

@@ -0,0 +1,8 @@
+export function pagePathCheck(path) {
+    return function () {
+        if (path && `/${this.is}` !== path) {
+            throw new Error(`页面路径错误,应为 /${this.is}`);
+        }
+    };
+}
+//# sourceMappingURL=pagePathCheck.js.map

package/dist/api/DefineComponent/normalizeOptions/hijackHandle/pagePathCheck.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"pagePathCheck.js","sourceRoot":"","sources":["../../../../../src/api/DefineComponent/normalizeOptions/hijackHandle/pagePathCheck.ts"],"names":[],"mappings":"AAEA,MAAM,UAAU,aAAa,CAAC,IAAa;IACzC,OAAO;QACL,IAAI,IAAI,IAAI,IAAI,IAAI,CAAC,EAAE,EAAE,KAAK,IAAI,EAAE,CAAC;YACnC,MAAM,IAAI,KAAK,CAAC,cAAc,IAAI,CAAC,EAAE,EAAE,CAAC,CAAC;QAC3C,CAAC;IACH,CAAC,CAAC;AACJ,CAAC"}

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

@@ -18,7 +18,6 @@ export type OptionsInnerFields = {
         __throttleDebounce__?: ThrottleDebounce;
     };
     methods: {
-        disposer?: Record<string, Func>;
         __computedUpdater__?: Func;
     };
 };
@@ -34,7 +33,7 @@ export type FinalOptionsOfComponent = {
     data: DataConstraint & OptionsInnerFields["data"];
     observers: Record<string, Func>;
     behaviors: string[];
-    methods: MethodsConstraint & OptionsInnerFields["methods"];
+    methods: MethodsConstraint;
     externalClasses: string[];
     pageLifetimes: PageLifetimesOption<false, object>["pageLifetimes"] & {};
     isPage: boolean;

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

@@ -1,6 +1,7 @@
 import { BBeforeCreate } from "../../../behaviors/BbeforeCreated";
 import { BStore } from "../../../behaviors/BStore";
 import { BthrottleDebounce } from "../../../behaviors/BthrottleDebounce";
+import { applyDebounceAndThrottle } from "../../../utils/applyDebounceAndThrottle";
 import { isEmptyObject } from "../../../utils/isEmptyObject";
 import { instanceConfig } from "../../InstanceInject/instanceConfig";
 import { __throttleDebounce__FieldCheck } from "./__throttleDebounce__FieldCheck";
@@ -9,6 +10,7 @@ import { hijack } from "./hijackHandle";
 import { isPageCheck } from "./hijackHandle/isPageCheck";
 import { loadReceivedDataHandle } from "./hijackHandle/loadReceivedDataHandle";
 import { onLoadReceivedDataHandle } from "./hijackHandle/onLoadReceivedDataHandle";
+import { pagePathCheck } from "./hijackHandle/pagePathCheck";
 import { initStore } from "./initStore";
 import { injectInfoHandler } from "./injectInfoHandler";
 import { InternalFieldProtection } from "./internalFieldProtection";
@@ -67,11 +69,13 @@ export function normalizeOptions(defineComponentOption) {
     }
     hijack(finalOptionsForComponent.methods, "onLoad", [onLoadReceivedDataHandle]);
     // 验证isPage字段是否配置正确
-    hijack(finalOptionsForComponent.lifetimes, "attached", [isPageCheck(rootComponentOption === null || rootComponentOption === void 0 ? void 0 : rootComponentOption.isPage)]);
+    hijack(finalOptionsForComponent.lifetimes, "attached", [isPageCheck(rootComponentOption === null || rootComponentOption === void 0 ? void 0 : rootComponentOption.isPage), pagePathCheck(defineComponentOption.path)]);
     // 页面时删除预设的虚拟组件字段
     if (finalOptionsForComponent.isPage && finalOptionsForComponent.options) {
         Reflect.deleteProperty(finalOptionsForComponent.options, "virtualHost");
     }
+    // 处理debounce和throttle前缀的方法(事件)配置
+    applyDebounceAndThrottle(finalOptionsForComponent.methods);
     // 初始化store数据到data并把store配置放入到data的__storeConfig__下为后续使用
     initStore(finalOptionsForComponent);
     // 处理computed和watch配置

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

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

package/dist/api/{navigateTo.d.ts → wxSugar.d.ts}

@@ -17,4 +17,5 @@ type NavigateToOption<T extends PageDoc> = {
  * navigateTo API 为 wx.navigateTo的语法糖,增加了data字段,最终的url数据拼接了通过encodeURIComponent编码(支持默认忽略的特殊符号)的data字段,在跳转页面的onload中通过decodeURIComponent解析url赋值给实例的data对象。为求使用时更加方便(无需对参数data解析再赋值)。且有ts类型提示。
  */
 export declare function navigateTo<TPageDoc extends PageDoc = never>(option: NoInfer<NavigateToOption<TPageDoc>>): Promise<WechatMiniprogram.NavigateToSuccessCallbackResult>;
+export declare function redirectTo<TPageDoc extends PageDoc = never>(option: NoInfer<NavigateToOption<TPageDoc>>): Promise<WechatMiniprogram.GeneralCallbackResult>;
 export {};

package/dist/api/{navigateTo.js → wxSugar.js}

@@ -24,4 +24,13 @@ export function navigateTo(option) {
         return wx.navigateTo(_encodeURIComponent(option));
     }
 }
-//# sourceMappingURL=navigateTo.js.map
+export function redirectTo(option) {
+    // @ts-ignore 隐式索引
+    if (!option.data) {
+        return wx.redirectTo(option);
+    }
+    else {
+        return wx.redirectTo(_encodeURIComponent(option));
+    }
+}
+//# sourceMappingURL=wxSugar.js.map

package/dist/api/wxSugar.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"wxSugar.js","sourceRoot":"","sources":["../../src/api/wxSugar.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AAwBnD;;GAEG;AACH,SAAS,mBAAmB,CAC1B,MAAuE;IAEvE,MAAM,MAAM,GAAuB;QACjC,GAAG,EAAE,GAAG,MAAM,CAAC,GAAG,IAAI,WAAW,CAAC,GAAG,IACnC,kBAAkB,CAChB,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,IAAI,CAAC,CAE/B,EAAE;KACH,CAAC;IAEF,OAAO,CAAC,cAAc,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;IAEtC,OAAO,CAAC,cAAc,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAEvC,OAAO,MAAM,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;AACvC,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,UAAU,CACxB,MAA2C;IAE3C,kBAAkB;IAClB,IAAI,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC;QACjB,OAAO,EAAE,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC;IAC/B,CAAC;SAAM,CAAC;QACN,OAAO,EAAE,CAAC,UAAU,CAClB,mBAAmB,CAAC,MAAuD,CAAC,CAC7E,CAAC;IACJ,CAAC;AACH,CAAC;AACD,MAAM,UAAU,UAAU,CACxB,MAA2C;IAE3C,kBAAkB;IAClB,IAAI,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC;QACjB,OAAO,EAAE,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC;IAC/B,CAAC;SAAM,CAAC;QACN,OAAO,EAAE,CAAC,UAAU,CAClB,mBAAmB,CAAC,MAAuD,CAAC,CAC7E,CAAC;IACJ,CAAC;AACH,CAAC"}

package/dist/index.d.ts

@@ -1,8 +1,8 @@
 import { DefineComponent } from "./api/DefineComponent";
 import { type IInjectInfo, instanceConfig } from "./api/InstanceInject/instanceConfig";
-import { navigateTo } from "./api/navigateTo";
 import { RootComponent } from "./api/RootComponent";
 import { SubComponent } from "./api/SubComponent";
+import { navigateTo, redirectTo } from "./api/wxSugar";
 import type { CreateComponentType } from "./types/CreateComponentType";
 import type { DetailedType } from "./types/DetailedType";
 import type { ExtendComponentType } from "./types/ExtendComponentType";
@@ -11,4 +11,4 @@ export * from "./utils/_utils";
 export type { Bubbles, BubblesCapture, BubblesCaptureComposed, BubblesComposed, Capture, CaptureComposed, Composed, CustomEventsTags, } from "./api/RootComponent/CustomEvents/CustomEventsTag";
 export type { Vant, Wm } from "./thirdLib";
 export type { CurrentTargetDataset, Dataset, Detail, Mark, TargetDataset, WMBaseEvent, WMCustomEvent, } from "./types/OfficialTypeAlias";
-export { type CreateComponentType, DefineComponent, type DetailedType, type ExtendComponentType, type IInjectInfo, instanceConfig, navigateTo, type ParamsEqual, RootComponent, SubComponent, };
+export { type CreateComponentType, DefineComponent, type DetailedType, type ExtendComponentType, type IInjectInfo, instanceConfig, navigateTo, type ParamsEqual, redirectTo, RootComponent, SubComponent, };

package/dist/index.js

@@ -1,8 +1,8 @@
 import { DefineComponent } from "./api/DefineComponent";
 import { instanceConfig } from "./api/InstanceInject/instanceConfig";
-import { navigateTo } from "./api/navigateTo";
 import { RootComponent } from "./api/RootComponent";
 import { SubComponent } from "./api/SubComponent";
+import { navigateTo, redirectTo } from "./api/wxSugar";
 export * from "./utils/_utils";
-export { DefineComponent, instanceConfig, navigateTo, RootComponent, SubComponent, };
+export { DefineComponent, instanceConfig, navigateTo, redirectTo, RootComponent, SubComponent, };
 //# sourceMappingURL=index.js.map

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AACxD,OAAO,EAAoB,cAAc,EAAE,MAAM,qCAAqC,CAAC;AACvF,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAC9C,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AACpD,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAKlD,cAAc,gBAAgB,CAAC;AAwB/B,OAAO,EAEL,eAAe,EAIf,cAAc,EACd,UAAU,EAEV,aAAa,EACb,YAAY,GACb,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AACxD,OAAO,EAAoB,cAAc,EAAE,MAAM,qCAAqC,CAAC;AACvF,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AACpD,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAClD,OAAO,EAAE,UAAU,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAKvD,cAAc,gBAAgB,CAAC;AAwB/B,OAAO,EAEL,eAAe,EAIf,cAAc,EACd,UAAU,EAEV,UAAU,EACV,aAAa,EACb,YAAY,GACb,CAAC"}

package/dist/utils/applyDebounceAndThrottle.d.ts

@@ -0,0 +1,7 @@
+import type { Func } from "hry-types/src/Misc/Func";
+/**
+ * 对象中的函数应用防抖和节流
+ * 规则 函数字段已下划线开始的后缀 如 xxx_debounced500 或 sub_xxx_throttled,无效后缀如 _debouncedxxx 不会被处理
+ * @param obj
+ */
+export declare function applyDebounceAndThrottle(obj: Record<string, Func>): void;

package/dist/utils/applyDebounceAndThrottle.js

@@ -0,0 +1,28 @@
+import { debounce } from "./debounce";
+import { throttle } from "./throttle";
+/**
+ * 对象中的函数应用防抖和节流
+ * 规则 函数字段已下划线开始的后缀 如 xxx_debounced500 或 sub_xxx_throttled,无效后缀如 _debouncedxxx 不会被处理
+ * @param obj
+ */
+export function applyDebounceAndThrottle(obj) {
+    for (const [key, value] of Object.entries(obj)) {
+        if (!key.includes("_"))
+            continue;
+        const suffix = key.split("_").at(-1);
+        const remaining = suffix.slice(9);
+        const delay = remaining === "" ? 300 : Number(remaining);
+        if (suffix.startsWith("debounced")) {
+            if (!isNaN(delay)) {
+                obj[key] = debounce(value, delay);
+            }
+            continue;
+        }
+        if (suffix.startsWith("throttled")) {
+            if (!isNaN(delay)) {
+                obj[key] = throttle(value, delay);
+            }
+        }
+    }
+}
+//# sourceMappingURL=applyDebounceAndThrottle.js.map

package/dist/utils/applyDebounceAndThrottle.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"applyDebounceAndThrottle.js","sourceRoot":"","sources":["../../src/utils/applyDebounceAndThrottle.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AACtC,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAEtC;;;;GAIG;AACH,MAAM,UAAU,wBAAwB,CAAC,GAAyB;IAChE,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC;QAC/C,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,GAAG,CAAC;YAAE,SAAS;QACjC,MAAM,MAAM,GAAG,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAW,CAAC;QAE/C,MAAM,SAAS,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;QAClC,MAAM,KAAK,GAAG,SAAS,KAAK,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;QAEzD,IAAI,MAAM,CAAC,UAAU,CAAC,WAAW,CAAC,EAAE,CAAC;YACnC,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,EAAE,CAAC;gBAClB,GAAG,CAAC,GAAG,CAAC,GAAG,QAAQ,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;YACpC,CAAC;YACD,SAAS;QACX,CAAC;QAED,IAAI,MAAM,CAAC,UAAU,CAAC,WAAW,CAAC,EAAE,CAAC;YACnC,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,EAAE,CAAC;gBAClB,GAAG,CAAC,GAAG,CAAC,GAAG,QAAQ,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;YACpC,CAAC;QACH,CAAC;IACH,CAAC;AACH,CAAC"}

package/dist/utils/debounce.d.ts

@@ -1,9 +1,11 @@
+type Callback = (...args: any[]) => any;
 /**
  * 防抖函数
  * 注意 需要在tsconfig.json的types中添加"node",否则NodeJS.Timeout会报错
- * 例如 应用在输入框输入时，只有在输入完成并delay后,才会触发搜索,
+ * 例如 在input框输入内容时,只有输入停止一段时间(wait)后,才会触发输入事件.
  * @param func
- * @param delay
+ * @param wait
  * @returns
  */
-export declare function debounce<F extends (...args: any[]) => any>(func: F, delay: number): (...args: Parameters<F>) => void;
+export declare function debounce<F extends Callback>(func: F, wait?: number): (...args: Parameters<F>) => void;
+export {};

package/dist/utils/debounce.js

@@ -1,19 +1,19 @@
 /**
  * 防抖函数
  * 注意 需要在tsconfig.json的types中添加"node",否则NodeJS.Timeout会报错
- * 例如 应用在输入框输入时，只有在输入完成并delay后,才会触发搜索,
+ * 例如 在input框输入内容时,只有输入停止一段时间(wait)后,才会触发输入事件.
  * @param func
- * @param delay
+ * @param wait
  * @returns
  */
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
-export function debounce(func, delay) {
+/* istanbul ignore next  */
+export function debounce(func, wait = 300) {
     let timeoutId = null;
-    return (...args) => {
+    return function (...args) {
         if (timeoutId) {
             clearTimeout(timeoutId);
         }
-        timeoutId = setTimeout(() => func(...args), delay);
+        timeoutId = setTimeout(() => func.call(this, ...args), wait);
     };
 }
 //# sourceMappingURL=debounce.js.map

package/dist/utils/debounce.js.map

@@ -1 +1 @@
-{"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"}
+{"version":3,"file":"debounce.js","sourceRoot":"","sources":["../../src/utils/debounce.ts"],"names":[],"mappings":"AAEA;;;;;;;GAOG;AACH,2BAA2B;AAC3B,MAAM,UAAU,QAAQ,CAAqB,IAAO,EAAE,IAAI,GAAG,GAAG;IAC9D,IAAI,SAAS,GAA0B,IAAI,CAAC;IAE5C,OAAO,UAAwB,GAAG,IAAmB;QACnD,IAAI,SAAS,EAAE,CAAC;YACd,YAAY,CAAC,SAAS,CAAC,CAAC;QAC1B,CAAC;QAED,SAAS,GAAG,UAAU,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,GAAG,IAAI,CAAC,EAAE,IAAI,CAAC,CAAC;IAC/D,CAAC,CAAC;AACJ,CAAC"}

package/dist/utils/throttle.js

@@ -5,13 +5,14 @@
  * @param interval 单位毫秒
  * @returns
  */
+/* istanbul ignore next  */
 export function throttle(callback, interval = 200) {
     let lastCall = 0;
     return function (...args) {
         const now = Date.now();
         if (now - lastCall >= interval) {
             lastCall = now;
-            callback(...args);
+            callback.call(this, ...args);
         }
     };
 }

package/dist/utils/throttle.js.map

@@ -1 +1 @@
-{"version":3,"file":"throttle.js","sourceRoot":"","sources":["../../src/utils/throttle.ts"],"names":[],"mappings":"AAGA;;;;;;GAMG;AACH,MAAM,UAAU,QAAQ,CAAqB,QAAW,EAAE,QAAQ,GAAG,GAAG;IACtE,IAAI,QAAQ,GAAG,CAAC,CAAC;IAEjB,OAAO,UAAS,GAAG,IAAmB;QACpC,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;QAEvB,IAAI,GAAG,GAAG,QAAQ,IAAI,QAAQ,EAAE,CAAC;YAC/B,QAAQ,GAAG,GAAG,CAAC;YAEf,QAAQ,CAAC,GAAG,IAAI,CAAC,CAAC;QACpB,CAAC;IACH,CAAC,CAAC;AACJ,CAAC"}
+{"version":3,"file":"throttle.js","sourceRoot":"","sources":["../../src/utils/throttle.ts"],"names":[],"mappings":"AAGA;;;;;;GAMG;AACH,2BAA2B;AAC3B,MAAM,UAAU,QAAQ,CAAqB,QAAW,EAAE,QAAQ,GAAG,GAAG;IACtE,IAAI,QAAQ,GAAG,CAAC,CAAC;IAEjB,OAAO,UAAwB,GAAG,IAAmB;QACnD,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;QAEvB,IAAI,GAAG,GAAG,QAAQ,IAAI,QAAQ,EAAE,CAAC;YAC/B,QAAQ,GAAG,GAAG,CAAC;YAEf,QAAQ,CAAC,IAAI,CAAC,IAAI,EAAE,GAAG,IAAI,CAAC,CAAC;QAC/B,CAAC;IACH,CAAC,CAAC;AACJ,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "annil",
-  "version": "1.8.3",
+  "version": "1.9.0",
   "description": "微信小程序(原生开发)插件",
   "main": "dist/index.js",
   "types": "src/index.ts",

package/src/api/DefineComponent/normalizeOptions/hijackHandle/pagePathCheck.ts

@@ -0,0 +1,9 @@
+import type { Instance } from "../../../RootComponent/Instance/RootComponentInstance";
+
+export function pagePathCheck(path?: string) {
+  return function(this: Instance) {
+    if (path && `/${this.is}` !== path) {
+      throw new Error(`页面路径错误,应为 /${this.is}`);
+    }
+  };
+}

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

@@ -2,6 +2,7 @@ import type { Func } from "hry-types/src/Misc/_api";
 import { BBeforeCreate } from "../../../behaviors/BbeforeCreated";
 import { BStore } from "../../../behaviors/BStore";
 import { BthrottleDebounce } from "../../../behaviors/BthrottleDebounce";
+import { applyDebounceAndThrottle } from "../../../utils/applyDebounceAndThrottle";
 import { isEmptyObject } from "../../../utils/isEmptyObject";
 import { instanceConfig } from "../../InstanceInject/instanceConfig";
 import type { ComputedConstraint } from "../../RootComponent/Computed/ComputedConstraint";
@@ -19,6 +20,7 @@ import { hijack } from "./hijackHandle";
 import { isPageCheck } from "./hijackHandle/isPageCheck";
 import { loadReceivedDataHandle } from "./hijackHandle/loadReceivedDataHandle";
 import { onLoadReceivedDataHandle } from "./hijackHandle/onLoadReceivedDataHandle";
+import { pagePathCheck } from "./hijackHandle/pagePathCheck";
 import { initStore } from "./initStore";
 import { injectInfoHandler } from "./injectInfoHandler";
 import { InternalFieldProtection } from "./internalFieldProtection";
@@ -36,8 +38,6 @@ export type OptionsInnerFields = {
     __throttleDebounce__?: ThrottleDebounce;
   };
   methods: {
-    disposer?: Record<string, Func>;
-    // computedHandle加入
     __computedUpdater__?: Func;
   };
 };
@@ -55,7 +55,7 @@ export type FinalOptionsOfComponent = {
   data: DataConstraint & OptionsInnerFields["data"];
   observers: Record<string, Func>;
   behaviors: string[];
-  methods: MethodsConstraint & OptionsInnerFields["methods"];
+  methods: MethodsConstraint;
   externalClasses: string[];
   pageLifetimes: PageLifetimesOption<false, object>["pageLifetimes"] & {};
   isPage: boolean;
@@ -66,6 +66,7 @@ export type FinalOptionsOfComponent = {
   watch: Record<string, Func>;
   lifetimes: LifetimesConstraint;
 };
+
 /**
  * 把DefineComponentOption转化为原生Component API支持的配置
  * @param defineComponentOption
@@ -129,7 +130,7 @@ export function normalizeOptions(
   hijack(
     finalOptionsForComponent.lifetimes,
     "attached",
-    [isPageCheck(rootComponentOption?.isPage)],
+    [isPageCheck(rootComponentOption?.isPage), pagePathCheck(defineComponentOption.path)],
   );
 
   // 页面时删除预设的虚拟组件字段
@@ -137,6 +138,9 @@ export function normalizeOptions(
     Reflect.deleteProperty(finalOptionsForComponent.options, "virtualHost");
   }
 
+  // 处理debounce和throttle前缀的方法(事件)配置
+  applyDebounceAndThrottle(finalOptionsForComponent.methods);
+
   // 初始化store数据到data并把store配置放入到data的__storeConfig__下为后续使用
   initStore(finalOptionsForComponent);
 

package/src/api/{navigateTo.ts → wxSugar.ts}

@@ -65,3 +65,15 @@ export function navigateTo<TPageDoc extends PageDoc = never>(
     );
   }
 }
+export function redirectTo<TPageDoc extends PageDoc = never>(
+  option: NoInfer<NavigateToOption<TPageDoc>>,
+) {
+  // @ts-ignore 隐式索引
+  if (!option.data) {
+    return wx.redirectTo(option);
+  } else {
+    return wx.redirectTo(
+      _encodeURIComponent(option as NavigateToOption<TPageDoc> & { data: object }),
+    );
+  }
+}

package/src/index.ts

@@ -1,8 +1,8 @@
 import { DefineComponent } from "./api/DefineComponent";
 import { type IInjectInfo, instanceConfig } from "./api/InstanceInject/instanceConfig";
-import { navigateTo } from "./api/navigateTo";
 import { RootComponent } from "./api/RootComponent";
 import { SubComponent } from "./api/SubComponent";
+import { navigateTo, redirectTo } from "./api/wxSugar";
 import type { CreateComponentType } from "./types/CreateComponentType";
 import type { DetailedType } from "./types/DetailedType";
 import type { ExtendComponentType } from "./types/ExtendComponentType";
@@ -40,6 +40,7 @@ export {
   instanceConfig,
   navigateTo,
   type ParamsEqual,
+  redirectTo,
   RootComponent,
   SubComponent,
 };

package/src/utils/applyDebounceAndThrottle.ts

@@ -0,0 +1,31 @@
+import type { Func } from "hry-types/src/Misc/Func";
+import { debounce } from "./debounce";
+import { throttle } from "./throttle";
+
+/**
+ * 对象中的函数应用防抖和节流
+ * 规则 函数字段已下划线开始的后缀 如 xxx_debounced500 或 sub_xxx_throttled,无效后缀如 _debouncedxxx 不会被处理
+ * @param obj
+ */
+export function applyDebounceAndThrottle(obj: Record<string, Func>) {
+  for (const [key, value] of Object.entries(obj)) {
+    if (!key.includes("_")) continue;
+    const suffix = key.split("_").at(-1) as string;
+
+    const remaining = suffix.slice(9);
+    const delay = remaining === "" ? 300 : Number(remaining);
+
+    if (suffix.startsWith("debounced")) {
+      if (!isNaN(delay)) {
+        obj[key] = debounce(value, delay);
+      }
+      continue;
+    }
+
+    if (suffix.startsWith("throttled")) {
+      if (!isNaN(delay)) {
+        obj[key] = throttle(value, delay);
+      }
+    }
+  }
+}

package/src/utils/debounce.ts

@@ -1,20 +1,22 @@
+/* eslint-disable @typescript-eslint/no-explicit-any */
+type Callback = (...args: any[]) => any;
 /**
  * 防抖函数
  * 注意 需要在tsconfig.json的types中添加"node",否则NodeJS.Timeout会报错
- * 例如 应用在输入框输入时，只有在输入完成并delay后,才会触发搜索,
+ * 例如 在input框输入内容时,只有输入停止一段时间(wait)后,才会触发输入事件.
  * @param func
- * @param delay
+ * @param wait
  * @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 {
+/* istanbul ignore next  */
+export function debounce<F extends Callback>(func: F, wait = 300): (...args: Parameters<F>) => void {
   let timeoutId: NodeJS.Timeout | null = null;
 
-  return (...args: Parameters<F>): void => {
+  return function(this: unknown, ...args: Parameters<F>): void {
     if (timeoutId) {
       clearTimeout(timeoutId);
     }
 
-    timeoutId = setTimeout(() => func(...args), delay);
+    timeoutId = setTimeout(() => func.call(this, ...args), wait);
   };
 }

package/src/utils/throttle.ts

@@ -8,16 +8,17 @@ type Callback = (...args: any[]) => any;
  * @param interval 单位毫秒
  * @returns
  */
+/* istanbul ignore next  */
 export function throttle<F extends Callback>(callback: F, interval = 200): (...args: Parameters<F>) => void {
   let lastCall = 0;
 
-  return function(...args: Parameters<F>) {
+  return function(this: unknown, ...args: Parameters<F>) {
     const now = Date.now();
 
     if (now - lastCall >= interval) {
       lastCall = now;
 
-      callback(...args);
+      callback.call(this, ...args);
     }
   };
 }

package/dist/api/navigateTo.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"navigateTo.js","sourceRoot":"","sources":["../../src/api/navigateTo.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AAwBnD;;GAEG;AACH,SAAS,mBAAmB,CAC1B,MAAuE;IAEvE,MAAM,MAAM,GAAuB;QACjC,GAAG,EAAE,GAAG,MAAM,CAAC,GAAG,IAAI,WAAW,CAAC,GAAG,IACnC,kBAAkB,CAChB,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,IAAI,CAAC,CAE/B,EAAE;KACH,CAAC;IAEF,OAAO,CAAC,cAAc,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;IAEtC,OAAO,CAAC,cAAc,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAEvC,OAAO,MAAM,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;AACvC,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,UAAU,CACxB,MAA2C;IAE3C,kBAAkB;IAClB,IAAI,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC;QACjB,OAAO,EAAE,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC;IAC/B,CAAC;SAAM,CAAC;QACN,OAAO,EAAE,CAAC,UAAU,CAClB,mBAAmB,CAAC,MAAuD,CAAC,CAC7E,CAAC;IACJ,CAAC;AACH,CAAC"}