{"body":"www currently on an older version of babel","commit":{"shortRevision":"3ba90a7f9c","revision":"3ba90a7f9c5ad26e7da84e539b3ee9b58e86717b","authorEmail":"34200447+mofeiZ@users.noreply.github.com","authoredAt":"2023-01-23T16:08:01-05:00","authorName":"mofeiZ","subject":"Inline hasNode check (hack)"},"patch":"diff --git a\/compiler\/forget\/src\/HIR\/BuildHIR.ts b\/compiler\/forget\/src\/HIR\/BuildHIR.ts\nindex ea14dbbf0b..5e8ed1e37c 100644\n--- a\/compiler\/forget\/src\/HIR\/BuildHIR.ts\n+++ b\/compiler\/forget\/src\/HIR\/BuildHIR.ts\n@@ -51,8 +51,11 @@ export function lower(\n const env = new Environment();\n const builder = new HIRBuilder(env);\n \n+ \/\/ Internal babel is on an older version that does not have hasNode (v7.17)\n+ \/\/ See https:\/\/github.com\/babel\/babel\/pull\/13940\/files for impl\n+ \/\/ TODO: write helper function for NodePath.node != null\n const id =\n- func.isFunctionDeclaration() && func.get(\"id\").hasNode()\n+ func.isFunctionDeclaration() && func.get(\"id\").node != null\n ? builder.resolveIdentifier(func.get(\"id\") as NodePath)\n : null;\n \n@@ -132,9 +135,10 @@ function lowerStatement(\n case \"ReturnStatement\": {\n const stmt = stmtPath as NodePath;\n const argument = stmt.get(\"argument\");\n- const value = argument.hasNode()\n- ? lowerExpressionToPlace(builder, argument)\n- : null;\n+ const value =\n+ argument.node != null\n+ ? lowerExpressionToPlace(builder, argument as NodePath)\n+ : null;\n const fallthrough = builder.reserve();\n const terminal: ReturnTerminal = {\n kind: \"return\",\n@@ -162,9 +166,9 @@ function lowerStatement(\n \/\/ Block for the alternate (if the test is not truthy)\n let alternateBlock: BlockId;\n const alternate = stmt.get(\"alternate\");\n- if (alternate.hasNode()) {\n+ if (alternate.node != null) {\n alternateBlock = builder.enter(\"block\", (blockId) => {\n- lowerStatement(builder, alternate);\n+ lowerStatement(builder, alternate as NodePath);\n return {\n kind: \"goto\",\n block: continuationBlock.id,\n@@ -347,7 +351,7 @@ function lowerStatement(\n \n const updateBlock = builder.enter(\"value\", (blockId) => {\n const update = stmt.get(\"update\");\n- if (!update.hasNode()) {\n+ if (update.node == null) {\n builder.pushError({\n reason: \"Handle empty for updater\",\n severity: ErrorSeverity.Todo,\n@@ -355,7 +359,7 @@ function lowerStatement(\n });\n return { kind: \"unsupported\", id: makeInstructionId(0) };\n }\n- lowerExpressionToVoid(builder, update);\n+ lowerExpressionToVoid(builder, update as NodePath);\n return {\n kind: \"goto\",\n block: testBlock.id,\n@@ -391,7 +395,7 @@ function lowerStatement(\n );\n \n const test = stmt.get(\"test\");\n- if (!test.hasNode()) {\n+ if (test.node == null) {\n builder.pushError({\n reason: \"ForStatement without test\",\n severity: ErrorSeverity.Todo,\n@@ -402,7 +406,10 @@ function lowerStatement(\n \"value\",\n {\n kind: \"if\",\n- test: lowerExpressionToPlace(builder, test),\n+ test: lowerExpressionToPlace(\n+ builder,\n+ test as NodePath\n+ ),\n consequent: bodyBlock,\n alternate: continuationBlock.id,\n fallthrough: continuationBlock.id,\n@@ -570,7 +577,7 @@ function lowerStatement(\n for (let ii = stmt.get(\"cases\").length - 1; ii >= 0; ii--) {\n const case_: NodePath = stmt.get(\"cases\")[ii];\n const test = case_.get(\"test\");\n- if (!test.hasNode()) {\n+ if (test.node == null) {\n if (hasDefault) {\n builder.pushError({\n reason:\n@@ -600,7 +607,10 @@ function lowerStatement(\n });\n });\n cases.push({\n- test: test.hasNode() ? lowerExpressionToPlace(builder, test) : null,\n+ test:\n+ test.node != null\n+ ? lowerExpressionToPlace(builder, test as NodePath)\n+ : null,\n block,\n });\n fallthrough = block;\n@@ -642,13 +652,13 @@ function lowerStatement(\n *\/\n lowerStatement(builder, stmt.get(\"block\"));\n const handler = stmt.get(\"handler\");\n- if (handler.hasNode()) {\n+ if (handler.node != null) {\n \/\/ TODO: consider whether we need to track the param\n- lowerStatement(builder, handler.get(\"body\"));\n+ lowerStatement(builder, handler.get(\"body\") as NodePath);\n }\n const finalizer = stmt.get(\"finalizer\");\n- if (finalizer.hasNode()) {\n- lowerStatement(builder, finalizer);\n+ if (finalizer.node != null) {\n+ lowerStatement(builder, finalizer as NodePath);\n }\n return;\n }\n@@ -670,8 +680,8 @@ function lowerStatement(\n const id = declaration.get(\"id\");\n const init = declaration.get(\"init\");\n let value: InstructionValue;\n- if (init.hasNode()) {\n- value = lowerExpression(builder, init);\n+ if (init.node != null) {\n+ value = lowerExpression(builder, init as NodePath);\n } else {\n value = {\n kind: \"Primitive\",\n@@ -856,7 +866,7 @@ function lowerExpression(\n let hasError = false;\n let elements: Place[] = [];\n for (const element of expr.get(\"elements\")) {\n- if (!element.hasNode() || !element.isExpression()) {\n+ if (element.node == null || !element.isExpression()) {\n builder.pushError({\n reason: \"Handle non-expression array elements\",\n severity: ErrorSeverity.Todo,\n@@ -865,7 +875,9 @@ function lowerExpression(\n hasError = true;\n continue;\n }\n- elements.push(lowerExpressionToPlace(builder, element));\n+ elements.push(\n+ lowerExpressionToPlace(builder, element as NodePath)\n+ );\n }\n return hasError\n ? { kind: \"UnsupportedNode\", node: exprNode, loc: exprLoc }\n@@ -1770,7 +1782,7 @@ function lowerAssignment(\n let hasError = false;\n for (let i = 0; i < elements.length; i++) {\n const element = elements[i];\n- if (!element.hasNode()) {\n+ if (element.node == null) {\n continue;\n }\n if (element.node.type === \"RestElement\") {\n@@ -1802,7 +1814,7 @@ function lowerAssignment(\n object: { ...arrayPlace },\n property,\n };\n- lowerAssignment(builder, loc, kind, element, value);\n+ lowerAssignment(builder, loc, kind, element as NodePath, value);\n }\n return hasError\n ? { kind: \"UnsupportedNode\", node: lvalueNode, loc }\n","files":[{"path":"compiler\/forget\/src\/HIR\/BuildHIR.ts","status":"M"}],"parents":["16169bec079682708e01bbb2bf20af760cdb6b8a"]}

dillon1000/react

Files changed