Merge branch 'main' into angular-20

# Conflicts:
#	package.json
#	tests/transform.test.ts
#	yarn.lock

Author: fisker

CHANGELOG.md

@@ -2,6 +2,15 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+## [11.1.1](https://github.com/prettier/angular-estree-parser/compare/v11.1.0...v11.1.1) (2025-03-12)
+
+
+### Bug Fixes
+
+* fix location for template literals ([#327](https://github.com/prettier/angular-estree-parser/issues/327)) ([299dd90](https://github.com/prettier/angular-estree-parser/commit/299dd90fcad91d584f45e02326eb8739d9f64f18))
+
+
+
 # [11.1.0](https://github.com/prettier/angular-estree-parser/compare/v11.0.0...v11.1.0) (2025-03-11)
 
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "angular-estree-parser",
-  "version": "11.1.0",
+  "version": "11.1.1",
   "description": "A parser that converts Angular source code into an ESTree-compatible form",
   "keywords": [],
   "main": "./lib/index.js",
@@ -29,8 +29,8 @@
   "devDependencies": {
     "@angular/compiler": "20.0.0-next.1",
     "@babel/code-frame": "7.26.2",
-    "@babel/parser": "7.26.9",
-    "@babel/types": "7.26.9",
+    "@babel/parser": "7.26.10",
+    "@babel/types": "7.26.10",
     "@types/babel__code-frame": "7.0.6",
     "@types/node": "22.13.10",
     "@vitest/coverage-v8": "3.0.8",
@@ -50,7 +50,7 @@
     "vitest": "3.0.8"
   },
   "peerDependencies": {
-    "@angular/compiler": "^19.0.0 || ^20.0.0"
+    "@angular/compiler": "^19.2.2 || ^20.0.0"
   },
   "engines": {
     "node": ">= 20"

src/transform-node.ts

@@ -581,24 +581,13 @@ class Transformer extends Source {
     }
 
     if (node instanceof angular.TemplateLiteralElement) {
-      const templateLiteral = options!.parent! as angular.TemplateLiteral;
-      const elementIndex = templateLiteral.elements.indexOf(node);
+      const { elements } = options!.parent! as angular.TemplateLiteral;
+      const elementIndex = elements.indexOf(node);
       const isFirst = elementIndex === 0;
-      const isLast = elementIndex === templateLiteral.elements.length - 1;
-
-      // The `TemplateLiteralElement` don't have correct location information
-      const start = isFirst
-        ? templateLiteral.sourceSpan.start + 1
-        : node.sourceSpan.start;
-      let end;
-      if (isLast) {
-        end = templateLiteral.sourceSpan.end - 1;
-      } else {
-        const nextExpression = templateLiteral.expressions[elementIndex];
-        // TODO: Support search multiple characters in `getCharacterLastIndex()`
-        // FIXME: Search `${` instead
-        end = this.getCharacterLastIndex('$', nextExpression.sourceSpan.start);
-      }
+      const isLast = elementIndex === elements.length - 1;
+
+      const end = node.sourceSpan.end - (isLast ? 1 : 0);
+      const start = node.sourceSpan.start + (isFirst ? 1 : 0);
       const raw = this.text.slice(start, end);
 
       return this.#create<babel.TemplateElement>(

tests/transform.test.ts

@@ -98,6 +98,10 @@ describe.each`
   ${'VoidExpression'}        | ${'UnaryExpression'}          | ${' ( ( void ( ( a() ) ) ) ) '}                 | ${true}     | ${true}      | ${true}            | ${true}
   ${'TemplateLiteral'}       | ${'TemplateLiteral'}          | ${' ` a ${ b } \\u0063 ` '}                     | ${true}     | ${true}      | ${true}            | ${true}
   ${'TemplateLiteral'}       | ${'TemplateLiteral'}          | ${' ( ( ` a ${ b } \\u0063 ` ) ) '}             | ${true}     | ${true}      | ${true}            | ${true}
+  ${'TemplateLiteral'}       | ${'TemplateLiteral'}          | ${' ( ` a ${ b } \u0063 ` ) '}                  | ${true}     | ${true}      | ${true}            | ${true}
+  ${'TemplateLiteral'}       | ${'TemplateLiteral'}          | ${' `  \u0063  ` '}                             | ${true}     | ${true}      | ${true}            | ${true}
+  ${'TemplateLiteral'}       | ${'TemplateLiteral'}          | ${' ( ( `   ` ) ) '}                            | ${true}     | ${true}      | ${true}            | ${true}
+  ${'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}
 `('($expectedAngularType -> $expectedEstreeType)', (fields) => {

yarn.lock

@@ -54,24 +54,24 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/parser@npm:7.26.9, @babel/parser@npm:^7.25.4":
-  version: 7.26.9
-  resolution: "@babel/parser@npm:7.26.9"
+"@babel/parser@npm:7.26.10, @babel/parser@npm:^7.25.4":
+  version: 7.26.10
+  resolution: "@babel/parser@npm:7.26.10"
   dependencies:
-    "@babel/types": "npm:^7.26.9"
+    "@babel/types": "npm:^7.26.10"
   bin:
     parser: ./bin/babel-parser.js
-  checksum: 10/cb84fe3ba556d6a4360f3373cf7eb0901c46608c8d77330cc1ca021d60f5d6ebb4056a8e7f9dd0ef231923ef1fe69c87b11ce9e160d2252e089a20232a2b942b
+  checksum: 10/3f87781f46795ba72448168061d9e99c394fdf9cd4aa3ddf053a06334247da4d25d0923ccc89195937d3360d384cee181e99711763c1e8fe81d4f17ee22541fc
   languageName: node
   linkType: hard
 
-"@babel/types@npm:7.26.9, @babel/types@npm:^7.25.4, @babel/types@npm:^7.26.9":
-  version: 7.26.9
-  resolution: "@babel/types@npm:7.26.9"
+"@babel/types@npm:7.26.10, @babel/types@npm:^7.25.4, @babel/types@npm:^7.26.10":
+  version: 7.26.10
+  resolution: "@babel/types@npm:7.26.10"
   dependencies:
     "@babel/helper-string-parser": "npm:^7.25.9"
     "@babel/helper-validator-identifier": "npm:^7.25.9"
-  checksum: 10/11b62ea7ed64ef7e39cc9b33852c1084064c3b970ae0eaa5db659241cfb776577d1e68cbff4de438bada885d3a827b52cc0f3746112d8e1bc672bb99a8eb5b56
+  checksum: 10/6b4f24ee77af853c2126eaabb65328cd44a7d6f439685131cf929c30567e01b6ea2e5d5653b2c304a09c63a5a6199968f0e27228a007acf35032036d79a9dee6
   languageName: node
   linkType: hard
 
@@ -991,8 +991,8 @@ __metadata:
   dependencies:
     "@angular/compiler": "npm:20.0.0-next.1"
     "@babel/code-frame": "npm:7.26.2"
-    "@babel/parser": "npm:7.26.9"
-    "@babel/types": "npm:7.26.9"
+    "@babel/parser": "npm:7.26.10"
+    "@babel/types": "npm:7.26.10"
     "@types/babel__code-frame": "npm:7.0.6"
     "@types/node": "npm:22.13.10"
     "@vitest/coverage-v8": "npm:3.0.8"
@@ -1011,7 +1011,7 @@ __metadata:
     typescript-eslint: "npm:8.26.1"
     vitest: "npm:3.0.8"
   peerDependencies:
-    "@angular/compiler": ^19.0.0 || ^20.0.0
+    "@angular/compiler": ^19.2.2 || ^20.0.0
   languageName: unknown
   linkType: soft
 
@@ -4666,8 +4666,8 @@ __metadata:
   linkType: hard
 
 "vite@npm:^5.0.0 || ^6.0.0":
-  version: 6.2.1
-  resolution: "vite@npm:6.2.1"
+  version: 6.2.4
+  resolution: "vite@npm:6.2.4"
   dependencies:
     esbuild: "npm:^0.25.0"
     fsevents: "npm:~2.3.3"
@@ -4713,7 +4713,7 @@ __metadata:
       optional: true
   bin:
     vite: bin/vite.js
-  checksum: 10/a37cbc33a3d9746434e8e96614dd6d8d45d821e61e9d266f389808da290b3128ac93ba0059ab09a098cdeab8b790d6d3ae7cdd5e1ce7d55c31b8bece650b3790
+  checksum: 10/3734c8695b4d35a5b3ea617159594835e370b428745f37e90d9c1daf82b53af5248578c1f1d9977fc1460320c0cdd4aef135095d378b2eba2736c03e2cfa019e
   languageName: node
   linkType: hard