@angular-eslint/template-parser 20.5.2-alpha.6 → 20.5.2-alpha.7

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAEV,UAAU,EAEX,MAAM,0CAA0C,CAAC;AAElD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,0BAA0B,CAAC;AACzD,OAAO,EAAS,YAAY,EAAE,MAAM,cAAc,CAAC;AACnD,OAAO,EACL,6BAA6B,EAC7B,0BAA0B,EAC3B,MAAM,8BAA8B,CAAC;AAEtC,KAAK,eAAe,GAAG,GAAG,CAAC;AAE3B,UAAU,IAAI;IAEZ,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAC;IACnB,IAAI,EAAE,eAAe,CAAC;CACvB;AAED,UAAU,WAAW;IACnB,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC;CAC9B;AAED,UAAU,KAAM,SAAQ,QAAQ,CAAC,QAAQ;IACvC,IAAI,EAAE,eAAe,CAAC;IACtB,KAAK,EAAE,MAAM,CAAC;CACf;AAED,UAAU,GAAI,SAAQ,IAAI,EAAE,IAAI,CAAC,KAAK,EAAE,QAAQ,CAAC;IAC/C,QAAQ,EAAE,KAAK,EAAE,CAAC;IAClB,MAAM,EAAE,KAAK,EAAE,CAAC;IAEhB,aAAa,EAAE,GAAG,EAAE,CAAC;CACtB;AAoLD,qBAAa,kBAAmB,SAAQ,KAAK;aAGzB,QAAQ,EAAE,MAAM;aAChB,KAAK,EAAE,MAAM;aACb,UAAU,EAAE,MAAM;aAClB,MAAM,EAAE,MAAM;gBAJ9B,OAAO,EAAE,MAAM,EACC,QAAQ,EAAE,MAAM,EAChB,KAAK,EAAE,MAAM,EACb,UAAU,EAAE,MAAM,EAClB,MAAM,EAAE,MAAM;CASjC;AAED,wBAAgB,wBAAwB,CACtC,UAAU,EAAE,UAAU,GACrB,kBAAkB,CAOpB;AAED,MAAM,WAAW,aAAa;IAC5B,QAAQ,EAAE,MAAM,CAAC;IACjB,mBAAmB,CAAC,EAAE,OAAO,CAAC;CAC/B;AAED,iBAAS,cAAc,CACrB,IAAI,EAAE,MAAM,EACZ,OAAO,EAAE,aAAa,GACrB;IACD,GAAG,EAAE,GAAG,CAAC;IACT,YAAY,EAAE,YAAY,CAAC,OAAO,YAAY,CAAC,CAAC;IAChD,WAAW,EAAE,WAAW,CAAC;IACzB,QAAQ,EAAE;QACR,6BAA6B,EAAE,OAAO,6BAA6B,CAAC;QACpE,0BAA0B,EAAE,OAAO,0BAA0B,CAAC;KAC/D,CAAC;CACH,CAsDA;AAED,OAAO,EAAE,cAAc,EAAE,CAAC;AAE1B,wBAAgB,KAAK,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,aAAa,GAAG,GAAG,CAE/D;AAGD,eAAO,MAAM,OAAO,EAAE,MAA2C,CAAC;AAElE,eAAO,MAAM,IAAI;;;CAGhB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAEV,UAAU,EAEX,MAAM,0CAA0C,CAAC;AAElD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,0BAA0B,CAAC;AACzD,OAAO,EAAS,YAAY,EAAE,MAAM,cAAc,CAAC;AACnD,OAAO,EACL,6BAA6B,EAC7B,0BAA0B,EAC3B,MAAM,8BAA8B,CAAC;AAEtC,KAAK,eAAe,GAAG,GAAG,CAAC;AAE3B,UAAU,IAAI;IAEZ,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAC;IACnB,IAAI,EAAE,eAAe,CAAC;CACvB;AAED,UAAU,WAAW;IACnB,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC;CAC9B;AAED,UAAU,KAAM,SAAQ,QAAQ,CAAC,QAAQ;IACvC,IAAI,EAAE,eAAe,CAAC;IACtB,KAAK,EAAE,MAAM,CAAC;CACf;AAED,UAAU,GAAI,SAAQ,IAAI,EAAE,IAAI,CAAC,KAAK,EAAE,QAAQ,CAAC;IAC/C,QAAQ,EAAE,KAAK,EAAE,CAAC;IAClB,MAAM,EAAE,KAAK,EAAE,CAAC;IAEhB,aAAa,EAAE,GAAG,EAAE,CAAC;CACtB;AAuQD,qBAAa,kBAAmB,SAAQ,KAAK;aAGzB,QAAQ,EAAE,MAAM;aAChB,KAAK,EAAE,MAAM;aACb,UAAU,EAAE,MAAM;aAClB,MAAM,EAAE,MAAM;gBAJ9B,OAAO,EAAE,MAAM,EACC,QAAQ,EAAE,MAAM,EAChB,KAAK,EAAE,MAAM,EACb,UAAU,EAAE,MAAM,EAClB,MAAM,EAAE,MAAM;CASjC;AAED,wBAAgB,wBAAwB,CACtC,UAAU,EAAE,UAAU,GACrB,kBAAkB,CAOpB;AAED,MAAM,WAAW,aAAa;IAC5B,QAAQ,EAAE,MAAM,CAAC;IACjB,mBAAmB,CAAC,EAAE,OAAO,CAAC;CAC/B;AAED,iBAAS,cAAc,CACrB,IAAI,EAAE,MAAM,EACZ,OAAO,EAAE,aAAa,GACrB;IACD,GAAG,EAAE,GAAG,CAAC;IACT,YAAY,EAAE,YAAY,CAAC,OAAO,YAAY,CAAC,CAAC;IAChD,WAAW,EAAE,WAAW,CAAC;IACzB,QAAQ,EAAE;QACR,6BAA6B,EAAE,OAAO,6BAA6B,CAAC;QACpE,0BAA0B,EAAE,OAAO,0BAA0B,CAAC;KAC/D,CAAC;CACH,CAsDA;AAED,OAAO,EAAE,cAAc,EAAE,CAAC;AAE1B,wBAAgB,KAAK,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,aAAa,GAAG,GAAG,CAE/D;AAGD,eAAO,MAAM,OAAO,EAAE,MAA2C,CAAC;AAElE,eAAO,MAAM,IAAI;;;CAGhB,CAAC"}

