@trpc/upgrade 0.0.0-alpha.9 → 11.0.0-alpha-tmp-query-optoins-codemod.673

package/dist/cli.cjs

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-var path = require('path');
+var path = require('node:path');
 var cli$1 = require('@effect/cli');
 var platform = require('@effect/platform');
 var platformNode = require('@effect/platform-node');
@@ -10,26 +10,31 @@ function _interopDefault (e) { return e && e.__esModule ? e : { default: e }; }
 
 var path__default = /*#__PURE__*/_interopDefault(path);
 
-var version = "0.0.0-alpha.8";
+var version = "11.0.0-alpha-tmp-query-optoins-codemod.673+594ff39d4";
 
-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 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(platform.Command.workingDirectory(process.cwd())(platform.Command.make(packageManager, 'install', packageName))).pipe(effect.Stream.mapEffect(effect.Console.log), effect.Stream.runDrain);
+    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(platform.Command.workingDirectory(process.cwd())(platform.Command.make(packageManager, uninstallCmd, packageName))).pipe(effect.Stream.mapEffect(effect.Console.log), effect.Stream.runDrain);
+    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(platform.Command.workingDirectory(process.cwd())(platform.Command.make('git', 'check-ignore', '**/*'))).pipe(effect.Effect.tap(effect.Effect.log), effect.Effect.map((_)=>_.split('\n')));
+        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;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@trpc/upgrade",
-  "version": "0.0.0-alpha.9",
+  "version": "11.0.0-alpha-tmp-query-optoins-codemod.673+594ff39d4",
   "description": "Upgrade scripts for tRPC",
   "author": "juliusmarminge",
   "license": "MIT",
@@ -19,6 +19,10 @@
       "require": "./dist/transforms/provider.cjs"
     }
   },
+  "scripts": {
+    "build": "bunchee",
+    "run": "tsx src/cli.ts"
+  },
   "files": [
     "dist",
     "src",
@@ -48,8 +52,5 @@
   "funding": [
     "https://trpc.io/sponsor"
   ],
-  "scripts": {
-    "build": "bunchee",
-    "run": "tsx src/cli.ts"
-  }
-}
+  "gitHead": "594ff39d43af4f6b6460549476ffcaddcd244dfd"
+}

package/src/bin/cli.ts

@@ -1,5 +1,5 @@
 /* eslint-disable @typescript-eslint/unbound-method */
-import path from 'path';
+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';
@@ -26,15 +26,22 @@ import {
 } from 'typescript';
 import { version } from '../../package.json';
 
-const assertCleanGitTree = Command.string(
-  Command.workingDirectory(process.cwd())(Command.make('git', 'status')),
-).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 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'),
@@ -46,9 +53,7 @@ const getPackageManager = () =>
 const installPackage = (packageName: string) => {
   const packageManager = getPackageManager();
   return Command.streamLines(
-    Command.workingDirectory(process.cwd())(
-      Command.make(packageManager, 'install', packageName),
-    ),
+    MakeCommand(packageManager, 'install', packageName),
   ).pipe(Stream.mapEffect(Console.log), Stream.runDrain);
 };
 
@@ -56,23 +61,21 @@ const uninstallPackage = (packageName: string) => {
   const packageManager = getPackageManager();
   const uninstallCmd = packageManager === 'yarn' ? 'remove' : 'uninstall';
   return Command.streamLines(
-    Command.workingDirectory(process.cwd())(
-      Command.make(packageManager, uninstallCmd, packageName),
-    ),
+    MakeCommand(packageManager, uninstallCmd, packageName),
   ).pipe(Stream.mapEffect(Console.log), Stream.runDrain);
 };
 
 const filterIgnored = (files: readonly SourceFile[]) =>
   Effect.gen(function* () {
     const ignores = yield* Command.string(
-      Command.workingDirectory(process.cwd())(
-        Command.make('git', 'check-ignore', '**/*'),
-      ),
+      MakeCommand('git', 'check-ignore', '**/*').pipe(Command.runInShell(true)),
     ).pipe(
-      Effect.tap(Effect.log),
+      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),
@@ -85,6 +88,7 @@ const filterIgnored = (files: readonly SourceFile[]) =>
         (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);