@kokiito0926/fs2xml 0.0.2 → 0.0.4

package/README.md

@@ -29,7 +29,8 @@ $ fs2xml "./src/**/*"
 $ fs2xml "./src/**/*.txt"
 ```
 
---ignoreのオプションを用いると、特定のパターンを除外することができます。
+--ignoreのオプションを用いると、特定のパターンを除外することができます。  
+現状の実装では、現在の作業中のディレクトリの.gitignoreが読み込まれ、そのパターンが自動的に適用されます。
 
 ```bash
 $ fs2xml "./src/**/*" --ignore "./src/test/**" --ignore "**/*.log"

package/index.js

@@ -8,19 +8,64 @@
 
 import { fs, path, minimist, glob } from "zx";
 import { create } from "xmlbuilder2";
+import ignore from "ignore";
+import globParent from "glob-parent";
+
+async function loadNearestGitignore(targetPattern) {
+	const ig = ignore();
+
+	const parentDir = globParent(targetPattern);
+	let currentDir = path.resolve(parentDir);
+
+	try {
+		const stats = await fs.stat(currentDir);
+		if (stats.isFile()) {
+			currentDir = path.dirname(currentDir);
+		}
+	} catch (e) {}
+
+	while (true) {
+		const gitignorePath = path.join(currentDir, ".gitignore");
+
+		if (fs.existsSync(gitignorePath)) {
+			// console.log(gitignorePath);
+
+			const content = await fs.readFile(gitignorePath, "utf8");
+			ig.add(content);
+
+			return { ig, baseDir: currentDir };
+		}
+
+		const parent = path.dirname(currentDir);
+		if (parent === currentDir) break;
+		currentDir = parent;
+	}
+
+	return { ig, baseDir: process.cwd() };
+}
 
 const args = minimist(process.argv.slice(2));
 const target = args._[0] || "**/*";
 
+const { ig, baseDir } = await loadNearestGitignore(target);
+
+// const defaultIgnore = [];
 const defaultIgnore = ["node_modules/**", ".git/**"];
 
 const userIgnore = args.ignore ? (Array.isArray(args.ignore) ? args.ignore : [args.ignore]) : [];
 
 const ignorePatterns = [...defaultIgnore, ...userIgnore].filter(Boolean);
 
-const files = await glob(target, {
+let files = await glob(target, {
 	ignore: ignorePatterns,
 	nodir: true,
+	dot: true,
+});
+
+files = files.filter((file) => {
+	const relativePath = path.relative(baseDir, path.resolve(file));
+	if (relativePath === "") return true;
+	return !ig.ignores(relativePath);
 });
 
 async function getFileData(filePath) {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@kokiito0926/fs2xml",
-	"version": "0.0.2",
+	"version": "0.0.4",
 	"private": false,
 	"description": "ファイルをXML形式でまとめることができます。",
 	"keywords": [
@@ -34,6 +34,8 @@
 		"test": "node --test"
 	},
 	"dependencies": {
+		"glob-parent": "^6.0.2",
+		"ignore": "^7.0.5",
 		"xmlbuilder2": "^4.0.3",
 		"zx": "^8.8.4"
 	},