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

package/dist/index.cjs.js

@@ -4,6 +4,7 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var Taro = require('@tarojs/api');
 var router = require('@tarojs/router');
+var shared = require('@tarojs/shared');
 var utils = require('@tarojs/router/dist/utils');
 var runtime = require('@tarojs/runtime');
 var base64Js = require('base64-js');
@@ -37,30 +38,38 @@ var jsonpRetry__default = /*#__PURE__*/_interopDefaultLegacy(jsonpRetry);
 
 class MethodHandler {
     constructor({ name, success, fail, complete }) {
+        this.isHandlerError = false;
         this.methodName = name;
         this.__success = success;
         this.__fail = fail;
         this.__complete = complete;
+        this.isHandlerError = shared.isFunction(this.__complete) || shared.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);
+        shared.isFunction(this.__success) && this.__success(res);
+        shared.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 (process.env.NODE_ENV !== 'production') {
+            console.error(res.errMsg);
+        }
+        shared.isFunction(this.__fail) && this.__fail(res);
+        shared.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);
     }
 }
 class CallbackManager {
@@ -104,12 +113,12 @@ class CallbackManager {
          */
         this.trigger = (...args) => {
             this.callbacks.forEach(opt => {
-                if (typeof opt === 'function') {
+                if (shared.isFunction(opt)) {
                     opt(...args);
                 }
                 else {
                     const { callback, ctx } = opt;
-                    typeof callback === 'function' && callback.call(ctx, ...args);
+                    shared.isFunction(callback) && callback.call(ctx, ...args);
                 }
             });
         };
@@ -161,16 +170,12 @@ function debounce(fn, ms = 250, scope) {
     };
 }
 
-function isFunction(obj) {
-    return typeof obj === 'function';
-}
 const VALID_COLOR_REG = /^#[0-9a-fA-F]{6}$/;
 const isValidColor = (color) => {
     return VALID_COLOR_REG.test(color);
 };
 
 /* eslint-disable prefer-promise-reject-errors */
-const isProd = process.env.NODE_ENV === 'production';
 function shouldBeObject(target) {
     if (target && typeof target === 'object')
         return { flag: true };
@@ -252,7 +257,7 @@ function temporarilyNotSupport(name = '') {
             type: 'method',
             category: 'temporarily',
         });
-        if (isProd) {
+        if (process.env.NODE_ENV === 'production') {
             console.warn(errMsg);
             return handle.success({ errMsg });
         }
@@ -272,7 +277,7 @@ function weixinCorpSupport(name) {
             type: 'method',
             category: 'weixin_corp',
         });
-        if (isProd) {
+        if (process.env.NODE_ENV === 'production') {
             console.warn(errMsg);
             return handle.success({ errMsg });
         }
@@ -292,7 +297,7 @@ function permanentlyNotSupport(name = '') {
             type: 'method',
             category: 'permanently',
         });
-        if (isProd) {
+        if (process.env.NODE_ENV === 'production') {
             console.warn(errMsg);
             return handle.success({ errMsg });
         }
@@ -308,7 +313,7 @@ function processOpenApi({ name, defaultOptions, standardMethod, formatOptions =
         // @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 (shared.isFunction(targetApi)) {
             return new Promise((resolve, reject) => {
                 ['fail', 'success', 'complete'].forEach(k => {
                     opts[k] = preRef => {
@@ -325,7 +330,7 @@ function processOpenApi({ name, defaultOptions, standardMethod, formatOptions =
                 });
             });
         }
-        else if (typeof standardMethod === 'function') {
+        else if (shared.isFunction(standardMethod)) {
             return standardMethod(opts);
         }
         else {
@@ -657,6 +662,8 @@ const getDeviceInfo = () => {
     const info = {
         /** 应用二进制接口类型（仅 Android 支持） */
         abi: '',
+        /** 设备二进制接口类型（仅 Android 支持） */
+        deviceAbi: '',
         /** 设备性能等级（仅Android小游戏）。取值为：-2 或 0（该设备无法运行小游戏），-1（性能未知），>=1（设备性能值，该值越高，设备性能越好，目前最高不到50） */
         benchmarkLevel: -1,
         /** 设备品牌 */
@@ -666,7 +673,9 @@ const getDeviceInfo = () => {
         /** 操作系统及版本 */
         system: md.os(),
         /** 客户端平台 */
-        platform: navigator.platform
+        platform: navigator.platform,
+        /** 设备二进制接口类型（仅 Android 支持） */
+        CPUType: '',
     };
     return info;
 };
@@ -1512,7 +1521,7 @@ const setClipboardData = ({ data, success, fail, complete }) => __awaiter(void 0
          * iOS < 10 的系统可能无法使用编程方式访问剪贴板，参考：
          * https://stackoverflow.com/questions/34045777/copy-to-clipboard-using-javascript-in-ios/34046084
          */
-        if (typeof document.execCommand === 'function') {
+        if (shared.isFunction(document.execCommand)) {
             const textarea = document.createElement('textarea');
             textarea.readOnly = true;
             textarea.value = data;
@@ -1972,9 +1981,9 @@ const getLocationByW3CApi = (options) => {
                 /** 调用结果,自动补充 */
                 errMsg: ''
             };
-            handle.success(result, resolve);
+            handle.success(result, { resolve, reject });
         }, (error) => {
-            handle.fail({ errMsg: error.message }, reject);
+            handle.fail({ errMsg: error.message }, { resolve, reject });
         }, positionOptions);
     });
 };
@@ -2072,7 +2081,7 @@ const chooseLocation = ({ success, fail, complete, mapOpts } = {}) => {
             console.warn('chooseLocation api 依赖腾讯地图定位api，需要在 defineConstants 中配置 LOCATION_APIKEY');
             return handle.fail({
                 errMsg: 'LOCATION_APIKEY needed'
-            }, reject);
+            }, { resolve, reject });
         }
         const onMessage = event => {
             // 接收位置信息，用户选择确认位置点后选点组件会触发该事件，回传用户的位置信息
@@ -2091,14 +2100,14 @@ const chooseLocation = ({ success, fail, complete, mapOpts } = {}) => {
                 chooser.remove();
             }, 300);
             if (res) {
-                return handle.fail(res, reject);
+                return handle.fail(res, { resolve, reject });
             }
             else {
                 if (chooseLocation.latitude && chooseLocation.longitude) {
-                    return handle.success(chooseLocation, resolve);
+                    return handle.success(chooseLocation, { resolve, reject });
                 }
                 else {
-                    return handle.fail({}, reject);
+                    return handle.fail({}, { resolve, reject });
                 }
             }
         }, key, mapOpts);
@@ -2355,12 +2364,12 @@ const getImageInfo = (options) => {
                 width: image.naturalWidth,
                 height: image.naturalHeight,
                 path: getBase64Image(image) || src
-            }, resolve);
+            }, { resolve, reject });
         };
         image.onerror = (e) => {
             handle.fail({
                 errMsg: e.message
-            }, reject);
+            }, { resolve, reject });
         };
         image.src = src;
     });
