@tarojs/taro-h5 3.5.11 → 3.6.0-beta.1

package/dist/taroApis.d.ts

@@ -544,7 +544,7 @@ declare function onSocketOpen(): void;
 declare function onSocketMessage(): void;
 declare function onSocketError(): void;
 declare function onSocketClose(): void;
-declare function connectSocket(options: any): Promise<unknown>;
+declare function connectSocket(options?: Taro.connectSocket.Option): Promise<unknown>;
 declare function closeSocket(): void;
 // 帐号信息
 declare const getAccountInfoSync: (option?: {}, ...args: any[]) => Promise<Partial<TaroGeneral.CallbackResult> & Record<string, unknown> & TaroGeneral.CallbackResult>;
@@ -679,7 +679,7 @@ declare const disableAlertBeforeUnload: (option?: {}, ...args: any[]) => Promise
 declare const getMenuButtonBoundingClientRect: (option?: {}, ...args: any[]) => Promise<Partial<TaroGeneral.CallbackResult> & Record<string, unknown> & TaroGeneral.CallbackResult>;
 // 导航栏
 declare const showNavigationBarLoading: (option?: {}, ...args: any[]) => Promise<Partial<TaroGeneral.CallbackResult> & Record<string, unknown> & TaroGeneral.CallbackResult>;
-declare function setNavigationBarTitle(options: any): Promise<Partial<TaroGeneral.CallbackResult> & Record<string, unknown> & TaroGeneral.CallbackResult>;
+declare function setNavigationBarTitle(options?: Taro.setNavigationBarTitle.Option): Promise<Partial<TaroGeneral.CallbackResult> & Record<string, unknown> & TaroGeneral.CallbackResult>;
 /**
  * 设置页面导航条颜色
  */

package/dist/utils/handler.d.ts

@@ -1,18 +1,23 @@
 declare type TCallback<T = Partial<TaroGeneral.CallbackResult>> = (res: T) => Promise<void> | void;
 interface IMethodParam<T = Partial<TaroGeneral.CallbackResult>> {
     name: string;
-    success?: TCallback<T>;
+    success?: TCallback<T & TaroGeneral.CallbackResult>;
     fail?: TCallback;
     complete?: TCallback;
 }
