flatlint 1.31.0 → 1.33.0

package/ChangeLog

@@ -1,3 +1,13 @@
+2025.01.10, v1.33.0
+
+feature:
+- 643c0a1 flatlint: convert-comma-to-semicolon: before operator
+
+2025.01.10, v1.32.0
+
+feature:
+- af50927 flatlint: balance: __expr
+
 2025.01.09, v1.31.0
 
 feature:

package/lib/compare/collect-expression.js

@@ -2,6 +2,7 @@ import {
     closeCurlyBrace,
     closeRoundBrace,
     comma,
+    openRoundBrace,
     semicolon,
 } from '#types';
 import {equal} from './equal.js';
@@ -9,6 +10,7 @@ import {equal} from './equal.js';
 export const collectExpression = ({currentTokenIndex, tokens, nextTemplateToken = semicolon}) => {
     const n = tokens.length;
     let index = currentTokenIndex;
+    let roundBracesBalance = 0;
     
     for (; index < n; index++) {
         const token = tokens[index];
@@ -25,7 +27,13 @@ export const collectExpression = ({currentTokenIndex, tokens, nextTemplateToken
         if (equal(token, closeCurlyBrace))
             break;
         
+        if (equal(token, openRoundBrace))
+            ++roundBracesBalance;
+        
         if (equal(token, closeRoundBrace))
+            --roundBracesBalance;
+        
+        if (roundBracesBalance < 0)
             break;
     }
     

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

@@ -19,9 +19,6 @@ export const match = () => ({
         if (path.isNextPunctuator(openCurlyBrace))
             return false;
         
-        if (path.isPrevIdentifier('function'))
-            return false;
-        
         for (const token of path.getAllNext()) {
             if (isPunctuator(token, semicolon))
                 return false;
@@ -42,15 +39,7 @@ export const match = () => ({
         if (path.isNextPunctuator(openCurlyBrace))
             return false;
         
-        if (path.isPrevIdentifier('function'))
-            return false;
-        
-        for (const token of path.getAllNext()) {
-            if (isPunctuator(token, semicolon))
-                return false;
-        }
-        
-        return true;
+        return !path.isPrevIdentifier('function');
     },
     '})': (vars, path) => {
         if (path.isNextPunctuator(arrow))
@@ -59,9 +48,6 @@ export const match = () => ({
         if (path.isNextPunctuator(comma))
             return false;
         
-        if (path.isCurrentPunctuator(comma))
-            return false;
-        
         return !path.isNextPunctuator(semicolon);
     },
 });

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

@@ -10,10 +10,25 @@ export const match = () => ({
         
         return true;
     },
+    'let __a = __b,': check,
+    'var __a = __b': check,
+    'let __a,': check,
+    'var __a,': check,
 });
 
 export const replace = () => ({
+    'var __a,': 'var __a;',
+    'let __a,': 'let __a;',
+    'var __a = __b,': 'var __a = __b;',
+    'let __a = __b,': 'let __a = __b;',
     'const __a = __b,': 'const __a = __b;',
     '__a(__args),': '__a(__args);',
     'return __expr,': 'return __expr;',
 });
+
+const check = (vars, path) => {
+    if (!path.isNext())
+        return true;
+    
+    return path.isNextOperator();
+};

package/lib/plugins/remove-useless-comma/index.js

@@ -1,6 +1,5 @@
 import {
     closeCurlyBrace,
-    closeRoundBrace,
     isIdentifier,
     isPunctuator,
     openSquireBrace,
@@ -26,9 +25,6 @@ export const match = () => ({
         if (!path.isNext())
             return true;
         
-        if (path.isNextPunctuator(closeRoundBrace))
-            return true;
-        
         if (path.isNextPunctuator(closeCurlyBrace))
             return false;
         

package/lib/plugins/remove-useless-round-brace/index.js

@@ -1,14 +1,5 @@
-import {isPunctuator, openRoundBrace} from '#types';
-
 export const report = () => 'Remove useless round brace';
 
-export const match = () => ({
-    'const __a = __expr);': ({__expr}) => {
-        const [, brace] = __expr;
-        return !isPunctuator(brace, openRoundBrace);
-    },
-});
-
 export const replace = () => ({
     'const __a = __expr);': 'const __a = __expr;',
     'from "__b")': 'from "__b"',

package/lib/runner/path.js

@@ -1,6 +1,7 @@
 import {
     isIdentifier,
     isNewLine,
+    isOperator,
     isPunctuator,
     isWhiteSpace,
 } from '#types';
@@ -21,6 +22,10 @@ export const createPath = ({tokens, start, end}) => ({
         tokens,
         end,
     }),
+    isNextOperator: createIsNextOperator({
+        tokens,
+        end,
+    }),
     isNextPunctuator: createIsNextPunctuator({
         tokens,
         end,
@@ -59,10 +64,10 @@ const next = ({tokens, end}) => {
 };
 
 const createIsNext = ({tokens, end}) => () => {
-    return next({
+    return Boolean(next({
         tokens,
         end,
-    });
+    }));
 };
 
 const createIsNextIdentifier = ({tokens, end}) => (value) => {
@@ -71,12 +76,18 @@ const createIsNextIdentifier = ({tokens, end}) => (value) => {
         end,
     });
     
-    if (!current)
-        return false;
-    
     return isIdentifier(current, value);
 };
 
+const createIsNextOperator = ({tokens, end}) => () => {
+    const current = next({
+        tokens,
+        end,
+    });
+    
+    return isOperator(current);
+};
+
 const createIsNextPunctuator = ({tokens, end}) => (punctuator) => {
     const current = next({
         tokens,

package/lib/types/types.js

@@ -2,9 +2,6 @@ const isString = (a) => typeof a === 'string';
 
 export const isWhiteSpace = ({type}) => type === 'WhiteSpace';
 export const isIdentifier = (token, value = token.value) => {
-    if (!token)
-        return false;
-    
     const {type} = token;
     const is = type === 'IdentifierName';
     
@@ -18,10 +15,22 @@ export const isStringLiteral = ({type}) => type === 'StringLiteral';
 export const isNumericLiteral = ({type}) => type === 'NumericLiteral';
 export const isNewLine = ({type}) => type === 'LineTerminatorSequence';
 export const notWhiteSpace = (a) => !isWhiteSpace(a);
-export const isPunctuator = (token, punctuator) => {
-    if (!token)
-        return false;
+export const isOperator = (token) => {
+    const operators = [
+        'var',
+        'let',
+        'const',
+        'export',
+    ];
+    
+    for (const operator of operators) {
+        if (isIdentifier(token, operator))
+            return true;
+    }
     
+    return false;
+};
+export const isPunctuator = (token, punctuator) => {
     if (token.type !== 'Punctuator')
         return false;
     

package/package.json

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