mm_expand 1.8.2 → 1.8.3

package/index.js

@@ -10,9 +10,10 @@ const {
 	rimrafSync
 } = require('rimraf');
 const {
-	j2xParser,
-	parse
-} = require('fast-xml-parser');
+	XMLParser,
+	XMLBuilder,
+	XMLValidator
+} = require("fast-xml-parser");
 const {
 	writeFileSync,
 	existsSync,
@@ -372,26 +373,67 @@ function toJson(obj, format) {
 	}
 }
 
+
+
+/**
+ * 递归将对象的所有字符串值转换为 CDATA 格式
+ * @param {Object} data 原始数据对象
+ * @returns 转换后的 CDATA 格式对象
+ */
+function convertToCDATA(data) {
+	// 处理基本类型
+	if (typeof data === "string") {
+		return {
+			"_cdata": data
+		};
+	}
+
+	// 处理数组
+	if (Array.isArray(data)) {
+		return data.map((item) => convertToCDATA(item));
+	}
+
+	// 处理对象
+	if (typeof data === "object" && data !== null) {
+		return Object.entries(data).reduce((acc, [key, value]) => {
+			acc[key] = convertToCDATA(value);
+			return acc;
+		}, {});
+	}
+
+	// 其他类型直接返回
+	return data;
+}
+
 /**
  * @description 转为xml字符串
  * @param {Object} obj 被转换的对象
  * @param {Boolean} format 是否格式化
  * @param {Boolean} mode 表示方式, true为属性格式
+ * @param {Boolean} cdata 是否将字符串转为cdata形式
  * @return {String} xml格式字符串
  */
