Refactor CLI path handling, fixing several bugs

Author: Piet van Agtmaal

.changeset/gold-gorillas-kiss.md

@@ -0,0 +1,5 @@
+---
+"openapi-typescript": patch
+---
+
+Refactor CLI path handling, fixing several bugs

packages/openapi-typescript/bin/cli.js

@@ -32,7 +32,7 @@ Options
 
 const OUTPUT_FILE = "FILE";
 const OUTPUT_STDOUT = "STDOUT";
-const CWD = new URL(`file://${process.cwd()}/`);
+const CWD = process.cwd();
 const EXT_RE = /\.[^.]+$/i;
 const HTTP_RE = /^https?:\/\//;
 
@@ -70,7 +70,7 @@ const flags = parser(args, {
   },
 });
 
-async function generateSchema(pathToSpec) {
+async function generateSchema(pathToSpec, outputFile) {
   const output = flags.output ? OUTPUT_FILE : OUTPUT_STDOUT; // FILE or STDOUT
 
   // Parse incoming headers from CLI flags
@@ -111,15 +111,11 @@ async function generateSchema(pathToSpec) {
 
   // output
   if (output === OUTPUT_FILE) {
-    let outputFilePath = new URL(flags.output, CWD); // note: may be directory
+    let outputFilePath = outputFile; // note: may be directory
     const isDir = fs.existsSync(outputFilePath) && fs.lstatSync(outputFilePath).isDirectory();
     if (isDir) {
-      const filename = pathToSpec.replace(EXT_RE, ".ts");
-      const originalOutputFilePath = outputFilePath;
-      outputFilePath = new URL(filename, originalOutputFilePath);
-      if (outputFilePath.protocol !== 'file:') {
-        outputFilePath = new URL(outputFilePath.host.replace(EXT_RE, ".ts"), originalOutputFilePath);
-      }
+      const filename = path.basename(pathToSpec).replace(EXT_RE, ".ts");
+      outputFilePath = path.join(outputFilePath, filename);
     }
 
     fs.writeFileSync(outputFilePath, result, "utf8");
@@ -140,15 +136,24 @@ async function main() {
     console.info(HELP);
     process.exit(0);
   }
-  const packageJSON = JSON.parse(fs.readFileSync(new URL("../package.json", import.meta.url), "utf8"));
+  const packageJSON = (await import("../package.json", { assert: { type: 'json' }})).default;
   if ("version" in flags) {
     console.info(`v${packageJSON.version}`);
     process.exit(0);
   }
 
   let output = flags.output ? OUTPUT_FILE : OUTPUT_STDOUT; // FILE or STDOUT
-  let outputFile = new URL(flags.output, CWD);
-  let outputDir = new URL(".", outputFile);
+  let outputFile
+  if (flags.output) {
+    if (path.isAbsolute(flags.output)) {
+      outputFile = flags.output;
+    } else {
+      outputFile = path.join(CWD, flags.output);
+    }
+  } else {
+    outputFile = CWD;
+  }
+  let outputDir = path.dirname(outputFile);
 
   if (output === OUTPUT_FILE) console.info(`✨ ${c.bold(`openapi-typescript ${packageJSON.version}`)}`); // only log if we’re NOT writing to stdout
 
@@ -188,14 +193,14 @@ async function main() {
   await Promise.all(
     inputSpecPaths.map(async (specPath) => {
       if (flags.output !== "." && output === OUTPUT_FILE) {
+        // recursively make parent dirs. For globs, the passed output target is a directory, else it is a file
         if (isGlob) {
-          fs.mkdirSync(new URL(path.dirname(specPath), outputDir), { recursive: true }); // recursively make parent dirs
-        }
-        else {
-          fs.mkdirSync(outputDir, { recursive: true }); // recursively make parent dirs
+          fs.mkdirSync(outputFile, { recursive: true });
+        } else {
+          fs.mkdirSync(outputDir, { recursive: true });
         }
       }
-      await generateSchema(specPath);
+      await generateSchema(specPath, outputFile);
     })
   );
 }