flatlint 1.85.0 → 1.87.0

package/ChangeLog

@@ -1,3 +1,16 @@
+2025.01.29, v1.87.0
+
+feature:
+- f299df8 flatlint: add-missing-round-brace: method
+
+2025.01.28, v1.86.0
+
+fix:
+- f3df7fa flatlint: add-missing-semicolon: exclude: if
+
+feature:
+- da300c1 flatlint: add-missing-round-brace: break
+
 2025.01.28, v1.85.0
 
 feature:

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

@@ -1,5 +1,6 @@
 import {
     colon,
+    isIdentifier,
     isOneOfKeywords,
     isPunctuator,
     openCurlyBrace,
@@ -9,18 +10,18 @@ export const report = () => `Add missing '=>'`;
 
 export const match = () => ({
     '(__args) {': (vars, path) => {
-        for (const current of path.getAllPrev()) {
-            if (isPunctuator(current, colon))
-                return true;
-            
-            if (isPunctuator(current, openCurlyBrace))
-                return false;
-            
-            if (isOneOfKeywords(current, ['if', 'function']))
-                return false;
-        }
+        const current = path.getPrev();
         
-        return true;
+        if (isOneOfKeywords(current, ['if', 'function']))
+            return false;
+        
+        if (isIdentifier(current))
+            return false;
+        
+        if (isPunctuator(current, colon))
+            return true;
+        
+        return !isPunctuator(current, openCurlyBrace);
     },
 });
 export const replace = () => ({

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

@@ -1,21 +1,17 @@
-import {
-    closeRoundBrace,
-    isLastPunctuator,
-    semicolon,
-} from '#types';
+import {closeRoundBrace} from '#types';
 
 export const report = () => 'Add missing round brace';
 
 export const match = () => ({
-    '__a(__args': ({__args}, path) => {
-        if (isLastPunctuator(__args, semicolon))
-            return false;
-        
+    '__a(__args': (vars, path) => {
         if (path.isCurrentPunctuator(closeRoundBrace))
             return false;
         
         return !path.isNextPunctuator(closeRoundBrace);
     },
+    'if (__a(__args)': (vars, path) => {
+        return path.isNextKeyword();
+    },
 });
 
 export const replace = () => ({
@@ -23,4 +19,5 @@ export const replace = () => ({
     '__a(__args': '__a(__args)',
     'if (__a.__b(__args) {': 'if (__a.__b(__args)) {',
     'if (__a(__args) {': 'if (__a(__args)) {',
+    'if (__a(__args)': 'if (__a(__args))',
 });

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

@@ -7,6 +7,7 @@ import {
     question,
     closeCurlyBrace,
     isOnlyWhitespaces,
+    isKeyword,
 } from '#types';
 
 export const report = () => 'Add missing semicolon';
@@ -35,6 +36,11 @@ export const match = () => ({
         if (path.isInsideTemplate())
             return false;
         
+        for (const current of path.getAllPrev()) {
+            if (isKeyword(current, 'if'))
+                return false;
+        }
+        
         return !path.isPrevIdentifier('function');
     },
     '})': (vars, path) => {

package/lib/runner/path.js

@@ -21,6 +21,10 @@ export const createPath = ({tokens, start, end}) => ({
         tokens,
         start,
     }),
+    getPrev: createGetPrev({
+        tokens,
+        start,
+    }),
     isNextKeyword: createIsNextKeyword({
         tokens,
         end,
@@ -103,6 +107,13 @@ const createIsNextPunctuator = ({tokens, end}) => (punctuators) => {
     return isPunctuator(current, punctuators);
 };
 
+const createGetPrev = ({tokens, start}) => () => {
+    return getPrev({
+        tokens,
+        start,
+    });
+};
+
 const createIsPrevPunctuator = ({tokens, start}) => (punctuators) => {
     const current = getPrev({
         tokens,

package/lib/types/types.js

@@ -31,15 +31,6 @@ 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;
@@ -218,11 +209,11 @@ export const getNext = ({tokens, end}) => {
 export const getPrev = ({tokens, start}) => {
     let i = start;
     
-    while (--i) {
+    while (--i > -1) {
         const token = tokens[i];
         
-        if (!token)
-            return token;
+        if (isWhiteSpace(token))
+            continue;
         
         return token;
     }

package/package.json

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