@trpc/upgrade 0.0.0-alpha.32 → 0.0.0-alpha.33

package/dist/bin.js

@@ -1,4 +1,5 @@
 #!/usr/bin/env node
+import { basename, extname } from 'node:path';
 import { parse } from '@bomb.sh/args';
 import * as p from '@clack/prompts';
 import { intro, log, multiselect, isCancel, outro } from '@clack/prompts';
@@ -8,15 +9,15 @@ import * as CP from 'node:child_process';
 import * as Util from 'node:util';
 import __node_cjsModule from 'node:module';
 
-var version = "0.0.0-alpha.31";
+var version = "0.0.0-alpha.32";
 
-function getProgram(args) {
+function getProgram() {
     const configFile = ts.findConfigFile(process.cwd(), (filepath)=>ts.sys.fileExists(filepath));
     if (!configFile) {
         p.log.error('No tsconfig found');
         process.exit(1);
     }
-    if (args.verbose) {
+    if (process.env.VERBOSE) {
         p.log.info(`Using tsconfig: ${configFile}`);
     }
     const { config } = ts.readConfigFile(configFile, (filepath)=>ts.sys.readFile(filepath));
@@ -136,7 +137,9 @@ async function installPackage(packageName) {
     if (stderr) {
         p.log.error(stderr);
     }
-    p.log.info(stdout);
+    if (process.env.VERBOSE) {
+        p.log.info(stdout);
+    }
 }
 async function uninstallPackage(packageName) {
     const packageManager = getPackageManager();
@@ -145,7 +148,9 @@ async function uninstallPackage(packageName) {
     if (stderr) {
         p.log.error(stderr);
     }
-    p.log.info(stdout);
+    if (process.env.VERBOSE) {
+        p.log.info(stdout);
+    }
 }
 
 const require = __node_cjsModule.createRequire(import.meta.url);
@@ -164,6 +169,7 @@ const args = parse(process.argv.slice(2), {
     },
     boolean: true
 });
+if (args.verbose) process.env.VERBOSE = '1';
 intro(`tRPC Upgrade CLI v${version}`);
 if (args.help) {
     log.info(`
@@ -199,22 +205,21 @@ const transforms = await multiselect({
 if (isCancel(transforms)) process.exit(0);
 // Make sure provider transform runs first if it's selected
 const sortedTransforms = transforms.sort((a)=>a.includes('provider') ? -1 : 1);
-const program = getProgram(args);
+const program = getProgram();
 const sourceFiles = program.getSourceFiles();
 const possibleReferences = findTRPCImportReferences(program);
 const trpcFile = possibleReferences.mostUsed.file;
 const trpcImportName = possibleReferences.importName;
 const commitedFiles = await filterIgnored(sourceFiles);
 for (const transform of sortedTransforms){
-    log.info(`Running transform: ${transform}`);
-    // eslint-disable-next-line @typescript-eslint/no-require-imports
-    const { run } = require('jscodeshift/src/Runner.js');
+    log.step(`Running transform: ${basename(transform, extname(transform))}`);
+    const { run } = await import('jscodeshift/src/Runner.js');
     await run(transform, commitedFiles, {
         ...args,
         trpcFile,
         trpcImportName
     });
-    log.info(`Transform ${transform} completed`);
+    log.success(`Transform completed`);
 }
 if (!args.skipTanstackQuery) {
     log.info('Installing @trpc/tanstack-react-query');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@trpc/upgrade",
-  "version": "0.0.0-alpha.32",
+  "version": "0.0.0-alpha.33",
   "description": "Upgrade scripts for tRPC",
   "author": "juliusmarminge",
   "license": "MIT",

package/src/bin/index.ts

@@ -1,4 +1,5 @@
 #!/usr/bin/env node
+import { basename, extname } from 'node:path';
 import { parse } from '@bomb.sh/args';
 import { intro, isCancel, log, multiselect, outro } from '@clack/prompts';
 import { version } from '../../package.json';
@@ -20,6 +21,7 @@ const args = parse(process.argv.slice(2), {
   },
   boolean: true,
 });
+if (args.verbose) process.env.VERBOSE = '1';
 
 intro(`tRPC Upgrade CLI v${version}`);
 
@@ -66,7 +68,7 @@ const sortedTransforms = transforms.sort((a) =>
   a.includes('provider') ? -1 : 1,
 );
 
-const program = getProgram(args);
+const program = getProgram();
 const sourceFiles = program.getSourceFiles();
 const possibleReferences = findTRPCImportReferences(program);
 const trpcFile = possibleReferences.mostUsed.file;
@@ -75,15 +77,14 @@ const trpcImportName = possibleReferences.importName;
 const commitedFiles = await filterIgnored(sourceFiles);
 
 for (const transform of sortedTransforms) {
-  log.info(`Running transform: ${transform}`);
-  // eslint-disable-next-line @typescript-eslint/no-require-imports
-  const { run } = require('jscodeshift/src/Runner.js');
+  log.step(`Running transform: ${basename(transform, extname(transform))}`);
+  const { run } = await import('jscodeshift/src/Runner.js');
   await run(transform, commitedFiles, {
     ...args,
     trpcFile,
     trpcImportName,
   });
-  log.info(`Transform ${transform} completed`);
+  log.success(`Transform completed`);
 }
 
 if (!args.skipTanstackQuery) {

package/src/lib/ast/scanners.ts

@@ -1,7 +1,7 @@
 import * as p from '@clack/prompts';
 import * as ts from 'typescript';
 
-export function getProgram(args: Record<string, unknown>) {
+export function getProgram() {
   const configFile = ts.findConfigFile(process.cwd(), (filepath) =>
     ts.sys.fileExists(filepath),
   );
@@ -10,7 +10,7 @@ export function getProgram(args: Record<string, unknown>) {
     process.exit(1);
   }
 
-  if (args.verbose) {
+  if (process.env.VERBOSE) {
     p.log.info(`Using tsconfig: ${configFile}`);
   }
 

package/src/lib/pkgmgr.ts

@@ -18,7 +18,9 @@ export async function installPackage(packageName: string) {
   if (stderr) {
     p.log.error(stderr);
   }
-  p.log.info(stdout);
+  if (process.env.VERBOSE) {
+    p.log.info(stdout);
+  }
 }
 
 export async function uninstallPackage(packageName: string) {
@@ -30,5 +32,7 @@ export async function uninstallPackage(packageName: string) {
   if (stderr) {
     p.log.error(stderr);
   }
-  p.log.info(stdout);
+  if (process.env.VERBOSE) {
+    p.log.info(stdout);
+  }
 }