flatlint 1.65.0 → 1.67.0

package/ChangeLog

@@ -1,3 +1,13 @@
+2025.01.21, v1.67.0
+
+feature:
+- 3a5ea58 flatlint: add-missing-comma: template
+
+2025.01.20, v1.66.0
+
+feature:
+- ff4cc99 flatlint: simplify
+
 2025.01.20, v1.65.0
 
 fix:

package/lib/compare/collect-args.js

@@ -11,10 +11,7 @@ import {
 } from '#types';
 import {equal} from './equal.js';
 
-const NOT_OK_PUNCTUATORS = [
-    semicolon,
-    closeRoundBrace,
-];
+const NOT_OK_PUNCTUATORS = [semicolon, closeRoundBrace];
 
 export const collectArgs = ({currentTokenIndex, tokens}) => {
     let index = currentTokenIndex;

package/lib/compare/compare.js

@@ -64,11 +64,10 @@ export const compare = (source, template, {index = 0} = {}) => {
                     nextTemplateToken: templateTokens[templateIndex + 1],
                 });
                 
-                if (indexOfExpressionEnd >= n - 1)
+                if (indexOfExpressionEnd >= n - 1) {
                     end = indexOfExpressionEnd;
-                
-                if (templateIndex === templateTokensLength - 1) {
-                    //delta = index;
+                    currentTokenIndex = end;
+                } else if (templateIndex === templateTokensLength - 1) {
                     currentTokenIndex = end;
                 } else {
                     delta = indexOfExpressionEnd - currentTokenIndex;

package/lib/flatlint.js

@@ -10,6 +10,7 @@ export function lint(source, overrides = {}) {
     });
     
     const tokens = parse(source);
+    
     const places = run(tokens, {
         plugins,
         fix,

package/lib/plugins/add-missing-semicolon/index.js

@@ -7,12 +7,19 @@ import {
     closeRoundBrace,
     question,
     closeCurlyBrace,
+    isOnlyWhitespaces,
 } from '#types';
 
 export const report = () => 'Add missing semicolon';
 
 export const match = () => ({
-    'const __a = __expr': (vars, path) => {
+    'const __a = __expr': ({__expr}, path) => {
+        if (isOnlyWhitespaces(__expr))
+            return false;
+        
+        if (!path.isNext())
+            return true;
+        
         const punctuators = [
             comma,
             semicolon,
@@ -20,16 +27,7 @@ export const match = () => ({
             question,
         ];
         
-        if (!path.isNext())
-            return true;
-        
-        if (path.isNextPunctuator(punctuators))
-            return false;
-        
-        for (const token of path.getAllNext()) {
-            if (isPunctuator(token, semicolon))
-                return false;
-        }
+        return !path.isNextPunctuator(punctuators);
     },
     '__a(__args)': (vars, path) => {
         if (path.isNextPunctuator() && !path.isNextPunctuator(closeCurlyBrace))
@@ -56,3 +54,4 @@ export const replace = () => ({
     
     '})': '});',
 });
+

package/lib/runner/path.js

@@ -6,6 +6,7 @@ import {
     isWhiteSpace,
     isTemplateTail,
     isTemplateMiddle,
+    isNoSubstitutionTemplate,
 } from '#types';
 
 export const createPath = ({tokens, start, end}) => ({
@@ -20,10 +21,6 @@ export const createPath = ({tokens, start, end}) => ({
         tokens,
         start,
     }),
-    getAllNext: createGetAllNext({
-        tokens,
-        end,
-    }),
     isNextKeyword: createIsNextKeyword({
         tokens,
         end,
@@ -94,6 +91,9 @@ const createIsInsideTemplate = ({tokens, end}) => () => {
     if (isTemplateTail(current))
         return true;
     
+    if (isNoSubstitutionTemplate(current))
+        return true;
+    
     return isTemplateMiddle(current);
 };
 
@@ -134,9 +134,3 @@ const createGetAllPrev = ({tokens, start}) => function*() {
         yield tokens[i];
     }
 };
-
-const createGetAllNext = ({tokens, end}) => function*() {
-    for (let i = end; i < tokens.length; ++i) {
-        yield tokens[i];
-    }
-};

package/lib/types/types.js

@@ -3,6 +3,7 @@ const maybeArray = (a) => isArray(a) ? a : [a];
 const isString = (a) => typeof a === 'string';
 
 export const isTemplateMiddle = (a) => a?.type === 'TemplateMiddle';
+export const isNoSubstitutionTemplate = (a) => a?.type === 'NoSubstitutionTemplate';
 export const isTemplateTail = (a) => a?.type === 'TemplateTail';
 export const isWhiteSpace = ({type}) => type === 'WhiteSpace';
 export const isIdentifier = (token, newToken) => {
@@ -155,3 +156,17 @@ export const quote = Punctuator(`'`);
 
 export const OK = true;
 export const NOT_OK = false;
+
+export const isOnlyWhitespaces = (tokens) => {
+    for (const token of tokens) {
+        if (isWhiteSpace(token))
+            continue;
+        
+        if (isNewLine(token))
+            continue;
+        
+        return false;
+    }
+    
+    return true;
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "flatlint",
-  "version": "1.65.0",
+  "version": "1.67.0",
   "description": "JavaScript tokens-based linter",
   "main": "lib/flatlint.js",
   "type": "module",