util-helpers 4.12.3 → 4.12.6

package/esm/parseIdCard.js

@@ -4,8 +4,6 @@ import _setPrototypeOf from "@babel/runtime/helpers/setPrototypeOf";
 
 function _wrapRegExp() { _wrapRegExp = function _wrapRegExp(re, groups) { return new BabelRegExp(re, undefined, groups); }; var _super = RegExp.prototype; var _groups = new WeakMap(); function BabelRegExp(re, flags, groups) { var _this = new RegExp(re, flags); _groups.set(_this, groups || _groups.get(re)); return _setPrototypeOf(_this, BabelRegExp.prototype); } _inherits(BabelRegExp, RegExp); BabelRegExp.prototype.exec = function (str) { var result = _super.exec.call(this, str); if (result) result.groups = buildGroups(result, this); return result; }; BabelRegExp.prototype[Symbol.replace] = function (str, substitution) { if (typeof substitution === "string") { var groups = _groups.get(this); return _super[Symbol.replace].call(this, str, substitution.replace(/\$<([^>]+)>/g, function (_, name) { return "$" + groups[name]; })); } else if (typeof substitution === "function") { var _this = this; return _super[Symbol.replace].call(this, str, function () { var args = arguments; if (_typeof(args[args.length - 1]) !== "object") { args = [].slice.call(args); args.push(buildGroups(args, _this)); } return substitution.apply(this, args); }); } else { return _super[Symbol.replace].call(this, str, substitution); } }; function buildGroups(result, re) { var g = _groups.get(re); return Object.keys(g).reduce(function (groups, name) { groups[name] = result[g[name]]; return groups; }, Object.create(null)); } return _wrapRegExp.apply(this, arguments); }
 
