flatlint 4.4.0 → 4.4.1

package/ChangeLog

@@ -1,3 +1,8 @@
+2026.01.29, v4.4.1
+
+feature:
+- 8f021bd flatlint: parser: improve support of Templates
+
 2026.01.29, v4.4.0
 
 feature:

package/lib/parser/parser.js

@@ -5,6 +5,7 @@ import {
     isNoSubstitutionTemplate,
     isStringLiteral,
     isWhiteSpace,
+    isTemplate,
 } from '#types';
 import {parseStringLiteral} from './string-literal.js';
 
@@ -62,14 +63,10 @@ function getTokensWithLocation(tokens) {
     const result = [];
     
     for (const token of tokens) {
-        if (isNewLine(token))
-            ++line;
-        
-        if (isMultilineComment(token))
-            line += token.value.split('\n').length - 1;
-        
-        if (isNoSubstitutionTemplate(token))
-            line += token.value.split('\n').length - 1;
+        line = maybeIncreateLine({
+            token,
+            line,
+        });
         
         result.push({
             ...token,
@@ -85,3 +82,21 @@ function getTokensWithLocation(tokens) {
     
     return result;
 }
+
+function maybeIncreateLine({line, token}) {
+    if (isNewLine(token))
+        ++line;
+    
+    if (isMultilineComment(token))
+        line += getNewlinesCount(token);
+    
+    if (isNoSubstitutionTemplate(token))
+        line += getNewlinesCount(token);
+    
+    if (isTemplate(token))
+        line += getNewlinesCount(token);
+    
+    return line;
+}
+
+const getNewlinesCount = ({value}) => value.split('\n').length - 1;

package/lib/types/types.js

@@ -22,6 +22,7 @@ export const isTemplateMiddle = (a) => a?.type === 'TemplateMiddle';
 export const isNoSubstitutionTemplate = (a) => a?.type === 'NoSubstitutionTemplate';
 export const isTemplateHead = (a) => a?.type === 'TemplateHead';
 export const isTemplateTail = (a) => a?.type === 'TemplateTail';
+export const isTemplate = (a) => isTemplateHead(a) || isTemplateTail(a);
 export const isWhiteSpace = ({type}) => type === 'WhiteSpace';
 export const isIdentifier = (token, newToken) => {
     if (!token)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "flatlint",
-  "version": "4.4.0",
+  "version": "4.4.1",
   "description": "JavaScript tokens-based linter",
   "main": "lib/flatlint.js",
   "type": "module",
@@ -9,33 +9,15 @@
     "./with-plugins": "./lib/with-plugins.js"
   },
   "imports": {
-    "#test": {
-      "default": "./lib/test/test.js"
-    },
-    "#types": {
-      "default": "./lib/types/types.js"
-    },
-    "#parser": {
-      "default": "./lib/parser/parser.js"
-    },
-    "#printer": {
-      "default": "./lib/printer/printer.js"
-    },
-    "#traverser": {
-      "default": "./lib/traverser/traverser.js"
-    },
-    "#compare": {
-      "default": "./lib/compare/compare.js"
-    },
-    "#compare/values": {
-      "default": "./lib/compare/values.js"
-    },
-    "#runner": {
-      "default": "./lib/runner/runner.js"
-    },
-    "#flatlint": {
-      "default": "./lib/flatlint.js"
-    }
+    "#test": "./lib/test/test.js",
+    "#types": "./lib/types/types.js",
+    "#parser": "./lib/parser/parser.js",
+    "#printer": "./lib/printer/printer.js",
+    "#traverser": "./lib/traverser/traverser.js",
+    "#compare": "./lib/compare/compare.js",
+    "#compare/values": "./lib/compare/values.js",
+    "#runner": "./lib/runner/runner.js",
+    "#flatlint": "./lib/flatlint.js"
   },
   "scripts": {
     "lint": "madrun lint",