@trpc/upgrade 0.0.0-alpha.28 → 0.0.0-alpha.29

package/dist/bin.js

@@ -1,23 +1,41 @@
 #!/usr/bin/env node
-import * as CP from 'node:child_process';
-import * as Path from 'node:path';
-import * as Util from 'node:util';
-import * as Args from '@bomb.sh/args';
+import { parse } from '@bomb.sh/args';
 import * as p from '@clack/prompts';
+import { intro, log, multiselect, isCancel, outro } from '@clack/prompts';
 import * as ts from 'typescript';
-import { forEachChild, isImportDeclaration, isStringLiteral, resolveModuleName, sys, isVariableStatement, isVariableDeclaration, isCallExpression, isIdentifier } from 'typescript';
+import * as Path from 'path';
+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.27";
+var version = "0.0.0-alpha.28";
 
+function getProgram(args) {
+    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) {
+        p.log.info(`Using tsconfig: ${configFile}`);
+    }
+    const { config } = ts.readConfigFile(configFile, (filepath)=>ts.sys.readFile(filepath));
+    const parsedConfig = ts.parseJsonConfigFileContent(config, ts.sys, process.cwd());
+    const program = ts.createProgram({
+        options: parsedConfig.options,
+        rootNames: parsedConfig.fileNames,
+        configFileParsingDiagnostics: parsedConfig.errors
+    });
+    return program;
+}
 function findSourceAndImportName(program) {
     const files = program.getSourceFiles().filter((sourceFile)=>{
         if (sourceFile.isDeclarationFile) return false;
         let found = false;
-        forEachChild(sourceFile, (node)=>{
-            if (!found && isImportDeclaration(node)) {
+        ts.forEachChild(sourceFile, (node)=>{
+            if (!found && ts.isImportDeclaration(node)) {
                 const { moduleSpecifier } = node;
-                if (isStringLiteral(moduleSpecifier) && moduleSpecifier.text.includes('@trpc/react-query')) {
+                if (ts.isStringLiteral(moduleSpecifier) && moduleSpecifier.text.includes('@trpc/react-query')) {
                     found = true;
                 }
             }
@@ -26,10 +44,10 @@ function findSourceAndImportName(program) {
     });
     let importName = 'trpc';
     files.forEach((sourceFile)=>{
-        forEachChild(sourceFile, (node)=>{
-            if (isVariableStatement(node) && node.modifiers?.some((mod)=>mod.getText(sourceFile) === 'export')) {
+        ts.forEachChild(sourceFile, (node)=>{
+            if (ts.isVariableStatement(node) && node.modifiers?.some((mod)=>mod.getText(sourceFile) === 'export')) {
                 node.declarationList.declarations.forEach((declaration)=>{
-                    if (isVariableDeclaration(declaration) && declaration.initializer && isCallExpression(declaration.initializer) && isIdentifier(declaration.initializer.expression) && declaration.initializer.expression.getText(sourceFile) === 'createTRPCReact') {
+                    if (ts.isVariableDeclaration(declaration) && declaration.initializer && ts.isCallExpression(declaration.initializer) && ts.isIdentifier(declaration.initializer.expression) && declaration.initializer.expression.getText(sourceFile) === 'createTRPCReact') {
                         importName = declaration.name.getText(sourceFile);
                     }
                 });
@@ -46,9 +64,9 @@ function findTRPCImportReferences(program) {
     const trpcReferenceSpecifiers = new Map();
     program.getSourceFiles().forEach((sourceFile)=>{
         if (sourceFile.isDeclarationFile) return;
-        forEachChild(sourceFile, (node)=>{
-            if (isImportDeclaration(node) && isStringLiteral(node.moduleSpecifier)) {
-                const resolved = resolveModuleName(node.moduleSpecifier.text, sourceFile.fileName, program.getCompilerOptions(), sys);
+        ts.forEachChild(sourceFile, (node)=>{
+            if (ts.isImportDeclaration(node) && ts.isStringLiteral(node.moduleSpecifier)) {
+                const resolved = ts.resolveModuleName(node.moduleSpecifier.text, sourceFile.fileName, program.getCompilerOptions(), ts.sys);
                 if (resolved.resolvedModule && filesImportingTRPC.includes(resolved.resolvedModule.resolvedFileName)) {
                     trpcReferenceSpecifiers.set(resolved.resolvedModule.resolvedFileName, node.moduleSpecifier.text);
                 }
@@ -76,45 +94,22 @@ function findTRPCImportReferences(program) {
     };
 }
 
-const require = __node_cjsModule.createRequire(import.meta.url);
-
 const execa = Util.promisify(CP.exec);
-function exitOnCancel(value) {
-    if (p.isCancel(value)) {
-        process.exit(0);
-    }
-}
-async function getPackageManager() {
-    const userAgent = process.env.npm_config_user_agent;
-    if (userAgent?.startsWith('pnpm')) return 'pnpm';
-    if (userAgent?.startsWith('yarn')) return 'yarn';
-    if (userAgent?.startsWith('bun')) return 'bun';
-    return 'npm';
-}
+
 async function assertCleanGitTree() {
     const { stdout } = await execa('git status');
     if (!stdout.includes('nothing to commit')) {
-        throw new Error('Git tree is not clean, please commit your changes and try again, or run with `--force`');
+        p.cancel('Git tree is not clean, please commit your changes and try again, or run with `--force`');
+        process.exit(1);
     }
 }
-async function installPackage(packageName) {
-    const packageManager = await getPackageManager();
-    const { stdout } = await execa(`${packageManager} install ${packageName}`);
-    console.log(stdout);
-}
-async function uninstallPackage(packageName) {
-    const packageManager = await getPackageManager();
-    const uninstallCmd = packageManager === 'yarn' ? 'remove' : 'uninstall';
-    const { stdout } = await execa(`${packageManager} ${uninstallCmd} ${packageName}`);
-    console.log(stdout);
-}
 async function filterIgnored(files) {
     const { stdout } = await execa('git check-ignore **/*');
     const ignores = stdout.split('\n');
     if (process.env.VERBOSE) {
-        console.debug('cwd:', process.cwd());
-        console.debug('All files in program:', files.map((file)=>file.fileName));
-        console.debug('Ignored files:', ignores);
+        p.log.info(`cwd: ${process.cwd()}`);
+        p.log.info(`All files in program: ${files.map((file)=>file.fileName).join(', ')}`);
+        p.log.info(`Ignored files: ${ignores.join(', ')}`);
     }
     // Ignore "common files"
     const filteredSourcePaths = files.filter((source)=>source.fileName.startsWith(Path.resolve()) && // only look ahead of current directory
@@ -122,119 +117,110 @@ async function filterIgnored(files) {
         !source.fileName.includes('/node_modules/') && // always ignore node_modules
         !ignores.includes(source.fileName)).map((source)=>source.fileName);
     if (process.env.VERBOSE) {
-        console.debug('Filtered files:', filteredSourcePaths);
+        p.log.info(`Filtered files: ${filteredSourcePaths.join(', ')}`);
     }
     return filteredSourcePaths;
 }
-// FIXME :: hacky
-const transformPath = (path)=>process.env.DEV ? path : path.replace('../', './').replace('.ts', '.cjs');
-async function main() {
-    const args = Args.parse(process.argv.slice(2), {
-        default: {
-            force: false,
-            skipTanstackQuery: false,
-            verbose: false,
-            version: false
-        },
-        alias: {
-            f: 'force',
-            h: 'help',
-            v: 'verbose',
-            q: 'skipTanstackQuery'
-        },
-        boolean: true
-    });
-    if (args.version) {
-        console.log(`v${version}`);
-        process.exit(0);
-    }
-    if (args.help) {
-        console.log(`
-      Usage: upgrade [options]
 
-      Options:
-        -f, --force             Skip git status check, use with caution
-        -q, --skipTanstackQuery Skip installing @trpc/tanstack-react-query package
-        -v, --verbose           Enable verbose logging
-        -h, --help              Show help
-      `.trim());
-        process.exit(0);
+function getPackageManager() {
+    const userAgent = process.env.npm_config_user_agent;
+    if (userAgent?.startsWith('pnpm')) return 'pnpm';
+    if (userAgent?.startsWith('yarn')) return 'yarn';
+    if (userAgent?.startsWith('bun')) return 'bun';
+    return 'npm';
+}
+async function installPackage(packageName) {
+    const packageManager = getPackageManager();
+    const installCmd = packageManager === 'yarn' ? 'add' : 'install';
+    const { stdout, stderr } = await execa(`${packageManager} ${installCmd} ${packageName}`);
+    if (stderr) {
+        p.log.error(stderr);
     }
-    if (args.verbose) {
-        console.log('Running upgrade with args:', args);
+    p.log.info(stdout);
+}
+async function uninstallPackage(packageName) {
+    const packageManager = getPackageManager();
+    const uninstallCmd = packageManager === 'yarn' ? 'remove' : 'uninstall';
+    const { stdout, stderr } = await execa(`${packageManager} ${uninstallCmd} ${packageName}`);
+    if (stderr) {
+        p.log.error(stderr);
     }
-    p.intro('tRPC Upgrade CLI');
-    if (!args.force) {
-        try {
-            await assertCleanGitTree();
-        } catch (error) {
-            console.error(error);
-            process.exit(1);
+    p.log.info(stdout);
+}
+
+const require = __node_cjsModule.createRequire(import.meta.url);
+
+const args = parse(process.argv.slice(2), {
+    default: {
+        force: false,
+        skipTanstackQuery: false,
+        verbose: false
+    },
+    alias: {
+        f: 'force',
+        h: 'help',
+        v: 'verbose',
+        q: 'skipTanstackQuery'
+    },
+    boolean: true
+});
+intro(`tRPC Upgrade CLI v${version}`);
+if (args.help) {
+    log.info(`
+Usage: upgrade [options]
+
+Options:
+  -f, --force             Skip git status check, use with caution
+  -q, --skipTanstackQuery Skip installing @trpc/tanstack-react-query package
+  -v, --verbose           Enable verbose logging
+  -h, --help              Show help
+      `.trim());
+    process.exit(0);
+}
+if (args.verbose) {
+    log.info(`Running upgrade with args: ${JSON.stringify(args, null, 2)}`);
+}
+if (!args.force) {
+    await assertCleanGitTree();
+}
+const transforms = await multiselect({
+    message: 'Select transforms to run',
+    options: [
+        {
+            value: require.resolve('@trpc/upgrade/transforms/hooksToOptions'),
+            label: 'Migrate Hooks to xxxOptions API'
+        },
+        {
+            value: require.resolve('@trpc/upgrade/transforms/provider'),
+            label: 'Migrate context provider setup'
         }
-    }
-    const transforms = await p.multiselect({
-        message: 'Select transforms to run',
-        options: [
-            {
-                value: require.resolve(transformPath('../transforms/hooksToOptions.ts')),
-                label: 'Migrate Hooks to xxxOptions API'
-            },
-            {
-                value: require.resolve(transformPath('../transforms/provider.ts')),
-                label: 'Migrate context provider setup'
-            }
-        ]
-    });
-    exitOnCancel(transforms);
-    if (!transforms || transforms.length === 0) {
-        console.error('Please select at least one transform to run');
-        process.exit(1);
-    }
-    // Make sure provider transform runs first if it's selected
-    const sortedTransforms = transforms.sort((a)=>a.includes('provider.ts') ? -1 : 1);
-    const configFile = ts.findConfigFile(process.cwd(), ts.sys.fileExists);
-    if (!configFile) {
-        console.error('No tsconfig found');
-        process.exit(1);
-    }
-    if (process.env.VERBOSE) {
-        console.debug('Using tsconfig', configFile);
-    }
-    const { config } = ts.readConfigFile(configFile, ts.sys.readFile);
-    const parsedConfig = ts.parseJsonConfigFileContent(config, ts.sys, process.cwd());
-    const program = ts.createProgram({
-        options: parsedConfig.options,
-        rootNames: parsedConfig.fileNames,
-        configFileParsingDiagnostics: parsedConfig.errors
+    ]
+});
+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 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}`);
+    const { run } = await import('jscodeshift/src/Runner.js');
+    await run(transform, commitedFiles, {
+        ...args,
+        trpcFile,
+        trpcImportName
     });
-    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){
-        console.log('Running transform', transform);
-        const { run } = await import('jscodeshift/src/Runner.js');
-        const result = await run(transform, commitedFiles, {
-            ...args,
-            trpcFile,
-            trpcImportName
-        });
-        console.log('Transform result', result);
-    }
-    if (!args.skipTanstackQuery) {
-        console.log('Installing @trpc/tanstack-react-query');
-        await installPackage('@trpc/tanstack-react-query');
-        console.log('Uninstalling @trpc/react-query');
-        await uninstallPackage('@trpc/react-query');
-    }
-    p.outro('Upgrade complete! 🎉');
+    log.info(`Transform ${transform} completed`);
 }
-main().catch((error)=>{
-    if (error instanceof Error) {
-        console.error(error.message);
-    } else {
-        console.error('An unknown error occurred:', error);
-    }
-    process.exit(1);
-});
+if (!args.skipTanstackQuery) {
+    log.info('Installing @trpc/tanstack-react-query');
+    await installPackage('@trpc/tanstack-react-query');
+    log.success('@trpc/tanstack-react-query installed');
+    log.info('Uninstalling @trpc/react-query');
+    await uninstallPackage('@trpc/react-query');
+    log.success('@trpc/react-query uninstalled');
+}
+outro('Upgrade complete! 🎉');

package/package.json

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