package/dist/index.js

@@ -67,16 +67,87 @@ function isNode(node) {
         typeof node === 'object' &&
         typeof node.type === 'string');
 }
+/**
+ * Get line offsets for a source code string (cached for performance)
+ */
+let lineOffsetsCache = null;
+function getLineOffsets(sourceCode) {
+    if (!lineOffsetsCache) {
+        lineOffsetsCache = new Map();
+    }
+    let offsets = lineOffsetsCache.get(sourceCode);
+    if (!offsets) {
+        offsets = [0];
+        for (let i = 0; i < sourceCode.length; i++) {
+            if (sourceCode[i] === '\n') {
+                offsets.push(i + 1);
+            }
+        }
+        lineOffsetsCache.set(sourceCode, offsets);
+    }
+    return offsets;
+}
+/**
+ * Convert absolute offsets to line/column positions
+ */
+function convertAbsoluteSourceSpanToLoc(sourceCode, span) {
+    const lineOffsets = getLineOffsets(sourceCode);
+    // Binary search for start line
+    let startLine = 0;
+    let left = 0;
+    let right = lineOffsets.length - 1;
+    while (left <= right) {
+        const mid = Math.floor((left + right) / 2);
+        if (lineOffsets[mid] <= span.start) {
+            startLine = mid;
+            left = mid + 1;
+        }
+        else {
+            right = mid - 1;
+        }
+    }
+    const startColumn = span.start - lineOffsets[startLine];
+    // Binary search for end line
+    let endLine = startLine; // Start from startLine as optimization
+    left = startLine;
+    right = lineOffsets.length - 1;
+    while (left <= right) {
+        const mid = Math.floor((left + right) / 2);
+        if (lineOffsets[mid] <= span.end) {
+            endLine = mid;
+            left = mid + 1;
+        }
+        else {
+            right = mid - 1;
+        }
+    }
+    const endColumn = span.end - lineOffsets[endLine];
+    return {
+        start: { line: startLine + 1, column: startColumn },
+        end: { line: endLine + 1, column: endColumn },
+    };
+}
 /**
  * ESLint requires all Nodes to have `type` and `loc` properties before it can
  * work with the custom AST.
  */
-function preprocessNode(node) {
+function preprocessNode(node, sourceCode) {
     let i = 0;
     let j = 0;
     const keys = KEYS[node.type] || getFallbackKeys(node);
-    if (!node.loc && node.sourceSpan) {
-        node.loc = (0, convert_source_span_to_loc_1.convertNodeSourceSpanToLoc)(node.sourceSpan);
+    if (!node.loc) {
+        if (node.sourceSpan &&
+            node.sourceSpan.start &&
+            typeof node.sourceSpan.start.line === 'number') {
+            // Regular ParseSourceSpan
+            node.loc = (0, convert_source_span_to_loc_1.convertNodeSourceSpanToLoc)(node.sourceSpan);
+        }
+        else if (node.sourceSpan &&
+            typeof node.sourceSpan.start === 'number' &&
+            sourceCode) {
+            // AbsoluteSourceSpan
+            node.loc = convertAbsoluteSourceSpanToLoc(sourceCode, node.sourceSpan);
+        }
     }
     for (i = 0; i < keys.length; ++i) {
         const child = node[keys[i]];
@@ -105,12 +176,12 @@ function preprocessNode(node) {
                     c.type = c.constructor.name;
                 }
                 if (isNode(c)) {
-                    preprocessNode(c);
+                    preprocessNode(c, sourceCode);
                 }
             }
         }
         else if (isNode(child)) {
-            preprocessNode(child);
+            preprocessNode(child, sourceCode);
         }
     }
 }
@@ -213,7 +284,7 @@ function parseForESLint(code, options) {
     };
     const scopeManager = new eslint_scope_1.ScopeManager({});
     new eslint_scope_1.Scope(scopeManager, 'module', null, ast, false);
-    preprocessNode(ast);
+    preprocessNode(ast, code);
     const startSourceSpan = getStartSourceSpanFromAST(ast);
     const endSourceSpan = getEndSourceSpanFromAST(ast);
     if (startSourceSpan && endSourceSpan) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@angular-eslint/template-parser",
-  "version": "20.5.2-alpha.6",
+  "version": "20.5.2-alpha.7",
   "description": "Angular Template parser for ESLint",
   "license": "MIT",
   "main": "dist/index.js",
@@ -19,7 +19,7 @@
   ],
   "dependencies": {
     "eslint-scope": "^8.0.2",
-    "@angular-eslint/bundled-angular-compiler": "20.5.2-alpha.6"
+    "@angular-eslint/bundled-angular-compiler": "20.5.2-alpha.7"
   },
   "peerDependencies": {
     "eslint": "^8.57.0 || ^9.0.0",