@tarojs/taro-h5 3.4.6 → 3.4.7

package/dist/api/device/scan.js

@@ -1,6 +1,10 @@
 import { processOpenApi } from '../utils';
 // 扫码
-export const scanCode = processOpenApi('scanQRCode', { needResult: 1 }, res => ({
-    errMsg: res.errMsg === 'scanQRCode:ok' ? 'scanCode:ok' : res.errMsg,
-    result: res.resultStr
-}));
+export const scanCode = processOpenApi({
+    name: 'scanQRCode',
+    defaultOptions: { needResult: 1 },
+    formatResult: res => ({
+        errMsg: res.errMsg === 'scanQRCode:ok' ? 'scanCode:ok' : res.errMsg,
+        result: res.resultStr
+    })
+});

package/dist/api/location/getLocation.js

@@ -0,0 +1,64 @@
+import { processOpenApi, shouldBeObject } from '../utils';
+import { MethodHandler } from '../utils/handler';
+const getLocationByW3CApi = (options) => {
+    var _a;
+    // 断言 options 必须是 Object
+    const isObject = shouldBeObject(options);
+    if (!isObject.flag) {
+        const res = { errMsg: `getLocation:fail ${isObject.msg}` };
+        console.error(res.errMsg);
+        return Promise.reject(res);
+    }
+    // 解构回调函数
+    const { success, fail, complete } = options;
+    const handle = new MethodHandler({ name: 'getLocation', success, fail, complete });
+    // const defaultMaximumAge = 5 * 1000
+    const positionOptions = {
+        enableHighAccuracy: options.isHighAccuracy || (options.altitude != null),
+        // maximumAge: defaultMaximumAge, // 允许取多久以内的缓存位置
+        timeout: options.highAccuracyExpireTime // 高精度定位超时时间
+    };
+    // Web端API实现暂时仅支持GPS坐标系
+    if (((_a = options.type) === null || _a === void 0 ? void 0 : _a.toUpperCase()) !== 'WGS84') {
+        return handle.fail({
+            errMsg: 'This coordinate system type is not temporarily supported'
+        });
+    }
+    // 判断当前浏览器是否支持位置API
+    const geolocationSupported = navigator.geolocation;
+    if (!geolocationSupported) {
+        return handle.fail({
+            errMsg: 'The current browser does not support this feature'
+        });
+    }
+    // 开始获取位置
+    return new Promise((resolve, reject) => {
+        navigator.geolocation.getCurrentPosition((position) => {
+            const result = {
+                /** 位置的精确度 */
+                accuracy: position.coords.accuracy,
+                /** 高度，单位 m */
+                altitude: position.coords.altitude,
+                /** 水平精度，单位 m */
+                horizontalAccuracy: position.coords.accuracy,
+                /** 纬度，范围为 -90~90，负数表示南纬 */
+                latitude: position.coords.latitude,
+                /** 经度，范围为 -180~180，负数表示西经 */
+                longitude: position.coords.longitude,
+                /** 速度，单位 m/s */
+                speed: position.coords.speed,
+                /** 垂直精度，单位 m（Android 无法获取，返回 0） */
+                verticalAccuracy: position.coords.altitudeAccuracy || 0,
+                /** 调用结果,自动补充 */
+                errMsg: ''
+            };
+            handle.success(result, resolve);
+        }, (error) => {
+            handle.fail({ errMsg: error.message }, reject);
+        }, positionOptions);
+    });
+};
+export const getLocation = processOpenApi({
+    name: 'getLocation',
+    standardMethod: getLocationByW3CApi
+});

package/dist/api/location/index.js

@@ -3,11 +3,14 @@ import { processOpenApi, temporarilyNotSupport } from '../utils/index';
 export const stopLocationUpdate = temporarilyNotSupport('stopLocationUpdate');
 export const startLocationUpdateBackground = temporarilyNotSupport('startLocationUpdateBackground');
 export const startLocationUpdate = temporarilyNotSupport('startLocationUpdate');
