flatlint 1.30.1 → 1.32.0

package/ChangeLog

@@ -1,3 +1,13 @@
+2025.01.10, v1.32.0
+
+feature:
+- af50927 flatlint: balance: __expr
+
+2025.01.09, v1.31.0
+
+feature:
+- cf7297d flatlint: __expr: improve
+
 2025.01.09, v1.30.1
 
 feature:

package/lib/compare/collect-expression.js

@@ -1,4 +1,5 @@
 import {
+    closeCurlyBrace,
     closeRoundBrace,
     comma,
     openRoundBrace,
@@ -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];
@@ -22,10 +24,16 @@ export const collectExpression = ({currentTokenIndex, tokens, nextTemplateToken
         if (equal(token, nextTemplateToken))
             break;
         
-        if (equal(token, openRoundBrace))
+        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

@@ -2,34 +2,58 @@ import {
     comma,
     isPunctuator,
     semicolon,
+    arrow,
+    openCurlyBrace,
 } from '#types';
 
 export const report = () => 'Add missing semicolon';
 
 export const match = () => ({
-    'const __a = __expr': check,
-    '__a(__args)': check,
+    'const __a = __expr': (vars, path) => {
+        if (path.isNextPunctuator(comma))
+            return false;
+        
+        if (path.isNextPunctuator(semicolon))
+            return false;
+        
+        if (path.isNextPunctuator(openCurlyBrace))
+            return false;
+        
+        for (const token of path.getAllNext()) {
+            if (isPunctuator(token, semicolon))
+                return false;
+        }
+        
+        return true;
+    },
+    '__a(__args)': (vars, path) => {
+        if (path.isNextPunctuator(comma))
+            return false;
+        
+        if (path.isNextPunctuator(semicolon))
+            return false;
+        
+        if (path.isNextPunctuator(arrow))
+            return false;
+        
+        if (path.isNextPunctuator(openCurlyBrace))
+            return false;
+        
+        return !path.isPrevIdentifier('function');
+    },
+    '})': (vars, path) => {
+        if (path.isNextPunctuator(arrow))
+            return false;
+        
+        if (path.isNextPunctuator(comma))
+            return false;
+        
+        return !path.isNextPunctuator(semicolon);
+    },
 });
 
 export const replace = () => ({
     'const __a = __expr': 'const __a = __expr;',
     '__a(__args)': '__a(__args);',
+    '})': '});',
 });
-
-function check(vars, path) {
-    if (path.isNextPunctuator(comma))
-        return false;
-    
-    if (path.isNextPunctuator(semicolon))
-        return false;
-    
-    if (path.isPrevIdentifier('function'))
-        return false;
-    
-    for (const token of path.getAllNext()) {
-        if (isPunctuator(token, semicolon))
-            return false;
-    }
-    
-    return true;
-}

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

@@ -1,9 +1,7 @@
 import {
     closeCurlyBrace,
-    closeRoundBrace,
     isIdentifier,
     isPunctuator,
-    openCurlyBrace,
     openSquireBrace,
 } from '#types';
 
@@ -27,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/runner/path.js

@@ -58,7 +58,7 @@ const next = ({tokens, end}) => {
     }
 };
 
-const createIsNext = ({tokens, end}) => (value) => {
+const createIsNext = ({tokens, end}) => () => {
     return next({
         tokens,
         end,
@@ -71,9 +71,6 @@ const createIsNextIdentifier = ({tokens, end}) => (value) => {
         end,
     });
     
-    if (!current)
-        return false;
-    
     return isIdentifier(current, value);
 };
 

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';
     
@@ -19,9 +16,6 @@ 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;
-    
     if (token.type !== 'Punctuator')
         return false;
     
@@ -83,9 +77,10 @@ export const isTemplateArrayToken = (a) => isIdentifier(a) && isTemplateArray(a.
 export const isTemplateExpressionToken = (a) => isIdentifier(a) && isTemplateExpression(a.value);
 export const isTemplateArgsToken = (a) => isIdentifier(a) && isTemplateArgs(a.value);
 
-export const openRoundBrace = Punctuator('(');
+export const arrow = Punctuator('=>');
 export const closeRoundBrace = Punctuator(')');
 export const closeSquareBrace = Punctuator(']');
+export const openRoundBrace = Punctuator('(');
 export const semicolon = Punctuator(';');
 export const comma = Punctuator(',');
 export const colon = Punctuator(':');

package/package.json

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