From 375de29e58e50ae67dbe5cac230feba77562d9dc Mon Sep 17 00:00:00 2001
From: Chris Manson <chris@manson.ie>
Date: Thu, 27 Feb 2025 14:09:29 +0000
Subject: [PATCH] convert from yargs to commander

---
 packages/template-tag-codemod/package.json |   6 +-
 packages/template-tag-codemod/src/cli.ts   | 154 ++++++++++-----------
 pnpm-lock.yaml                             |  25 +++-
 3 files changed, 95 insertions(+), 90 deletions(-)

diff --git a/packages/template-tag-codemod/package.json b/packages/template-tag-codemod/package.json
index aac04b3d0..11c1d96e7 100644
--- a/packages/template-tag-codemod/package.json
+++ b/packages/template-tag-codemod/package.json
@@ -38,20 +38,20 @@
     "@babel/generator": "^7.26.5",
     "@babel/plugin-syntax-decorators": "^7.25.9",
     "@babel/plugin-syntax-typescript": "^7.25.9",
+    "@commander-js/extra-typings": "^13.1.0",
     "@embroider/compat": "workspace:^*",
     "@embroider/core": "workspace:^*",
     "@embroider/reverse-exports": "workspace:^*",
     "@humanwhocodes/module-importer": "^1.0.1",
     "@types/babel__core": "^7.20.5",
-    "@types/yargs": "^17.0.3",
     "babel-import-util": "^3.0.0",
     "babel-plugin-ember-template-compilation": "^2.3.0",
     "broccoli": "^3.5.2",
+    "commander": "^13.1.0",
     "console-ui": "^3.1.2",
     "ember-cli": "^6.0.1",
     "glob": "^11.0.0",
