Require Angular 20 (#335)

Author: fisker

package.json

@@ -27,30 +27,30 @@
     "release": "release-it"
   },
   "devDependencies": {
-    "@angular/compiler": "20.0.0-next.8",
-    "@babel/code-frame": "7.26.2",
-    "@babel/parser": "7.26.10",
-    "@babel/types": "7.26.10",
+    "@angular/compiler": "20.0.0",
+    "@babel/code-frame": "7.27.1",
+    "@babel/parser": "7.27.3",
+    "@babel/types": "7.27.3",
     "@types/babel__code-frame": "7.0.6",
-    "@types/node": "22.13.10",
-    "@vitest/coverage-v8": "3.0.8",
+    "@types/node": "22.15.23",
+    "@vitest/coverage-v8": "3.1.4",
     "del-cli": "6.0.0",
-    "eslint": "9.22.0",
-    "eslint-config-prettier": "10.1.1",
+    "eslint": "9.27.0",
+    "eslint-config-prettier": "10.1.5",
     "eslint-plugin-simple-import-sort": "12.1.1",
-    "eslint-plugin-unicorn": "57.0.0",
-    "globals": "16.0.0",
+    "eslint-plugin-unicorn": "59.0.1",
+    "globals": "16.2.0",
     "jest-snapshot-serializer-raw": "2.0.0",
     "lines-and-columns": "2.0.4",
-    "npm-run-all2": "7.0.2",
+    "npm-run-all2": "8.0.4",
     "prettier": "3.5.3",
-    "release-it": "19.0.1",
-    "typescript": "5.8.2",
-    "typescript-eslint": "8.26.1",
-    "vitest": "3.0.8"
+    "release-it": "19.0.2",
+    "typescript": "5.8.3",
+    "typescript-eslint": "8.33.0",
+    "vitest": "3.1.4"
   },
   "peerDependencies": {
-    "@angular/compiler": ">=19.2.2 || ^20.0.0"
+    "@angular/compiler": "^20.0.0"
   },
   "engines": {
     "node": ">= 20"

src/transform-node.ts

@@ -405,8 +405,9 @@ class Transformer extends Source {
           type: nodeType,
           callee: tReceiver,
           arguments: tArgs,
-          optional:
-            nodeType === 'OptionalCallExpression' ? isOptionalType : undefined,
+          ...(nodeType === 'OptionalCallExpression'
+            ? { optional: isOptionalType }
+            : undefined),
           start: getOuterStart(tReceiver),
           end: node.sourceSpan.end, // `)`
         },

tests/helpers.ts

@@ -37,13 +37,13 @@ export function parseBabel(input: string) {
   return fixBabelCommentsRange(babelParser.parse(input, babelParserOptions));
 }
 
-export function massageAst(ast: any): any {
+export function massageAst(ast: any, parser): any {
   if (!ast || typeof ast !== 'object') {
     return ast;
   }
 
   if (Array.isArray(ast)) {
-    return ast.map(massageAst);
+    return ast.map((node) => massageAst(node, parser));
   }
 
   // Not exists in types, but exists in node.
@@ -64,7 +64,7 @@ export function massageAst(ast: any): any {
         // do nothing
         break;
       case 'extra': {
-        const extra = massageAst(ast[key]);
+        const extra = massageAst(ast[key], parser);
         if (extra) {
           // we added a custom `parenEnd` field for positioning
           delete extra.parenEnd;
@@ -75,7 +75,7 @@ export function massageAst(ast: any): any {
         break;
       }
       default:
-        reduced[key] = massageAst(ast[key]);
+        reduced[key] = massageAst(ast[key], parser);
         break;
     }
     return reduced;

tests/transform.test.ts

@@ -104,6 +104,8 @@ describe.each`
   ${'TemplateLiteral'}       | ${'TemplateLiteral'}          | ${' `` '}                                       | ${true}     | ${true}      | ${true}            | ${true}
   ${'TaggedTemplateLiteral'} | ${'TaggedTemplateExpression'} | ${' tag ` a ${ b } \\u0063 ` '}                 | ${true}     | ${true}      | ${true}            | ${true}
   ${'TaggedTemplateLiteral'} | ${'TaggedTemplateExpression'} | ${' ( ( ( ( tag ) ) ` a ${ b } \\u0063 ` ) ) '} | ${true}     | ${true}      | ${true}            | ${true}
+  ${'LiteralMap'}            | ${'ObjectExpression'}         | ${' ( ( {foo: ` a ${ b } ` } ) ) '}             | ${true}     | ${true}      | ${true}            | ${true}
+  ${'LiteralMap'}            | ${'ObjectExpression'}         | ${' ( ( {foo: tag ` a ${ b } ` } ) ) '}         | ${true}     | ${true}      | ${true}            | ${true}
 `('($expectedAngularType -> $expectedEstreeType)', (fields) => {
   for (const method of PARSE_METHODS) {
     testSection(method, fields);
@@ -178,6 +180,8 @@ function testSection(
       expect(statement.type).toEqual('ExpressionStatement');
       babelNode = { ...statement.expression, comments };
     }
-    expect(massageAst(estreeNode)).toEqual(massageAst(babelNode));
+    expect(massageAst(estreeNode, 'angular')).toEqual(
+      massageAst(babelNode, 'babel'),
+    );
   });
 }