util-helpers 4.8.2 → 4.10.0

package/lib/isSocialCreditCode.js

@@ -5,7 +5,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports["default"] = void 0;
 
-var _convertToString = _interopRequireDefault(require("./utils/convertToString"));
+var _normalizeString = _interopRequireDefault(require("./normalizeString"));
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
@@ -77,7 +77,7 @@ function isSocialCreditCode(value) {
       _ref$loose = _ref.loose,
       loose = _ref$loose === void 0 ? false : _ref$loose;
 
-  var valueStr = (0, _convertToString["default"])(value);
+  var valueStr = (0, _normalizeString["default"])(value);
   var passBaseRule = baseReg.test(valueStr); // 宽松模式 或 基础规则不通过直接返回
 
   if (loose || !passBaseRule) {

package/lib/isSwiftCode.js

@@ -0,0 +1,40 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports["default"] = void 0;
+
+var _normalizeString = _interopRequireDefault(require("./normalizeString"));
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
+
+var reg = /^[A-Z]{6}[A-Z\d]{2}(?:[A-Z\d]{3})?$/;
+/**
+ * 检测值是否为 Swift Code。8位或11位，前6位为大写字母，7-8位为大写字母或数字，9-11位为可选的大写字母或数字。
+ *
+ * @static
+ * @alias module:Validator.isSwiftCode
+ * @see 参考 {@link https://zh.wikipedia.org/wiki/ISO_9362|ISO 9362}
+ * @since 4.9.0
+ * @param {*} value 要检测的值
+ * @returns {boolean} 值是否为 Swift Code
+ * @example
+ *
+ * isSwiftCode('DEUTDEFF') //  true
+ * isSwiftCode('deutdeff') //  false
+ *
+ * isSwiftCode('BKTWTWTP010') //  true
+ * isSwiftCode('010BKTWTWTP') //  false
+ *
+ * isSwiftCode('ICBKCNBJBJM') //  true
+ *
+ */
+
+function isSwiftCode(value) {
+  var valueStr = (0, _normalizeString["default"])(value);
+  return reg.test(valueStr);
+}
+
+var _default = isSwiftCode;
+exports["default"] = _default;

package/lib/isTWCard.js

@@ -5,7 +5,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports["default"] = void 0;
 
-var _convertToString = _interopRequireDefault(require("./utils/convertToString"));
+var _normalizeString = _interopRequireDefault(require("./normalizeString"));
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
@@ -29,7 +29,7 @@ var regTWCard = /^(\d{8}|[\da-z]{10})$/i;
  */
 
 function isTWCard(value) {
-  var valueStr = (0, _convertToString["default"])(value);
+  var valueStr = (0, _normalizeString["default"])(value);
   return regTWCard.test(valueStr);
 }
 

package/lib/isTelephone.js

@@ -5,7 +5,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports["default"] = void 0;
 
-var _convertToString = _interopRequireDefault(require("./utils/convertToString"));
+var _normalizeString = _interopRequireDefault(require("./normalizeString"));
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
@@ -36,7 +36,7 @@ var reg = /^(0\d{2,3}\-)?([2-9]\d{6,7})(\-\d{1,6})?$/;
  */
 
 function isTelephone(value) {
-  var valueStr = (0, _convertToString["default"])(value);
+  var valueStr = (0, _normalizeString["default"])(value);
   return reg.test(valueStr);
 }
 

package/lib/isUrl.js

@@ -5,12 +5,12 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports["default"] = void 0;
 
-var _convertToString = _interopRequireDefault(require("./utils/convertToString"));
+var _normalizeString = _interopRequireDefault(require("./normalizeString"));
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
 // url正则
-var reg = /(((^https?:(?:\/\/)?)(?:[-;:&=\+\$,\w]+@)?[A-Za-z0-9.-]+(?::\d+)?|(?:www.|[-;:&=\+\$,\w]+@)[A-Za-z0-9.-]+)((?:\/[\+~%\/.\w-_]*)?\??(?:[-\+=&;%@.\w_]*)#?(?:[\w]*))?)$/;
+var reg = /(((^https?:(?:\/\/)?)(?:[-;:&=\+\$,\w]+@)?[A-Za-z0-9.-]+(?::\d+)?|(?:www.|[-;:&=\+\$,\w]+@)[A-Za-z0-9.-]+)((?:\/[\+~%\/.\w-_]*)?\??(?:[-\*\+=&;%@.\w_]*)#?(?:[\w]*))?)$/;
 /**
  * 检测值是否为url
  *
@@ -45,7 +45,7 @@ var reg = /(((^https?:(?:\/\/)?)(?:[-;:&=\+\$,\w]+@)?[A-Za-z0-9.-]+(?::\d+)?|(?:
  */
 
 function isUrl(value) {
-  var valueStr = (0, _convertToString["default"])(value);
+  var valueStr = (0, _normalizeString["default"])(value);
   return reg.test(valueStr);
 }
 

package/lib/isVehicle.js

@@ -5,7 +5,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports["default"] = void 0;
 
-var _convertToString = _interopRequireDefault(require("./utils/convertToString"));
+var _normalizeString = _interopRequireDefault(require("./normalizeString"));
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
@@ -40,7 +40,7 @@ var reg = /^[京津沪渝冀豫云辽黑湘皖鲁新苏浙赣鄂桂甘晋蒙陕
  */
 
 function isVehicle(value) {
-  var valueStr = (0, _convertToString["default"])(value);
+  var valueStr = (0, _normalizeString["default"])(value);
   return reg.test(valueStr);
 }
 

package/lib/isWX.js

@@ -5,7 +5,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports["default"] = void 0;
 
-var _convertToString = _interopRequireDefault(require("./utils/convertToString"));
+var _normalizeString = _interopRequireDefault(require("./normalizeString"));
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
@@ -30,7 +30,7 @@ var reg = /^[a-z]([-_a-z0-9]{5,19})+$/i;
  */
 
 function isWX(value) {
-  var valueStr = (0, _convertToString["default"])(value);
+  var valueStr = (0, _normalizeString["default"])(value);
   return reg.test(valueStr);
 }
 

package/lib/randomString.js

@@ -34,7 +34,7 @@ function internalRandomString() {
  * @alias module:Other.randomString
  * @since 4.8.0
  * @param {number} [len=0] 长度
- * @param {string} [optionalChars] 允许的字符，默认为数字和大小写字母
+ * @param {string} [optionalChars='0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ'] 允许的字符，默认为数字和大小写字母
  * @returns {string} 随机字符串
  * @example
  * randomString(5); // slk23

package/lib/strlen.js

@@ -0,0 +1,48 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports["default"] = void 0;
+
+var _normalizeString = _interopRequireDefault(require("./normalizeString"));
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
+
+/**
+ * 获取字符长度。中文汉字占2个字符，英文占1个字符，特殊如emoji占4个字符。
+ *
+ * @static
+ * @alias module:Other.strlen
+ * @since 4.10.0
+ * @param {string} str 字符串
+ * @returns {number} 字符长度
+ * @example
+ *
+ * strlen('你好a'); // 5
+ * strlen('你好，世界！'); // 12
+ * strlen('严両丞丽'); // 8
+ * strlen('abcde'); // 5
+ * strlen('𠮷'); // 4
+ * strlen('🍎'); // 4
+ *
+ */
+function strlen(str) {
+  var realStr = (0, _normalizeString["default"])(str);
+  var len = 0;
+
+  for (var i = 0; i < realStr.length; i++) {
+    var c = realStr.charCodeAt(i);
+
+    if (c >= 0x0001 && c <= 0x007e || 0xff60 <= c && c <= 0xff9f) {
+      len++;
+    } else {
+      len += 2;
+    }
+  }
+
+  return len;
+}
+
+var _default = strlen;
+exports["default"] = _default;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "util-helpers",
-  "version": "4.8.2",
+  "version": "4.10.0",
   "description": "一个基于业务场景的工具方法库",
   "main": "lib/index.js",
   "module": "esm/index.js",
@@ -18,6 +18,7 @@
     "build:dist": "rm -rf dist && rollup -c",
     "build:doc": "npm run doc",
     "doc": "rm -rf docs && jsdoc -c conf.json",
+    "open:doc": "open ./docs/index.html",
     "prettier": "prettier --write 'src/**/*.js' && prettier --write 'test/**/*.js'",
     "lint-staged": "lint-staged",
     "lint-staged:js": "eslint --ext .js",

package/types/index.d.ts

@@ -19,6 +19,7 @@ export { default as validatePassword } from "./validatePassword";
 export { default as isPromiseLike } from "./isPromiseLike";
 export { default as isHMCard } from "./isHMCard";
 export { default as isTWCard } from "./isTWCard";
+export { default as isSwiftCode } from "./isSwiftCode";
 export { default as formatMoney } from "./formatMoney";
 export { default as formatBankCard } from "./formatBankCard";
 export { default as replaceChar } from "./replaceChar";
@@ -40,4 +41,5 @@ export { default as round } from "./round";
 export { default as waitTime } from "./waitTime";
 export { default as calculateCursorPosition } from "./calculateCursorPosition";
 export { default as randomString } from "./randomString";
+export { default as strlen } from "./strlen";
 export { setDisableWarning } from "./utils/config";

package/types/isSwiftCode.d.ts

@@ -0,0 +1,22 @@
+export default isSwiftCode;
+/**
+ * 检测值是否为 Swift Code。8位或11位，前6位为大写字母，7-8位为大写字母或数字，9-11位为可选的大写字母或数字。
+ *
+ * @static
+ * @alias module:Validator.isSwiftCode
+ * @see 参考 {@link https://zh.wikipedia.org/wiki/ISO_9362|ISO 9362}
+ * @since 4.9.0
+ * @param {*} value 要检测的值
+ * @returns {boolean} 值是否为 Swift Code
+ * @example
+ *
+ * isSwiftCode('DEUTDEFF') //  true
+ * isSwiftCode('deutdeff') //  false
+ *
+ * isSwiftCode('BKTWTWTP010') //  true
+ * isSwiftCode('010BKTWTWTP') //  false
+ *
+ * isSwiftCode('ICBKCNBJBJM') //  true
+ *
+ */
+declare function isSwiftCode(value: any): boolean;

package/types/randomString.d.ts

@@ -6,7 +6,7 @@ export default randomString;
  * @alias module:Other.randomString
  * @since 4.8.0
  * @param {number} [len=0] 长度
- * @param {string} [optionalChars] 允许的字符，默认为数字和大小写字母
+ * @param {string} [optionalChars='0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ'] 允许的字符，默认为数字和大小写字母
  * @returns {string} 随机字符串
  * @example
  * randomString(5); // slk23

package/types/strlen.d.ts

@@ -0,0 +1,20 @@
+export default strlen;
+/**
+ * 获取字符长度。中文汉字占2个字符，英文占1个字符，特殊如emoji占4个字符。
+ *
+ * @static
+ * @alias module:Other.strlen
+ * @since 4.10.0
+ * @param {string} str 字符串
+ * @returns {number} 字符长度
+ * @example
+ *
+ * strlen('你好a'); // 5
+ * strlen('你好，世界！'); // 12
+ * strlen('严両丞丽'); // 8
+ * strlen('abcde'); // 5
+ * strlen('𠮷'); // 4
+ * strlen('🍎'); // 4
+ *
+ */
+declare function strlen(str: string): number;