@ray-js/api 1.3.21 → 1.3.23

package/lib/getCdnUrl/index.thing.js

@@ -1,8 +1,4 @@
-import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
-import _regeneratorRuntime from "@babel/runtime/regenerator";
-import "core-js/modules/es.object.to-string.js";
-import "core-js/modules/es.promise.js";
-var regionMap = {
+const regionMap = {
   AY: 'images.tuyacn.com',
   AZ: 'usimagesd1448c85ulz2o4.cdn5th.com',
   EU: 'euimagesd2h2yqnfpu4gl5.cdn5th.com',
@@ -11,21 +7,21 @@ var regionMap = {
   WE: 'd2h2yqnfpu4gl5.cdn5th.com',
   UE: 'usimagesd1448c85ulz2o4.cdn5th.com'
 };
-var regionCode = 'EU';
+let regionCode = 'EU';
 export function getRegionCode() {
-  return new Promise(function (resolve, reject) {
+  return new Promise((resolve, reject) => {
     ty.getAppInfo({
-      success: function success(res) {
+      success: function (res) {
         resolve(res.regionCode);
       },
-      fail: function fail(err) {
+      fail: function (err) {
         reject(err);
       }
     });
   });
 }
 ty.getAppInfo({
-  success: function success(res) {
+  success: function (res) {
     regionCode = res.regionCode;
   }
 });
@@ -34,85 +30,34 @@ export default function getCdnUrl(path, cdnMap, region) {
     console.warn('请传入cdnMap');
     return path;
   }
-
-  var cdnShortPath = cdnMap[path];
-
+  const cdnShortPath = cdnMap[path];
   if (!cdnShortPath) {
     console.warn('[App] cdn "' + path + '" is not exist.');
     return path;
   }
-
-  var cdnPath = 'https://' + regionMap[region || regionCode] + '/' + cdnShortPath;
+  const cdnPath = 'https://' + regionMap[region || regionCode] + '/' + cdnShortPath;
   return cdnPath;
 }
-export function getCdnUrlAsync() {
-  return _getCdnUrlAsync.apply(this, arguments);
-}
-
-function _getCdnUrlAsync() {
-  _getCdnUrlAsync = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(path, cdnMap, region) {
-    var _regionCode, cdnShortPath, cdnPath;
-
-    return _regeneratorRuntime.wrap(function (_context) {
-      while (1) {
-        switch (_context.prev = _context.next) {
-          case 0:
-            if (cdnMap) {
-              _context.next = 3;
-              break;
-            }
-
-            console.warn('请传入cdnMap');
-            return _context.abrupt("return", path);
-
-          case 3:
-            _regionCode = 'EU';
-
-            if (!region) {
-              _context.next = 8;
-              break;
-            }
-
-            _regionCode = region;
-            _context.next = 17;
-            break;
-
-          case 8:
-            _context.prev = 8;
-            _context.next = 11;
-            return getRegionCode();
-
-          case 11:
-            _regionCode = _context.sent;
-            _context.next = 17;
-            break;
-
-          case 14:
-            _context.prev = 14;
-            _context.t0 = _context["catch"](8);
-            console.warn('[App] getRegionCode error, use default region EU', _context.t0);
-
-          case 17:
-            cdnShortPath = cdnMap[path];
-
-            if (cdnShortPath) {
-              _context.next = 21;
-              break;
-            }
-
-            console.warn('[App] cdn "' + path + '" is not exist.');
-            return _context.abrupt("return", path);
-
-          case 21:
-            cdnPath = 'https://' + regionMap[_regionCode] + '/' + cdnShortPath;
-            return _context.abrupt("return", cdnPath);
-
-          case 23:
-          case "end":
-            return _context.stop();
-        }
-      }
-    }, _callee, null, [[8, 14]]);
-  }));
-  return _getCdnUrlAsync.apply(this, arguments);
+export async function getCdnUrlAsync(path, cdnMap, region) {
+  if (!cdnMap) {
+    console.warn('请传入cdnMap');
+    return path;
+  }
+  let _regionCode = 'EU';
+  if (region) {
+    _regionCode = region;
+  } else {
+    try {
+      _regionCode = await getRegionCode();
+    } catch (error) {
+      console.warn('[App] getRegionCode error, use default region EU', error);
+    }
+  }
+  const cdnShortPath = cdnMap[path];
+  if (!cdnShortPath) {
+    console.warn('[App] cdn "' + path + '" is not exist.');
+    return path;
+  }
+  const cdnPath = 'https://' + regionMap[_regionCode] + '/' + cdnShortPath;
+  return cdnPath;
 }

package/lib/getCdnUrl/index.wechat.js

@@ -1,5 +1,3 @@
-import "core-js/modules/es.object.to-string.js";
-import "core-js/modules/es.promise.js";
 export default function getCdnUrl(path) {
   // 暂未实现获取cdn方法，将直接返回path
   return path;

package/lib/getElementById/index.js

@@ -1,7 +1,5 @@
-import "core-js/modules/es.object.to-string.js";
-import "core-js/modules/es.promise.js";
 export default function getElementById(id) {
-  return new Promise(function (resolve) {
+  return new Promise(resolve => {
     resolve(document.getElementById(id));
   });
 }

package/lib/getElementById/index.thing.js

@@ -1,8 +1,6 @@
-import "core-js/modules/es.object.to-string.js";
-import "core-js/modules/es.promise.js";
 export default function getElementById(id) {
-  return new Promise(function (resolve) {
-    var nodeRef = ty.createSelectorQuery().select("#".concat(id));
+  return new Promise(resolve => {
+    const nodeRef = ty.createSelectorQuery().select(`#${id}`);
     resolve(nodeRef);
   });
 }

package/lib/getElementById/index.wechat.js

@@ -1,8 +1,6 @@
-import "core-js/modules/es.object.to-string.js";
-import "core-js/modules/es.promise.js";
 export default function getElementById(id) {
-  return new Promise(function (resolve) {
-    var nodeRef = wx.createSelectorQuery().select("#".concat(id));
+  return new Promise(resolve => {
+    const nodeRef = wx.createSelectorQuery().select(`#${id}`);
     resolve(nodeRef);
   });
 }

package/lib/hideTabBar/index.d.ts

@@ -1,3 +1,9 @@
 /// <reference path="../../@types/api.d.ts" />
-declare const _default: (arg?: any) => Promise<any>;
+declare const _default: (arg?: {
+    animation?: boolean | undefined;
+} & {
+    success?: ((S?: any) => void) | undefined;
+    fail?: ((F?: any) => void) | undefined;
+    complete?: ((C?: any) => void) | undefined;
+} & import("../core").PromisifyArgs<any, any>) => Promise<any>;
 export default _default;

package/lib/index.js

@@ -1,4 +1,5 @@
 /// <reference path="../@types/api.d.ts" />
+
 export * from './constants';
 export * from './all-kits';
 export * from './lifecycles';
@@ -21,15 +22,15 @@ export { default as switchTab } from './switchTab';
 export { default as onNavigationBarBack } from './onNavigationBarBack';
 export { default as setNavigationBarBack } from './setNavigationBarBack';
 export { default as getCdnUrl, getCdnUrlAsync } from './getCdnUrl';
+
 /**
  * 提供 glboal-api 将 wx / ty 对象暴露出去，供给业务在Ray为显示导出api时进行快速响应开发。
  */
-
 export { default as globalApi } from './global-api';
 export * from './cloud';
+
 /**
  * 0.10.3将一部分未支持的api导入
  */
-
 export * from './viewAPI';
 export * from './panel';

package/lib/lifecycles/offAppEvent/index.js

@@ -1,6 +1,6 @@
 /// <reference path="../../@types/api.d.ts" />
-var offAppEvent = function () {
+
+const offAppEvent = function () {
   console.warn('// TODO 暂未实现方法 offAppEvent');
 };
-
 export default offAppEvent;

package/lib/lifecycles/offAppHide/index.js

@@ -1,6 +1,6 @@
 /// <reference path="../../@types/api.d.ts" />
-var offAppHide = function () {
+
+const offAppHide = function () {
   console.warn('// TODO 暂未实现方法 offAppHide');
 };
-
 export default offAppHide;

package/lib/lifecycles/offAppShow/index.js

@@ -1,6 +1,6 @@
 /// <reference path="../../@types/api.d.ts" />
-var offAppShow = function () {
+
+const offAppShow = function () {
   console.warn('// TODO 暂未实现方法 offAppShow');
 };
-
 export default offAppShow;

package/lib/lifecycles/offError/index.js

@@ -1,6 +1,6 @@
 /// <reference path="../../@types/api.d.ts" />
-var offError = function () {
+
+const offError = function () {
   console.warn('// TODO 暂未实现方法 offError');
 };
-
 export default offError;

package/lib/lifecycles/offThemeChange/index.js

@@ -1,6 +1,6 @@
 /// <reference path="../../@types/api.d.ts" />
-var offThemeChange = function () {
+
+const offThemeChange = function () {
   console.warn('// TODO 暂未实现方法 offThemeChange');
 };
-
 export default offThemeChange;

package/lib/lifecycles/offWindowResize/index.js

@@ -1,6 +1,6 @@
 /// <reference path="../../@types/api.d.ts" />
-var offWindowResize = function () {
+
+const offWindowResize = function () {
   console.warn('// TODO 暂未实现方法 offWindowResize');
 };
-
 export default offWindowResize;

package/lib/lifecycles/onAppEvent/index.js

@@ -1,6 +1,6 @@
 /// <reference path="../../@types/api.d.ts" />
-var onAppEvent = function () {
+
+const onAppEvent = function () {
   console.warn('// TODO 暂未实现方法 onAppEvent');
 };
-
 export default onAppEvent;

package/lib/lifecycles/onAppHide/index.js

@@ -1,6 +1,6 @@
 /// <reference path="../../@types/api.d.ts" />
-var onAppHide = function () {
+
+const onAppHide = function () {
   console.warn('// TODO 暂未实现方法 onAppHide');
 };
-
 export default onAppHide;

package/lib/lifecycles/onAppShow/index.js

@@ -1,6 +1,6 @@
 /// <reference path="../../@types/api.d.ts" />
-var onAppShow = function () {
+
+const onAppShow = function () {
   console.warn('// TODO 暂未实现方法 onAppShow');
 };
-
 export default onAppShow;

package/lib/lifecycles/onError/index.js

@@ -1,6 +1,6 @@
 /// <reference path="../../@types/api.d.ts" />
-var onError = function () {
+
+const onError = function () {
   console.warn('// TODO 暂未实现方法 onError');
 };
-
 export default onError;

package/lib/lifecycles/onPageNotFound/index.js

@@ -1,6 +1,6 @@
 /// <reference path="../../@types/api.d.ts" />
-var onPageNotFound = function () {
+
+const onPageNotFound = function () {
   console.warn('// TODO 暂未实现方法 onPageNotFound');
 };
-
 export default onPageNotFound;

package/lib/lifecycles/onThemeChange/index.js

@@ -1,6 +1,6 @@
 /// <reference path="../../@types/api.d.ts" />
-var onThemeChange = function () {
+
+const onThemeChange = function () {
   console.warn('// TODO 暂未实现方法 onThemeChange');
 };
-
 export default onThemeChange;

package/lib/lifecycles/onWindowResize/index.js

@@ -1,6 +1,6 @@
 /// <reference path="../../@types/api.d.ts" />
-var onWindowResize = function () {
+
+const onWindowResize = function () {
   console.warn('// TODO 暂未实现方法 onWindowResize');
 };
-
 export default onWindowResize;

package/lib/navigateBack/index.js

@@ -1,14 +1,11 @@
-import "core-js/modules/es.object.to-string.js";
-import "core-js/modules/es.promise.js";
 /// <reference path="../../@types/api.d.ts" />
-import router from '@ray-js/router';
 
-var navigateBack = function () {
-  var options = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {
+import router from '@ray-js/router';
+const navigateBack = function () {
+  let options = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {
     delta: 1
   };
   router.go(options.delta * -1);
   return Promise.resolve();
 };
-
 export default navigateBack;

package/lib/navigateTo/index.js

@@ -1,11 +1,8 @@
-import "core-js/modules/es.object.to-string.js";
-import "core-js/modules/es.promise.js";
 /// <reference path="../../@types/api.d.ts" />
-import router from '@ray-js/router';
 
-var navigateTo = function (options) {
+import router from '@ray-js/router';
+const navigateTo = function (options) {
   router.push(options.url);
   return Promise.resolve();
 };
-
 export default navigateTo;

package/lib/onNavigationBarBack/index.js

@@ -1,5 +1,4 @@
-var onNavigationBarBack = function () {
+const onNavigationBarBack = function () {
   console.warn('尚未支持');
 };
-
 export default onNavigationBarBack;

package/lib/onNavigationBarBack/index.wechat.js

@@ -1,5 +1,4 @@
-var onNavigationBarBack = function () {
+const onNavigationBarBack = function () {
   console.warn('尚未支持');
 };
-
 export default onNavigationBarBack;

package/lib/panel/devInfo/index.js

@@ -1,13 +1,8 @@
-import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
-import _regeneratorRuntime from "@babel/runtime/regenerator";
-import "core-js/modules/es.object.to-string.js";
-import "core-js/modules/web.dom-collections.for-each.js";
-import "core-js/modules/es.promise.js";
 import { getDeviceInfo, getLaunchOptionsSync, getGroupInfo, getApp, registerDeviceListListener, registerGroupChange, exitMiniProgram, subscribeDeviceRemoved, onDeviceRemoved } from '@ray-js/api';
 // 本地化缓存 deviceInfo 方便随时调用
-var __deviceInfo = null;
-var defaultPanelEnvironmentOptions = {
+let __deviceInfo = null;
+const defaultPanelEnvironmentOptions = {
   useDefaultOffline: true,
   bleCover: false,
   customTop: null,
@@ -15,17 +10,20 @@ var defaultPanelEnvironmentOptions = {
   showBLEToast: true
 };
 export function parseDevice(dev) {
-  if (!dev) return null; // @ts-ignore
-
-  var deviceInfo = _objectSpread({}, dev);
-
-  var schema = dev.schema;
-  var idCodes = {};
-  var codeIds = {};
-  schema.forEach(function (item) {
+  if (!dev) return null;
+  // @ts-ignore
+  const deviceInfo = _objectSpread({}, dev);
+  const {
+    schema
+  } = dev;
+  const idCodes = {};
+  const codeIds = {};
+  schema.forEach(item => {
     // @ts-ignore
-    var id = item.id,
-        code = item.code;
+    const {
+      id,
+      code
+    } = item;
     idCodes[id] = code;
     codeIds[code] = id;
   });
@@ -33,35 +31,33 @@ export function parseDevice(dev) {
   deviceInfo.codeIds = codeIds;
   return deviceInfo;
 }
+
 /**
  * 初始化面板环境下使用到的设备信息
  * @returns Promise<DevInfo>
  */
-
-export var initDevInfo = function (option) {
-  return new Promise(function (resolve, reject) {
+export const initDevInfo = option => {
+  return new Promise((resolve, reject) => {
     if (__deviceInfo) {
       resolve(__deviceInfo);
     }
-
-    var data = getLaunchOptionsSync();
-
-    var _ref = option || data.query,
-        deviceId = _ref.deviceId,
-        groupId = _ref.groupId;
-
+    const data = getLaunchOptionsSync();
+    const {
+      deviceId,
+      groupId
+    } = option || data.query;
     if (groupId) {
       getGroupInfo({
-        groupId: groupId,
-        success: function success(groupInfo) {
+        groupId,
+        success: groupInfo => {
           __deviceInfo = groupInfo;
           resolve(__deviceInfo);
         }
       });
     } else {
       getDeviceInfo({
-        deviceId: deviceId,
-        success: function success(deviceInfo) {
+        deviceId,
+        success: deviceInfo => {
           __deviceInfo = parseDevice(deviceInfo);
           resolve(__deviceInfo);
         },
@@ -70,108 +66,75 @@ export var initDevInfo = function (option) {
     }
   });
 };
-export var getDevInfo = function () {
+export const getDevInfo = () => {
   return __deviceInfo;
 };
-export var updateDevInfo = function (devInfo) {
+export const updateDevInfo = devInfo => {
   __deviceInfo = devInfo;
 };
+
 /**
  * 监听设备移除
  */
-
-var handleDeviceRemoved = function () {
+const handleDeviceRemoved = () => {
   exitMiniProgram();
 };
+
 /**
  * 绑定当前设备或群组基础事件
  * @param config: InitPanelEnvironmentOptions 配置项
  */
-
-
-export function initPanelEnvironment() {
-  return _initPanelEnvironment.apply(this, arguments);
-}
-
-function _initPanelEnvironment() {
-  _initPanelEnvironment = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
-    var options,
-        App,
-        _args = arguments;
-    return _regeneratorRuntime.wrap(function (_context) {
-      while (1) {
-        switch (_context.prev = _context.next) {
-          case 0:
-            options = _args.length > 0 && _args[0] !== undefined ? _args[0] : defaultPanelEnvironmentOptions;
-
-            if (getApp()) {
-              _context.next = 5;
-              break;
-            }
-
-            _context.next = 4;
-            return new Promise(function (resolve) {
-              setTimeout(function () {
-                resolve(initPanelEnvironment(options));
-              }, 0);
-            });
-
-          case 4:
-            return _context.abrupt("return");
-
-          case 5:
-            App = getApp(); // 基础库版本需要大于 2.6.0
-            // @ts-ignore
-
-            App.onReady = function (event) {
-              var _options$deviceId, _options$groupId;
-
-              var deviceId = (_options$deviceId = options.deviceId) !== null && _options$deviceId !== void 0 ? _options$deviceId : event.query.deviceId;
-              var groupId = (_options$groupId = options.groupId) !== null && _options$groupId !== void 0 ? _options$groupId : event.query.groupId;
-              var useDefaultOffline = options.useDefaultOffline; // @ts-ignore
-
-              if (ty.panel && ty.panel.initPanelKit && useDefaultOffline) {
-                // @ts-ignore
-                ty.panel.initPanelKit(_objectSpread({
-                  deviceId: deviceId,
-                  groupId: groupId
-                }, options));
-              } else {
-                // 否则使用 registerDeviceListListener 注册，删除上述条件方法
-                // 若需要能用离线逻辑，则需要在 global.config.ts 中添加   pageWrapper: ['@ray-js/ray-panel-wrapper/lib/page'],
-                if (deviceId) {
-                  registerDeviceListListener({
-                    deviceIdList: [deviceId]
-                  });
-                }
-
-                if (groupId) {
-                  registerGroupChange({
-                    groupIdList: [groupId]
-                  });
-                }
-              }
-
-              if (deviceId) {
-                subscribeDeviceRemoved({
-                  deviceId: deviceId,
-                  success: function success() {
-                    onDeviceRemoved(handleDeviceRemoved);
-                  }
-                });
-              }
-            }; // 使用 Promise 确保业务可以通过 initPanelEnvironment 的正常调用明确设备信息初始化完成
-
-
-            _context.next = 9;
-            return initDevInfo(options.deviceId || options.groupId ? options : undefined);
-
-          case 9:
-          case "end":
-            return _context.stop();
-        }
+export async function initPanelEnvironment() {
+  let options = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : defaultPanelEnvironmentOptions;
+  if (!getApp()) {
+    await new Promise(resolve => {
+      setTimeout(() => {
+        resolve(initPanelEnvironment(options));
+      }, 0);
+    });
+    return;
+  }
+  const App = getApp();
+
+  // 基础库版本需要大于 2.6.0
+  // @ts-ignore
+  App.onReady = event => {
+    var _options$deviceId, _options$groupId;
+    const deviceId = (_options$deviceId = options.deviceId) !== null && _options$deviceId !== void 0 ? _options$deviceId : event.query.deviceId;
+    const groupId = (_options$groupId = options.groupId) !== null && _options$groupId !== void 0 ? _options$groupId : event.query.groupId;
+    const {
+      useDefaultOffline
+    } = options;
+    // @ts-ignore
+    if (ty.panel && ty.panel.initPanelKit && useDefaultOffline) {
+      // @ts-ignore
+      ty.panel.initPanelKit(_objectSpread({
+        deviceId,
+        groupId
+      }, options));
+    } else {
+      // 否则使用 registerDeviceListListener 注册，删除上述条件方法
+      // 若需要能用离线逻辑，则需要在 global.config.ts 中添加   pageWrapper: ['@ray-js/ray-panel-wrapper/lib/page'],
+      if (deviceId) {
+        registerDeviceListListener({
+          deviceIdList: [deviceId]
+        });
+      }
+      if (groupId) {
+        registerGroupChange({
+          groupIdList: [groupId]
+        });
       }
-    }, _callee);
-  }));
-  return _initPanelEnvironment.apply(this, arguments);
+    }
+    if (deviceId) {
+      subscribeDeviceRemoved({
+        deviceId,
+        success: () => {
+          onDeviceRemoved(handleDeviceRemoved);
+        }
+      });
+    }
+  };
+  // 使用 Promise 确保业务可以通过 initPanelEnvironment 的正常调用明确设备信息初始化完成
+  await initDevInfo(options.deviceId || options.groupId ? options : undefined);
 }