@trpc/upgrade 0.0.0-alpha.6 → 0.0.0-alpha.8

package/dist/cli.cjs

@@ -10,21 +10,21 @@ function _interopDefault (e) { return e && e.__esModule ? e : { default: e }; }
 
 var path__default = /*#__PURE__*/_interopDefault(path);
 
-var version = "0.0.0-alpha.6";
+var version = "0.0.0-alpha.7";
 
-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 assertCleanGitTree = platform.Command.string(platform.Command.workingDirectory(process.cwd())(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 = getPackageManager();
-    return platform.Command.streamLines(platform.Command.make(packageManager, 'install', packageName)).pipe(effect.Stream.mapEffect(effect.Console.log), effect.Stream.runDrain);
+    return platform.Command.streamLines(platform.Command.workingDirectory(process.cwd())(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);
+    return platform.Command.streamLines(platform.Command.workingDirectory(process.cwd())(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')));
+        const ignores = yield* platform.Command.string(platform.Command.workingDirectory(process.cwd())(platform.Command.make('git', 'check-ignore', '**/*'))).pipe(effect.Effect.map((_)=>_.split('\n')));
         yield* effect.Effect.logDebug('All files in program:', files.map((_)=>_.fileName));
         yield* effect.Effect.logDebug('Ignored files:', ignores);
         // Ignore "common files"
@@ -92,7 +92,7 @@ const rootComamnd = cli$1.Command.make('upgrade', {
             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}`

package/package.json

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

package/src/bin/cli.ts

@@ -7,6 +7,8 @@ import {
   Array,
   Console,
   Effect,
+  Logger,
+  LogLevel,
   Match,
   Order,
   pipe,
@@ -24,7 +26,9 @@ import {
 } from 'typescript';
 import { version } from '../../package.json';
 
-const assertCleanGitTree = Command.string(Command.make('git', 'status')).pipe(
+const assertCleanGitTree = Command.string(
+  Command.workingDirectory(process.cwd())(Command.make('git', 'status')),
+).pipe(
   Effect.filterOrFail(
     String.includes('nothing to commit'),
     () =>
@@ -42,7 +46,9 @@ const getPackageManager = () =>
 const installPackage = (packageName: string) => {
   const packageManager = getPackageManager();
   return Command.streamLines(
-    Command.make(packageManager, 'install', packageName),
+    Command.workingDirectory(process.cwd())(
+      Command.make(packageManager, 'install', packageName),
+    ),
   ).pipe(Stream.mapEffect(Console.log), Stream.runDrain);
 };
 
@@ -50,14 +56,18 @@ const uninstallPackage = (packageName: string) => {
   const packageManager = getPackageManager();
   const uninstallCmd = packageManager === 'yarn' ? 'remove' : 'uninstall';
   return Command.streamLines(
-    Command.make(packageManager, uninstallCmd, packageName),
+    Command.workingDirectory(process.cwd())(
+      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(
-      Command.make('git', 'check-ignore', '**/*'),
+      Command.workingDirectory(process.cwd())(
+        Command.make('git', 'check-ignore', '**/*'),
+      ),
     ).pipe(Effect.map((_) => _.split('\n')));
 
     yield* Effect.logDebug(
@@ -208,7 +218,9 @@ const rootComamnd = CLICommand.make(
         yield* Effect.log('Uninstalling @trpc/react-query');
         yield* uninstallPackage('@trpc/react-query');
       }
-    }),
+    }).pipe(
+      Logger.withMinimumLogLevel(args.verbose ? LogLevel.Debug : LogLevel.Info),
+    ),
 );
 
 const cli = CLICommand.run(rootComamnd, {