refactor: address review comments

vaadin · Feb 28, 2025 · 046694a · 046694a
1 parent baa6ac0
commit 046694a
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 10 deletions.
diff --git a/packages/java/engine-core/src/main/java/com/vaadin/hilla/engine/GeneratorProcessor.java b/packages/java/engine-core/src/main/java/com/vaadin/hilla/engine/GeneratorProcessor.java
@@ -136,7 +136,6 @@ private void applyPlugins(GeneratorConfiguration.@NonNull Plugins plugins) {
 
     private void prepareOpenAPI(ArrayList<Object> arguments) {
         logger.debug("Using OpenAPI file: {}", openAPIFile);
-        arguments.add("-i");
         arguments.add(openAPIFile);
     }
 

diff --git a/packages/ts/generator-cli/src/index.ts b/packages/ts/generator-cli/src/index.ts
@@ -8,7 +8,8 @@ import type { PackageJson } from 'type-fest';
 import GeneratorIO from './GeneratorIO.js';
 
 const {
-  values: { inputFile, help, outputDir, plugin: plugins, verbose, version },
+  positionals: [file],
+  values: { help, outputDir, plugin: plugins, verbose, version },
 } = parseArgs({
   options: {
     inputFile: {
@@ -37,15 +38,18 @@ const {
       type: 'boolean',
     },
   },
+  allowPositionals: true,
 });
 
 if (help) {
   // eslint-disable-next-line no-console
   console.log(`Usage:
-tsgen
+tsgen <file> [OPTIONS]
+
+Arguments:
+  file                   OpenAPI JSON schema file (required)
 
 Options:
-  -i, --input-file       OpenAPI schema file (required)
   -h, --help             Show this screen
   -o, --output-dir       Output directory
   -p, --plugin <path>    Use the plugin loadable by <path>.
@@ -57,8 +61,8 @@ Options:
   // eslint-disable-next-line no-console
   console.log(packageJson.version);
 } else {
-  if (!inputFile) {
-    throw new Error('Input file is required');
+  if (!file) {
+    throw new Error('OpenAPI file is required');
   }
 
   const logger = new LoggerFactory({ verbose });
@@ -75,7 +79,7 @@ Options:
   );
   const generator = new Generator(resolvedPlugins, { logger, outputDir });
 
-  const files = await generator.process(await readFile(inputFile, 'utf8'));
+  const files = await generator.process(await readFile(file, 'utf8'));
   const filesToDelete = await io.getExistingGeneratedFiles();
   const generatedFiles = await io.writeGeneratedFiles(files);
 

diff --git a/packages/ts/generator-cli/test/cli.spec.ts b/packages/ts/generator-cli/test/cli.spec.ts
@@ -22,6 +22,6 @@ describe('cli', () => {
   });
 
   it('should throw an error if input file is not provided', async () => {
-    await expect(execAsync(`npx tsx src/index.ts`)).rejects.and.throws(Error, 'Input file is required');
+    await expect(execAsync(`npx tsx src/index.ts`)).rejects.and.throws(Error, 'OpenAPI file is required');
   });
 });
diff --git a/packages/ts/generator-cli/test/fixtures/help.snap b/packages/ts/generator-cli/test/fixtures/help.snap
@@ -1,8 +1,10 @@
 Usage:
-tsgen
+tsgen <file> [OPTIONS]
+
+Arguments:
+  file                   OpenAPI JSON schema file (required)
 
 Options:
-  -i, --input-file       OpenAPI schema file (required)
   -h, --help             Show this screen
   -o, --output-dir       Output directory
   -p, --plugin <path>    Use the plugin loadable by <path>.