flatlint 1.30.1 → 1.31.0

package/ChangeLog

@@ -1,3 +1,8 @@
+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,7 +1,7 @@
 import {
+    closeCurlyBrace,
     closeRoundBrace,
     comma,
-    openRoundBrace,
     semicolon,
 } from '#types';
 import {equal} from './equal.js';
@@ -22,7 +22,7 @@ export const collectExpression = ({currentTokenIndex, tokens, nextTemplateToken
         if (equal(token, nextTemplateToken))
             break;
         
-        if (equal(token, openRoundBrace))
+        if (equal(token, closeCurlyBrace))
             break;
         
         if (equal(token, closeRoundBrace))

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

@@ -2,34 +2,72 @@ 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;
+        
+        if (path.isPrevIdentifier('function'))
+            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;
+        
+        if (path.isPrevIdentifier('function'))
+            return false;
+        
+        for (const token of path.getAllNext()) {
+            if (isPunctuator(token, semicolon))
+                return false;
+        }
+        
+        return true;
+    },
+    '})': (vars, path) => {
+        if (path.isNextPunctuator(arrow))
+            return false;
+        
+        if (path.isNextPunctuator(comma))
+            return false;
+        
+        if (path.isCurrentPunctuator(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

@@ -3,7 +3,6 @@ import {
     closeRoundBrace,
     isIdentifier,
     isPunctuator,
-    openCurlyBrace,
     openSquireBrace,
 } from '#types';
 

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

@@ -1,5 +1,14 @@
+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

@@ -58,7 +58,7 @@ const next = ({tokens, end}) => {
     }
 };
 
-const createIsNext = ({tokens, end}) => (value) => {
+const createIsNext = ({tokens, end}) => () => {
     return next({
         tokens,
         end,

package/lib/types/types.js

@@ -83,9 +83,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.31.0",
   "description": "JavaScript tokens-based linter",
   "main": "lib/flatlint.js",
   "type": "module",