Merge branch 'master' into release/bin/revamp

Author: inferrinizzard

package-lock.json

@@ -36,6 +36,7 @@
         "@types/unicode-properties": "^1.3.0",
         "@types/urijs": "^1.19.25",
         "@types/wordwrap": "^1.0.3",
+        "command-line-args": "^5.2.1",
         "typescript": "~5.8.3"
     },
     "overrides": {

packages/quicktype-core/package.json

@@ -1,21 +1,22 @@
 import type { EnumOption, Option } from "./index";
+import type { OptionDefinition as CommandLineArgsOptionDefinition } from "command-line-args";
 
 /**
  * Primary options show up in the web UI in the "Language" settings tab,
  * Secondary options in "Other".
  * CLI is only for cli
  */
 export type OptionKind = "primary" | "secondary" | "cli";
+export type OptionType = "string" | "boolean" | "enum";
 
-export interface OptionDefinition<Name extends string = string, T = unknown> {
+export interface OptionDefinition<Name extends string = string, T = unknown>
+    extends CommandLineArgsOptionDefinition {
     /** Option Name */
     name: Name;
-    /** Option Alias for CLI */
-    alias?: string;
     /** Option Description */
     description: string;
     /** Category of Option */
-    optionType: "string" | "boolean" | "enum";
+    optionType: OptionType;
     /** Default Value for Option */
     defaultValue?: T;
     /** Enum only, map of possible keys and values */

packages/quicktype-core/src/RendererOptions/types.ts

@@ -456,6 +456,7 @@ function makeOptionDefinitions(
             typeLabel: "FILE|URL|DIRECTORY",
             description: "The file, url, or data directory to type.",
             kind: "cli",
+            defaultOption: true,
         },
         {
             name: "src-urls",
@@ -728,7 +729,13 @@ function parseOptions(
 ): Partial<CLIOptions> {
     let opts: commandLineArgs.CommandLineOptions;
     try {
-        opts = commandLineArgs(definitions, { argv, partial });
+        opts = commandLineArgs(
+            definitions.map((def) => ({
+                ...def,
+                type: def.optionType === "boolean" ? Boolean : String,
+            })),
+            { argv, partial },
+        );
     } catch (e) {
         assert(!partial, "Partial option parsing should not have failed");
         return messageError("DriverCLIOptionParsingFailed", {