@trpc/upgrade 11.0.0-rc.824 → 11.0.0-rc.828

package/dist/bin.js

@@ -9,7 +9,7 @@ import { exec } from 'node:child_process';
 import { promisify } from 'node:util';
 import __node_cjsModule from 'node:module';
 
-var version = "11.0.0-rc.824+b21849468";
+var version = "11.0.0-rc.828+322552736";
 
 function getProgram() {
     const configFile = ts.findConfigFile(process.cwd(), (filepath)=>ts.sys.fileExists(filepath));

package/dist/transforms/hooksToOptions.cjs

@@ -233,7 +233,7 @@ function transform(file, api, options) {
                 root.find(j.Identifier, {
                     name: oldIdentifier.name
                 }).forEach((path)=>{
-                    if (j.MemberExpression.check(path.parent?.parent?.node)) {
+                    if (j.MemberExpression.check(path.parent?.parent?.node) || j.CallExpression.check(path.parent?.parent?.node)) {
                         const callExprPath = findParentOfType(path.parentPath, j.CallExpression);
                         if (!callExprPath) {
                             console.warn(`Failed to walk up the tree to find utilMethod call expression, on file: ${file.path}`, callExprPath, {
@@ -251,7 +251,7 @@ function transform(file, api, options) {
                             });
                             return;
                         }
-                        if (!(j.MemberExpression.check(memberExpr.object) && j.Identifier.check(memberExpr.property) && memberExpr.property.name in utilMap)) {
+                        if (!(j.Identifier.check(memberExpr.property) && memberExpr.property.name in utilMap)) {
                             console.warn('Failed to identify utilMethod from proxy call expression', memberExpr);
                             return;
                         }
@@ -333,6 +333,7 @@ function transform(file, api, options) {
             const tuple = j.ArrayPattern.check(declarator?.id) ? declarator.id : null;
             const dataName = j.Identifier.check(tuple?.elements?.[0]) ? tuple.elements[0].name : null;
             const queryName = j.Identifier.check(tuple?.elements?.[1]) ? tuple.elements[1].name : null;
+            const deepDestructure = j.ArrayPattern.check(declarator?.id) && j.ObjectPattern.check(tuple?.elements?.[0]) ? tuple?.elements?.[0] : null;
             if (queryName) {
                 declarator.id = j.identifier(queryName);
                 dirtyFlag = true;
@@ -347,6 +348,12 @@ function transform(file, api, options) {
                     j.property('init', j.identifier('data'), j.identifier(dataName))
                 ]);
                 dirtyFlag = true;
+            } else if (deepDestructure) {
+                // const [{ dataName }] = ... => const { data: { dataName } } = ...
+                declarator.id = j.objectPattern([
+                    j.property('init', j.identifier('data'), deepDestructure)
+                ]);
+                dirtyFlag = true;
             }
         });
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@trpc/upgrade",
-  "version": "11.0.0-rc.824+b21849468",
+  "version": "11.0.0-rc.828+322552736",
   "description": "Upgrade scripts for tRPC",
   "author": "juliusmarminge",
   "license": "MIT",
@@ -39,10 +39,10 @@
   },
   "devDependencies": {
     "@tanstack/react-query": "^5.67.1",
-    "@trpc/client": "11.0.0-rc.824+b21849468",
-    "@trpc/react-query": "11.0.0-rc.824+b21849468",
-    "@trpc/server": "11.0.0-rc.824+b21849468",
-    "@trpc/tanstack-react-query": "11.0.0-rc.824+b21849468",
+    "@trpc/client": "11.0.0-rc.828+322552736",
+    "@trpc/react-query": "11.0.0-rc.828+322552736",
+    "@trpc/server": "11.0.0-rc.828+322552736",
+    "@trpc/tanstack-react-query": "11.0.0-rc.828+322552736",
     "@types/jscodeshift": "0.12.0",
     "@types/node": "^22.13.5",
     "bunchee": "6.4.0",
@@ -56,5 +56,5 @@
   "funding": [
     "https://trpc.io/sponsor"
   ],
-  "gitHead": "b218494681e3e70ce41c8b25785765c9985c08f5"
+  "gitHead": "322552736e8e54f7fa07cb532032a86292408119"
 }

package/src/transforms/hooksToOptions.ts

@@ -232,7 +232,10 @@ export default function transform(
           root
             .find(j.Identifier, { name: oldIdentifier.name })
             .forEach((path) => {
-              if (j.MemberExpression.check(path.parent?.parent?.node)) {
+              if (
+                j.MemberExpression.check(path.parent?.parent?.node) ||
+                j.CallExpression.check(path.parent?.parent?.node)
+              ) {
                 const callExprPath = findParentOfType<CallExpression>(
                   path.parentPath,
                   j.CallExpression,
@@ -261,7 +264,6 @@ export default function transform(
 
                 if (
                   !(
-                    j.MemberExpression.check(memberExpr.object) &&
                     j.Identifier.check(memberExpr.property) &&
                     memberExpr.property.name in utilMap
                   )
@@ -403,6 +405,12 @@ export default function transform(
           ? tuple.elements[1].name
           : null;
 
+        const deepDestructure =
+          j.ArrayPattern.check(declarator?.id) &&
+          j.ObjectPattern.check(tuple?.elements?.[0])
+            ? tuple?.elements?.[0]
+            : null;
+
         if (queryName) {
           declarator.id = j.identifier(queryName);
           dirtyFlag = true;
@@ -423,6 +431,12 @@ export default function transform(
             j.property('init', j.identifier('data'), j.identifier(dataName)),
           ]);
           dirtyFlag = true;
+        } else if (deepDestructure) {
+          // const [{ dataName }] = ... => const { data: { dataName } } = ...
+          declarator.id = j.objectPattern([
+            j.property('init', j.identifier('data'), deepDestructure),
+          ]);
+          dirtyFlag = true;
         }
       });
   }