Clean up files (combine help, file checks)

Author: harmony7

src/cli/js-compute-runtime-cli.ts

@@ -1,8 +1,7 @@
 #!/usr/bin/env node
 
 import { parseInputs } from '../parseInputs.js';
-import { printVersion } from '../printVersion.js';
-import { printHelp } from '../printHelp.js';
+import { printHelp, printVersion } from '../printHelp.js';
 import { addSdkMetadataField } from '../addSdkMetadataField.js';
 
 const parsedInputs = await parseInputs(process.argv.slice(2));

src/compileApplicationToWasm.ts

@@ -12,8 +12,7 @@ import { rmSync } from 'node:fs';
 import weval from '@bytecodealliance/weval';
 import wizer from '@bytecodealliance/wizer';
 
-import { isFile } from './isFile.js';
-import { isFileOrDoesNotExist } from './isFileOrDoesNotExist.js';
+import { isDirectory, isFile } from './isFile.js';
 import { postbundle } from './postbundle.js';
 import { bundle } from './bundle.js';
 import { composeSourcemaps, ExcludePattern } from './composeSourcemaps.js';
@@ -102,30 +101,29 @@ export async function compileApplicationToWasm(params: CompileApplicationToWasmP
     );
     process.exit(1);
   }
-  try {
-    await mkdir(dirname(output), {
-      recursive: true,
-    });
-  } catch (maybeError: unknown) {
-    const error = maybeError instanceof Error ? maybeError : new Error(String(maybeError));
-    console.error(
-      `Error: Failed to create the \`output\` (${output}) directory`,
-      error.message,
-    );
-    process.exit(1);
-  }
 
+  // If output exists already, make sure it's not a directory
+  // (we'll try to overwrite it if it's a file)
   try {
-    if (!(await isFileOrDoesNotExist(output))) {
+    if (await isDirectory(output)) {
       console.error(
-        `Error: The \`output\` path does not point to a file: ${output}`,
+        `Error: The \`output\` path points to a directory: ${output}`,
       );
       process.exit(1);
     }
+  } catch {
+    // Output doesn't exist
+  }
+
+  try {
+    await mkdir(dirname(output), {
+      recursive: true,
+    });
   } catch (maybeError: unknown) {
-    const error = maybeError instanceof Error ? maybeError : new Error(String(maybeError));
+    const error =
+      maybeError instanceof Error ? maybeError : new Error(String(maybeError));
     console.error(
-      `Error: Failed to check whether the \`output\` (${output}) is a file path`,
+      `Error: Failed to create the \`output\` (${dirname(output)}) directory: ${output}`,
       error.message,
     );
     process.exit(1);

src/isFile.ts

@@ -4,3 +4,8 @@ export async function isFile(path: string) {
   const stats = await stat(path);
   return stats.isFile();
 }
+
+export async function isDirectory(path: string) {
+  const stats = await stat(path);
+  return stats.isDirectory();
+}

src/isFileOrDoesNotExist.ts

@@ -1,7 +1,6 @@
 import { fileURLToPath } from 'node:url';
 import { dirname, join, isAbsolute } from 'node:path';
-import { unknownArgument } from './unknownArgument.js';
-import { tooManyEngines } from './tooManyEngines.js';
+import { tooManyEngines, unknownArgument } from './printHelp.js';
 import { EnvParser } from './env.js';
 
 export type ParsedInputs =

src/parseInputs.ts

@@ -1,6 +1,8 @@
-import { basename } from 'node:path';
+import { readFile } from 'node:fs/promises';
+import { basename, dirname, join } from 'node:path';
 import { argv } from 'node:process';
-import { printVersion } from './printVersion.js';
+import { fileURLToPath } from 'node:url';
+const __dirname = dirname(fileURLToPath(import.meta.url));
 
 export async function printHelp() {
   await printVersion();
@@ -34,3 +36,31 @@ ARGS:
     <output>    The file path to write the output Wasm module to [default: bin/main.wasm]
 `);
 }
+
+export async function printVersion() {
+  const packageJson = await readFile(join(__dirname, '../package.json'), {
+    encoding: 'utf-8',
+  });
+  const version = (JSON.parse(packageJson) as { version: string }).version;
+  console.log(`${basename(argv[1])} ${version}`);
+}
+
+export function tooManyEngines() {
+  console.error(`error: The argument '--engine-wasm <engine-wasm>' was provided more than once, but cannot be used multiple times
+  
+USAGE:
+    js-compute-runtime --engine-wasm <engine-wasm>
+      
+For more information try --help`);
+  process.exit(1);
+}
+
+export function unknownArgument(cliInput: string) {
+  console.error(`error: Found argument '${cliInput}' which wasn't expected, or isn't valid in this context
+
+USAGE:
+    js-compute-runtime [FLAGS] [OPTIONS] [ARGS]
+
+For more information try --help`);
+  process.exit(1);
+}