util-helpers 4.0.4 → 4.0.8

package/lib/times.js

@@ -7,15 +7,27 @@ exports["default"] = void 0;
 
 var _math = require("./utils/math.util");
 
+var _type = require("./utils/type");
+
+function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
+
+function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+
+function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
+
+function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
+
+function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
+
+function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
+
 /**
  * 精确乘法，支持多个数相乘
  *
  * @static
  * @alias module:Math.times
  * @since 3.1.0
- * @param {number|string} num1 相乘的第一个数
- * @param {number|string} num2 相乘的第二个数
- * @param {...number|string} others 相乘的其余数
+ * @param {...number|string} nums 相乘的数
  * @returns {number} 乘积
  * @example
  *
@@ -28,14 +40,23 @@ var _math = require("./utils/math.util");
  * times(3, 0.6, 2, 10);
  * // => 36
  */
-function times(num1, num2) {
-  for (var _len = arguments.length, others = new Array(_len > 2 ? _len - 2 : 0), _key = 2; _key < _len; _key++) {
-    others[_key - 2] = arguments[_key];
+function times() {
+  for (var _len = arguments.length, nums = new Array(_len), _key = 0; _key < _len; _key++) {
+    nums[_key] = arguments[_key];
   }
 
-  if (others.length > 0) {
+  var num1 = nums[0],
+      num2 = nums[1],
+      rest = nums.slice(2);
+
+  if (rest.length > 0) {
+    return times.apply(void 0, [times(num1, num2)].concat(_toConsumableArray(rest)));
+  } // 兼容处理，如果第2个参数为非数字或字符串时，返回第一个参数
+
+
+  if ((!(0, _type.isNumber)(num2) || (0, _type.isNaN)(num2)) && !(0, _type.isString)(num2)) {
     // @ts-ignore
-    return times.apply(void 0, [times(num1, num2)].concat(others));
+    return num1;
   }
 
   var num1Changed = (0, _math.float2Fixed)(num1);

package/lib/utils/convertToString.js

@@ -7,26 +7,16 @@ exports["default"] = void 0;
 
 var _isString = _interopRequireDefault(require("./type/isString"));
 
-var _config = require("./config");
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
 /**
  * 转换为字符串
  *
  * @param {*} value 值
- * @returns 字符串
+ * @returns {string} 字符串
  */
 function convertToString(value) {
-  if (!(0, _isString["default"])(value)) {
-    if (!_config.config.disableWarning) {
-      console.warn("[validatePassword] value must be a string.");
-    }
-
-    return String(value);
-  }
-
-  return value;
+  return (0, _isString["default"])(value) ? value : String(value);
 }
 
 var _default = convertToString;

package/lib/utils/math.util.js

@@ -8,6 +8,7 @@ exports.strip = strip;
 exports.digitLength = digitLength;
 exports.float2Fixed = float2Fixed;
 exports.checkBoundary = checkBoundary;
+exports.trimLeftZero = trimLeftZero;
 exports.scientificToNumber = scientificToNumber;
 
 var _constants = require("./constants");
@@ -99,13 +100,13 @@ function checkBoundary(num) {
 
 
 function trimLeftZero(num) {
-  var reg = /^([+-])?(0+)([1-9\.]+)$/;
+  var reg = /^([+-])?(0+)([0-9\.]+)$/;
   var result = reg.exec(num);
   var sign;
 
   if (result) {
     sign = result[1] || '';
-    return sign + result[3];
+    return sign + (result[3][0] === '.' ? '0' + result[3] : result[3]);
   }
 
   return num;
@@ -144,7 +145,7 @@ function scientificToNumber(num) {
       var dec = coeff_array[1]; //如果是整数，将整数除第一位之外的非零数字计入位数，相应的减少0的个数
 
       if (l - dec.length < 0) {
-        num = trimLeftZero(coeff_array[0] + dec.substr(0, l)) + '.' + dec.substr(l);
+        num = trimLeftZero(coeff_array[0] + dec.substring(0, l)) + '.' + dec.substring(l);
       } else {
         //拼接字符串，如果是整数，不需要拼接小数点
         num = coeff_array.join('') + new Array(l - dec.length + 1).join(zero);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "util-helpers",
-  "version": "4.0.4",
+  "version": "4.0.8",
   "description": "一个基于业务场景的工具方法库",
   "main": "lib/index.js",
   "module": "esm/index.js",
@@ -25,7 +25,7 @@
     "lint": "eslint src --ext .js",
     "lint:fix": "eslint src --ext .js --fix",
     "commit": "cz",
-    "pub": "npm run build && npm publish",
+    "prepublishOnly": "npm test && npm run build",
     "types": "tsc"
   },
   "repository": {

package/types/divide.d.ts

@@ -5,9 +5,7 @@ export default divide;
  * @static
  * @alias module:Math.divide
  * @since 3.1.0
- * @param {number|string} num1 除数
- * @param {number|string} num2 被除数
- * @param {...number|string} others 其余被除数
+ * @param {...number|string} nums 除数和被除数
  * @returns {number} 商数
  * @example
  *
@@ -20,4 +18,4 @@ export default divide;
  * divide(1000, 10, 10, 10);
  * // => 1
  */
-declare function divide(num1: number | string, num2: number | string, ...others: (number | string)[]): number;
+declare function divide(...nums: (number | string)[]): number;

package/types/minus.d.ts

@@ -5,9 +5,7 @@ export default minus;
  * @static
  * @alias module:Math.minus
  * @since 3.1.0
- * @param {number|string} num1 相减的第一个数
- * @param {number|string} num2 相减的第二个数
- * @param {...number|string} others 相减的第其余数
+ * @param {...number|string} nums 相减的数
  * @returns {number} 差
  * @example
  *
@@ -20,4 +18,4 @@ export default minus;
  * minus(1, 0.9, 0.02, 0.08);
  * // => 0
  */
-declare function minus(num1: number | string, num2: number | string, ...others: (number | string)[]): number;
+declare function minus(...nums: (number | string)[]): number;

package/types/parseIdCard.d.ts

@@ -7,7 +7,7 @@ export default parseIdCard;
  * @since 4.0.0
  * @see 参考 {@link https://baike.baidu.com/item/居民身份证号码|居民身份证号码}
  * @param {string} id 身份证号码，支持15位
- * @returns {null | Object} 省份、生日、性别，省/市/区/年/月/日/性别编码
+ * @returns null 或 省份、生日、性别，省/市/区/年/月/日/性别编码
  * @example
  * parseIdCard('123456789123456');
  * // => null
@@ -32,4 +32,17 @@ export default parseIdCard;
 }
  *
  */
-declare function parseIdCard(id: string): null | Object;
+declare function parseIdCard(id: string): {
+    province: string;
+    birthday: string;
+    gender: string;
+    origin: {
+        province: string;
+        city: string;
+        area: string;
+        year: string;
+        month: string;
+        day: string;
+        gender: string;
+    };
+} | null;

package/types/plus.d.ts

@@ -5,9 +5,7 @@ export default plus;
  * @static
  * @alias module:Math.plus
  * @since 3.1.0
- * @param {number|string} num1 相加的第一个数
- * @param {number|string} num2 相加的第二个数
- * @param {...number|string} others 相加的其余数
+ * @param {...number|string} nums 相加的数
  * @returns {number} 总和
  * @example
  *
@@ -20,4 +18,4 @@ export default plus;
  * plus(0.1, 0.2, 0.3, 0.4);
  * // => 1
  */
-declare function plus(num1: number | string, num2: number | string, ...others: (number | string)[]): number;
+declare function plus(...nums: (number | string)[]): number;

package/types/replaceChar.d.ts

@@ -37,11 +37,11 @@ export default replaceChar;
  * // => 6228 **** **** **** 018
  *
  * // 用户名
- * replaceChar('林某某', {start: 1, end: 10, repeat: 2});
+ * replaceChar('林某某', {start: 1, end: Infinity, repeat: 2});
  * // => 林**
- * replaceChar('林某', {start: 1, end: 10, repeat: 2});
+ * replaceChar('林某', {start: 1, end: Infinity, repeat: 2});
  * // => 林**
- * replaceChar('林某某某', {start: 1, end: 10, repeat: 2});
+ * replaceChar('林某某某', {start: 1, end: Infinity, repeat: 2});
  * // => 林**
  *
  */

package/types/times.d.ts

@@ -5,9 +5,7 @@ export default times;
  * @static
  * @alias module:Math.times
  * @since 3.1.0
- * @param {number|string} num1 相乘的第一个数
- * @param {number|string} num2 相乘的第二个数
- * @param {...number|string} others 相乘的其余数
+ * @param {...number|string} nums 相乘的数
  * @returns {number} 乘积
  * @example
  *
@@ -20,4 +18,4 @@ export default times;
  * times(3, 0.6, 2, 10);
  * // => 36
  */
-declare function times(num1: number | string, num2: number | string, ...others: (number | string)[]): number;
+declare function times(...nums: (number | string)[]): number;

package/types/utils/convertToString.d.ts

@@ -3,6 +3,6 @@ export default convertToString;
  * 转换为字符串
  *
  * @param {*} value 值
- * @returns 字符串
+ * @returns {string} 字符串
  */
-declare function convertToString(value: any): any;
+declare function convertToString(value: any): string;

package/types/utils/math.util.d.ts

@@ -36,6 +36,13 @@ export function float2Fixed(num: number | string): number;
  * @returns
  */
 export function checkBoundary(num: number): void;
+/**
+ * 去掉左边数字0
+ *
+ * @param {string} num 数字字符串
+ * @returns {string}
+ */
+export function trimLeftZero(num: string): string;
 /**
  * 科学计数法转换成普通数字
  *