@@ -2387,7 +2396,7 @@ const previewImage = (options) => __awaiter(void 0, void 0, void 0, function* ()
             item.appendChild(div);
             // Note: 等待图片加载完后返回，会导致轮播被卡住
             resolve(item);
-            if (typeof loadFail === 'function') {
+            if (shared.isFunction(loadFail)) {
                 image.addEventListener('error', (err) => {
                     loadFail({ errMsg: err.message });
                 });
@@ -2492,7 +2501,7 @@ const chooseImage = function (options) {
             el.removeAttribute('capture');
         }
     }
-    return new Promise(resolve => {
+    return new Promise((resolve, reject) => {
         const TaroMouseEvents = document.createEvent('MouseEvents');
         TaroMouseEvents.initEvent('click', true, true);
         if (el) {
@@ -2511,7 +2520,7 @@ const chooseImage = function (options) {
                         (_a = res.tempFilePaths) === null || _a === void 0 ? void 0 : _a.push(url);
                         (_b = res.tempFiles) === null || _b === void 0 ? void 0 : _b.push({ path: url, size: item.size, type: item.type, originalFileObj: item });
                     });
-                    handle.success(res, resolve);
+                    handle.success(res, { resolve, reject });
                     target.value = '';
                 }
             };
@@ -2579,7 +2588,7 @@ const chooseVideo = (options) => {
     inputEl.setAttribute('accept', 'video/*');
     inputEl.setAttribute('style', 'position: fixed; top: -4000px; left: -3000px; z-index: -300;');
     document.body.appendChild(inputEl);
-    return new Promise(resolve => {
+    return new Promise((resolve, reject) => {
         const TaroMouseEvents = document.createEvent('MouseEvents');
         TaroMouseEvents.initEvent('click', true, true);
         inputEl.dispatchEvent(TaroMouseEvents);
@@ -2600,7 +2609,7 @@ const chooseVideo = (options) => {
                     res.size = event.total;
                     res.height = videoEl.videoHeight;
                     res.width = videoEl.videoHeight;
-                    return handle.success(res, resolve);
+                    return handle.success(res, { resolve, reject });
                 };
             };
             if (file) {
@@ -2881,13 +2890,13 @@ function _request(options) {
             .then(data => {
             res.statusCode = 200;
             res.data = data;
-            typeof success === 'function' && success(res);
-            typeof complete === 'function' && complete(res);
+            shared.isFunction(success) && success(res);
+            shared.isFunction(complete) && complete(res);
             return res;
         })
             .catch(err => {
-            typeof fail === 'function' && fail(err);
-            typeof complete === 'function' && complete(res);
+            shared.isFunction(fail) && fail(err);
+            shared.isFunction(complete) && complete(res);
             return Promise.reject(err);
         });
     }
@@ -2955,13 +2964,13 @@ function _request(options) {
     })
         .then(data => {
         res.data = data;
-        typeof success === 'function' && success(res);
-        typeof complete === 'function' && complete(res);
+        shared.isFunction(success) && success(res);
+        shared.isFunction(complete) && complete(res);
         return res;
     })
         .catch(err => {
-        typeof fail === 'function' && fail(err);
-        typeof complete === 'function' && complete(res);
+        shared.isFunction(fail) && fail(err);
+        shared.isFunction(complete) && complete(res);
         err.statusCode = res.statusCode;
         err.errMsg = err.message;
         return Promise.reject(err);
@@ -3150,14 +3159,14 @@ class SocketTask {
         if (this.readyState !== 1) {
             const res = { errMsg: 'SocketTask.send:fail SocketTask.readState is not OPEN' };
             console.error(res.errMsg);
-            typeof fail === 'function' && fail(res);
-            typeof complete === 'function' && complete(res);
+            shared.isFunction(fail) && fail(res);
+            shared.isFunction(complete) && complete(res);
             return Promise.reject(res);
         }
         this.ws.send(data);
         const res = { errMsg: 'sendSocketMessage:ok' };
-        typeof success === 'function' && success(res);
-        typeof complete === 'function' && complete(res);
+        shared.isFunction(success) && success(res);
+        shared.isFunction(complete) && complete(res);
         return Promise.resolve(res);
     }
     close(opts = {}) {
@@ -3169,8 +3178,8 @@ class SocketTask {
         this._destroyWhenClose && this._destroyWhenClose();
         this.ws.close();
         const res = { errMsg: 'closeSocket:ok' };
-        typeof success === 'function' && success(res);
-        typeof complete === 'function' && complete(res);
+        shared.isFunction(success) && success(res);
+        shared.isFunction(complete) && complete(res);
         return Promise.resolve(res);
     }
     onOpen(func) {
@@ -3228,13 +3237,13 @@ function connectSocket(options) {
                     correct: 'String',
                     wrong: url
                 })
-            }, reject);
+            }, { resolve, reject });
         }
         // options.url must be invalid
         if (!url.startsWith('ws://') && !url.startsWith('wss://')) {
             return handle.fail({
                 errMsg: `request:fail invalid url "${url}"`
-            }, reject);
+            }, { resolve, reject });
         }
         // protocols must be array
         const _protocols = Array.isArray(protocols) ? protocols : null;
@@ -3242,7 +3251,7 @@ function connectSocket(options) {
         if (socketTasks.length > 1) {
             return handle.fail({
                 errMsg: '同时最多发起 2 个 socket 请求，更多请参考文档。'
-            }, reject);
+            }, { resolve, reject });
         }
         const task = new SocketTask(url, _protocols);
         task._destroyWhenClose = function () {
@@ -4596,8 +4605,8 @@ const startPullDownRefresh = function ({ success, fail, complete } = {}) {
     const handle = new MethodHandler({ name: 'startPullDownRefresh', success, fail, complete });
     return new Promise((resolve, reject) => {
         Taro__default["default"].eventCenter.trigger('__taroStartPullDownRefresh', {
-            successHandler: (res = {}) => handle.success(res, resolve),
-            errorHandler: (res = {}) => handle.fail(res, reject)
+            successHandler: (res = {}) => handle.success(res, { resolve, reject }),
+            errorHandler: (res = {}) => handle.fail(res, { resolve, reject })
         });
     });
 };
@@ -4608,8 +4617,8 @@ const stopPullDownRefresh = function ({ success, fail, complete } = {}) {
     const handle = new MethodHandler({ name: 'stopPullDownRefresh', success, fail, complete });
     return new Promise((resolve, reject) => {
         Taro__default["default"].eventCenter.trigger('__taroStopPullDownRefresh', {
-            successHandler: (res = {}) => handle.success(res, resolve),
-            errorHandler: (res = {}) => handle.fail(res, reject)
+            successHandler: (res = {}) => handle.success(res, { resolve, reject }),
+            errorHandler: (res = {}) => handle.fail(res, { resolve, reject })
         });
     });
 };
@@ -4628,7 +4637,7 @@ const pageScrollTo = ({ scrollTop, selector = '', offsetTop = 0, duration = 300,
             if (scrollTop === undefined && !selector) {
                 return handle.fail({
                     errMsg: 'scrollTop" 或 "selector" 需要其之一'
-                }, reject);
+                }, { resolve, reject });
             }
             const id = (_b = (_a = runtime.Current.page) === null || _a === void 0 ? void 0 : _a.path) === null || _b === void 0 ? void 0 : _b.replace(/([^a-z0-9\u00a0-\uffff_-])/ig, '\\$1');
             const el = (id
@@ -4682,7 +4691,7 @@ const pageScrollTo = ({ scrollTop, selector = '', offsetTop = 0, duration = 300,
                     }, FRAME_DURATION);
                 }
                 else {
-                    return handle.success({}, resolve);
+                    return handle.success({}, { resolve, reject });
                 }
             };
             scroll();
@@ -4690,7 +4699,7 @@ const pageScrollTo = ({ scrollTop, selector = '', offsetTop = 0, duration = 300,
         catch (e) {
             return handle.fail({
                 errMsg: e.message
-            }, reject);
+            }, { resolve, reject });
         }
     });
 };