-function toXml(obj, format, mode) {
-	var param = {
+function toXml(obj, format, mode, cdata = false) {
+	var options = {
 		format
 	};
 	if (mode) {
-		param = {
+		options = {
 			format,
-			attrNodeName: "_attrs",
-			textNodeName: "#text",
-			cdataTagName: "_cdata"
+			ignoreAttributes: false,
+			suppressBooleanAttributes: false,
+			suppressUnpairedNode: false,
+			processEntities: false // 禁用实体转换
 		}
 	};
-	return xml = new j2xParser(param).parse(obj);
+
+	if (cdata) {
+		options.cdataPropName = cdata ? "_cdata" : undefined;
+		obj = convertToCDATA(Object.assign({}, obj));
+	}
+
+	const builder = new XMLBuilder(options);
+	return builder.build(obj);
 };
 
 /**
@@ -442,11 +484,13 @@ function saveJson(obj, file, format) {
  * @param {String} file 保存文件名
  * @param {Boolean} format 是否格式化
  * @param {Boolean} mode 表示方式, true为属性格式
+ * @param {Boolean} cdata 是否将字符串转为cdata形式
  * @return {Boolean} 保存结果
  */
-function saveXml(obj, file, format, mode) {
-	return file.saveText(toXml(obj, format, mode));
+function saveXml(obj, file, format = true, mode = true, cdata = false) {
+	return file.saveText(toXml(obj, format, mode, cdata));
 };
+
 /**
  * @description 拷贝对象
  * @param {Object} obj 被拷贝的对象
@@ -893,7 +937,8 @@ if (typeof($) === "undefined") {
 	 */
 	String.prototype.toXml = function() {
 		try {
-			return parse(this);
+			const parser = new XMLParser();
+			return parser.parse(this);
 		} catch (e) {
 			// var text = this;
 			// if(text.length > 1000) {

package/package.json

@@ -1,38 +1,38 @@
 {
-    "name": "mm_expand",
-    "version": "1.8.2",
-    "description": "这是超级美眉原型函数拓展模块，更有利于对string、array、object的操作，避免出错，简化业务逻辑。",
-    "main": "index.js",
-    "scripts": {
-        "dev": "nodemon test.js",
-        "test": "node test.js"
-    },
-    "repository": {
-        "type": "git",
-        "url": "git+https://github.com/qiuwenwu/mm_expand.git"
-    },
-    "keywords": [
-        "string",
-        "array",
-        "object",
-        "date",
-        "get",
-        "set",
-        "prototype",
-        "expand",
-        "$"
-    ],
-    "author": "邱文武",
-    "license": "ISC",
-    "bugs": {
-        "url": "https://github.com/qiuwenwu/mm_expand/issues"
-    },
-    "homepage": "https://github.com/qiuwenwu/mm_expand#readme",
-    "dependencies": {
-        "fast-xml-parser": "^4.5.0",
-        "json5": "^2.2.3",
-        "ncp": "^2.0.0",
-        "pinyinlite": "^1.2.1",
-        "rimraf": "^6.0.1"
-    }
-}
+	"name": "mm_expand",
+	"version": "1.8.3",
+	"description": "这是超级美眉原型函数拓展模块，更有利于对string、array、object的操作，避免出错，简化业务逻辑。",
+	"main": "index.js",
+	"scripts": {
+		"dev": "nodemon test.js",
+		"test": "node test.js"
+	},
+	"repository": {
+		"type": "git",
+		"url": "git+https://gitee.com/qiuwenwu91/mm_expand.git"
+	},
+	"keywords": [
+		"string",
+		"array",
+		"object",
+		"date",
+		"get",
+		"set",
+		"prototype",
+		"expand",
+		"$"
+	],
+	"author": "邱文武",
+	"license": "ISC",
+	"bugs": {
+		"url": "https://gitee.com/qiuwenwu91/mm_expand/issues"
+	},
+	"homepage": "https://gitee.com/qiuwenwu91/mm_expand#readme",
+	"dependencies": {
+		"fast-xml-parser": "^5.2.0",
+		"json5": "^2.2.3",
+		"ncp": "^2.0.0",
+		"pinyinlite": "^1.2.1",
+		"rimraf": "^6.0.1"
+	}
+}

package/test.js

@@ -1,24 +1,56 @@
 require('./index.js');
 
 async function test() {
-	console.log("./test.json".fullname());
-	
-	var bl = "./test.json".isFile();
-	console.log("是文件否？", bl);
-	
-	var bl = "./test.json".fullname().isFile();
-	console.log("是文件否？", bl);
-
-	var bl = "./demo/".isDir();
-	console.log("是目录否？", bl);
-
-	var bl = "./demo/".fullname().isDir();
-	console.log("是目录否？", bl);
-	
-	// var json = "./test.json".loadJson(__dirname);
-	// console.log("读取json5", json);
+	var user = {
+		"name": "张三",
+		"age": 24,
+		"sex": true
+	}
+	var xml = $.toXml(user);
+	console.log("转为xml\n", xml);
+	xml = $.toXml(user, true);
+	console.log("转为xml并格式化\n", xml);
+	xml = $.toXml(user, true, true, true);
+	console.log("字符串转CDATA\n", xml);
+	var obj = xml.toXml();
+	console.log(obj);
+
+	var xml = `<name><![CDATA[张三]]></name><age>24</age><sex>true</sex>`
+	console.log(xml.toXml());
+
+	xml = `
+	<xml>
+	  <ToUserName><![CDATA[toUser]]></ToUserName>
+	  <FromUserName><![CDATA[fromUser]]></FromUserName>
+	  <CreateTime>12345678</CreateTime>
+	  <MsgType><![CDATA[text]]></MsgType>
+	  <Content><![CDATA[Welcome to wechat world!]]></Content>
+	</xml>
+	`
+	var obj = xml.toXml()
+	console.log(obj);
+	console.log($.toXml(obj, true, true, true));
 }
 
+// async function test() {
+// console.log("./test.json".fullname());
+
+// var bl = "./test.json".isFile();
+// console.log("是文件否？", bl);
+
+// var bl = "./test.json".fullname().isFile();
+// console.log("是文件否？", bl);
+
+// var bl = "./demo/".isDir();
+// console.log("是目录否？", bl);
+
+// var bl = "./demo/".fullname().isDir();
+// console.log("是目录否？", bl);
+
+// var json = "./test.json".loadJson(__dirname);
+// console.log("读取json5", json);
+// }
+
 // async function test() {
 
 // 	// 创建事件监听