@ray-js/api 1.4.0-alpha.0 → 1.4.0-alpha.10

package/lib/core/promisify/index.js

@@ -1,24 +1,20 @@
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
-import "core-js/modules/es.object.to-string.js";
-import "core-js/modules/es.promise.js";
 export function promisify(api) {
   return function () {
-    var arg = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
-    return new Promise(function (resolve, reject) {
-      var promisifyArg = arg;
+    let arg = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+    return new Promise((resolve, reject) => {
+      const promisifyArg = arg;
       api(_objectSpread(_objectSpread({}, promisifyArg), {}, {
-        success: function success(res) {
+        success: res => {
           if (promisifyArg && typeof promisifyArg.success === 'function') {
             promisifyArg.success(res);
           }
-
           resolve(res);
         },
-        fail: function fail(res) {
+        fail: res => {
           if (promisifyArg && typeof promisifyArg.fail === 'function') {
             promisifyArg.fail(res);
           }
-
           reject(res);
         }
       }));

package/lib/getBoundingClientRect/index.js

@@ -1,26 +1,25 @@
-import "core-js/modules/es.object.to-string.js";
-import "core-js/modules/es.promise.js";
-
 /**
  * 获取元素的大小及其相对于视口的位置
  * @param element HTEMLElement | Nodes
  */
 export default function getBoundingClientRect(element) {
-  return new Promise(function (resolve) {
-    var rect = element.getBoundingClientRect();
-    var right = rect.right,
-        left = rect.left,
-        top = rect.top,
-        bottom = rect.bottom,
-        width = rect.width,
-        height = rect.height;
+  return new Promise(resolve => {
+    const rect = element.getBoundingClientRect();
+    const {
+      right,
+      left,
+      top,
+      bottom,
+      width,
+      height
+    } = rect;
     resolve({
-      right: right,
-      left: left,
-      top: top,
-      bottom: bottom,
-      width: width,
-      height: height
+      right,
+      left,
+      top,
+      bottom,
+      width,
+      height
     });
   });
 }

package/lib/getBoundingClientRect/index.thing.js

@@ -1,22 +1,21 @@
-import "core-js/modules/es.object.to-string.js";
-import "core-js/modules/es.promise.js";
-import "core-js/modules/es.regexp.exec.js";
 export default function getBoundingClientRect(ref) {
-  return new Promise(function (resolve) {
-    ref.boundingClientRect(function (rect) {
-      var right = rect.right,
-          left = rect.left,
-          top = rect.top,
-          bottom = rect.bottom,
-          width = rect.width,
-          height = rect.height;
+  return new Promise(resolve => {
+    ref.boundingClientRect(rect => {
+      const {
+        right,
+        left,
+        top,
+        bottom,
+        width,
+        height
+      } = rect;
       resolve({
-        right: right,
-        left: left,
-        top: top,
-        bottom: bottom,
-        width: width,
-        height: height
+        right,
+        left,
+        top,
+        bottom,
+        width,
+        height
       });
     }).exec();
   });

package/lib/getBoundingClientRect/index.wechat.js

@@ -1,22 +1,21 @@
-import "core-js/modules/es.object.to-string.js";
-import "core-js/modules/es.promise.js";
-import "core-js/modules/es.regexp.exec.js";
 export default function getBoundingClientRect(ref) {
-  return new Promise(function (resolve) {
-    ref.boundingClientRect(function (rect) {
-      var right = rect.right,
-          left = rect.left,
-          top = rect.top,
-          bottom = rect.bottom,
-          width = rect.width,
-          height = rect.height;
+  return new Promise(resolve => {
+    ref.boundingClientRect(rect => {
+      const {
+        right,
+        left,
+        top,
+        bottom,
+        width,
+        height
+      } = rect;
       resolve({
-        right: right,
-        left: left,
-        top: top,
-        bottom: bottom,
-        width: width,
-        height: height
+        right,
+        left,
+        top,
+        bottom,
+        width,
+        height
       });
     }).exec();
   });

package/lib/getCdnUrl/index.d.ts

@@ -1 +1,2 @@
 export default function getCdnUrl(path: string): string;
+export declare function getCdnUrlAsync(path: string): Promise<string>;

package/lib/getCdnUrl/index.js

@@ -1,4 +1,8 @@
 export default function getCdnUrl(path) {
   // 暂未实现获取cdn方法，将直接返回path
   return path;
+}
+export function getCdnUrlAsync(path) {
+  // 暂未实现获取cdn方法，将直接返回path
+  return Promise.resolve(path);
 }

package/lib/getCdnUrl/index.thing.d.ts

@@ -1 +1,3 @@
-export default function getCdnUrl(path: string, cdnMap?: Record<string, string>): string;
+export declare function getRegionCode(): Promise<string>;
+export default function getCdnUrl(path: string, cdnMap?: Record<string, string>, region?: string): string;
+export declare function getCdnUrlAsync(path: string, cdnMap?: Record<string, string>, region?: string): Promise<string>;

package/lib/getCdnUrl/index.thing.js

@@ -1,28 +1,63 @@
-export default function getCdnUrl(path, cdnMap) {
+const regionMap = {
+  AY: 'images.tuyacn.com',
+  AZ: 'usimagesd1448c85ulz2o4.cdn5th.com',
+  EU: 'euimagesd2h2yqnfpu4gl5.cdn5th.com',
+  IN: 'inimagesd1jqokb9wptk2t.cdn5th.com',
+  RU: 'euimagesd2h2yqnfpu4gl5.cdn5th.com',
+  WE: 'd2h2yqnfpu4gl5.cdn5th.com',
+  UE: 'usimagesd1448c85ulz2o4.cdn5th.com'
+};
+let regionCode = 'EU';
+export function getRegionCode() {
+  return new Promise((resolve, reject) => {
+    ty.getAppInfo({
+      success: function (res) {
+        resolve(res.regionCode);
+      },
+      fail: function (err) {
+        reject(err);
+      }
+    });
+  });
+}
+ty.getAppInfo({
+  success: function (res) {
+    regionCode = res.regionCode;
+  }
+});
+export default function getCdnUrl(path, cdnMap, region) {
   if (!cdnMap) {
     console.warn('请传入cdnMap');
     return path;
   }
-
-  var regionCode = 'EU';
-  ty.getAppInfo().then(function (res) {
-    regionCode = res.regionCode;
-  });
-  var region = {
-    AY: 'images.tuyacn.com',
-    AZ: 'usimagesd1448c85ulz2o4.cdn5th.com',
-    EU: 'euimagesd2h2yqnfpu4gl5.cdn5th.com',
-    IN: 'inimagesd1jqokb9wptk2t.cdn5th.com',
-    RU: 'euimagesd2h2yqnfpu4gl5.cdn5th.com',
-    WE: 'd2h2yqnfpu4gl5.cdn5th.com',
-    UE: 'usimagesd1448c85ulz2o4.cdn5th.com'
-  }[regionCode];
-  var cdnShortPath = cdnMap[path];
-
+  const cdnShortPath = cdnMap[path];
+  if (!cdnShortPath) {
+    console.warn('[App] cdn "' + path + '" is not exist.');
+    return path;
+  }
+  const cdnPath = 'https://' + regionMap[region || regionCode] + '/' + cdnShortPath;
+  return cdnPath;
+}
+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;
   }
-
-  return 'https://' + region + '/' + cdnShortPath;
+  const cdnPath = 'https://' + regionMap[_regionCode] + '/' + cdnShortPath;
+  return cdnPath;
 }

package/lib/getCdnUrl/index.wechat.d.ts

@@ -1 +1,2 @@
 export default function getCdnUrl(path: string): string;
+export declare function getCdnUrlAsync(path: string): Promise<string>;

package/lib/getCdnUrl/index.wechat.js

@@ -1,4 +1,8 @@
 export default function getCdnUrl(path) {
   // 暂未实现获取cdn方法，将直接返回path
   return path;
+}
+export function getCdnUrlAsync(path) {
+  // 暂未实现获取cdn方法，将直接返回path
+  return Promise.resolve(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("#".concat(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("#".concat(id));
     resolve(nodeRef);
   });
 }

package/lib/index.d.ts

@@ -20,7 +20,7 @@ export { default as showTabBar } from './showTabBar';
 export { default as switchTab } from './switchTab';
 export { default as onNavigationBarBack } from './onNavigationBarBack';
 export { default as setNavigationBarBack } from './setNavigationBarBack';
-export { default as getCdnUrl } from './getCdnUrl';
+export { default as getCdnUrl, getCdnUrlAsync } from './getCdnUrl';
 /**
  * 提供 glboal-api 将 wx / ty 对象暴露出去，供给业务在Ray为显示导出api时进行快速响应开发。
  */

package/lib/index.js

@@ -1,4 +1,5 @@
 /// <reference path="../@types/api.d.ts" />
+
 export * from './constants';
 export * from './all-kits';
 export * from './lifecycles';
@@ -20,16 +21,16 @@ export { default as showTabBar } from './showTabBar';
 export { default as switchTab } from './switchTab';
 export { default as onNavigationBarBack } from './onNavigationBarBack';
 export { default as setNavigationBarBack } from './setNavigationBarBack';
-export { default as getCdnUrl } from './getCdnUrl';
+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;