+interface IMockPromise {
+    resolve?: typeof Promise.resolve | TFunc;
+    reject?: typeof Promise.reject | TFunc;
+}
 export declare class MethodHandler<T = Partial<TaroGeneral.CallbackResult>> {
     methodName: string;
     protected __success?: TCallback<T>;
     protected __fail?: TCallback;
     protected __complete?: TCallback;
+    protected isHandlerError: boolean;
     constructor({ name, success, fail, complete }: IMethodParam<T>);
-    success<U = Record<string, unknown>>(res?: Partial<T> & Partial<TaroGeneral.CallbackResult>, resolve?: any): Promise<T & U & TaroGeneral.CallbackResult>;
-    fail<U = Record<string, unknown>>(res?: Partial<T> & Partial<TaroGeneral.CallbackResult>, reject?: any): Promise<T & U & TaroGeneral.CallbackResult>;
+    success<U = Record<string, unknown>>(res?: Partial<T> & Partial<TaroGeneral.CallbackResult>, promise?: IMockPromise): Promise<T & U & TaroGeneral.CallbackResult>;
+    fail<U = Record<string, unknown>>(res?: Partial<T> & Partial<TaroGeneral.CallbackResult>, promise?: IMockPromise): Promise<T & U & TaroGeneral.CallbackResult>;
 }
 declare type TCallbackManagerParam = (...arr: unknown[]) => void;
 interface ICallbackManagerOption {

package/dist/utils/handler.js

@@ -1,29 +1,39 @@
+import { isFunction } from '@tarojs/shared';
+import { isProd } from './index';
 export class MethodHandler {
     constructor({ name, success, fail, complete }) {
+        this.isHandlerError = false;
         this.methodName = name;
         this.__success = success;
         this.__fail = fail;
         this.__complete = complete;
+        this.isHandlerError = isFunction(this.__complete) || isFunction(this.__fail);
     }
-    success(res = {}, resolve = Promise.resolve.bind(Promise)) {
+    success(res = {}, promise = {}) {
         if (!res.errMsg) {
             res.errMsg = `${this.methodName}:ok`;
         }
-        typeof this.__success === 'function' && this.__success(res);
-        typeof this.__complete === 'function' && this.__complete(res);
+        isFunction(this.__success) && this.__success(res);
+        isFunction(this.__complete) && this.__complete(res);
+        const { resolve = Promise.resolve.bind(Promise) } = promise;
         return resolve(res);
     }
-    fail(res = {}, reject = Promise.reject.bind(Promise)) {
+    fail(res = {}, promise = {}) {
         if (!res.errMsg) {
             res.errMsg = `${this.methodName}:fail`;
         }
         else {
             res.errMsg = `${this.methodName}:fail ${res.errMsg}`;
         }
-        console.error(res.errMsg);
-        typeof this.__fail === 'function' && this.__fail(res);
-        typeof this.__complete === 'function' && this.__complete(res);
-        return reject(res);
+        if (!isProd) {
+            console.error(res.errMsg);
+        }
+        isFunction(this.__fail) && this.__fail(res);
+        isFunction(this.__complete) && this.__complete(res);
+        const { resolve = Promise.resolve.bind(Promise), reject = Promise.reject.bind(Promise) } = promise;
+        return this.isHandlerError
+            ? resolve(res)
+            : reject(res);
     }
 }
 export class CallbackManager {
@@ -67,12 +77,12 @@ export class CallbackManager {
          */
         this.trigger = (...args) => {
             this.callbacks.forEach(opt => {
-                if (typeof opt === 'function') {
+                if (isFunction(opt)) {
                     opt(...args);
                 }
                 else {
                     const { callback, ctx } = opt;
-                    typeof callback === 'function' && callback.call(ctx, ...args);
+                    isFunction(callback) && callback.call(ctx, ...args);
                 }
             });
         };

package/dist/utils/index.js

@@ -2,6 +2,7 @@
 import Taro from '@tarojs/api';
 import { addLeadingSlash, getHomePage, stripBasename } from '@tarojs/router/dist/utils';
 import { Current, hooks } from '@tarojs/runtime';
+import { isFunction } from '@tarojs/shared';
 import { MethodHandler } from './handler';
 export const isProd = process.env.NODE_ENV === 'production';
 export function shouldBeObject(target) {
@@ -141,7 +142,7 @@ export function processOpenApi({ name, defaultOptions, standardMethod, formatOpt
         // @ts-ignore
         const targetApi = (_a = window === null || window === void 0 ? void 0 : window.wx) === null || _a === void 0 ? void 0 : _a[name];
         const opts = formatOptions(Object.assign({}, defaultOptions, options));
-        if (typeof targetApi === 'function') {
+        if (isFunction(targetApi)) {
             return new Promise((resolve, reject) => {
                 ['fail', 'success', 'complete'].forEach(k => {
                     opts[k] = preRef => {
@@ -158,7 +159,7 @@ export function processOpenApi({ name, defaultOptions, standardMethod, formatOpt
                 });
             });
         }
-        else if (typeof standardMethod === 'function') {
+        else if (isFunction(standardMethod)) {
             return standardMethod(opts);
         }
         else {

package/dist/utils/valid.d.ts

@@ -1,2 +1 @@
-export declare function isFunction(obj: any): boolean;
-export declare const isValidColor: (color: any) => boolean;
+export declare const isValidColor: (color: string) => boolean;

package/dist/utils/valid.js

@@ -1,6 +1,3 @@
-export function isFunction(obj) {
-    return typeof obj === 'function';
-}
 const VALID_COLOR_REG = /^#[0-9a-fA-F]{6}$/;
 export const isValidColor = (color) => {
     return VALID_COLOR_REG.test(color);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tarojs/taro-h5",
-  "version": "3.5.11",
+  "version": "3.6.0-beta.1",
   "description": "Taro h5 framework",
   "browser": "dist/index.esm.js",
   "main:h5": "dist/index.js",
@@ -31,11 +31,16 @@
     "jsonp-retry": "^1.0.3",
     "query-string": "^7.1.1",
     "whatwg-fetch": "^3.4.0",
-    "@tarojs/api": "3.5.11",
-    "@tarojs/router": "3.5.11",
-    "@tarojs/runtime": "3.5.11"
+    "@tarojs/api": "3.6.0-beta.1",
+    "@tarojs/router": "3.6.0-beta.1",
+    "@tarojs/runtime": "3.6.0-beta.1",
+    "@tarojs/shared": "3.6.0-beta.1"
   },
   "devDependencies": {
+    "jest": "^29.3.1",
+    "jest-fetch-mock": "^3.0.3",
+    "jest-localstorage-mock": "^2.4.0",
+    "jest-mock-console": "^1.0.0",
     "react": "^18.2.0",
     "react-test-renderer": "^18.2.0"
   },

package/types/global.d.ts

@@ -0,0 +1 @@
+declare type TFunc = (...args: any[]) => any