chore(codemods): Fix TS errors (#11999)

We're having CI errors on the codemod package. Trying to limit the scope
of what I need to look into I'm fixing all TS issues first. They're
distracting.

Author: Tobbe

packages/codemods/src/codemods/v4.2.x/updateClerkGetCurrentUser/__testfixtures__/default.input.js renamed to packages/codemods/src/codemods/v4.2.x/updateClerkGetCurrentUser/__testfixtures__/default.input.ts

@@ -1,3 +1,4 @@
+//@ts-nocheck
 import { parseJWT } from '@redwoodjs/api'
 import { AuthenticationError, ForbiddenError } from '@redwoodjs/graphql-server'
 

packages/codemods/src/codemods/v4.2.x/updateClerkGetCurrentUser/__testfixtures__/default.output.js renamed to packages/codemods/src/codemods/v4.2.x/updateClerkGetCurrentUser/__testfixtures__/default.output.ts

@@ -1,3 +1,4 @@
+//@ts-nocheck
 import { parseJWT } from '@redwoodjs/api'
 import { AuthenticationError, ForbiddenError } from '@redwoodjs/graphql-server'
 

packages/codemods/src/codemods/v4.2.x/updateClerkGetCurrentUser/updateClerkGetCurrentUser.ts

@@ -1,4 +1,4 @@
-import type { FileInfo, API, ObjectExpression } from 'jscodeshift'
+import type { FileInfo, API } from 'jscodeshift'
 
 const newReturn = `userWithoutPrivateMetadata`
 const destructureStatement = `const { privateMetadata, ...${newReturn} } = decoded`
@@ -54,14 +54,22 @@ export default function transform(file: FileInfo, api: API) {
       },
     })
     .replaceWith((path) => {
-      const properties = (
-        path.value.argument as ObjectExpression
-      ).properties.filter(
-        (property) =>
-          property.type !== 'SpreadElement' && property.name !== 'decoded',
-      )
+      if (path.value.argument?.type !== 'ObjectExpression') {
+        return path.value
+      }
 
-      properties.push(j.spreadElement(j.identifier(newReturn)))
+      // Filter out the spread element with 'decoded'
+      const properties = path.value.argument.properties.filter((property) => {
+        return !(
+          property.type === 'SpreadElement' &&
+          property.argument.type === 'Identifier' &&
+          property.argument.name === 'decoded'
+        )
+      })
+
+      // Create a new spread element with the new name
+      const spreadElement = j.spreadProperty(j.identifier(newReturn))
+      properties.push(spreadElement)
 
       return j.returnStatement(j.objectExpression(properties))
     })

packages/codemods/src/codemods/v5.x.x/cellQueryResult/cellQueryResult.ts

@@ -1,4 +1,4 @@
-import type { FileInfo, API, Property } from 'jscodeshift'
+import type { FileInfo, API } from 'jscodeshift'
 
 // We need to check all of the cell functions
 const cellFunctionsToCheck = ['Success', 'Failure', 'Loading', 'Empty']
