fix: add optional chaining to prevent runtime errors in magic-redirec…

…t and recursiveParent functions (#16)
expressjs · Jan 11, 2025 · d16b91f · d16b91f
1 parent 4d6a100
commit d16b91f
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/transforms/magic-redirect.ts b/transforms/magic-redirect.ts
@@ -14,7 +14,8 @@ import { recursiveParent } from '../utils/recursiveParent'
 
 const unifiedMagicString = (path: ASTPath<CallExpression>, projectRequestName: string) => {
   const pathArguments = path.value.arguments
-  if (pathArguments.length === 1 && pathArguments[0].type === 'StringLiteral' && pathArguments[0].value === 'back') {
+
+  if (pathArguments.length === 1 && pathArguments[0]?.type === 'StringLiteral' && pathArguments[0].value === 'back') {
     path.value.arguments = [
       logicalExpression(
         '||',
@@ -39,6 +40,7 @@ export default function transformer(file: FileInfo, _api: API) {
       },
     })
     .map((path) => unifiedMagicString(path, recursiveParent(path.parentPath) || 'req'))
+
   parsedFile
     .find(CallExpression, {
       callee: {

diff --git a/utils/recursiveParent.ts b/utils/recursiveParent.ts
@@ -7,9 +7,9 @@ export const recursiveParent = (
   paramIndex = 0,
   parentExpressionType = defaultParentExpressionType,
 ): string | null => {
-  if (parentExpressionType.some((type) => parent.value.type === type)) {
+  if (parentExpressionType.some((type) => parent.value?.type === type)) {
     const foundNode = parent.value as unknown as ArrowFunctionExpression | FunctionExpression
-    if (foundNode.params[paramIndex].type === 'Identifier') {
+    if (foundNode.params[paramIndex]?.type === 'Identifier') {
       return foundNode.params[paramIndex].name
     }
     return null