mm_expand 2.4.2 → 2.4.4

package/lib/global.js

@@ -21,6 +21,7 @@ function sleep(milli_seconds, obj, key) {
 
   if (!obj) {
     simpleSleep(end_time);
+    return;
   }
 
   if (key) {
@@ -278,7 +279,7 @@ if (!global.$) {
     }
 
     // 先判断基本类型
-    compareBasic(source, target);
+    var basic_result = compareBasic(source, target);
     if (basic_result !== null) {
       return basic_result;
     }

package/lib/lang.js

@@ -6,7 +6,7 @@ const { Base } = require('./base.js');
  */
 class Lang extends Base {
   static config = {
-    zhCn: {},
+    zh_cn: {},
     en: {},
     default: 'zh_cn',
     fallback: true
@@ -27,7 +27,7 @@ class Lang extends Base {
       en(count) {
         return count === 1 ? 0 : 1;
       },
-      zhCn() {
+      zh_cn(count) {
         return 0;
       }
     };
@@ -345,8 +345,8 @@ Lang.prototype.formatDate = function (dt, format = 'YYYY-MM-DD hh:mm:ss') {
  * @param {number} num - 要格式化的数字
  * @param {object} [options] - 选项
  * @param {number} [options.decimals=2] - 小数位数
- * @param {string} [options.decimalSeparator] - 小数分隔符
- * @param {string} [options.thousandsSeparator] - 千位分隔符
+ * @param {string} [options.decimal_separator] - 小数分隔符
+ * @param {string} [options.thousands_separator] - 千位分隔符
  * @returns {string} 格式化后的数字字符串
  */
 Lang.prototype.formatNumber = function (num, options = {}) {
@@ -359,8 +359,8 @@ Lang.prototype.formatNumber = function (num, options = {}) {
   var decimals = typeof opt.decimals === 'number' ? opt.decimals : 2;
 
   // 获取语言特定的分隔符
-  var decimal_sepa = opt.decimalSeparator || '.';
-  var thou_sepa = opt.thousandsSeparator || ',';
+  var decimal_sepa = opt.decimal_separator || '.';
+  var thou_sepa = opt.thousands_separator || ',';
 
   // 格式化数字
   var parts = num.toFixed(decimals).split('.');

package/lib/logger.js

@@ -67,7 +67,7 @@ Logger.prototype.debug = function (message, ...args) {
     this.emit('debug:after', ctx);
   } catch (error) {
     // 日志错误处理
-    this._logger.error(error);
+    this.getLogger().error(error);
   }
 };
 
@@ -130,7 +130,7 @@ Logger.prototype.warn = function (message, ...args) {
     this.emit('warn:after', ctx);
   } catch (error) {
     // 日志错误处理
-    this._logger.error(error);
+    this.getLogger().error(error);
   }
 };
 

package/lib/string.js

@@ -4,6 +4,7 @@
 const json5 = require('json5');
 const pinyin = require('pinyinlite');
 const { createHash, createCipheriv, createDecipheriv  } = require('crypto');
+const { XMLParser } = require('fast-xml-parser');
 
 /**
  * form-data转对象
@@ -57,7 +58,7 @@ String.prototype.aesEncode = function (key, iv) {
     chunks.push(cipher.final(encoding));
     return chunks.join('');
   } catch (error) {
-    throw new Error('AES加密错误:', error);
+    throw new Error('AES加密错误: ' + error.message);
   }
 };
 
@@ -83,7 +84,7 @@ String.prototype.aesDecode = function (key, iv) {
     chunks.push(decipher.final(encoding));
     return chunks.join('');
   } catch (error) {
-    throw new Error('AES解密错误:', error);
+    throw new Error('AES解密错误: ' + error.message);
   }
 };
 
@@ -123,7 +124,7 @@ String.prototype.toJson = function () {
   try {
     return json5.parse(this);
   } catch (error) {
-    throw new Error('json反序列化错误', error);
+    throw new Error('json反序列化错误: ' + error.message);
   }
 };
 /**
@@ -132,10 +133,10 @@ String.prototype.toJson = function () {
  */
 String.prototype.toXml = function () {
   try {
-    const parser = new XmlParser();
+    const parser = new XMLParser();
     return parser.parse(this);
   } catch (error) {
-    throw new Error('xml反序列化错误！', error);
+    throw new Error('xml反序列化错误: ' + error.message);
   }
 };
 /**
@@ -385,8 +386,8 @@ String.prototype.addSeconds = function (seconds, format) {
   }
 
   // 降级处理
-  const newTime = new Date(date.getTime() + seconds * 1000);
-  return format ? newTime.toISOString() : newTime;
+  const new_time = new Date(date.getTime() + seconds * 1000);
+  return format ? new_time.toISOString() : new_time;
 };
 
 /**
@@ -409,8 +410,8 @@ String.prototype.addDays = function (days, format) {
   }
 
   // 降级处理
-  const newTime = new Date(date.getTime() + days * 24 * 60 * 60 * 1000);
-  return format ? newTime.toISOString() : newTime;
+  const new_time = new Date(date.getTime() + days * 24 * 60 * 60 * 1000);
+  return format ? new_time.toISOString() : new_time;
 };
 
 /**
@@ -480,7 +481,7 @@ String.prototype.toRx = function (mode) {
     let pattern = this.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
     return new RegExp(pattern, _mode);
   } catch (error) {
-    throw new Error('字符串转正则错误:', error);
+    throw new Error('字符串转正则错误: ' + error.message);
   }
 };
 

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "mm_expand",
-	"version": "2.4.2",
+	"version": "2.4.4",
 	"description": "超级美眉原型函数扩展模块 - 增强的字符串、数组、对象、日期操作，具备错误预防功能并简化业务逻辑",
 	"main": "index.js",
 	"scripts": {
@@ -46,7 +46,7 @@
 	},
 	"devDependencies": {
 		"eslint": "^10.6.0",
-		"eslint-plugin-jsdoc": "^63.0.10",
+		"eslint-plugin-jsdoc": "^63.0.12",
 		"mm_eslint": "^1.7.5"
 	},
 	"engines": {