flatlint 1.33.0 → 1.35.0

package/ChangeLog

@@ -1,3 +1,13 @@
+2025.01.10, v1.35.0
+
+feature:
+- aeb79de flatlint: add-missing-semicolon: open round brace
+
+2025.01.10, v1.34.0
+
+feature:
+- 49aadee flatlint: convert-comma-to-semicolon: import
+
 2025.01.10, v1.33.0
 
 feature:

package/README.md

@@ -29,6 +29,9 @@ function x() {
 -   return m,
 +   return m;
 }
+
+-import a from 'a',
++import a from 'a';
 ```
 
 </details>

package/lib/compare/collect-expression.js

@@ -2,6 +2,7 @@ import {
     closeCurlyBrace,
     closeRoundBrace,
     comma,
+    openCurlyBrace,
     openRoundBrace,
     semicolon,
 } from '#types';
@@ -11,6 +12,7 @@ export const collectExpression = ({currentTokenIndex, tokens, nextTemplateToken
     const n = tokens.length;
     let index = currentTokenIndex;
     let roundBracesBalance = 0;
+    let curlyBracesBalance = 0;
     
     for (; index < n; index++) {
         const token = tokens[index];
@@ -24,17 +26,23 @@ export const collectExpression = ({currentTokenIndex, tokens, nextTemplateToken
         if (equal(token, nextTemplateToken))
             break;
         
-        if (equal(token, closeCurlyBrace))
-            break;
-        
         if (equal(token, openRoundBrace))
             ++roundBracesBalance;
         
         if (equal(token, closeRoundBrace))
             --roundBracesBalance;
         
+        if (equal(token, openCurlyBrace))
+            ++curlyBracesBalance;
+        
+        if (equal(token, closeCurlyBrace))
+            --curlyBracesBalance;
+        
         if (roundBracesBalance < 0)
             break;
+        
+        if (curlyBracesBalance < 0)
+            break;
     }
     
     return --index;

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

@@ -4,6 +4,7 @@ import {
     semicolon,
     arrow,
     openCurlyBrace,
+    closeRoundBrace,
 } from '#types';
 
 export const report = () => 'Add missing semicolon';
@@ -27,13 +28,15 @@ export const match = () => ({
         return true;
     },
     '__a(__args)': (vars, path) => {
-        if (path.isNextPunctuator(comma))
-            return false;
-        
-        if (path.isNextPunctuator(semicolon))
-            return false;
-        
-        if (path.isNextPunctuator(arrow))
+        const punctuators = [
+            comma,
+            semicolon,
+            arrow,
+            closeRoundBrace,
+            openCurlyBrace,
+        ];
+        
+        if (path.isNextPunctuator(punctuators))
             return false;
         
         if (path.isNextPunctuator(openCurlyBrace))

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

@@ -17,6 +17,7 @@ export const match = () => ({
 });
 
 export const replace = () => ({
+    'from "__a",': 'from "__a";',
     'var __a,': 'var __a;',
     'let __a,': 'let __a;',
     'var __a = __b,': 'var __a = __b;',

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,
@@ -88,7 +91,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 +100,12 @@ 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 createIsPrevIdentifier = ({tokens, start}) => (value) => {
@@ -127,3 +135,4 @@ const createGetAllNext = ({tokens, end}) => function*() {
         yield current;
     }
 };
+

package/lib/types/types.js

@@ -21,6 +21,7 @@ export const isOperator = (token) => {
         'let',
         'const',
         'export',
+        'from',
     ];
     
     for (const operator of operators) {

package/package.json

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