@alicloud/alfa-core 1.4.36 → 1.4.38-alpha.0

package/es/utils/index.js

@@ -1,11 +1,11 @@
-import md5 from 'crypto-js/md5';
+import { getMainUid, getMD5MainUid } from './uid';
 export { getEnv } from './env';
 export { getLocale } from './locale';
+export { getMainUid, getMD5MainUid };
 export function getFeatureStatus(feature) {
-  var _ALIYUN_CONSOLE_CONFI;
-  var uid = ((_ALIYUN_CONSOLE_CONFI = window.ALIYUN_CONSOLE_CONFIG) === null || _ALIYUN_CONSOLE_CONFI === void 0 ? void 0 : _ALIYUN_CONSOLE_CONFI.MAIN_ACCOUNT_PK) || '';
-  if (!feature || !uid) return false;
-  var md5Uid = md5(uid).toString();
+  var uid = getMainUid();
+  var md5Uid = getMD5MainUid();
+  if (!feature || !md5Uid) return false;
   var enableBlockList = feature.enableBlockList,
     enableSampling = feature.enableSampling,
     enableWhiteList = feature.enableWhiteList,
@@ -14,7 +14,7 @@ export function getFeatureStatus(feature) {
     whiteList = feature.whiteList;
   if (enableBlockList && blockList !== null && blockList !== void 0 && blockList.includes(md5Uid)) return false;
   if (enableWhiteList && whiteList !== null && whiteList !== void 0 && whiteList.includes(md5Uid)) return true;
-  if (enableSampling) {
+  if (enableSampling && uid) {
     var gray = uid.substring(uid.length - 2);
     if (Number(gray) >= (sampling !== null && sampling !== void 0 ? sampling : 0) * 100 || sampling === 0) return false;
     return true;

package/es/utils/locale.js

@@ -9,18 +9,15 @@ var localeMap = {
   fr: 'fr_FR',
   de: 'de_DE'
 };
-var getLocaleFromCookie = function getLocaleFromCookie() {
-  var lang = getCookie('aliyun_lang');
-  return lang && localeMap[lang];
-};
 
 /**
- * x-X-Y to x_X_Y
+ * 1. x-X-Y to x_X_Y
+ * 2. zh to zh_CN
  * @param key
  * @returns
  */
 var formatLocale = function formatLocale(key) {
-  return key.replace('-', '_');
+  return localeMap[key] ? localeMap[key] : key.replace('-', '_');
 };
 
 /**
@@ -29,5 +26,5 @@ var formatLocale = function formatLocale(key) {
  */
 export var getLocale = function getLocale(key) {
   var _window, _window$ALIYUN_CONSOL;
-  return formatLocale(key || ((_window = window) === null || _window === void 0 ? void 0 : (_window$ALIYUN_CONSOL = _window.ALIYUN_CONSOLE_CONFIG) === null || _window$ALIYUN_CONSOL === void 0 ? void 0 : _window$ALIYUN_CONSOL.LOCALE) || getLocaleFromCookie() || globalLocale);
+  return formatLocale(key || ((_window = window) === null || _window === void 0 ? void 0 : (_window$ALIYUN_CONSOL = _window.ALIYUN_CONSOLE_CONFIG) === null || _window$ALIYUN_CONSOL === void 0 ? void 0 : _window$ALIYUN_CONSOL.LOCALE) || getCookie('aliyun_lang') || globalLocale);
 };

package/es/utils/uid.js

@@ -0,0 +1,21 @@
+import md5 from 'crypto-js/md5';
+import { getCookie } from '@alicloud/cookie';
+/**
+ * 获取主账号 uid
+ * @returns
+ */
+export var getMainUid = function getMainUid() {
+  var _ALIYUN_CONSOLE_CONFI;
+  return ((_ALIYUN_CONSOLE_CONFI = window.ALIYUN_CONSOLE_CONFIG) === null || _ALIYUN_CONSOLE_CONFI === void 0 ? void 0 : _ALIYUN_CONSOLE_CONFI.MAIN_ACCOUNT_PK) || getCookie('login_aliyunid_pk') || undefined;
+};
+
+/**
+ * 获取 md5 后的主账号 uid
+ * @param uid
+ * @returns
+ */
+export var getMD5MainUid = function getMD5MainUid() {
+  var uid = getMainUid();
+  if (!uid) return undefined;
+  return md5(uid).toString();
+};

package/lib/utils/index.js

@@ -1,6 +1,5 @@
 "use strict";
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
@@ -17,15 +16,26 @@ Object.defineProperty(exports, "getLocale", {
     return _locale.getLocale;
   }
 });
+Object.defineProperty(exports, "getMD5MainUid", {
+  enumerable: true,
+  get: function get() {
+    return _uid.getMD5MainUid;
+  }
+});
+Object.defineProperty(exports, "getMainUid", {
+  enumerable: true,
+  get: function get() {
+    return _uid.getMainUid;
+  }
+});
 exports.getURL = exports.getRelativePath = exports.getManifestFromConfig = void 0;
-var _md = _interopRequireDefault(require("crypto-js/md5"));
+var _uid = require("./uid");
 var _env = require("./env");
 var _locale = require("./locale");
 function getFeatureStatus(feature) {
-  var _ALIYUN_CONSOLE_CONFI;
-  var uid = ((_ALIYUN_CONSOLE_CONFI = window.ALIYUN_CONSOLE_CONFIG) === null || _ALIYUN_CONSOLE_CONFI === void 0 ? void 0 : _ALIYUN_CONSOLE_CONFI.MAIN_ACCOUNT_PK) || '';
-  if (!feature || !uid) return false;
-  var md5Uid = (0, _md.default)(uid).toString();
+  var uid = (0, _uid.getMainUid)();
+  var md5Uid = (0, _uid.getMD5MainUid)();
+  if (!feature || !md5Uid) return false;
   var enableBlockList = feature.enableBlockList,
     enableSampling = feature.enableSampling,
     enableWhiteList = feature.enableWhiteList,
@@ -34,7 +44,7 @@ function getFeatureStatus(feature) {
     whiteList = feature.whiteList;
   if (enableBlockList && blockList !== null && blockList !== void 0 && blockList.includes(md5Uid)) return false;
   if (enableWhiteList && whiteList !== null && whiteList !== void 0 && whiteList.includes(md5Uid)) return true;
-  if (enableSampling) {
+  if (enableSampling && uid) {
     var gray = uid.substring(uid.length - 2);
     if (Number(gray) >= (sampling !== null && sampling !== void 0 ? sampling : 0) * 100 || sampling === 0) return false;
     return true;

package/lib/utils/locale.js

@@ -15,18 +15,15 @@ var localeMap = {
   fr: 'fr_FR',
   de: 'de_DE'
 };
-var getLocaleFromCookie = function getLocaleFromCookie() {
-  var lang = (0, _cookie.getCookie)('aliyun_lang');
-  return lang && localeMap[lang];
-};
 
 /**
- * x-X-Y to x_X_Y
+ * 1. x-X-Y to x_X_Y
+ * 2. zh to zh_CN
  * @param key
  * @returns
  */
 var formatLocale = function formatLocale(key) {
-  return key.replace('-', '_');
+  return localeMap[key] ? localeMap[key] : key.replace('-', '_');
 };
 
 /**
@@ -35,6 +32,6 @@ var formatLocale = function formatLocale(key) {
  */
 var getLocale = function getLocale(key) {
   var _window, _window$ALIYUN_CONSOL;
-  return formatLocale(key || ((_window = window) === null || _window === void 0 ? void 0 : (_window$ALIYUN_CONSOL = _window.ALIYUN_CONSOLE_CONFIG) === null || _window$ALIYUN_CONSOL === void 0 ? void 0 : _window$ALIYUN_CONSOL.LOCALE) || getLocaleFromCookie() || globalLocale);
+  return formatLocale(key || ((_window = window) === null || _window === void 0 ? void 0 : (_window$ALIYUN_CONSOL = _window.ALIYUN_CONSOLE_CONFIG) === null || _window$ALIYUN_CONSOL === void 0 ? void 0 : _window$ALIYUN_CONSOL.LOCALE) || (0, _cookie.getCookie)('aliyun_lang') || globalLocale);
 };
 exports.getLocale = getLocale;

package/lib/utils/uid.js

@@ -0,0 +1,30 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.getMainUid = exports.getMD5MainUid = void 0;
+var _md = _interopRequireDefault(require("crypto-js/md5"));
+var _cookie = require("@alicloud/cookie");
+/**
+ * 获取主账号 uid
+ * @returns
+ */
+var getMainUid = function getMainUid() {
+  var _ALIYUN_CONSOLE_CONFI;
+  return ((_ALIYUN_CONSOLE_CONFI = window.ALIYUN_CONSOLE_CONFIG) === null || _ALIYUN_CONSOLE_CONFI === void 0 ? void 0 : _ALIYUN_CONSOLE_CONFI.MAIN_ACCOUNT_PK) || (0, _cookie.getCookie)('login_aliyunid_pk') || undefined;
+};
+
+/**
+ * 获取 md5 后的主账号 uid
+ * @param uid
+ * @returns
+ */
+exports.getMainUid = getMainUid;
+var getMD5MainUid = function getMD5MainUid() {
+  var uid = getMainUid();
+  if (!uid) return undefined;
+  return (0, _md.default)(uid).toString();
+};
+exports.getMD5MainUid = getMD5MainUid;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@alicloud/alfa-core",
-  "version": "1.4.36",
+  "version": "1.4.38-alpha.0",
   "description": "MicroFront End SDK for alicloud",
   "main": "lib/index.js",
   "module": "es/index.js",
@@ -32,7 +32,6 @@
   },
   "gitHead": "6387c6b9e984da70641716a25ff92d382cc4d7ca",
   "scripts": {
-    "prepublish": "npm run build && npm run babel && npm run babel:esm && npm run types",
     "build": "breezr build --engine webpack",
     "babel": "breezr build --engine babel",
     "babel:esm": "breezr build --engine babel --es-module",

package/types/utils/index.d.ts

@@ -1,6 +1,8 @@
+import { getMainUid, getMD5MainUid } from './uid';
 import { IAppConfig, AlfaFeature } from '../types';
 export { getEnv } from './env';
 export { getLocale } from './locale';
+export { getMainUid, getMD5MainUid };
 export declare function getFeatureStatus(feature?: AlfaFeature): boolean;
 export declare const getURL: (appConfig: IAppConfig) => string;
 export declare const getManifestFromConfig: (appConfig: IAppConfig) => string | import("@alicloud/console-os-kernal/lib/type").AppManifest | undefined;

package/types/utils/uid.d.ts

@@ -0,0 +1,11 @@
+/**
+ * 获取主账号 uid
+ * @returns
+ */
+export declare const getMainUid: () => string | undefined;
+/**
+ * 获取 md5 后的主账号 uid
+ * @param uid
+ * @returns
+ */
+export declare const getMD5MainUid: () => string | undefined;