@trpc/upgrade 11.0.0-rc.800 → 11.0.0-rc.802

package/dist/bin.js

@@ -0,0 +1,232 @@
+#!/usr/bin/env node
+import { basename, extname } from 'node:path';
+import { parse } from '@bomb.sh/args';
+import * as p from '@clack/prompts';
+import { cancel, log, intro, multiselect, isCancel, outro } from '@clack/prompts';
+import * as ts from 'typescript';
+import { resolve } from 'path';
+import { exec } from 'node:child_process';
+import { promisify } from 'node:util';
+import __node_cjsModule from 'node:module';
+
+var version = "11.0.0-rc.802+1eccc1171";
+
+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 (process.env.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;
+        ts.forEachChild(sourceFile, (node)=>{
+            if (!found && ts.isImportDeclaration(node)) {
+                const { moduleSpecifier } = node;
+                if (ts.isStringLiteral(moduleSpecifier) && moduleSpecifier.text.includes('@trpc/react-query')) {
+                    found = true;
+                }
+            }
+        });
+        return found;
+    });
+    let importName = 'trpc';
+    files.forEach((sourceFile)=>{
+        ts.forEachChild(sourceFile, (node)=>{
+            if (ts.isVariableStatement(node) && node.modifiers?.some((mod)=>mod.getText(sourceFile) === 'export')) {
+                node.declarationList.declarations.forEach((declaration)=>{
+                    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);
+                    }
+                });
+            }
+        });
+    });
+    return {
+        files: files.map((d)=>d.fileName),
+        importName
+    };
+}
+function findTRPCImportReferences(program) {
+    const { files: filesImportingTRPC, importName } = findSourceAndImportName(program);
+    const trpcReferenceSpecifiers = new Map();
+    program.getSourceFiles().forEach((sourceFile)=>{
+        if (sourceFile.isDeclarationFile) return;
+        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);
+                }
+            }
+        });
+    });
+    const counts = {};
+    let currentMax = 0;
+    const mostUsed = {
+        file: ''
+    };
+    [
+        ...trpcReferenceSpecifiers.values()
+    ].forEach((specifier)=>{
+        counts[specifier] = (counts[specifier] || 0) + 1;
+        if (counts[specifier] > currentMax) {
+            currentMax = counts[specifier];
+            mostUsed.file = specifier;
+        }
+    });
+    return {
+        importName,
+        mostUsed,
+        all: Object.fromEntries(trpcReferenceSpecifiers.entries())
+    };
+}
+
+const execa = promisify(exec);
+
+async function assertCleanGitTree() {
+    const { stdout } = await execa('git status');
+    if (!stdout.includes('nothing to commit')) {
+        cancel('Git tree is not clean, please commit your changes and try again, or run with `--force`');
+        process.exit(1);
+    }
+}
+async function filterIgnored(files) {
+    const { stdout } = await execa('git check-ignore **/*');
+    const ignores = stdout.split('\n');
+    if (process.env.VERBOSE) {
+        log.info(`cwd: ${process.cwd()}`);
+        log.info(`All files in program: ${files.map((file)=>file.fileName).join(', ')}`);
+        log.info(`Ignored files: ${ignores.join(', ')}`);
+    }
+    // Ignore "common files"
+    const filteredSourcePaths = files.filter((source)=>source.fileName.startsWith(resolve()) && // only look ahead of current directory
+        !source.fileName.includes('/trpc/packages/') && // relative paths when running codemod locally
+        !source.fileName.includes('/node_modules/') && // always ignore node_modules
+        !ignores.includes(source.fileName)).map((source)=>source.fileName);
+    if (process.env.VERBOSE) {
+        log.info(`Filtered files: ${filteredSourcePaths.join(', ')}`);
+    }
+    return filteredSourcePaths;
+}
+
+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) {
+        log.error(stderr);
+    }
+    if (process.env.VERBOSE) {
+        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) {
+        log.error(stderr);
+    }
+    if (process.env.VERBOSE) {
+        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
+});
+if (args.verbose) process.env.VERBOSE = '1';
+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'
+        }
+    ]
+});
+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();
+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.step(`Running transform: ${basename(transform, extname(transform))}`);
+    const { run } = await import('jscodeshift/src/Runner.js');
+    await run(transform, commitedFiles, {
+        ...args,
+        trpcFile,
+        trpcImportName
+    });
+    log.success(`Transform completed`);
+}
+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,10 +1,11 @@
 {
   "name": "@trpc/upgrade",
-  "version": "11.0.0-rc.800+892471d1b",
+  "version": "11.0.0-rc.802+1eccc1171",
   "description": "Upgrade scripts for tRPC",
   "author": "juliusmarminge",
   "license": "MIT",
-  "bin": "./dist/bin.cjs",
+  "type": "module",
+  "bin": "./dist/bin.js",
   "homepage": "https://trpc.io",
   "repository": {
     "type": "git",
@@ -32,10 +33,8 @@
     "!**/__tests__"
   ],
   "dependencies": {
-    "@effect/cli": "0.56.2",
-    "@effect/platform": "0.77.2",
-    "@effect/platform-node": "0.73.2",
-    "effect": "3.13.2",
+    "@bomb.sh/args": "0.3.0",
+    "@clack/prompts": "0.10.0",
     "jscodeshift": "17.1.1",
     "typescript": "^5.6.2"
   },
@@ -52,5 +51,5 @@
   "funding": [
     "https://trpc.io/sponsor"
   ],
-  "gitHead": "892471d1bd6914ca2df548bdda2e703e3c73a5e7"
+  "gitHead": "1eccc1171fba8b1bdb4d8acd83ab37d1e0a98b22"
 }