@@ -4727,8 +4736,8 @@ const showTabBarRedDot = (options) => {
     return new Promise((resolve, reject) => {
         Taro__default["default"].eventCenter.trigger('__taroShowTabBarRedDotHandler', {
             index,
-            successHandler: (res = {}) => handle.success(res, resolve),
-            errorHandler: (res = {}) => handle.fail(res, reject)
+            successHandler: (res = {}) => handle.success(res, { resolve, reject }),
+            errorHandler: (res = {}) => handle.fail(res, { resolve, reject })
         });
     });
 };
@@ -4757,8 +4766,8 @@ const showTabBar = (options = {}) => {
     return new Promise((resolve, reject) => {
         Taro__default["default"].eventCenter.trigger('__taroShowTabBar', {
             animation,
-            successHandler: (res = {}) => handle.success(res, resolve),
-            errorHandler: (res = {}) => handle.fail(res, reject)
+            successHandler: (res = {}) => handle.success(res, { resolve, reject }),
+            errorHandler: (res = {}) => handle.fail(res, { resolve, reject })
         });
     });
 };
@@ -4809,8 +4818,8 @@ const setTabBarStyle = (options = {}) => {
             selectedColor,
             backgroundColor,
             borderStyle,
-            successHandler: (res = {}) => handle.success(res, resolve),
-            errorHandler: (res = {}) => handle.fail(res, reject)
+            successHandler: (res = {}) => handle.success(res, { resolve, reject }),
+            errorHandler: (res = {}) => handle.fail(res, { resolve, reject })
         });
     });
 };
