tools-for-js 1.5.0 → 1.5.2

package/README.md

@@ -69,4 +69,5 @@ import { API } from 'tools-for-js'
 | 验证手机号                                       | checkMobile       |
 | 验证邮箱                                         | checkEmail        |
 | 验证运动账号                                     | checkSports       |
+| 判断是否为 json 字符串                           | isJSONString      |
 | 待更新                                           | function          |

package/lib/index.js

@@ -177,6 +177,12 @@ Object.defineProperty(exports, "getTimeDistance", {
     return _time.getTimeDistance;
   }
 });
+Object.defineProperty(exports, "getValByKey", {
+  enumerable: true,
+  get: function get() {
+    return _object.getValByKey;
+  }
+});
 Object.defineProperty(exports, "getValueFromArray", {
   enumerable: true,
   get: function get() {
@@ -207,6 +213,12 @@ Object.defineProperty(exports, "isExpires", {
     return _time.isExpires;
   }
 });
+Object.defineProperty(exports, "isJSONString", {
+  enumerable: true,
+  get: function get() {
+    return _object.isJSONString;
+  }
+});
 Object.defineProperty(exports, "lowercaseKeys", {
   enumerable: true,
   get: function get() {

package/lib/utils/common.js

@@ -90,18 +90,20 @@ var isEmpty = exports.isEmpty = function isEmpty(params) {
 var isEqual = exports.isEqual = function isEqual(a, b) {
   // 类型为基本类型时,如果相等,则返回true
   if (a === b) return true;
-  if (IsType('Object', a) && IsType('Object', b) && Object.keys(a).length === Object.keys(b).length) {
-    // 若两个参数都为对象，先判断对象长度是否相同==>遍历对象内元素是否相同
-    for (var key in a) {
-      if (a.hasOwnProperty(key)) {
-        if (!isEqual(a[key], b[key])) {
+  if (IsType('Object', a) && IsType('Object', b)) {
+    // 若两个参数都为对象，先判断对象长度是否相同，再遍历对象内元素是否相同
+    if (Object.keys(a).length !== Object.keys(b).length) return false;
+    for (var k in a) {
+      if (a.hasOwnProperty(k)) {
+        if (!isEqual(a[k], b[k])) {
           // 对象中具有不相同属性 返回false
           return false;
         }
       }
     }
-  } else if (IsType('Array', a) && IsType('Array', b) && a.length === b.length) {
-    // 若两个参数都为数组，则先判断数组长度是否相同==>遍历数组元素是否相同
+  } else if (IsType('Array', a) && IsType('Array', b)) {
+    // 若两个参数都为数组，则先判断数组长度是否相同，遍历数组元素是否相同
+    if (a.length !== b.length) return false;
     for (var i = 0, length = a.length; i < length; i++) {
       if (!isEqual(a[i], b[i])) {
         // 如果数组元素中具有不相同元素,返回false

package/lib/utils/object.js

@@ -3,7 +3,9 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.objectToQs = exports.getValByKey = void 0;
+exports.getValByKey = void 0;
+exports.isJSONString = isJSONString;
+exports.objectToQs = void 0;
 /*******
  * @description: 将对象转换为查询字符串
  * @author: 琴时
@@ -32,4 +34,19 @@ var getValByKey = exports.getValByKey = function getValByKey(obj, key) {
     value = value[keys[i]];
   }
   return value;
-};
+};
+
+/*******
+ * @description: 判断是否为json字符串
+ * @author: 琴时
+ * @param {String} str
+ * @return {Object|Boolean}
+ */
+function isJSONString(str) {
+  try {
+    var res = JSON.parse(str);
+    return res;
+  } catch (e) {
+    return false;
+  }
+}

package/lib/utils/string.js

@@ -9,6 +9,7 @@ exports.splitString = splitString;
 exports.splitToFileName = splitToFileName;
 exports.toCode = void 0;
 var _random = require("./random");
+var _common = require("./common");
 var _utf8_encode = function _utf8_encode(string) {
   string = string ? string.toString() : '';
   string = string.replace(/\r\n/g, '\n');
@@ -56,18 +57,28 @@ var _utf8_decode = function _utf8_decode(utf_text) {
 /*******
  * @description: 字符加密
  * @author: 琴时
- * @param {String|Number} input
- * @return {String}
+ * @param {*} input
+ * @param {String} key [盐值]
+ * @param {Number} expires [有效期/毫秒|不传则永久有效]
+ * @return {String} [''|null|undefined==>'']
  */
-var encrypt = exports.encrypt = function encrypt(input, key) {
-  if (!input) return '';
+var encrypt = exports.encrypt = function encrypt(input, key, expires) {
+  if ((0, _common.IsType)('Object', input) || (0, _common.IsType)('Array', input) || (0, _common.IsType)('Number', input)) {
+    input = JSON.stringify(input);
+  } else if (!input) return '';
   // 取65位字符
   var _keyStr = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=';
   var output = '';
   var chr1, chr2, chr3, enc1, enc2, enc3, enc4;
   var i = 0;
   input = _utf8_encode(input);
-  input = "".concat((0, _random.randomCode)(6), ":").concat(key, ":").concat(input);
+  key = key || '';
+  if (expires) {
+    var et = Date.now() + Number(expires);
+    input = "".concat(et, ":").concat(key, ":").concat(input);
+  } else {
+    input = "".concat((0, _random.randomCode)(6), ":").concat(key, ":").concat(input);
+  }
   while (i < input.length) {
     chr1 = input.charCodeAt(i++);
     chr2 = input.charCodeAt(i++);
@@ -90,6 +101,7 @@ var encrypt = exports.encrypt = function encrypt(input, key) {
  * @description: 字符解密
  * @author: 琴时
  * @param {String} input
+ * @param {String} key [盐值]
  * @return {String}
  */
 var decrypt = exports.decrypt = function decrypt(input, key) {
@@ -118,21 +130,30 @@ var decrypt = exports.decrypt = function decrypt(input, key) {
     }
   }
   output = _utf8_decode(output);
+  key = key || ''; // 盐值
   var symbol = ":".concat(key, ":"); // 盐字段切割符号
-  return output.split(symbol)[1] || '';
+  output = output.split(symbol);
+  if (output.length === 1) return '';
+  if (output[0] > 6 && /^\d+$/.test(output[0])) {
+    var nt = Date.now();
+    if (nt > output[0]) return '';
+  }
+  return output[1] || '';
 };
 
 /*******
  * @description: 校验加密字符
  * @author: 琴时
- * @param {String|Number} text
- * @param {String} crypt
- * @param {*} key
+ * @param {*} input [明文]
+ * @param {String} crypt [密文]
+ * @param {*} key [盐值]
  * @return {Boolean}
  */
-var checkCrypt = exports.checkCrypt = function checkCrypt(text, crypt, key) {
-  text = text ? text.toString() : undefined;
-  return text === decrypt(crypt, key);
+var checkCrypt = exports.checkCrypt = function checkCrypt(input, crypt, key) {
+  if ((0, _common.IsType)('Object', input) || (0, _common.IsType)('Array', input) || (0, _common.IsType)('Number', input)) {
+    input = JSON.stringify(input);
+  }
+  return input === decrypt(crypt, key);
 };
 
 /*******

package/lib/utils/test.js

@@ -0,0 +1,19 @@
+"use strict";
+
+/* 新API */
+// 1. 深克隆测试
+var objectDeepClone = function objectDeepClone() {
+  var obj = {
+    id: 1,
+    name: '张三',
+    sex: '男',
+    age: 30,
+    child: {
+      name: '李四',
+      sex: '男',
+      age: 18
+    }
+  };
+  var cloneObj = structuredClone(obj);
+  cloneObj.child.name = '王五';
+};

package/lib/utils/time.js

@@ -19,13 +19,15 @@ _dayjs["default"].locale('zh-cn'); // 全局使用
  * @return {Date}
  */
 var createDate = exports.createDate = function createDate(date) {
-  var pattern = /^(?=.*T)(?=.*).*$/;
-  var patternNum = /^\d*$/;
+  var regexS = /^\d*$/; // 判断是否为时间戳
+  var regexT = /^(?=.*T)(?=.*).*$/; // 判断是否为时间字符串==>2021-05-19T16:00:00.000Z
+  var regexC = /[\u4e00-\u9fa5]/; // 判断是否存在中文 ==> Thu May 20 2021 00:00:00 GMT+0800 (中国标准时间)
   if (!date) return new Date(); // 不传参数
-  if (patternNum.test(date)) {
-    // 时间戳
-    date = parseInt(date);
-  } else if (typeof date === 'string' && !pattern.test(date)) {
+  if (regexS.test(date)) {
+    date = parseInt(date); // 时间戳
+  } else if (regexC.test(date)) {
+    date = Date.parse(date);
+  } else if (typeof date === 'string' && !regexT.test(date)) {
     //兼容ios: 将时间字符串中的'-'替换成'/' 2021-05-20 00:00:00=>2021/05/20 00:00:00
     date = "".concat(date).replace(/-/g, '/');
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tools-for-js",
-  "version": "1.5.0",
+  "version": "1.5.2",
   "description": "基于babel构建的javascript工具库",
   "main": "lib/index.js",
   "scripts": {