@kokiito0926/fs2xml 0.0.7 → 0.0.9

package/index.js

@@ -1,15 +1,9 @@
 #!/usr/bin/env node
 
-// >> $ ./index.js "./example/example.txt"
-// >> $ ./index.js "./example/sub/example.js"
-
-// >> $ ./index.js "./example/**/*.txt"
-// >> $ ./index.js "./example/**/*.txt" --ignore "./example/ignore/**"
-
 import { fs, path, minimist, glob } from "zx";
-import { create } from "xmlbuilder2";
 import ignore from "ignore";
 import globParent from "glob-parent";
+import xml2js from "xml2js";
 
 async function loadNearestGitignore(targetPattern) {
 	const ig = ignore();
@@ -28,8 +22,6 @@ async function loadNearestGitignore(targetPattern) {
 		const gitignorePath = path.join(currentDir, ".gitignore");
 
 		if (fs.existsSync(gitignorePath)) {
-			// console.log(gitignorePath);
-
 			const content = await fs.readFile(gitignorePath, "utf8");
 			ig.add(content);
 
@@ -53,7 +45,6 @@ const { ig, baseDir } =
 	gitignore == false ? { ig: ignore(), baseDir: process.cwd() } : await loadNearestGitignore(target);
 
 const defaultIgnore = [];
-// const defaultIgnore = ["node_modules/**", ".git/**"];
 
 const userIgnore = args.ignore ? (Array.isArray(args.ignore) ? args.ignore : [args.ignore]) : [];
 
@@ -78,6 +69,9 @@ async function getFileData(filePath) {
 	content = content.replace(/[\x00-\x08\x0B\x0C\x0E-\x1F\x7F]/g, "");
 	if (!content) return null;
 
+	content = content.replace(/]]>/g, "]]]]><![CDATA[>");
+	if (!content) return null;
+
 	return {
 		name: path.basename(filePath),
 		path: filePath.replace(/\\/g, "/"),
@@ -86,11 +80,17 @@ async function getFileData(filePath) {
 }
 
 if (files.length === 0) {
-	process.stderr.write(`No files matched the pattern: ${pattern}\n`);
-	process.exit(0);
+	process.exit(1);
 }
 
 let xmlOutput = "";
+let xmlObject = {};
+
+const builder = new xml2js.Builder({
+	cdata: true,
+	xmldec: { version: "1.0", encoding: "UTF-8" },
+	renderOpts: { pretty: true },
+});
 
 if (files.length === 1) {
 	const data = await getFileData(files[0]);
@@ -98,19 +98,13 @@ if (files.length === 1) {
 		process.exit(1);
 	}
 
-	xmlOutput = create({ version: "1.0", encoding: "UTF-8" })
-		.ele("file")
-		.ele("name")
-		.txt(data.name)
-		.up()
-		.ele("path")
-		.txt(data.path)
-		.up()
-		.ele("content")
-		// .txt(data.content)
-		.dat(data.content)
-		.up()
-		.end({ prettyPrint: true });
+	xmlObject = {
+		file: {
+			name: data.name,
+			path: data.path,
+			content: data.content,
+		},
+	};
 } else {
 	const allFiles = [];
 	for (const file of files) {
@@ -122,24 +116,17 @@ if (files.length === 1) {
 	if (!allFiles.length) {
 		process.exit(1);
 	}
-	// console.log(allFiles);
-
-	const root = create({ version: "1.0", encoding: "UTF-8" }).ele("files");
-	for (const f of allFiles) {
-		root.ele("file")
-			.ele("name")
-			.txt(f.name)
-			.up()
-			.ele("path")
-			.txt(f.path)
-			.up()
-			.ele("content")
-			// .txt(f.content)
-			.dat(f.content)
-			.up()
-			.up();
-	}
-	xmlOutput = root.end({ prettyPrint: true });
+
+	xmlObject = {
+		files: {
+			file: allFiles.map((f) => ({
+				name: f.name,
+				path: f.path,
+				content: f.content,
+			})),
+		},
+	};
 }
 
+xmlOutput = builder.buildObject(xmlObject);
 console.log(xmlOutput);

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@kokiito0926/fs2xml",
-	"version": "0.0.7",
+	"version": "0.0.9",
 	"private": false,
 	"description": "ファイルをXML形式でまとめることができるコマンドラインのツールです。",
 	"keywords": [
@@ -36,7 +36,7 @@
 	"dependencies": {
 		"glob-parent": "^6.0.2",
 		"ignore": "^7.0.5",
-		"xmlbuilder2": "^4.0.3",
+		"xml2js": "^0.6.2",
 		"zx": "^8.8.4"
 	},
 	"engines": {