flatlint 1.61.0 → 1.62.0

package/ChangeLog

@@ -1,3 +1,8 @@
+2025.01.19, v1.62.0
+
+feature:
+- ca2745a flatlint: __expr: improve
+
 2025.01.18, v1.61.0
 
 feature:

package/lib/compare/collect-expression.js

@@ -2,6 +2,7 @@ import {
     closeCurlyBrace,
     closeRoundBrace,
     comma,
+    isNewLine,
     openCurlyBrace,
     openRoundBrace,
     semicolon,
@@ -17,15 +18,6 @@ export const collectExpression = ({currentTokenIndex, tokens, nextTemplateToken
     for (; index < n; index++) {
         const token = tokens[index];
         
-        if (equal(token, semicolon))
-            break;
-        
-        if (equal(token, comma))
-            break;
-        
-        if (equal(token, nextTemplateToken))
-            break;
-        
         if (equal(token, openRoundBrace))
             ++roundBracesBalance;
         
@@ -43,7 +35,21 @@ export const collectExpression = ({currentTokenIndex, tokens, nextTemplateToken
         
         if (curlyBracesBalance < 0)
             break;
+        
+        if (!curlyBracesBalance) {
+            if (equal(token, semicolon))
+                break;
+            
+            if (equal(token, comma))
+                break;
+            
+            if (equal(token, nextTemplateToken))
+                break;
+        }
     }
     
+    if (isNewLine(tokens[index - 1]))
+        --index;
+    
     return --index;
 };

package/lib/compare/compare.js

@@ -64,13 +64,16 @@ export const compare = (source, template, {index = 0} = {}) => {
                     nextTemplateToken: templateTokens[templateIndex + 1],
                 });
                 
-                if (indexOfExpressionEnd >= n - 1) {
+                if (indexOfExpressionEnd >= n - 1)
                     end = indexOfExpressionEnd;
-                    continue;
-                }
                 
-                delta = indexOfExpressionEnd - currentTokenIndex;
-                index = indexOfExpressionEnd - templateIndex;
+                if (templateIndex === templateTokensLength - 1) {
+                    //delta = index;
+                    currentTokenIndex = end;
+                } else {
+                    delta = indexOfExpressionEnd - currentTokenIndex;
+                    index = indexOfExpressionEnd - templateIndex;
+                }
             } else if (isTemplateArrayToken(templateToken)) {
                 const [ok, indexOfArrayEnd] = collectArray({
                     currentTokenIndex,

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

@@ -5,17 +5,14 @@ import {
     arrow,
     openCurlyBrace,
     closeRoundBrace,
-    dot,
     question,
-    openRoundBrace,
-    or,
     closeCurlyBrace,
 } from '#types';
 
 export const report = () => 'Add missing semicolon';
 
 export const match = () => ({
-    'const __a = __expr': ({__expr}, path) => {
+    'const __a = __expr': (vars, path) => {
         const punctuators = [
             comma,
             semicolon,
@@ -23,8 +20,8 @@ export const match = () => ({
             question,
         ];
         
-        if (isPunctuator(openCurlyBrace, __expr))
-            return false;
+        if (!path.isNext())
+            return true;
         
         if (path.isNextPunctuator(punctuators))
             return false;
@@ -33,8 +30,6 @@ export const match = () => ({
             if (isPunctuator(token, semicolon))
                 return false;
         }
-        
-        return true;
     },
     '__a(__args)': (vars, path) => {
         if (path.isNextPunctuator() && !path.isNextPunctuator(closeCurlyBrace))
@@ -58,5 +53,6 @@ export const match = () => ({
 export const replace = () => ({
     'const __a = __expr': 'const __a = __expr;',
     '__a(__args)': '__a(__args);',
+    
     '})': '});',
 });

package/lib/plugins/convert-comma-to-semicolon/index.js

@@ -42,6 +42,7 @@ export const replace = () => ({
     '__a(__args),': '__a(__args);',
     'return __expr,': 'return __expr;',
     '__a.__b = __expr,': '__a.__b = __expr;',
+    '__a.__b.__c = __expr,': '__a.__b.__c = __expr;',
 });
 
 const check = ({__x}, path) => {

package/lib/plugins.js

@@ -16,12 +16,13 @@ import * as convertSemicolonToComma from './plugins/convert-semicolon-to-comma/i
 import * as wrapAssignmentInParens from './plugins/wrap-assignment-in-parens/index.js';
 
 export const plugins = [
+    ['add-missing-semicolon', addMissingSemicolon],
+    ['remove-useless-comma', removeUselessComma],
     ['add-missing-arrow', addMissingArrow],
     ['add-missing-assign', addMissingAssign],
     ['add-missing-curly-brace', addMissingCurlyBrace],
     ['add-missing-round-brace', addMissingRoundBrace],
     ['add-missing-squire-brace', addMissingSquireBrace],
-    ['add-missing-semicolon', addMissingSemicolon],
     ['add-missing-comma', addMissingComma],
     ['add-missing-quote', addMissingQuote],
     ['add-const-to-export', addConstToExport],
@@ -29,7 +30,6 @@ export const plugins = [
     ['convert-semicolon-to-comma', convertSemicolonToComma],
     ['convert-from-to-require', convertFromToRequire],
     ['remove-useless-round-brace', removeUselessRoundBrace],
-    ['remove-useless-comma', removeUselessComma],
     ['remove-invalid-character', removeInvalidCharacter],
     ['wrap-assignment-in-parens', wrapAssignmentInParens],
 ];

package/lib/runner/path.js

@@ -103,9 +103,6 @@ const createIsNextKeyword = ({tokens, end}) => () => {
         end,
     });
     
-    if (!current)
-        return false;
-    
     return isKeyword(current);
 };
 

package/package.json

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