flatlint 1.81.0 → 1.83.0

package/ChangeLog

@@ -1,3 +1,13 @@
+2025.01.23, v1.83.0
+
+feature:
+- fd891b3 flatlint: add-missing-round-brace: exclude not last
+
+2025.01.23, v1.82.0
+
+feature:
+- e1b595d flatlint: convert-comma-to-semicolon: exclude prev punctuator
+
 2025.01.22, v1.81.0
 
 feature:

package/lib/plugins/add-missing-round-brace/index.js

@@ -1,9 +1,16 @@
-import {closeRoundBrace} from '#types';
+import {
+    closeRoundBrace,
+    isLastPunctuator,
+    semicolon,
+} from '#types';
 
 export const report = () => 'Add missing round brace';
 
 export const match = () => ({
-    '__a(__args': (vars, path) => {
+    '__a(__args': ({__args}, path) => {
+        if (isLastPunctuator(__args, semicolon))
+            return false;
+        
         if (path.isCurrentPunctuator(closeRoundBrace))
             return false;
         

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

@@ -39,7 +39,12 @@ export const match = () => ({
         
         return !path.isNextPunctuator(quote);
     },
-    '__a.__b = __expr,': ({}, path) => !path.isNextPunctuator([quote, openCurlyBrace]),
+    '__a.__b = __expr,': (vars, path) => {
+        if (path.isPrevPunctuator())
+            return false;
+        
+        return !path.isNextPunctuator([quote, openCurlyBrace]);
+    },
 });
 
 export const replace = () => ({

package/lib/runner/path.js

@@ -29,6 +29,10 @@ export const createPath = ({tokens, start, end}) => ({
         tokens,
         end,
     }),
+    isPrevPunctuator: createIsPrevPunctuator({
+        tokens,
+        start,
+    }),
     isInsideTemplate: createIsInsideTemplate({
         tokens,
         end,
@@ -66,6 +70,25 @@ const next = ({tokens, end}) => {
     }
 };
 
+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({
         tokens,
@@ -97,7 +120,7 @@ const createIsInsideTemplate = ({tokens, end}) => () => {
     return isTemplateMiddle(current);
 };
 
-const createIsNextKeyword = ({tokens, end}) => (name) => {
+const createIsNextKeyword = ({tokens, end}) => () => {
     const current = next({
         tokens,
         end,
@@ -118,6 +141,18 @@ const createIsNextPunctuator = ({tokens, end}) => (punctuators) => {
     return isPunctuator(current, punctuators);
 };
 
+const createIsPrevPunctuator = ({tokens, start}) => (punctuators) => {
+    const current = prev({
+        tokens,
+        start,
+    });
+    
+    if (!current)
+        return false;
+    
+    return isPunctuator(current, punctuators);
+};
+
 const createIsPrevIdentifier = ({tokens, start}) => (value) => {
     const SPACE = 1;
     const FUNCTION = 1;

package/lib/types/types.js

@@ -28,6 +28,15 @@ export const isNumericLiteral = ({type}) => type === 'NumericLiteral';
 export const isNewLine = ({type}) => type === 'LineTerminatorSequence';
 export const notWhiteSpace = (a) => !isWhiteSpace(a);
 
+export const isLastPunctuator = (tokens, punctuator) => {
+    if (!tokens.length)
+        return false;
+    
+    const last = tokens.at(-1);
+    
+    return isPunctuator(last, punctuator);
+};
+
 export const isKeyword = (token, name) => {
     if (!token)
         return false;
@@ -183,4 +192,3 @@ export const isBalancedRoundBraces = (tokens) => {
     
     return !roundBalance;
 };
-

package/package.json

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