flatlint 1.84.0 → 1.85.0

package/ChangeLog

@@ -1,3 +1,8 @@
+2025.01.28, v1.85.0
+
+feature:
+- c87d666 flatlint: add-missing-round-brace: improve
+
 2025.01.24, v1.84.0
 
 feature:

package/lib/compare/collect-args.js

@@ -1,8 +1,10 @@
 import {
     closeCurlyBrace,
     closeRoundBrace,
+    isIdentifier,
     isNewLine,
     isOneOfPunctuators,
+    getNext,
     NOT_OK,
     OK,
     openCurlyBrace,
@@ -37,8 +39,18 @@ export const collectArgs = ({currentTokenIndex, tokens}) => {
         if (equal(token, openCurlyBrace))
             ++curlyBracesBalance;
         
-        if (equal(token, closeCurlyBrace))
+        if (equal(token, closeCurlyBrace)) {
             --curlyBracesBalance;
+            const next = getNext({
+                tokens,
+                end: index + 1,
+            });
+            
+            if (isIdentifier(next)) {
+                ++index;
+                break;
+            }
+        }
         
         if (curlyBracesBalance < 0)
             break;

package/lib/runner/path.js

@@ -1,12 +1,12 @@
 import {
     isIdentifier,
-    isNewLine,
     isKeyword,
     isPunctuator,
-    isWhiteSpace,
     isTemplateTail,
     isTemplateMiddle,
     isNoSubstitutionTemplate,
+    getNext,
+    getPrev,
 } from '#types';
 
 export const createPath = ({tokens, start, end}) => ({
@@ -51,53 +51,15 @@ export const createPath = ({tokens, start, end}) => ({
     }),
 });
 
-const next = ({tokens, end}) => {
-    let i = end - 1;
-    
-    while (++i) {
-        const token = tokens[i];
-        
-        if (!token)
-            return token;
-        
-        if (isNewLine(token))
-            continue;
-        
-        if (isWhiteSpace(token))
-            continue;
-        
-        return token;
-    }
-};
-
-const prev = ({tokens, start}) => {
-    let i = start;
-    
-    while (--i) {
-        const token = tokens[i];
-        
-        if (!token)
-            return token;
-        
-        if (isNewLine(token))
-            continue;
-        
-        if (isWhiteSpace(token))
-            continue;
-        
-        return token;
-    }
-};
-
 const createIsNext = ({tokens, end}) => () => {
-    return Boolean(next({
+    return Boolean(getNext({
         tokens,
         end,
     }));
 };
 
 const createIsNextIdentifier = ({tokens, end}) => (value) => {
-    const current = next({
+    const current = getNext({
         tokens,
         end,
     });
@@ -106,7 +68,7 @@ const createIsNextIdentifier = ({tokens, end}) => (value) => {
 };
 
 const createIsInsideTemplate = ({tokens, end}) => () => {
-    const current = next({
+    const current = getNext({
         tokens,
         end,
     });
@@ -121,7 +83,7 @@ const createIsInsideTemplate = ({tokens, end}) => () => {
 };
 
 const createIsNextKeyword = ({tokens, end}) => () => {
-    const current = next({
+    const current = getNext({
         tokens,
         end,
     });
@@ -130,7 +92,7 @@ const createIsNextKeyword = ({tokens, end}) => () => {
 };
 
 const createIsNextPunctuator = ({tokens, end}) => (punctuators) => {
-    const current = next({
+    const current = getNext({
         tokens,
         end,
     });
@@ -142,7 +104,7 @@ const createIsNextPunctuator = ({tokens, end}) => (punctuators) => {
 };
 
 const createIsPrevPunctuator = ({tokens, start}) => (punctuators) => {
-    const current = prev({
+    const current = getPrev({
         tokens,
         start,
     });

package/lib/types/types.js

@@ -9,6 +9,9 @@ export const isNoSubstitutionTemplate = (a) => a?.type === 'NoSubstitutionTempla
 export const isTemplateTail = (a) => a?.type === 'TemplateTail';
 export const isWhiteSpace = ({type}) => type === 'WhiteSpace';
 export const isIdentifier = (token, newToken) => {
+    if (!token)
+        return false;
+    
     const {type} = token;
     const is = type === 'IdentifierName';
     
@@ -192,3 +195,35 @@ export const isBalancedRoundBraces = (tokens) => {
     
     return !roundBalance;
 };
+
+export const getNext = ({tokens, end}) => {
+    let i = end - 1;
+    
+    while (++i) {
+        const token = tokens[i];
+        
+        if (!token)
+            return token;
+        
+        if (isNewLine(token))
+            continue;
+        
+        if (isWhiteSpace(token))
+            continue;
+        
+        return token;
+    }
+};
+
+export const getPrev = ({tokens, start}) => {
+    let i = start;
+    
+    while (--i) {
+        const token = tokens[i];
+        
+        if (!token)
+            return token;
+        
+        return token;
+    }
+};

package/package.json

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