@@ -4842,8 +4851,8 @@ const setTabBarItem = (options) => {
             text,
             iconPath,
             selectedIconPath,
-            successHandler: (res = {}) => handle.success(res, resolve),
-            errorHandler: (res = {}) => handle.fail(res, reject)
+            successHandler: (res = {}) => handle.success(res, { resolve, reject }),
+            errorHandler: (res = {}) => handle.fail(res, { resolve, reject })
         });
     });
 };
@@ -4882,8 +4891,8 @@ const setTabBarBadge = (options) => {
         Taro__default["default"].eventCenter.trigger('__taroSetTabBarBadge', {
             index,
             text,
-            successHandler: (res = {}) => handle.success(res, resolve),
-            errorHandler: (res = {}) => handle.fail(res, reject)
+            successHandler: (res = {}) => handle.success(res, { resolve, reject }),
+            errorHandler: (res = {}) => handle.fail(res, { resolve, reject })
         });
     });
 };
@@ -4912,8 +4921,8 @@ const removeTabBarBadge = (options) => {
     return new Promise((resolve, reject) => {
         Taro__default["default"].eventCenter.trigger('__taroRemoveTabBarBadge', {
             index,
-            successHandler: (res = {}) => handle.success(res, resolve),
-            errorHandler: (res = {}) => handle.fail(res, reject)
+            successHandler: (res = {}) => handle.success(res, { resolve, reject }),
+            errorHandler: (res = {}) => handle.fail(res, { resolve, reject })
         });
     });
 };