package/src/bin/index.ts

@@ -1,247 +1,100 @@
-/* eslint-disable @typescript-eslint/unbound-method */
-import path from 'node:path';
-import { Command as CLICommand, Options, Prompt } from '@effect/cli';
-import { Command } from '@effect/platform';
-import { NodeContext, NodeRuntime } from '@effect/platform-node';
-import {
-  Array,
-  Console,
-  Effect,
-  Logger,
-  LogLevel,
-  Match,
-  Order,
-  pipe,
-  Predicate,
-  Stream,
-  String,
-} from 'effect';
-import type { SourceFile } from 'typescript';
-import {
-  createProgram,
-  findConfigFile,
-  parseJsonConfigFileContent,
-  readConfigFile,
-  sys,
-} from 'typescript';
+#!/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';
-import { findTRPCImportReferences } from '../lib/ast/scanners';
-
-const MakeCommand = (command: string, ...args: string[]) => {
-  return Command.make(command, ...args).pipe(
-    Command.workingDirectory(process.cwd()),
-    Command.runInShell(true),
-  );
-};
-
-const assertCleanGitTree = Command.string(MakeCommand('git', 'status'))
-  .pipe()
-  .pipe(
-    Effect.filterOrFail(
-      String.includes('nothing to commit'),
-      () =>
-        'Git tree is not clean, please commit your changes and try again, or run with `--force`',
-    ),
-  );
-const getPackageManager = () =>
-  Match.value(process.env.npm_config_user_agent ?? 'npm').pipe(
-    Match.when(String.startsWith('pnpm'), () => 'pnpm'),
-    Match.when(String.startsWith('yarn'), () => 'yarn'),
-    Match.when(String.startsWith('bun'), () => 'bun'),
-    Match.orElse(() => 'npm'),
-  );
-
-const installPackage = (packageName: string) => {
-  const packageManager = getPackageManager();
-  return Command.streamLines(
-    MakeCommand(packageManager, 'install', packageName),
-  ).pipe(Stream.mapEffect(Console.log), Stream.runDrain);
-};
-
-const uninstallPackage = (packageName: string) => {
-  const packageManager = getPackageManager();
-  const uninstallCmd = packageManager === 'yarn' ? 'remove' : 'uninstall';
-  return Command.streamLines(
-    MakeCommand(packageManager, uninstallCmd, packageName),
-  ).pipe(Stream.mapEffect(Console.log), Stream.runDrain);
-};
-
-const filterIgnored = (files: readonly SourceFile[]) =>
-  Effect.gen(function* () {
-    const ignores = yield* Command.string(
-      MakeCommand('git', 'check-ignore', '**/*').pipe(Command.runInShell(true)),
-    ).pipe(
-      Effect.tap((_) => Effect.logDebug('Ignored files output:', _)),
-      Effect.map((_) => _.split('\n')),
-    );
-
-    yield* Effect.logDebug('cwd:', process.cwd());
-
-    yield* Effect.logDebug(
-      'All files in program:',
-      files.map((_) => _.fileName),
-    );
-    yield* Effect.logDebug('Ignored files:', ignores);
-
-    // Ignore "common files"
-    const filteredSourcePaths = files
-      .filter(
-        (source) =>
-          source.fileName.startsWith(path.resolve()) && // only look ahead of current directory
-          !source.fileName.includes('/trpc/packages/') && // relative paths when running codemod locally
-          !source.fileName.includes('/node_modules/') && // always ignore node_modules
-          !ignores.includes(source.fileName), // ignored files
-      )
-      .map((source) => source.fileName);
-
-    yield* Effect.logDebug('Filtered files:', filteredSourcePaths);
-
-    return filteredSourcePaths;
-  });
-
-const TSProgram = Effect.succeed(
-  findConfigFile(process.cwd(), sys.fileExists),
-).pipe(
-  Effect.filterOrFail(Predicate.isNotNullable, () => 'No tsconfig found'),
-  Effect.tap((_) => Effect.logDebug('Using tsconfig', _)),
-  Effect.map((_) => readConfigFile(_, sys.readFile)),
-  Effect.map((_) => parseJsonConfigFileContent(_.config, sys, process.cwd())),
-  Effect.map((_) =>
-    createProgram({
-      options: _.options,
-      rootNames: _.fileNames,
-      configFileParsingDiagnostics: _.errors,
-    }),
-  ),
-);
+import { findTRPCImportReferences, getProgram } from '../lib/ast/scanners';
+import { assertCleanGitTree, filterIgnored } from '../lib/git';
+import { installPackage, uninstallPackage } from '../lib/pkgmgr';
+
+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,
+});
+if (args.verbose) process.env.VERBOSE = '1';
 