-export const openLocation = processOpenApi('openLocation', { scale: 18 });
+export const openLocation = processOpenApi({
+    name: 'openLocation',
+    defaultOptions: { scale: 18 }
+});
 export const onLocationChangeError = temporarilyNotSupport('onLocationChangeError');
 export const onLocationChange = temporarilyNotSupport('onLocationChange');
 export const offLocationChangeError = temporarilyNotSupport('offLocationChangeError');
 export const offLocationChange = temporarilyNotSupport('offLocationChange');
-export const getLocation = processOpenApi('getLocation');
+export { getLocation } from './getLocation';
 export const choosePoi = temporarilyNotSupport('choosePoi');
-export * from './chooseLocation';
+export { chooseLocation } from './chooseLocation';

package/dist/api/utils/index.js

@@ -90,7 +90,7 @@ export function temporarilyNotSupport(apiName) {
 }
 export function weixinCorpSupport(apiName) {
     return () => {
-        const errMsg = `h5端仅在微信公众号中支持 API ${apiName}`;
+        const errMsg = `h5端当前仅在微信公众号JS-SDK环境下支持此 API ${apiName}`;
         if (process.env.NODE_ENV !== 'production') {
             console.error(errMsg);
             return Promise.reject({
@@ -129,31 +129,36 @@ const VALID_COLOR_REG = /^#[0-9a-fA-F]{6}$/;
 export const isValidColor = (color) => {
     return VALID_COLOR_REG.test(color);
 };
-export function processOpenApi(apiName, defaultOptions, formatResult = res => res, formatParams = options => options) {
-    // @ts-ignore
-    if (!window.wx) {
-        return weixinCorpSupport(apiName);
-    }
-    return options => {
-        options = options || {};
-        const obj = Object.assign({}, defaultOptions, options);
-        const p = new Promise((resolve, reject) => {
-            ['fail', 'success', 'complete'].forEach(k => {
-                obj[k] = oriRes => {
-                    const res = formatResult(oriRes);
-                    options[k] && options[k](res);
-                    if (k === 'success') {
-                        resolve(res);
-                    }
-                    else if (k === 'fail') {
-                        reject(res);
-                    }
-                };
+export function processOpenApi({ name, defaultOptions, standardMethod, formatOptions = options => options, formatResult = res => res }) {
+    const notSupported = weixinCorpSupport(name);
+    return (options = {}) => {
+        var _a;
+        // @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') {
+            return new Promise((resolve, reject) => {
+                ['fail', 'success', 'complete'].forEach(k => {
+                    opts[k] = preRef => {
+                        const res = formatResult(preRef);
+                        options[k] && options[k](res);
+                        if (k === 'success') {
+                            resolve(res);
+                        }
+                        else if (k === 'fail') {
+                            reject(res);
+                        }
+                    };
+                    return targetApi(opts);
+                });
             });
-            // @ts-ignore
-            wx[apiName](formatParams(obj));
-        });
-        return p;
+        }
+        else if (typeof standardMethod === 'function') {
+            return standardMethod(opts);
+        }
+        else {
+            return notSupported();
+        }
     };
 }
 /**

package/dist/dist/api/device/scan.d.ts

@@ -1 +1,3 @@
-export declare const scanCode: (options: any) => Promise<unknown>;
+export declare const scanCode: (options?: Partial<{
+    needResult: number;
+}>) => Promise<any>;

package/dist/dist/api/location/getLocation.d.ts

@@ -0,0 +1,2 @@
+import Taro from '@tarojs/api';
+export declare const getLocation: (options?: Partial<Taro.getLocation.Option>) => Promise<Taro.getLocation.SuccessCallbackResult>;

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

@@ -7,7 +7,9 @@ export declare const startLocationUpdateBackground: () => Promise<{
 export declare const startLocationUpdate: () => Promise<{
     errMsg: string;
 }>;
-export declare const openLocation: (options: any) => Promise<unknown>;
+export declare const openLocation: (options?: Partial<{
+    scale: number;
+}>) => Promise<any>;
 export declare const onLocationChangeError: () => Promise<{
     errMsg: string;
 }>;
@@ -20,8 +22,8 @@ export declare const offLocationChangeError: () => Promise<{
 export declare const offLocationChange: () => Promise<{
     errMsg: string;
 }>;
-export declare const getLocation: (options: any) => Promise<unknown>;
+export { getLocation } from './getLocation';
 export declare const choosePoi: () => Promise<{
     errMsg: string;
 }>;
-export * from './chooseLocation';
+export { chooseLocation } from './chooseLocation';

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

@@ -28,7 +28,14 @@ export declare function permanentlyNotSupport(apiName: any): () => Promise<{
 }>;
 export declare function isFunction(obj: any): boolean;
 export declare const isValidColor: (color: any) => boolean;
-export declare function processOpenApi(apiName: string, defaultOptions?: Record<string, unknown>, formatResult?: (res: any) => any, formatParams?: (options: any) => any): (options: any) => Promise<unknown>;
+interface IProcessOpenApi<TOptions = Record<string, unknown>, TResult extends TaroGeneral.CallbackResult = any> {
+    name: string;
+    defaultOptions?: TOptions;
+    standardMethod?: (opts: TOptions) => Promise<TResult>;
+    formatOptions?: (opts: TOptions) => TOptions;
+    formatResult?: (res: TResult) => TResult;
+}
+export declare function processOpenApi<TOptions = Record<string, unknown>, TResult extends TaroGeneral.CallbackResult = any>({ name, defaultOptions, standardMethod, formatOptions, formatResult }: IProcessOpenApi<TOptions, TResult>): (options?: Partial<TOptions>) => Promise<TResult>;
 /**
  * ease-in-out的函数
  * @param t 0-1的数字

package/dist/index.cjs.js

@@ -108,7 +108,7 @@ function temporarilyNotSupport(apiName) {
 }
 function weixinCorpSupport(apiName) {
     return () => {
-        const errMsg = `h5端仅在微信公众号中支持 API ${apiName}`;
+        const errMsg = `h5端当前仅在微信公众号JS-SDK环境下支持此 API ${apiName}`;
         if (process.env.NODE_ENV !== 'production') {
             console.error(errMsg);
             return Promise.reject({
@@ -147,31 +147,36 @@ const VALID_COLOR_REG = /^#[0-9a-fA-F]{6}$/;
 const isValidColor = (color) => {
     return VALID_COLOR_REG.test(color);
 };
-function processOpenApi(apiName, defaultOptions, formatResult = res => res, formatParams = options => options) {
-    // @ts-ignore
-    if (!window.wx) {
-        return weixinCorpSupport(apiName);
-    }
-    return options => {
-        options = options || {};
-        const obj = Object.assign({}, defaultOptions, options);
-        const p = new Promise((resolve, reject) => {
-            ['fail', 'success', 'complete'].forEach(k => {
-                obj[k] = oriRes => {
-                    const res = formatResult(oriRes);
-                    options[k] && options[k](res);
-                    if (k === 'success') {
-                        resolve(res);
-                    }
-                    else if (k === 'fail') {
-                        reject(res);
-                    }
-                };
+function processOpenApi({ name, defaultOptions, standardMethod, formatOptions = options => options, formatResult = res => res }) {
+    const notSupported = weixinCorpSupport(name);
+    return (options = {}) => {
+        var _a;
+        // @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') {
+            return new Promise((resolve, reject) => {
+                ['fail', 'success', 'complete'].forEach(k => {
+                    opts[k] = preRef => {
+                        const res = formatResult(preRef);
+                        options[k] && options[k](res);
+                        if (k === 'success') {
+                            resolve(res);
+                        }
+                        else if (k === 'fail') {
+                            reject(res);
+                        }
+                    };
+                    return targetApi(opts);
+                });
             });
-            // @ts-ignore
-            wx[apiName](formatParams(obj));
-        });
-        return p;
+        }
+        else if (typeof standardMethod === 'function') {
+            return standardMethod(opts);
+        }
+        else {
+            return notSupported();
+        }
     };
 }
 /**
@@ -1478,10 +1483,14 @@ const makePhoneCall = (options) => {
 };
 
 // 扫码
-const scanCode = processOpenApi('scanQRCode', { needResult: 1 }, res => ({
-    errMsg: res.errMsg === 'scanQRCode:ok' ? 'scanCode:ok' : res.errMsg,
-    result: res.resultStr
-}));
+const scanCode = processOpenApi({
+    name: 'scanQRCode',
+    defaultOptions: { needResult: 1 },
+    formatResult: res => ({
+        errMsg: res.errMsg === 'scanQRCode:ok' ? 'scanCode:ok' : res.errMsg,
+        result: res.resultStr
+    })
+});
 
 // 屏幕
 const setVisualEffectOnCapture = temporarilyNotSupport('setVisualEffectOnCapture');
@@ -1559,6 +1568,69 @@ const getApp = function () {
 // 自定义组件
 const getCurrentInstance = Taro__default["default"].getCurrentInstance;
 
+const getLocationByW3CApi = (options) => {
+    var _a;
+    // 断言 options 必须是 Object
+    const isObject = shouldBeObject(options);
+    if (!isObject.flag) {
+        const res = { errMsg: `getLocation:fail ${isObject.msg}` };
+        console.error(res.errMsg);
+        return Promise.reject(res);
+    }
+    // 解构回调函数
+    const { success, fail, complete } = options;
+    const handle = new MethodHandler({ name: 'getLocation', success, fail, complete });
+    // const defaultMaximumAge = 5 * 1000
+    const positionOptions = {
+        enableHighAccuracy: options.isHighAccuracy || (options.altitude != null),
+        // maximumAge: defaultMaximumAge, // 允许取多久以内的缓存位置
+        timeout: options.highAccuracyExpireTime // 高精度定位超时时间
+    };
+    // Web端API实现暂时仅支持GPS坐标系
+    if (((_a = options.type) === null || _a === void 0 ? void 0 : _a.toUpperCase()) !== 'WGS84') {
+        return handle.fail({
+            errMsg: 'This coordinate system type is not temporarily supported'
+        });
+    }
+    // 判断当前浏览器是否支持位置API
+    const geolocationSupported = navigator.geolocation;
+    if (!geolocationSupported) {
+        return handle.fail({
+            errMsg: 'The current browser does not support this feature'
+        });
+    }
+    // 开始获取位置
+    return new Promise((resolve, reject) => {
+        navigator.geolocation.getCurrentPosition((position) => {
+            const result = {
+                /** 位置的精确度 */
+                accuracy: position.coords.accuracy,
+                /** 高度，单位 m */
+                altitude: position.coords.altitude,
+                /** 水平精度，单位 m */
+                horizontalAccuracy: position.coords.accuracy,
+                /** 纬度，范围为 -90~90，负数表示南纬 */
+                latitude: position.coords.latitude,
+                /** 经度，范围为 -180~180，负数表示西经 */
+                longitude: position.coords.longitude,
+                /** 速度，单位 m/s */
+                speed: position.coords.speed,
+                /** 垂直精度，单位 m（Android 无法获取，返回 0） */
+                verticalAccuracy: position.coords.altitudeAccuracy || 0,
+                /** 调用结果,自动补充 */
+                errMsg: ''
+            };
+            handle.success(result, resolve);
+        }, (error) => {
+            handle.fail({ errMsg: error.message }, reject);
+        }, positionOptions);
+    });
+};
+const getLocation = processOpenApi({
+    name: 'getLocation',
+    standardMethod: getLocationByW3CApi
+});
+
 function styleInject(css, ref) {
   if ( ref === void 0 ) ref = {};
   var insertAt = ref.insertAt;
@@ -1694,12 +1766,14 @@ const chooseLocation = ({ success, fail, complete, mapOpts } = {}) => {
 const stopLocationUpdate = temporarilyNotSupport('stopLocationUpdate');
 const startLocationUpdateBackground = temporarilyNotSupport('startLocationUpdateBackground');
 const startLocationUpdate = temporarilyNotSupport('startLocationUpdate');
-const openLocation = processOpenApi('openLocation', { scale: 18 });
+const openLocation = processOpenApi({
+    name: 'openLocation',
+    defaultOptions: { scale: 18 }
+});
 const onLocationChangeError = temporarilyNotSupport('onLocationChangeError');
 const onLocationChange = temporarilyNotSupport('onLocationChange');
 const offLocationChangeError = temporarilyNotSupport('offLocationChangeError');
 const offLocationChange = temporarilyNotSupport('offLocationChange');
-const getLocation = processOpenApi('getLocation');
 const choosePoi = temporarilyNotSupport('choosePoi');
 
 class InnerAudioContext {