@@ -26,12 +26,12 @@ export default function transform(file: FileInfo, api: API) {
   cellFunctionsToCheck.forEach((variableName) => {
     const foundCellFunctions = ast.findVariableDeclarators(variableName)
     if (foundCellFunctions.size() === 1) {
-      const foundFunction = foundCellFunctions.get()
+      const foundFunction = foundCellFunctions.paths()[0]
 
       // We expect the variable to be a function (standard or arrow)
       if (
-        foundFunction.value.init.type === 'ArrowFunctionExpression' ||
-        foundFunction.value.init.type === 'FunctionExpression'
+        foundFunction.value.init?.type === 'ArrowFunctionExpression' ||
+        foundFunction.value.init?.type === 'FunctionExpression'
       ) {
         const firstParameter = foundFunction.value.init.params.at(0)
 
@@ -42,14 +42,20 @@ export default function transform(file: FileInfo, api: API) {
           // We expect the function to be destructuring the properties the cell is passed
           if (firstParameter.type === 'ObjectPattern') {
             const previouslySpreadPropertiesInUse =
-              firstParameter.properties.filter((property: Property) => {
+              firstParameter.properties.filter((property) => {
                 // skip rest params
-                if (property.type === 'RestElement') {
+                if (
+                  property.type === 'SpreadProperty' ||
+                  property.type === 'SpreadPropertyPattern' ||
+                  property.type === 'RestProperty' ||
+                  property.key.type !== 'Identifier'
+                ) {
                   return false
                 }
 
                 return nonSpreadVariables.includes(property.key.name)
               })
+
             if (previouslySpreadPropertiesInUse.length > 0) {
               // Add the newly destructured properties as function parameters
               firstParameter.properties.push(
@@ -58,33 +64,37 @@ export default function transform(file: FileInfo, api: API) {
                   j.identifier('queryResult'), // Previously spead properties are now found within 'queryResult'
                   j.objectPattern(
                     // For every previously spead property in use add a destructuring
-                    previouslySpreadPropertiesInUse.map(
-                      (usedProperty: Property) => {
-                        if (
-                          usedProperty.key.type !== 'Identifier' ||
-                          usedProperty.value.type !== 'Identifier'
-                        ) {
-                          throw new Error(
-                            'Unable to process a parameter within the cell function',
-                          )
-                        }
-                        const prop = j.property(
-                          'init',
-                          j.identifier(usedProperty.key.name),
-                          j.identifier(usedProperty.value.name),
+                    previouslySpreadPropertiesInUse.map((usedProperty) => {
+                      if (
+                        !('key' in usedProperty) ||
+                        !('value' in usedProperty) ||
+                        usedProperty.key.type !== 'Identifier' ||
+                        usedProperty.value.type !== 'Identifier'
+                      ) {
+                        throw new Error(
+                          'Unable to process a parameter within the cell function',
                         )
-                        // Use an alias if one was previously defined by the user
-                        prop.shorthand = usedProperty.shorthand
-                        return prop
-                      },
-                    ),
+                      }
+
+                      const prop = j.property(
+                        'init',
+                        j.identifier(usedProperty.key.name),
+                        j.identifier(usedProperty.value.name),
+                      )
+                      // Use an alias if one was previously defined by the user
+                      prop.shorthand = usedProperty.shorthand
+                      return prop
+                    }),
                   ),
                 ),
               )
               // Remove the existing function parameters corresponding to previously spread variables
               firstParameter.properties = firstParameter.properties.filter(
-                (property: Property) => {
-                  if (property.key.type !== 'Identifier') {
+                (property) => {
+                  if (
+                    !('key' in property) ||
+                    property.key.type !== 'Identifier'
+                  ) {
                     throw new Error('Unable to process a parameter')
                   }
                   return !nonSpreadVariables.includes(property.key.name)

packages/codemods/src/codemods/v5.x.x/updateAuth0ToV2/updateAuth0ToV2.ts

@@ -5,7 +5,10 @@ export default function transform(file: FileInfo, api: API) {
   const ast = j(file.source)
 
   const paths = ast.find(j.ObjectProperty, (node) => {
-    return ['redirect_uri', 'audience'].includes(node.key.name)
+    return (
+      'name' in node.key &&
+      (node.key.name === 'redirect_uri' || node.key.name === 'audience')
+    )
   })
 
   let nodes = paths.nodes()

packages/codemods/src/codemods/v5.x.x/upgradeToReact18/upgradeToReact18.ts

@@ -7,7 +7,9 @@ import type { TaskInnerAPI } from 'tasuku'
 
 import { getPaths } from '@redwoodjs/project-config'
 
-function checkAndTransformReactRoot(taskContext: TaskInnerAPI) {
+function checkAndTransformReactRoot(
+  taskContext: Pick<TaskInnerAPI, 'setWarning'>,
+) {
   const indexHTMLFilepath = path.join(getPaths().web.src, 'index.html')
 
   const indexHTML = load(fs.readFileSync(indexHTMLFilepath, 'utf-8'))

packages/codemods/src/lib/cells.ts

@@ -123,7 +123,7 @@ export const getNamedExports = (ast: types.Node): NamedExports[] => {
         })
       } else if (declaration.type === 'ClassDeclaration') {
         namedExports.push({
-          name: declaration?.id?.name,
+          name: declaration?.id?.name || '',
           type: 'class',
         })
       }

packages/codemods/tsconfig.json

@@ -1,12 +1,16 @@
 {
   "extends": "../../tsconfig.compilerOption.json",
   "compilerOptions": {
-    "rootDir": "src",
     "emitDeclarationOnly": false,
     "noEmit": true,
     "module": "Node16",
-    "moduleResolution": "Node16"
+    "moduleResolution": "Node16",
+    "rootDir": "."
   },
   "include": ["src", "./testUtils.d.ts"],
-  "exclude": ["**/__testfixtures__"]
+  "exclude": ["**/__testfixtures__", "**/__tests__"],
+  "references": [
+    { "path": "../framework-tools" },
+    { "path": "../project-config" }
+  ]
 }