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

package/dist/cli.cjs

@@ -10,7 +10,7 @@ function _interopDefault (e) { return e && e.__esModule ? e : { default: e }; }
 
 var path__default = /*#__PURE__*/_interopDefault(path);
 
-var version = "0.0.0-alpha.2";
+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 installPackage = (packageName)=>{
@@ -19,13 +19,13 @@ const installPackage = (packageName)=>{
 };
 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.log('All files in program:', files.map((_)=>_.fileName));
-        yield* effect.Effect.log('Ignored files:', ignores);
+        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
             !ignores.includes(source.fileName)).map((source)=>source.fileName);
-        yield* effect.Effect.log('Filtered files:', filteredSourcePaths);
+        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({
@@ -66,10 +66,7 @@ const rootComamnd = cli$1.Command.make('upgrade', {
         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,
-                            verbose: true
-                        })))), effect.Effect.map((_)=>effect.Effect.log('Transform result', _)));
+            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');

package/dist/transforms/provider.cjs

@@ -2,6 +2,7 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 function transform(file, api, options) {
     const { trpcImportName } = options;
+    let routerName = undefined;
     const j = api.jscodeshift;
     const root = j(file.source);
     let dirtyFlag = false;
@@ -10,6 +11,8 @@ function transform(file, api, options) {
         const declaration = path.node.declarations[0];
         if (j.Identifier.check(declaration.id) && declaration.id.name === trpcImportName) {
             if (j.CallExpression.check(declaration.init) && j.Identifier.check(declaration.init.callee) && declaration.init.callee.name === 'createTRPCReact') {
+                // Get router name ( TODO : should probably get this from the TS compiler along with the import path)
+                routerName = declaration.init.original?.typeParameters?.params?.[0]?.typeName?.name;
                 // Replace the `createTRPCReact` call with `createTRPCContext`
                 declaration.init.callee.name = 'createTRPCContext';
                 // Destructure the result into `TRPCProvider` and `useTRPC`
@@ -46,7 +49,7 @@ function transform(file, api, options) {
             });
         });
     }
-    // Replace trpc.createClient with createTRPCClient
+    // Replace trpc.createClient with createTRPCClient<TRouter>
     root.find(j.CallExpression, {
         callee: {
             object: {
@@ -59,6 +62,11 @@ function transform(file, api, options) {
     }).forEach((path)=>{
         path.node.callee = j.identifier('createTRPCClient');
         dirtyFlag = true;
+        if (routerName) {
+            path.node.typeParameters = j.tsTypeParameterInstantiation([
+                j.tsTypeReference(j.identifier(routerName))
+            ]);
+        }
     });
     // Replace <trpc.Provider client={...} with <TRPCProvider trpcClient={...}
     root.find(j.JSXElement, {

package/package.json

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

package/src/bin/cli.ts

@@ -52,11 +52,11 @@ const filterIgnored = (files: readonly SourceFile[]) =>
       Command.make('git', 'check-ignore', '**/*'),
     ).pipe(Effect.map((_) => _.split('\n')));
 
-    yield* Effect.log(
+    yield* Effect.logDebug(
       'All files in program:',
       files.map((_) => _.fileName),
     );
-    yield* Effect.log('Ignored files:', ignores);
+    yield* Effect.logDebug('Ignored files:', ignores);
 
     // Ignore "common files"
     const filteredSourcePaths = files
@@ -68,7 +68,7 @@ const filterIgnored = (files: readonly SourceFile[]) =>
       )
       .map((source) => source.fileName);
 
-    yield* Effect.log('Filtered files:', filteredSourcePaths);
+    yield* Effect.logDebug('Filtered files:', filteredSourcePaths);
 
     return filteredSourcePaths;
   });
@@ -159,7 +159,7 @@ const rootComamnd = CLICommand.make(
           Effect.flatMap(() =>
             Effect.tryPromise(async () =>
               import('jscodeshift/src/Runner.js').then(({ run }) =>
-                run(transform, commitedFiles, { ...args, verbose: true }),
+                run(transform, commitedFiles, args),
               ),
             ),
           ),

package/src/transforms/provider.ts

@@ -10,6 +10,7 @@ export default function transform(
   options: TransformOptions,
 ) {
   const { trpcImportName } = options;
+  let routerName: string | undefined = undefined;
 
   const j = api.jscodeshift;
   const root = j(file.source);
@@ -27,6 +28,11 @@ export default function transform(
         j.Identifier.check(declaration.init.callee) &&
         declaration.init.callee.name === 'createTRPCReact'
       ) {
+        // Get router name ( TODO : should probably get this from the TS compiler along with the import path)
+        routerName =
+          declaration.init.original?.typeParameters?.params?.[0]?.typeName
+            ?.name;
+
         // Replace the `createTRPCReact` call with `createTRPCContext`
         declaration.init.callee.name = 'createTRPCContext';
 
@@ -68,7 +74,7 @@ export default function transform(
       });
   }
 
-  // Replace trpc.createClient with createTRPCClient
+  // Replace trpc.createClient with createTRPCClient<TRouter>
   root
     .find(j.CallExpression, {
       callee: {
@@ -79,6 +85,12 @@ export default function transform(
     .forEach((path) => {
       path.node.callee = j.identifier('createTRPCClient');
       dirtyFlag = true;
+
+      if (routerName) {
+        (path.node as any).typeParameters = j.tsTypeParameterInstantiation([
+          j.tsTypeReference(j.identifier(routerName)),
+        ]);
+      }
     });
 
   // Replace <trpc.Provider client={...} with <TRPCProvider trpcClient={...}