@trpc/upgrade 0.0.0-alpha.4 → 0.0.0-alpha.5

package/README.md

@@ -2,6 +2,9 @@ run locally with source files
 
 ```sh
 DEV=1 pnpx tsx path/to/cli.ts
+
+# example
+cd examples/minimal-react/client && DEV=1 pnpx tsx ../../../packages/upgrade/src/bin/cli.ts --force --skipTanstackQuery --verbose
 ```
 
 or compiled

package/dist/cli.cjs

@@ -13,10 +13,16 @@ var path__default = /*#__PURE__*/_interopDefault(path);
 var version = "0.0.0-alpha.4";
 
 const assertCleanGitTree = platform.Command.string(platform.Command.make('git', 'status')).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 = 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 packageManager = getPackageManager();
     return platform.Command.streamLines(platform.Command.make(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(platform.Command.make(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(platform.Command.make('git', 'check-ignore', '**/*')).pipe(effect.Effect.map((_)=>_.split('\n')));
         yield* effect.Effect.logDebug('All files in program:', files.map((_)=>_.fileName));
@@ -40,15 +46,22 @@ const force = cli$1.Options.boolean('force').pipe(cli$1.Options.withAlias('f'),
  * 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
+    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.Effect.map(cli$1.Prompt.multiSelect({
+        const transforms = yield* effect.pipe(cli$1.Prompt.multiSelect({
             message: 'Select transforms to run',
             choices: [
                 {
@@ -60,16 +73,25 @@ const rootComamnd = cli$1.Command.make('upgrade', {
                     value: require.resolve(transformPath('../transforms/provider.ts'))
                 }
             ]
-        }), // Make sure provider transform runs first if it's selected
-        effect.Array.sortWith((a)=>!a.includes('provider.ts'), effect.Order.boolean));
+        }), 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 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)))), effect.Effect.map((_)=>effect.Effect.log('Transform result', _)));
         });
-        yield* effect.Effect.log('Installing @trpc/tanstack-react-query');
-        yield* installPackage('@trpc/tanstack-react-query');
+        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');
+        }
     }));
 const cli = cli$1.Command.run(rootComamnd, {
     name: 'tRPC Upgrade CLI',

package/package.json

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

package/src/bin/cli.ts

@@ -31,21 +31,29 @@ const assertCleanGitTree = Command.string(Command.make('git', 'status')).pipe(
       'Git tree is not clean, please commit your changes and try again, or run with `--force`',
   ),
 );
-
-const installPackage = (packageName: string) => {
-  const packageManager = Match.value(
-    process.env.npm_config_user_agent ?? 'npm',
-  ).pipe(
+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(
     Command.make(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(
+    Command.make(packageManager, uninstallCmd, packageName),
+  ).pipe(Stream.mapEffect(Console.log), Stream.runDrain);
+};
+
 const filterIgnored = (files: readonly SourceFile[]) =>
   Effect.gen(function* () {
     const ignores = yield* Command.string(
@@ -114,20 +122,36 @@ const trpcImportName = Options.text('trpcImportName').pipe(
   Options.withDescription('Name of the trpc import'),
 );
 
+const skipTanstackQuery = Options.boolean('skipTanstackQuery').pipe(
+  Options.withAlias('q'),
+  Options.withDefault(false),
+  Options.withDescription('Skip installing @trpc/tanstack-react-query package'),
+);
+
+const verbose = Options.boolean('verbose').pipe(
+  Options.withAlias('v'),
+  Options.withDefault(false),
+  Options.withDescription('Enable verbose logging'),
+);
+
 const rootComamnd = CLICommand.make(
   'upgrade',
   {
     force,
     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* Effect.map(
+      const transforms = yield* pipe(
         Prompt.multiSelect({
           message: 'Select transforms to run',
           choices: [
@@ -145,8 +169,18 @@ const rootComamnd = CLICommand.make(
             },
           ],
         }),
-        // Make sure provider transform runs first if it's selected
-        Array.sortWith((a) => !a.includes('provider.ts'), Order.boolean),
+        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;
@@ -167,8 +201,13 @@ const rootComamnd = CLICommand.make(
         );
       });
 
-      yield* Effect.log('Installing @trpc/tanstack-react-query');
-      yield* installPackage('@trpc/tanstack-react-query');
+      if (!args.skipTanstackQuery) {
+        yield* Effect.log('Installing @trpc/tanstack-react-query');
+        yield* installPackage('@trpc/tanstack-react-query');
+
+        yield* Effect.log('Uninstalling @trpc/react-query');
+        yield* uninstallPackage('@trpc/react-query');
+      }
     }),
 );