Refactoring.

Author: tjprescott

tools/tsp-client/package-lock.json

@@ -17,7 +17,9 @@
     "clean": "rimraf ./dist ./types",
     "example": "npx ts-node src/index.ts update",
     "prepack": "npm run build",
-    "test": "mocha --exclude **/examples/**"
+    "test": "mocha --exclude **/examples/**",
+    "tsp-client": "node cmd/tsp-client.js",
+    "watch": "tsc -p . --watch"
   },
   "author": "Microsoft Corporation",
   "license": "MIT",
@@ -47,11 +49,13 @@
   },
   "dependencies": {
     "@azure/core-rest-pipeline": "^1.12.0",
+    "@types/yargs": "^17.0.32",
     "chalk": "^5.3.0",
     "dotenv": "^16.4.5",
     "prompt-sync": "^4.2.0",
     "simple-git": "^3.20.0",
-    "yaml": "^2.3.1"
+    "yaml": "^2.3.1",
+    "yargs": "^17.2.1"
   },
   "peerDependencies": {
     "@typespec/compiler": ">=0.48.1 <1.0.0"

tools/tsp-client/package.json

@@ -1,8 +1,8 @@
 import { mkdir, rm, stat, readFile, access } from "node:fs/promises";
 import { Logger } from "./log.js";
 import { parse as parseYaml } from "yaml";
-import { TspLocation } from "./typespec.js";
 import { joinPaths, normalizePath, resolvePath } from "@typespec/compiler";
+import { TspLocation } from "./typespec.js";
 
 export async function ensureDirectory(path: string) {
   await mkdir(path, { recursive: true });

tools/tsp-client/src/fs.ts

@@ -1,5 +1,4 @@
 import chalk from "chalk";
-import { getPackageVersion } from "./npm.js";
 
 const logSink = {
   log: console.log,
@@ -31,8 +30,11 @@ function createLogger(): Logger {
   return direct;
 }
 
-export function enableDebug(): void {
-  logSink.debug = console.debug;
+export function checkDebugLogging(argv: any): void {
+  const debug = argv.debug;
+  if (debug) {
+    logSink.debug = console.debug;
+  }
 }
 
 export const Logger = createLogger();
@@ -54,46 +56,7 @@ export function printBanner() {
   Logger.info(bannerText);
 }
 
-const usageText = `
-Usage: tsp-client <command> [options]
+export const usageText = `
+Usage: tsp-client <COMMAND> [OPTIONS]
 
-Use one of the supported commands to get started generating clients from a TypeSpec project.
-This tool will default to using your current working directory to generate clients in and will
-use it to look for relevant configuration files. To specify a different directory, use
-the -o or --output-dir option.
-
-Commands:
-  init        Initialize the SDK project folder from a tspconfig.yaml   [string]
-  sync        Sync TypeSpec project specified in tsp-location.yaml      [string]
-  generate    Generate from a TypeSpec project                          [string]
-  update      Sync and generate from a TypeSpec project                 [string]
-  convert     Convert a swagger specification to TypeSpec               [string]
-
-Options:
-  --arm                     Convert ARM swagger specification to TypeSpec       [boolean]
-  -c, --tsp-config          The tspconfig.yaml file to use                      [string]
-  --commit                  Commit to be used for project init or update        [string]
-  -d, --debug               Enable debug logging                                [boolean]
-  --emitter-options         The options to pass to the emitter                  [string]
-  --generate-lock-file      Generate a lock file under the eng/ directory from 
-                            an existing emitter-package.json                    [boolean]
-  -h, --help                Show help                                           [boolean]
-  --local-spec-repo         Path to local repository with the TypeSpec project  [string]
-  --no-prompt               Skip prompting for output directory confirmation    [boolean]
-  --save-inputs             Don't clean up the temp directory after generation  [boolean]
-  --skip-sync-and-generate  Skip sync and generate during project init          [boolean]
-  --swagger-readme          Path or url to swagger readme file                  [string]
-  -o, --output-dir          Specify an alternate output directory for the 
-                            generated files. Default is your current directory  [string]
-  --repo                    Repository where the project is defined for init 
-                            or update                                           [string]
-  -v, --version             Show version number                                 [boolean]
-`;
-export function printUsage() {
-  Logger(usageText);
-}
-
-export async function printVersion() {
-  const version = await getPackageVersion();
-  Logger(`tsp-client version: ${version}`);
-}
+Use one of the supported commands to get started generating clients from a TypeSpec project. This tool will default to using your current working directory to generate clients in and will use it to look for relevant configuration files. To specify a different directory, use the -o or --output-dir option.`;

tools/tsp-client/src/index.ts

@@ -1,7 +1,5 @@
-import * as path from "node:path";
-import { readFile, writeFile } from "node:fs/promises";
+import { writeFile } from "node:fs/promises";
 import { spawn } from "node:child_process";
-import { fileURLToPath } from "node:url";
 import { joinPaths } from "@typespec/compiler";
 
 export async function createPackageJson(rootPath: string, deps: Set<string>): Promise<void> {
@@ -58,15 +56,3 @@ export async function npxCommand(workingDir: string, args: string[]): Promise<vo
     });
   });
 }
-
-let packageVersion: string;
-export async function getPackageVersion(): Promise<string> {
-  if (!packageVersion) {
-    const __dirname = path.dirname(fileURLToPath(import.meta.url));
-    const packageJson = JSON.parse(
-      await readFile(joinPaths(__dirname, "..", "package.json"), "utf-8"),
-    );
-    packageVersion = packageJson.version ?? "unknown";
-  }
-  return packageVersion;
-}