@@ -4942,8 +4951,8 @@ const hideTabBarRedDot = (options) => {
     return new Promise((resolve, reject) => {
         Taro__default["default"].eventCenter.trigger('__taroHideTabBarRedDotHandler', {
             index,
-            successHandler: (res = {}) => handle.success(res, resolve),
-            errorHandler: (res = {}) => handle.fail(res, reject)
+            successHandler: (res = {}) => handle.success(res, { resolve, reject }),
+            errorHandler: (res = {}) => handle.fail(res, { resolve, reject })
         });
     });
 };
@@ -4972,8 +4981,8 @@ const hideTabBar = (options = {}) => {
     return new Promise((resolve, reject) => {
         Taro__default["default"].eventCenter.trigger('__taroHideTabBar', {
             animation,
-            successHandler: (res = {}) => handle.success(res, resolve),
-            errorHandler: (res = {}) => handle.fail(res, reject)
+            successHandler: (res = {}) => handle.success(res, { resolve, reject }),
+            errorHandler: (res = {}) => handle.fail(res, { resolve, reject })
         });
     });
 };
@@ -5133,7 +5142,7 @@ function generateMediaQueryStr(descriptor) {
 class MediaQueryObserver {
     // 监听页面媒体查询变化情况
     observe(descriptor, callback) {
-        if (isFunction(callback)) {
+        if (shared.isFunction(callback)) {
             // 创建媒体查询对象
             this._mediaQueryObserver = window.matchMedia(generateMediaQueryStr(descriptor));
             // 监听器
@@ -5141,7 +5150,7 @@ class MediaQueryObserver {
                 callback({ matches: ev.matches });
             };
             callback({ matches: this._mediaQueryObserver.matches });
-            // 兼容旧浏览器中MediaQueryList尚未继承于EventTarget导致不存在'addEventListener'
+            // 兼容旧浏览器中 MediaQueryList 尚未继承于 EventTarget 导致不存在 'addEventListener'
             if ('addEventListener' in this._mediaQueryObserver) {
                 this._mediaQueryObserver.addEventListener('change', this._listener);
             }
@@ -5153,7 +5162,7 @@ class MediaQueryObserver {
     // 停止监听，销毁媒体查询对象
     disconnect() {
         if (this._mediaQueryObserver && this._listener) {
-            // 兼容旧浏览器中MediaQueryList尚未继承于EventTarget导致不存在'removeEventListener'
+            // 兼容旧浏览器中 MediaQueryList 尚未继承于 EventTarget 导致不存在 'removeEventListener'
             if ('removeEventListener' in this._mediaQueryObserver) {
                 this._mediaQueryObserver.removeEventListener('change', this._listener);
             }
@@ -5389,9 +5398,9 @@ class SelectorQuery {
             const _queueCb = this._queueCb;
             res.forEach((item, index) => {
                 const cb = _queueCb[index];
-                typeof cb === 'function' && cb.call(this, item);
+                shared.isFunction(cb) && cb.call(this, item);
             });
-            typeof cb === 'function' && cb.call(this, res);
+            shared.isFunction(cb) && cb.call(this, res);
         });
         return this;
     }
@@ -5444,7 +5453,7 @@ const requirePlugin = permanentlyNotSupport('requirePlugin');
 const pxTransform = function (size) {
     const options = taro.config;
     const baseFontSize = options.baseFontSize || 20;
-    const designWidth = ((input = 0) => typeof options.designWidth === 'function'
+    const designWidth = ((input = 0) => shared.isFunction(options.designWidth)
         ? options.designWidth(input)
         : options.designWidth);
     const rootValue = (input = 0) => baseFontSize / options.deviceRatio[designWidth(input)] * 2;