@kokiito0926/fs2xml 0.0.8 → 0.0.10

package/index.js

@@ -1,13 +1,6 @@
 #!/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 { fs, path, argv, glob } from "zx";
 import ignore from "ignore";
 import globParent from "glob-parent";
 import xml2js from "xml2js";
@@ -29,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);
 
@@ -45,16 +36,14 @@ async function loadNearestGitignore(targetPattern) {
 	return { ig, baseDir: process.cwd() };
 }
 
-const args = minimist(process.argv.slice(2));
-const target = args._[0] || "**/*";
-const dot = args.dot || false;
-const gitignore = args.gitignore || true;
+const target = argv?._[0] || "**/*";
+const dot = argv?.dot || false;
+const gitignore = argv?.gitignore || true;
 
 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]) : [];
 
@@ -79,6 +68,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, "/"),
@@ -87,8 +79,7 @@ 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 = "";
@@ -98,7 +89,6 @@ const builder = new xml2js.Builder({
 	cdata: true,
 	xmldec: { version: "1.0", encoding: "UTF-8" },
 	renderOpts: { pretty: true },
-	// renderOpts: { pretty: true, indent: "  ", newline: "\n" },
 });
 
 if (files.length === 1) {
@@ -114,22 +104,6 @@ if (files.length === 1) {
 			content: data.content,
 		},
 	};
-
-	/*
-	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 });
-	*/
 } else {
 	const allFiles = [];
 	for (const file of files) {
@@ -141,7 +115,6 @@ if (files.length === 1) {
 	if (!allFiles.length) {
 		process.exit(1);
 	}
-	// console.log(allFiles);
 
 	xmlObject = {
 		files: {
@@ -152,25 +125,6 @@ if (files.length === 1) {
 			})),
 		},
 	};
-
-	/*
-	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 });
-	*/
 }
 
 xmlOutput = builder.buildObject(xmlObject);

package/package.json

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