-import isIdCard from './isIdCard';
-
 var regIdCard = /*#__PURE__*/_wrapRegExp(/^([0-9]{2})([0-9]{2})([0-9]{2})((?:[0-9]{2})?[0-9]{2})([0-9]{2})([0-9]{2})[0-9]{2}([0-9])(?:[0-9]|X)?$/i, {
   province: 1,
   city: 2,
@@ -93,24 +91,17 @@ var Provinces = [// 华北地区：北京市|110000，天津市|120000，河北
  */
 
 function parseIdCard(id) {
-  if (!isIdCard(id, {
-    loose: true
-  })) {
+  if (!regIdCard.test(id)) {
     return null;
   }
+  /** @type {RegExpExecArray} */
+  // @ts-ignore
 
-  var info = regIdCard.exec(id);
 
-  if (!info) {
-    return null;
-  }
-  /**
-   * @type {{ province: string, city: string, area: string, year: string, month: string, day: string, gender: string }}
-   *
-   */
+  var info = regIdCard.exec(id);
+  /** @type {{ province: string, city: string, area: string, year: string, month: string, day: string, gender: string }} */
   // @ts-ignore
 
-
   var origin = (info === null || info === void 0 ? void 0 : info.groups) || {
     province: info[1],
     city: info[2],

package/esm/utils/config.js

@@ -1,4 +1,4 @@
-var version = "4.12.3";
+var version = "4.12.6";
 var config = {
   // 禁用warning提示
   disableWarning: true

package/esm/utils/math.util.js

@@ -7,38 +7,6 @@
 import { MAX_SAFE_INTEGER, MIN_SAFE_INTEGER } from './constants';
 import devWarn from './devWarn';
 import { isNumber, isString, isSymbol } from './type';
-/**
- * 值是否为有效的数值
- * 
- * @deprecated 已废弃
- * @param {*} value 待检测的值
- * @returns {boolean} 是否为有效的数值
- */
-
-export function isEffectiveNumeric() {
-  var value = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : '';
-
-  if (isNumber(value) && !isNaN(value)) {
-    return true;
-  } // 避免空字符串 或 带空格的字符串
-
-
-  if (isString(value)) {
-    var fmtStrValue = value.trim(); // 带空格的字符串也不转换数字
-    // Number(' ') => 0
-
-    if (fmtStrValue === value) {
-      var numValue = fmtStrValue ? Number(fmtStrValue) : NaN;
-
-      if (!isNaN(numValue)) {
-        return true;
-      }
-    }
-  }
-
-  devWarn("".concat(value, " is not a valid number."));
-  return false;
-}
 /**
  * 将值转换为有效数值
  * 
@@ -60,18 +28,13 @@ export function transformEffectiveNumber(value) {
       ret = Number.NaN;
     }
   } else if (isSymbol(value)) {
-    ret = Number.NaN;
-  } else if (!isNumber(value)) {
-    // 其余非数字类型通过 Number 转换
     // 例如 Symbol 包装器对象将会报错
     // symObj = Object(Symbol());
     // Number(symObj); // TypeError: Cannot convert a Symbol value to a number
-    try {
-      ret = Number(value);
-    } catch (err) {
-      ret = Number.NaN;
-      console.error(err);
-    }
+    ret = Number.NaN;
+  } else if (!isNumber(value)) {
+    // 其余非数字类型通过 Number 转换
+    ret = Number(value);
   } else {
     ret = value;
   }

package/lib/parseIdCard.js

@@ -7,10 +7,6 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports["default"] = void 0;
 
-var _isIdCard = _interopRequireDefault(require("./isIdCard"));
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
-
 function _wrapRegExp() { _wrapRegExp = function _wrapRegExp(re, groups) { return new BabelRegExp(re, undefined, groups); }; var _super = RegExp.prototype; var _groups = new WeakMap(); function BabelRegExp(re, flags, groups) { var _this = new RegExp(re, flags); _groups.set(_this, groups || _groups.get(re)); return _setPrototypeOf(_this, BabelRegExp.prototype); } _inherits(BabelRegExp, RegExp); BabelRegExp.prototype.exec = function (str) { var result = _super.exec.call(this, str); if (result) result.groups = buildGroups(result, this); return result; }; BabelRegExp.prototype[Symbol.replace] = function (str, substitution) { if (typeof substitution === "string") { var groups = _groups.get(this); return _super[Symbol.replace].call(this, str, substitution.replace(/\$<([^>]+)>/g, function (_, name) { return "$" + groups[name]; })); } else if (typeof substitution === "function") { var _this = this; return _super[Symbol.replace].call(this, str, function () { var args = arguments; if (_typeof(args[args.length - 1]) !== "object") { args = [].slice.call(args); args.push(buildGroups(args, _this)); } return substitution.apply(this, args); }); } else { return _super[Symbol.replace].call(this, str, substitution); } }; function buildGroups(result, re) { var g = _groups.get(re); return Object.keys(g).reduce(function (groups, name) { groups[name] = result[g[name]]; return groups; }, Object.create(null)); } return _wrapRegExp.apply(this, arguments); }
 
 function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function"); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, writable: true, configurable: true } }); if (superClass) _setPrototypeOf(subClass, superClass); }
@@ -104,24 +100,17 @@ var Provinces = [// 华北地区：北京市|110000，天津市|120000，河北
  */
 
 function parseIdCard(id) {
-  if (!(0, _isIdCard["default"])(id, {
-    loose: true
-  })) {
+  if (!regIdCard.test(id)) {
     return null;
   }
+  /** @type {RegExpExecArray} */
+  // @ts-ignore
 
-  var info = regIdCard.exec(id);
 
-  if (!info) {
-    return null;
-  }
-  /**
-   * @type {{ province: string, city: string, area: string, year: string, month: string, day: string, gender: string }}
-   *
-   */
+  var info = regIdCard.exec(id);
+  /** @type {{ province: string, city: string, area: string, year: string, month: string, day: string, gender: string }} */
   // @ts-ignore
 
-
   var origin = (info === null || info === void 0 ? void 0 : info.groups) || {
     province: info[1],
     city: info[2],

package/lib/utils/config.js

@@ -5,7 +5,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.setDisableWarning = setDisableWarning;
 exports.version = exports.config = void 0;
-var version = "4.12.3";
+var version = "4.12.6";
 exports.version = version;
 var config = {
   // 禁用warning提示

package/lib/utils/math.util.js

@@ -3,7 +3,6 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.isEffectiveNumeric = isEffectiveNumeric;
 exports.transformEffectiveNumber = transformEffectiveNumber;
 exports.isScientificNumber = isScientificNumber;
 exports.strip = strip;
@@ -28,45 +27,12 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "d
  * 问题示例：2.3 + 2.4 = 4.699999999999999，1.0 - 0.9 = 0.09999999999999998
  */
 
-/**
- * 值是否为有效的数值
- * 
- * @deprecated 已废弃
- * @param {*} value 待检测的值
- * @returns {boolean} 是否为有效的数值
- */
-function isEffectiveNumeric() {
-  var value = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : '';
-
-  if ((0, _type.isNumber)(value) && !isNaN(value)) {
-    return true;
-  } // 避免空字符串 或 带空格的字符串
-
-
-  if ((0, _type.isString)(value)) {
-    var fmtStrValue = value.trim(); // 带空格的字符串也不转换数字
-    // Number(' ') => 0
-
-    if (fmtStrValue === value) {
-      var numValue = fmtStrValue ? Number(fmtStrValue) : NaN;
-
-      if (!isNaN(numValue)) {
-        return true;
-      }
-    }
-  }
-
-  (0, _devWarn["default"])("".concat(value, " is not a valid number."));
-  return false;
-}
 /**
  * 将值转换为有效数值
  * 
  * @param {*} value 要转换的值
  * @returns {number|string} 有效数值
  */
-
-
 function transformEffectiveNumber(value) {
   /** @type {string|number|undefined} */
   var ret;
@@ -81,18 +47,13 @@ function transformEffectiveNumber(value) {
       ret = Number.NaN;
     }
   } else if ((0, _type.isSymbol)(value)) {
-    ret = Number.NaN;
-  } else if (!(0, _type.isNumber)(value)) {
-    // 其余非数字类型通过 Number 转换
     // 例如 Symbol 包装器对象将会报错
     // symObj = Object(Symbol());
     // Number(symObj); // TypeError: Cannot convert a Symbol value to a number
-    try {
-      ret = Number(value);
-    } catch (err) {
-      ret = Number.NaN;
-      console.error(err);
-    }
+    ret = Number.NaN;
+  } else if (!(0, _type.isNumber)(value)) {
+    // 其余非数字类型通过 Number 转换
+    ret = Number(value);
   } else {
     ret = value;
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "util-helpers",
-  "version": "4.12.3",
+  "version": "4.12.6",
   "description": "一个基于业务场景的工具方法库",
   "main": "lib/index.js",
   "module": "esm/index.js",

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

@@ -1,11 +1,3 @@
-/**
- * 值是否为有效的数值
- *
- * @deprecated 已废弃
- * @param {*} value 待检测的值
- * @returns {boolean} 是否为有效的数值
- */
-export function isEffectiveNumeric(value?: any): boolean;
 /**
  * 将值转换为有效数值
  *