fix: normalize paths to unix style

mcarvin8 · Dec 15, 2024 · 159a518 · 159a518
1 parent b6a119a
commit 159a518
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 6 deletions.
diff --git a/src/service/deleteReassembledXML.ts b/src/service/deleteReassembledXML.ts
@@ -1,7 +1,7 @@
 "use strict";
 
 import { stat, readdir, rm } from "node:fs/promises";
-import { join } from "node:path";
+import { join } from "node:path/posix";
 
 export async function deleteReassembledXML(
   disassembledPath: string,

diff --git a/src/service/json2xmlReassembler.ts b/src/service/json2xmlReassembler.ts
@@ -1,7 +1,7 @@
 "use strict";
 
 import { stat, readdir } from "node:fs/promises";
-import { join } from "node:path";
+import { join } from "node:path/posix";
 
 import { logger } from "@src/index";
 import { reassembleHandler } from "@src/service/reassembleHandler";

diff --git a/src/service/transform2JSON.ts b/src/service/transform2JSON.ts
@@ -1,7 +1,7 @@
 "use strict";
 
 import { readdir, readFile, rm, stat, writeFile } from "node:fs/promises";
-import { join } from "node:path";
+import { join } from "node:path/posix";
 import { XMLParser } from "fast-xml-parser";
 
 import { logger } from "@src/index";

diff --git a/src/service/xml2jsonDisassembler.ts b/src/service/xml2jsonDisassembler.ts
@@ -2,7 +2,14 @@
 
 import { existsSync } from "node:fs";
 import { stat, readdir, readFile } from "node:fs/promises";
-import { resolve, join, basename, dirname, extname, relative } from "node:path";
+import {
+  resolve,
+  join,
+  basename,
+  dirname,
+  extname,
+  relative,
+} from "node:path/posix";
 import ignore, { Ignore } from "ignore";
 
 import { logger } from "@src/index";
@@ -53,9 +60,12 @@ export class XmlToJsonDisassembler {
       });
     } else if (fileStat.isDirectory()) {
       const subFiles = await readdir(filePath);
+      const resolvedBasePath = dirname(resolvedIgnorePath); // Base path of the ignore file
       for (const subFile of subFiles) {
         const subFilePath = join(filePath, subFile);
-        const relativeSubFilePath = relative(process.cwd(), subFilePath);
+        const relativeSubFilePath = this.posixPath(
+          relative(resolvedBasePath, subFilePath),
+        );
         if (
           subFilePath.endsWith(".xml") &&
           !this.ign.ignores(relativeSubFilePath)
@@ -96,4 +106,8 @@ export class XmlToJsonDisassembler {
     const baseName = fullName.split(".")[0];
     await transform2JSON(join(basePath, baseName));
   }
+  private posixPath(path: string): string {
+    // Normalize path to POSIX-style (for cross-platform compatibility)
+    return path.replace(/\\+/g, "/");
+  }
 }
diff --git a/test/main.spec.ts b/test/main.spec.ts
@@ -1,6 +1,6 @@
 import { readdir, readFile, writeFile, rm } from "node:fs/promises";
 import { strictEqual } from "node:assert";
-import { resolve, join } from "node:path";
+import { resolve, join } from "node:path/posix";
 import { copy } from "fs-extra";
 
 import {