-    "html-tag-names": "^2.1.0",
-    "yargs": "^17.0.1"
+    "html-tag-names": "^2.1.0"
   },
   "devDependencies": {
     "@glimmer/syntax": "^0.84.3",
diff --git a/packages/template-tag-codemod/src/cli.ts b/packages/template-tag-codemod/src/cli.ts
index e2edc3aed..807094323 100644
--- a/packages/template-tag-codemod/src/cli.ts
+++ b/packages/template-tag-codemod/src/cli.ts
@@ -1,86 +1,78 @@
 #!/usr/bin/env node
-import yargs from 'yargs/yargs';
 import { type Options, optionsWithDefaults, run } from './index.js';
 
-yargs(process.argv.slice(2))
-  .scriptName('template-tag-codemod')
-  .command(
-    '$0',
-    "Converts Ember's .hbs format to .gjs or .gts format.",
-    y =>
-      y
-        .option('relativeLocalPaths', {
-          default: optionsWithDefaults().relativeLocalPaths,
-          type: 'boolean',
-          describe: `When true, imports for other files in the same project will use relative paths with file extensions. This is the most compatible with modern Node ESM convensions, but it's not supported by Ember's classic build.`,
-        })
-        .option('extensions', {
-          array: true,
-          type: 'string',
-          default: optionsWithDefaults().extensions,
-          describe: `File extensions to search when resolving components, helpers, and modifiers inside your hbs files`,
-        })
-        .option('nativeRouteTemplates', {
-          default: optionsWithDefaults().nativeRouteTemplates,
-          type: 'boolean',
-          describe: `When true, assume we can use template-tag directly in route files (requires ember-source >= 6.3.0-beta.3). When false, assume we can use the ember-route-template addon instead.`,
-        })
-        .option('nativeLexicalThis', {
-          default: optionsWithDefaults().nativeLexicalThis,
-          type: 'boolean',
-          describe: `When true, assume that Ember supports accessing the lexically-scoped "this" from template-tags that are used as expressions (requires ember-source >= TODO). When false, introduce a new local variable to make "this" accessible.`,
-        })
-        .option('routeTemplates', {
-          array: true,
-          type: 'string',
-          default: optionsWithDefaults().routeTemplates,
-          describe: `Controls which route template files we will convert to template tag. Provide a list of globs.`,
-        })
-        .option('components', {
-          array: true,
-          type: 'string',
-          default: optionsWithDefaults().components,
-          describe: `Controls which component files we will convert to template tag. Provide a list of globs.`,
-        })
-        .option('renderTests', {
-          array: true,
-          type: 'string',
-          default: optionsWithDefaults().renderTests,
-          describe: `Controls the files in which we will search for rendering tests to convert to template tags. Provide a list of globs.`,
-        })
-        .option('defaultFormat', {
-          type: 'string',
-          default: optionsWithDefaults().defaultFormat,
-          describe: `When a .js or .ts file already exists, we necessarily convert to .gjs or .gts respectively. But when only an .hbs file exists, we have a choice of default.`,
-        })
-        .option('templateOnlyComponentSignature', {
-          type: 'string',
-          default: optionsWithDefaults().templateOnlyComponentSignature,
-          describe: `Snippet of typescript to use as the type signature of newly-converted template-only components.`,
-        })
-        .option('routeTemplateSignature', {
-          type: 'string',
-          default: optionsWithDefaults().routeTemplateSignature,
-          describe: `Snippet of typescript to use as the type signature of route templates.`,
-        })
-        .option('templateInsertion', {
-          type: 'string',
-          default: optionsWithDefaults().templateInsertion,
-          describe: `Where should <template> be inserted inside existing class bodies? Say "beginning" or "end".`,
-        })
-        .option('renamingRules', {
-          type: 'string',
-          default: optionsWithDefaults().renamingRules,
-          describe: `The name of a module that will provide a renaming strategy for picking the names of components, helpers, and modifiers in rewritten templates`,
-        }),
+import { program } from '@commander-js/extra-typings';
 
-    async argv => {
-      await run(argv as Options);
-
-      // we need this to be explicit because our prebuild runs things like
-      // broccoli-babel-transpiler which leak worker processes and will
-      // otherwise prevent exit.🤮
-      process.exit(0);
-    }
+program
+  .name('template-tag-codemod')
+  .description(`Converts Ember's .hbs format to .gjs or .gts format.`)
+  .option(
+    '--no-relativeLocalPaths',
+    `When true, imports for other files in the same project will use relative paths with file extensions. This is the most compatible with modern Node ESM convensions, but it's not supported by Ember's classic build.`,
+    optionsWithDefaults().relativeLocalPaths
+  )
+  .option(
+    '--extensions <...extensions>',
+    `File extensions to search when resolving components, helpers, and modifiers inside your hbs files`,
+    optionsWithDefaults().extensions
+  )
+  .option(
+    '--no-nativeRouteTemplates',
+    `When true, assume we can use template-tag directly in route files (requires ember-source >= 6.3.0-beta.3). When false, assume we can use the ember-route-template addon instead.`,
+    optionsWithDefaults().nativeRouteTemplates
+  )
+  .option(
+    '--nativeLexicalThis',
+    `When true, assume that Ember supports accessing the lexically-scoped "this" from template-tags that are used as expressions (requires ember-source >= TODO). When false, introduce a new local variable to make "this" accessible.`,
+    optionsWithDefaults().nativeLexicalThis
+  )
+  .option(
+    '--routeTemplates <...globs>',
+    `Controls which route template files we will convert to template tag. Provide a list of globs.`,
+    optionsWithDefaults().routeTemplates
+  )
+  .option(
+    '--components <...globs>',
+    `Controls which component files we will convert to template tag. Provide a list of globs.`,
+    optionsWithDefaults().components
+  )
+  .option(
+    '--renderTests <...globs>',
+    `Controls the files in which we will search for rendering tests to convert to template tags. Provide a list of globs.`,
+    optionsWithDefaults().renderTests
   )
-  .parse();
+  .option(
+    '--defaultFormat <value>',
+    `When a .js or .ts file already exists, we necessarily convert to .gjs or .gts respectively. But when only an .hbs file exists, we have a choice of default.`,
+    optionsWithDefaults().defaultFormat
+  )
+  .option(
+    '--templateOnlyComponentSignature <value>',
+    `Snippet of typescript to use as the type signature of newly-converted template-only components.`,
+    optionsWithDefaults().templateOnlyComponentSignature
+  )
+  .option(
+    '--routeTemplateSignature <value>',
+    `Snippet of typescript to use as the type signature of route templates.`,
+    optionsWithDefaults().routeTemplateSignature
+  )
+  .option(
+    '--templateInsertion <value>',
+    `Where should <template> be inserted inside existing class bodies? Say "beginning" or "end".`,
+    optionsWithDefaults().templateInsertion
+  )
+  .option(
+    '--renamingRules <value>',
+    `The name of a module that will provide a renaming strategy for picking the names of components, helpers, and modifiers in rewritten templates`,
+    optionsWithDefaults().renamingRules
+  )
+  .action(async args => {
+    await run(args as Options);
+
+    // we need this to be explicit because our prebuild runs things like
+    // broccoli-babel-transpiler which leak worker processes and will
+    // otherwise prevent exit.🤮
+    process.exit(0);
+  });
+
+program.parse();
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index eb32a707f..8456a711b 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -835,6 +835,9 @@ importers:
       '@babel/plugin-syntax-typescript':
         specifier: ^7.25.9
         version: 7.25.9(@babel/core@7.26.9)
+      '@commander-js/extra-typings':
+        specifier: ^13.1.0
+        version: 13.1.0(commander@13.1.0)
       '@embroider/compat':
         specifier: workspace:^*
         version: link:../compat
@@ -850,9 +853,6 @@ importers:
       '@types/babel__core':
         specifier: ^7.20.5
         version: 7.20.5
-      '@types/yargs':
-        specifier: ^17.0.3
-        version: 17.0.33
       babel-import-util:
         specifier: ^3.0.0
         version: 3.0.0
@@ -862,6 +862,9 @@ importers:
       broccoli:
         specifier: ^3.5.2
         version: 3.5.2
+      commander:
+        specifier: ^13.1.0
+        version: 13.1.0
       console-ui:
         specifier: ^3.1.2
         version: 3.1.2
@@ -874,9 +877,6 @@ importers:
       html-tag-names:
         specifier: ^2.1.0
         version: 2.1.0
-      yargs:
-        specifier: ^17.0.1
-        version: 17.7.2
     devDependencies:
       '@glimmer/syntax':
         specifier: ^0.84.3
@@ -4274,6 +4274,14 @@ packages:
     dev: true
     optional: true
 
+  /@commander-js/extra-typings@13.1.0(commander@13.1.0):
+    resolution: {integrity: sha512-q5P52BYb1hwVWE6dtID7VvuJWrlfbCv4klj7BjUUOqMz4jbSZD4C9fJ9lRjL2jnBGTg+gDDlaXN51rkWcLk4fg==}
+    peerDependencies:
+      commander: ~13.1.0
+    dependencies:
+      commander: 13.1.0
+    dev: false
+
   /@cspotcode/source-map-support@0.8.1:
     resolution: {integrity: sha512-IchNf6dN4tHoMFIn/7OE8LWZ19Y6q/67Bmf6vnGREv8RSbBVb9LPJxEcnwrcwX6ixSvaiGoomAUvu4YSxXrVgw==}
     engines: {node: '>=12'}
@@ -12406,6 +12414,11 @@ packages:
     dependencies:
       delayed-stream: 1.0.0
 
+  /commander@13.1.0:
+    resolution: {integrity: sha512-/rFeCpNJQbhSZjGVwO9RFV3xPqbnERS8MmIQzCtD/zl6gpJuV/bMLuN92oG3F7d8oDEHHRrujSXNUr8fpjntKw==}
+    engines: {node: '>=18'}
+    dev: false
+
   /commander@2.20.3:
     resolution: {integrity: sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==}