-// FIXME :: hacky
-const transformPath = (path: string) =>
-  process.env.DEV ? path : path.replace('../', './').replace('.ts', '.cjs');
+intro(`tRPC Upgrade CLI v${version}`);
 
-const force = Options.boolean('force').pipe(
-  Options.withAlias('f'),
-  Options.withDefault(false),
-  Options.withDescription('Skip git status check, use with caution'),
-);
+if (args.help) {
+  log.info(
+    `
+Usage: upgrade [options]
 
-/**
- * TODO: Instead of default values these should be detected automatically from the TS program
- */
-const trpcFile = Options.text('trpcFile').pipe(
-  Options.withAlias('f'),
-  Options.withDefault('~/trpc'),
-  Options.withDescription('Path to the trpc import file'),
-);
+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',
+    },
+  ],
+});
+if (isCancel(transforms)) process.exit(0);
 
-const trpcImportName = Options.text('trpcImportName').pipe(
-  Options.withAlias('i'),
-  Options.withDefault('trpc'),
-  Options.withDescription('Name of the trpc import'),
+// Make sure provider transform runs first if it's selected
+const sortedTransforms = transforms.sort((a) =>
+  a.includes('provider') ? -1 : 1,
 );
 
-const skipTanstackQuery = Options.boolean('skipTanstackQuery').pipe(
-  Options.withAlias('q'),
-  Options.withDefault(false),
-  Options.withDescription('Skip installing @trpc/tanstack-react-query package'),
-);
+const program = getProgram();
+const sourceFiles = program.getSourceFiles();
+const possibleReferences = findTRPCImportReferences(program);
+const trpcFile = possibleReferences.mostUsed.file;
+const trpcImportName = possibleReferences.importName;
 
-const verbose = Options.boolean('verbose').pipe(
-  Options.withAlias('v'),
-  Options.withDefault(false),
-  Options.withDescription('Enable verbose logging'),
-);
+const commitedFiles = await filterIgnored(sourceFiles);
 
-const rootComamnd = CLICommand.make(
-  'upgrade',
-  {
-    force,
+for (const transform of sortedTransforms) {
+  log.step(`Running transform: ${basename(transform, extname(transform))}`);
+  const { run } = await import('jscodeshift/src/Runner.js');
+  await run(transform, commitedFiles, {
+    ...args,
     trpcFile,
     trpcImportName,
-    skipTanstackQuery,
-    verbose,
-  },
-  (args) =>
-    Effect.gen(function* () {
-      if (args.verbose) {
-        yield* Effect.log('Running upgrade with args:', args);
-      }
-      if (!args.force) {
-        yield* assertCleanGitTree;
-      }
-      const transforms = yield* pipe(
-        Prompt.multiSelect({
-          message: 'Select transforms to run',
-          choices: [
-            {
-              title: 'Migrate Hooks to xxxOptions API',
-              value: require.resolve(
-                transformPath('../transforms/hooksToOptions.ts'),
-              ),
-            },
-            {
-              title: 'Migrate context provider setup',
-              value: require.resolve(
-                transformPath('../transforms/provider.ts'),
-              ),
-            },
-          ],
-        }),
-        Effect.flatMap((selected) => {
-          if (selected.length === 0) {
-            return Effect.fail(
-              new Error('Please select at least one transform to run'),
-            );
-          }
-          return Effect.succeed(selected);
-        }),
-        Effect.map(
-          // Make sure provider transform runs first if it's selected
-          Array.sortWith((a) => !a.includes('provider.ts'), Order.boolean),
-        ),
-      );
-
-      const program = yield* TSProgram;
-      const sourceFiles = program.getSourceFiles();
-
-      const possibleReferences = findTRPCImportReferences(program);
-      const trpcFile = possibleReferences.mostUsed.file;
-      const trpcImportName = possibleReferences.importName;
-
-      const commitedFiles = yield* filterIgnored(sourceFiles);
-      yield* Effect.forEach(transforms, (transform) => {
-        return pipe(
-          Effect.log('Running transform', transform),
-          Effect.flatMap(() =>
-            Effect.tryPromise(async () =>
-              import('jscodeshift/src/Runner.js').then(({ run }) =>
-                run(transform, commitedFiles, {
-                  ...args,
-                  trpcFile: trpcFile,
-                  trpcImportName: trpcImportName,
-                }),
-              ),
-            ),
-          ),
-          Effect.map((_) => Effect.log('Transform result', _)),
-        );
-      });
-
-      if (!args.skipTanstackQuery) {
-        yield* Effect.log('Installing @trpc/tanstack-react-query');
-        yield* installPackage('@trpc/tanstack-react-query');
+  });
+  log.success(`Transform completed`);
+}
 
-        yield* Effect.log('Uninstalling @trpc/react-query');
-        yield* uninstallPackage('@trpc/react-query');
-      }
-    }).pipe(
-      Logger.withMinimumLogLevel(args.verbose ? LogLevel.Debug : LogLevel.Info),
-    ),
-);
+if (!args.skipTanstackQuery) {
+  log.info('Installing @trpc/tanstack-react-query');
+  await installPackage('@trpc/tanstack-react-query');
+  log.success('@trpc/tanstack-react-query installed');
 
-const cli = CLICommand.run(rootComamnd, {
-  name: 'tRPC Upgrade CLI',
-  version: `v${version}`,
-});
+  log.info('Uninstalling @trpc/react-query');
+  await uninstallPackage('@trpc/react-query');
+  log.success('@trpc/react-query uninstalled');
+}
 
-cli(process.argv).pipe(Effect.provide(NodeContext.layer), NodeRuntime.runMain);
+outro('Upgrade complete! 🎉');

package/src/lib/ast/scanners.ts

@@ -1,25 +1,45 @@
-import {
-  forEachChild,
-  isCallExpression,
-  isIdentifier,
-  isImportDeclaration,
-  isStringLiteral,
-  isVariableDeclaration,
-  isVariableStatement,
-  resolveModuleName,
-  sys,
-  type Program,
-} from 'typescript';
+import * as p from '@clack/prompts';
+import * as ts from 'typescript';
 
-export function findSourceAndImportName(program: Program) {
+export 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 (process.env.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;
+}
+
+export function findSourceAndImportName(program: ts.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) &&
+          ts.isStringLiteral(moduleSpecifier) &&
           moduleSpecifier.text.includes('@trpc/react-query')
         ) {
           found = true;
@@ -31,17 +51,17 @@ export function findSourceAndImportName(program: Program) {
 
   let importName = 'trpc';
   files.forEach((sourceFile) => {
-    forEachChild(sourceFile, (node) => {
+    ts.forEachChild(sourceFile, (node) => {
       if (
-        isVariableStatement(node) &&
+        ts.isVariableStatement(node) &&
         node.modifiers?.some((mod) => mod.getText(sourceFile) === 'export')
       ) {
         node.declarationList.declarations.forEach((declaration) => {
           if (
-            isVariableDeclaration(declaration) &&
+            ts.isVariableDeclaration(declaration) &&
             declaration.initializer &&
-            isCallExpression(declaration.initializer) &&
-            isIdentifier(declaration.initializer.expression) &&
+            ts.isCallExpression(declaration.initializer) &&
+            ts.isIdentifier(declaration.initializer.expression) &&
             declaration.initializer.expression.getText(sourceFile) ===
               'createTRPCReact'
           ) {
@@ -58,20 +78,23 @@ export function findSourceAndImportName(program: Program) {
   };
 }
 
-export function findTRPCImportReferences(program: Program) {
+export function findTRPCImportReferences(program: ts.Program) {
   const { files: filesImportingTRPC, importName } =
     findSourceAndImportName(program);
   const trpcReferenceSpecifiers = new Map<string, string>();
 
   program.getSourceFiles().forEach((sourceFile) => {
     if (sourceFile.isDeclarationFile) return;
-    forEachChild(sourceFile, (node) => {
-      if (isImportDeclaration(node) && isStringLiteral(node.moduleSpecifier)) {
-        const resolved = resolveModuleName(
+    ts.forEachChild(sourceFile, (node) => {
+      if (
+        ts.isImportDeclaration(node) &&
+        ts.isStringLiteral(node.moduleSpecifier)
+      ) {
+        const resolved = ts.resolveModuleName(
           node.moduleSpecifier.text,
           sourceFile.fileName,
           program.getCompilerOptions(),
-          sys,
+          ts.sys,
         );
         if (
           resolved.resolvedModule &&

package/src/lib/execa.ts

@@ -0,0 +1,4 @@
+import { exec } from 'node:child_process';
+import { promisify } from 'node:util';
+
+export const execa = promisify(exec);

package/src/lib/git.ts

@@ -0,0 +1,44 @@
+import { resolve } from 'path';
+import { cancel, log } from '@clack/prompts';
+import type { SourceFile } from 'typescript';
+import { execa } from './execa';
+
+export async function assertCleanGitTree() {
+  const { stdout } = await execa('git status');
+  if (!stdout.includes('nothing to commit')) {
+    cancel(
+      'Git tree is not clean, please commit your changes and try again, or run with `--force`',
+    );
+    process.exit(1);
+  }
+}
+
+export async function filterIgnored(files: readonly SourceFile[]) {
+  const { stdout } = await execa('git check-ignore **/*');
+  const ignores = stdout.split('\n');
+
+  if (process.env.VERBOSE) {
+    log.info(`cwd: ${process.cwd()}`);
+    log.info(
+      `All files in program: ${files.map((file) => file.fileName).join(', ')}`,
+    );
+    log.info(`Ignored files: ${ignores.join(', ')}`);
+  }
+
+  // Ignore "common files"
+  const filteredSourcePaths = files
+    .filter(
+      (source) =>
+        source.fileName.startsWith(resolve()) && // only look ahead of current directory
+        !source.fileName.includes('/trpc/packages/') && // relative paths when running codemod locally
+        !source.fileName.includes('/node_modules/') && // always ignore node_modules
+        !ignores.includes(source.fileName), // ignored files
+    )
+    .map((source) => source.fileName);
+
+  if (process.env.VERBOSE) {
+    log.info(`Filtered files: ${filteredSourcePaths.join(', ')}`);
+  }
+
+  return filteredSourcePaths;
+}

package/src/lib/pkgmgr.ts

@@ -0,0 +1,38 @@
+import { log } from '@clack/prompts';
+import { execa } from './execa';
+
+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';
+}
+
+export async function installPackage(packageName: string) {
+  const packageManager = getPackageManager();
+  const installCmd = packageManager === 'yarn' ? 'add' : 'install';
+  const { stdout, stderr } = await execa(
+    `${packageManager} ${installCmd} ${packageName}`,
+  );
+  if (stderr) {
+    log.error(stderr);
+  }
+  if (process.env.VERBOSE) {
+    log.info(stdout);
+  }
+}
+
+export async function uninstallPackage(packageName: string) {
+  const packageManager = getPackageManager();
+  const uninstallCmd = packageManager === 'yarn' ? 'remove' : 'uninstall';
+  const { stdout, stderr } = await execa(
+    `${packageManager} ${uninstallCmd} ${packageName}`,
+  );
+  if (stderr) {
+    log.error(stderr);
+  }
+  if (process.env.VERBOSE) {
+    log.info(stdout);
+  }
+}

package/dist/bin.cjs

@@ -1,178 +0,0 @@
-#!/usr/bin/env node
-var path = require('node:path');
-var cli$1 = require('@effect/cli');
-var platform = require('@effect/platform');
-var platformNode = require('@effect/platform-node');
-var effect = require('effect');
-var typescript = require('typescript');
-
-function _interopDefault (e) { return e && e.__esModule ? e : { default: e }; }
-
-var path__default = /*#__PURE__*/_interopDefault(path);
-
-var version = "11.0.0-rc.800+892471d1b";
-
-function findSourceAndImportName(program) {
-    const files = program.getSourceFiles().filter((sourceFile)=>{
-        if (sourceFile.isDeclarationFile) return false;
-        let found = false;
-        typescript.forEachChild(sourceFile, (node)=>{
-            if (!found && typescript.isImportDeclaration(node)) {
-                const { moduleSpecifier } = node;
-                if (typescript.isStringLiteral(moduleSpecifier) && moduleSpecifier.text.includes('@trpc/react-query')) {
-                    found = true;
-                }
-            }
-        });
-        return found;
-    });
-    let importName = 'trpc';
-    files.forEach((sourceFile)=>{
-        typescript.forEachChild(sourceFile, (node)=>{
-            if (typescript.isVariableStatement(node) && node.modifiers?.some((mod)=>mod.getText(sourceFile) === 'export')) {
-                node.declarationList.declarations.forEach((declaration)=>{
-                    if (typescript.isVariableDeclaration(declaration) && declaration.initializer && typescript.isCallExpression(declaration.initializer) && typescript.isIdentifier(declaration.initializer.expression) && declaration.initializer.expression.getText(sourceFile) === 'createTRPCReact') {
-                        importName = declaration.name.getText(sourceFile);
-                    }
-                });
-            }
-        });
-    });
-    return {
-        files: files.map((d)=>d.fileName),
-        importName
-    };
-}
-function findTRPCImportReferences(program) {
-    const { files: filesImportingTRPC, importName } = findSourceAndImportName(program);
-    const trpcReferenceSpecifiers = new Map();
-    program.getSourceFiles().forEach((sourceFile)=>{
-        if (sourceFile.isDeclarationFile) return;
-        typescript.forEachChild(sourceFile, (node)=>{
-            if (typescript.isImportDeclaration(node) && typescript.isStringLiteral(node.moduleSpecifier)) {
-                const resolved = typescript.resolveModuleName(node.moduleSpecifier.text, sourceFile.fileName, program.getCompilerOptions(), typescript.sys);
-                if (resolved.resolvedModule && filesImportingTRPC.includes(resolved.resolvedModule.resolvedFileName)) {
-                    trpcReferenceSpecifiers.set(resolved.resolvedModule.resolvedFileName, node.moduleSpecifier.text);
-                }
-            }
-        });
-    });
-    const counts = {};
-    let currentMax = 0;
-    const mostUsed = {
-        file: ''
-    };
-    [
-        ...trpcReferenceSpecifiers.values()
-    ].forEach((specifier)=>{
-        counts[specifier] = (counts[specifier] || 0) + 1;
-        if (counts[specifier] > currentMax) {
-            currentMax = counts[specifier];
-            mostUsed.file = specifier;
-        }
-    });
-    return {
-        importName,
-        mostUsed,
-        all: Object.fromEntries(trpcReferenceSpecifiers.entries())
-    };
-}
-
-const MakeCommand = (command, ...args)=>{
-    return platform.Command.make(command, ...args).pipe(platform.Command.workingDirectory(process.cwd()), platform.Command.runInShell(true));
-};
-const assertCleanGitTree = platform.Command.string(MakeCommand('git', 'status')).pipe().pipe(effect.Effect.filterOrFail(effect.String.includes('nothing to commit'), ()=>'Git tree is not clean, please commit your changes and try again, or run with `--force`'));
-const getPackageManager = ()=>effect.Match.value(process.env.npm_config_user_agent ?? 'npm').pipe(effect.Match.when(effect.String.startsWith('pnpm'), ()=>'pnpm'), effect.Match.when(effect.String.startsWith('yarn'), ()=>'yarn'), effect.Match.when(effect.String.startsWith('bun'), ()=>'bun'), effect.Match.orElse(()=>'npm'));
-const installPackage = (packageName)=>{
-    const packageManager = getPackageManager();
-    return platform.Command.streamLines(MakeCommand(packageManager, 'install', packageName)).pipe(effect.Stream.mapEffect(effect.Console.log), effect.Stream.runDrain);
-};
-const uninstallPackage = (packageName)=>{
-    const packageManager = getPackageManager();
-    const uninstallCmd = packageManager === 'yarn' ? 'remove' : 'uninstall';
-    return platform.Command.streamLines(MakeCommand(packageManager, uninstallCmd, packageName)).pipe(effect.Stream.mapEffect(effect.Console.log), effect.Stream.runDrain);
-};
-const filterIgnored = (files)=>effect.Effect.gen(function*() {
-        const ignores = yield* platform.Command.string(MakeCommand('git', 'check-ignore', '**/*').pipe(platform.Command.runInShell(true))).pipe(effect.Effect.tap((_)=>effect.Effect.logDebug('Ignored files output:', _)), effect.Effect.map((_)=>_.split('\n')));
-        yield* effect.Effect.logDebug('cwd:', process.cwd());
-        yield* effect.Effect.logDebug('All files in program:', files.map((_)=>_.fileName));
-        yield* effect.Effect.logDebug('Ignored files:', ignores);
-        // Ignore "common files"
-        const filteredSourcePaths = files.filter((source)=>source.fileName.startsWith(path__default.default.resolve()) && // only look ahead of current directory
-            !source.fileName.includes('/trpc/packages/') && // relative paths when running codemod locally
-            !source.fileName.includes('/node_modules/') && // always ignore node_modules
-            !ignores.includes(source.fileName)).map((source)=>source.fileName);
-        yield* effect.Effect.logDebug('Filtered files:', filteredSourcePaths);
-        return filteredSourcePaths;
-    });
-const TSProgram = effect.Effect.succeed(typescript.findConfigFile(process.cwd(), typescript.sys.fileExists)).pipe(effect.Effect.filterOrFail(effect.Predicate.isNotNullable, ()=>'No tsconfig found'), effect.Effect.tap((_)=>effect.Effect.logDebug('Using tsconfig', _)), effect.Effect.map((_)=>typescript.readConfigFile(_, typescript.sys.readFile)), effect.Effect.map((_)=>typescript.parseJsonConfigFileContent(_.config, typescript.sys, process.cwd())), effect.Effect.map((_)=>typescript.createProgram({
-        options: _.options,
-        rootNames: _.fileNames,
-        configFileParsingDiagnostics: _.errors
-    })));
-// FIXME :: hacky
-const transformPath = (path)=>process.env.DEV ? path : path.replace('../', './').replace('.ts', '.cjs');
-const force = cli$1.Options.boolean('force').pipe(cli$1.Options.withAlias('f'), cli$1.Options.withDefault(false), cli$1.Options.withDescription('Skip git status check, use with caution'));
-/**
- * TODO: Instead of default values these should be detected automatically from the TS program
- */ const trpcFile = cli$1.Options.text('trpcFile').pipe(cli$1.Options.withAlias('f'), cli$1.Options.withDefault('~/trpc'), cli$1.Options.withDescription('Path to the trpc import file'));
-const trpcImportName = cli$1.Options.text('trpcImportName').pipe(cli$1.Options.withAlias('i'), cli$1.Options.withDefault('trpc'), cli$1.Options.withDescription('Name of the trpc import'));
-const skipTanstackQuery = cli$1.Options.boolean('skipTanstackQuery').pipe(cli$1.Options.withAlias('q'), cli$1.Options.withDefault(false), cli$1.Options.withDescription('Skip installing @trpc/tanstack-react-query package'));
-const verbose = cli$1.Options.boolean('verbose').pipe(cli$1.Options.withAlias('v'), cli$1.Options.withDefault(false), cli$1.Options.withDescription('Enable verbose logging'));
-const rootComamnd = cli$1.Command.make('upgrade', {
-    force,
-    trpcFile,
-    trpcImportName,
-    skipTanstackQuery,
-    verbose
-}, (args)=>effect.Effect.gen(function*() {
-        if (args.verbose) {
-            yield* effect.Effect.log('Running upgrade with args:', args);
-        }
-        if (!args.force) {
-            yield* assertCleanGitTree;
-        }
-        const transforms = yield* effect.pipe(cli$1.Prompt.multiSelect({
-            message: 'Select transforms to run',
-            choices: [
-                {
-                    title: 'Migrate Hooks to xxxOptions API',
-                    value: require.resolve(transformPath('../transforms/hooksToOptions.ts'))
-                },
-                {
-                    title: 'Migrate context provider setup',
-                    value: require.resolve(transformPath('../transforms/provider.ts'))
-                }
-            ]
-        }), effect.Effect.flatMap((selected)=>{
-            if (selected.length === 0) {
-                return effect.Effect.fail(new Error('Please select at least one transform to run'));
-            }
-            return effect.Effect.succeed(selected);
-        }), effect.Effect.map(// Make sure provider transform runs first if it's selected
-        effect.Array.sortWith((a)=>!a.includes('provider.ts'), effect.Order.boolean)));
-        const program = yield* TSProgram;
-        const sourceFiles = program.getSourceFiles();
-        const possibleReferences = findTRPCImportReferences(program);
-        const trpcFile = possibleReferences.mostUsed.file;
-        const trpcImportName = possibleReferences.importName;
-        const commitedFiles = yield* filterIgnored(sourceFiles);
-        yield* effect.Effect.forEach(transforms, (transform)=>{
-            return effect.pipe(effect.Effect.log('Running transform', transform), effect.Effect.flatMap(()=>effect.Effect.tryPromise(async ()=>import('jscodeshift/src/Runner.js').then(({ run })=>run(transform, commitedFiles, {
-                            ...args,
-                            trpcFile: trpcFile,
-                            trpcImportName: trpcImportName
-                        })))), effect.Effect.map((_)=>effect.Effect.log('Transform result', _)));
-        });
-        if (!args.skipTanstackQuery) {
-            yield* effect.Effect.log('Installing @trpc/tanstack-react-query');
-            yield* installPackage('@trpc/tanstack-react-query');
-            yield* effect.Effect.log('Uninstalling @trpc/react-query');
-            yield* uninstallPackage('@trpc/react-query');
-        }
-    }).pipe(effect.Logger.withMinimumLogLevel(args.verbose ? effect.LogLevel.Debug : effect.LogLevel.Info)));
-const cli = cli$1.Command.run(rootComamnd, {
-    name: 'tRPC Upgrade CLI',
-    version: `v${version}`
-});
-cli(process.argv).pipe(effect.Effect.provide(platformNode.NodeContext.layer), platformNode.NodeRuntime.runMain);