flatlint 1.34.0 → 1.36.0

package/ChangeLog

@@ -1,3 +1,13 @@
+2025.01.10, v1.36.0
+
+feature:
+- bf14d47 flatlint: add-missing-semicolon: exclude chain
+
+2025.01.10, v1.35.0
+
+feature:
+- aeb79de flatlint: add-missing-semicolon: open round brace
+
 2025.01.10, v1.34.0
 
 feature:

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

@@ -4,19 +4,21 @@ import {
     semicolon,
     arrow,
     openCurlyBrace,
+    closeRoundBrace,
+    dot,
 } from '#types';
 
 export const report = () => 'Add missing semicolon';
 
 export const match = () => ({
     'const __a = __expr': (vars, path) => {
-        if (path.isNextPunctuator(comma))
-            return false;
-        
-        if (path.isNextPunctuator(semicolon))
-            return false;
+        const punctuators = [
+            comma,
+            semicolon,
+            openCurlyBrace,
+        ];
         
-        if (path.isNextPunctuator(openCurlyBrace))
+        if (path.isNextPunctuator(punctuators))
             return false;
         
         for (const token of path.getAllNext()) {
@@ -27,25 +29,24 @@ export const match = () => ({
         return true;
     },
     '__a(__args)': (vars, path) => {
-        if (path.isNextPunctuator(comma))
-            return false;
+        const punctuators = [
+            comma,
+            semicolon,
+            arrow,
+            closeRoundBrace,
+            openCurlyBrace,
+            dot,
+        ];
         
-        if (path.isNextPunctuator(semicolon))
-            return false;
-        
-        if (path.isNextPunctuator(arrow))
-            return false;
-        
-        if (path.isNextPunctuator(openCurlyBrace))
+        if (path.isNextPunctuator(punctuators))
             return false;
         
         return !path.isPrevIdentifier('function');
     },
     '})': (vars, path) => {
-        if (path.isNextPunctuator(arrow))
-            return false;
+        const punctuators = [arrow, comma];
         
-        if (path.isNextPunctuator(comma))
+        if (path.isNextPunctuator(punctuators))
             return false;
         
         return !path.isNextPunctuator(semicolon);

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

@@ -28,8 +28,5 @@ export const replace = () => ({
 });
 
 const check = (vars, path) => {
-    if (!path.isNext())
-        return true;
-    
     return path.isNextOperator();
 };

package/lib/runner/path.js

@@ -6,6 +6,9 @@ import {
     isWhiteSpace,
 } from '#types';
 
+const {isArray} = Array;
+const maybeArray = (a) => isArray(a) ? a : [a];
+
 export const createPath = ({tokens, start, end}) => ({
     tokens,
     start,
@@ -38,12 +41,33 @@ export const createPath = ({tokens, start, end}) => ({
         tokens,
         start,
     }),
+    isPrevPunctuator: createIsPrevPunctuator({
+        tokens,
+        start,
+        end,
+    }),
     isCurrentPunctuator: createIsNextPunctuator({
         tokens,
         end: end - 1,
     }),
 });
 
+const prev = ({tokens, start, end}) => {
+    let i = end + 1;
+    
+    while (--i >= start) {
+        const token = tokens[i];
+        
+        if (isNewLine(token))
+            continue;
+        
+        if (isWhiteSpace(token))
+            continue;
+        
+        return token;
+    }
+};
+
 const next = ({tokens, end}) => {
     let i = end - 1;
     
@@ -88,7 +112,7 @@ const createIsNextOperator = ({tokens, end}) => () => {
     return isOperator(current);
 };
 
-const createIsNextPunctuator = ({tokens, end}) => (punctuator) => {
+const createIsNextPunctuator = ({tokens, end}) => (punctuators) => {
     const current = next({
         tokens,
         end,
@@ -97,7 +121,30 @@ const createIsNextPunctuator = ({tokens, end}) => (punctuator) => {
     if (!current)
         return false;
     
-    return isPunctuator(current, punctuator);
+    for (const punctuator of maybeArray(punctuators)) {
+        if (isPunctuator(current, punctuator))
+            return true;
+    }
+    
+    return false;
+};
+
+const createIsPrevPunctuator = ({tokens, start, end}) => (punctuators) => {
+    const current = prev({
+        tokens,
+        start,
+        end,
+    });
+    
+    if (!current)
+        return false;
+    
+    for (const punctuator of maybeArray(punctuators)) {
+        if (isPunctuator(current, punctuator))
+            return true;
+    }
+    
+    return false;
 };
 
 const createIsPrevIdentifier = ({tokens, start}) => (value) => {

package/lib/types/types.js

@@ -96,14 +96,14 @@ export const isTemplateArgsToken = (a) => isIdentifier(a) && isTemplateArgs(a.va
 export const arrow = Punctuator('=>');
 export const closeRoundBrace = Punctuator(')');
 export const closeSquareBrace = Punctuator(']');
+export const colon = Punctuator(':');
+export const comma = Punctuator(',');
+export const dot = Punctuator('.');
 export const openRoundBrace = Punctuator('(');
 export const semicolon = Punctuator(';');
-export const comma = Punctuator(',');
-export const colon = Punctuator(':');
 export const openCurlyBrace = Punctuator('{');
 export const closeCurlyBrace = Punctuator('}');
 export const openSquireBrace = Punctuator('[');
-export const closeSquireBrace = Punctuator(']');
 export const quote = Punctuator(`'`);
 
 export const OK = true;

package/package.json

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