flatlint 1.54.1 → 1.56.0

package/ChangeLog

@@ -1,3 +1,13 @@
+2025.01.17, v1.56.0
+
+feature:
+- 8683716 flatlint: convert-comma-to-semicolon: improve
+
+2025.01.17, v1.55.0
+
+feature:
+- 8d3ee0b flatlint: remove-useless-semicolon -> convert-semicolon-to-comma
+
 2025.01.17, v1.54.1
 
 feature:

package/README.md

@@ -137,7 +137,7 @@ import {
 
  </details>
 
-<details><summary>remove useless semicolon</summary>
+<details><summary>convert semicolon to comma</summary>
 
 ```diff
 const a = {

package/lib/compare/collect-args.js

@@ -1,8 +1,11 @@
 import {
+    closeCurlyBrace,
     closeRoundBrace,
     isNewLine,
     NOT_OK,
     OK,
+    openCurlyBrace,
+    openRoundBrace,
 } from '#types';
 import {equal} from './equal.js';
 
@@ -13,16 +16,34 @@ export const collectArgs = ({currentTokenIndex, tokens}) => {
     if (equal(tokens[index], closeRoundBrace))
         return [NOT_OK];
     
+    let curlyBracesBalance = 0;
+    let roundBracesBalance = 0;
+    
     for (; index < n; index++) {
         const token = tokens[index];
         
+        if (equal(token, openRoundBrace))
+            ++roundBracesBalance;
+        
         if (equal(token, closeRoundBrace))
+            --roundBracesBalance;
+        
+        if (equal(token, openCurlyBrace))
+            ++curlyBracesBalance;
+        
+        if (equal(token, closeCurlyBrace))
+            --curlyBracesBalance;
+        
+        if (curlyBracesBalance < 0)
             break;
         
-        if (isNewLine(token))
+        if (roundBracesBalance < 0)
             break;
     }
     
+    if (isNewLine(tokens[index - 1]))
+        --index;
+    
     return [
         OK,
         --index,

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

@@ -1,37 +1,27 @@
 import {
     arrow,
+    closeCurlyBrace,
     closeRoundBrace,
     isPunctuator,
+    openCurlyBrace,
     openRoundBrace,
 } from '#types';
 
 export const report = () => 'Add missing round brace';
 
 export const match = () => ({
-    '(__args) {': ({__args}) => {
-        if (isPunctuator(arrow, __args))
-            return false;
-        
-        if (!isPunctuator(openRoundBrace, __args))
-            return false;
-        
-        return !isPunctuator(closeRoundBrace, __args);
-    },
-    '__a(__args': (vars, path) => {
+    '__a(__args': ({__args}, path) => {
         if (path.isCurrentPunctuator(closeRoundBrace))
             return false;
         
-        for (const token of path.getAllNext()) {
-            if (isPunctuator(token, closeRoundBrace))
-                return false;
-        }
-        
-        return true;
+        return !path.isNextPunctuator(closeRoundBrace);
     },
 });
 
 export const replace = () => ({
     'if __a > __b': 'if (__a > __b)',
     '__a(__args': '__a(__args)',
-    '(__args) {': '(__args)) {',
+    'if (__a.__b(__args) {': 'if (__a.__b(__args)) {',
+    'if (__a(__args) {': 'if (__a(__args)) {',
 });
+

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

@@ -13,7 +13,7 @@ import {
 export const report = () => 'Add missing semicolon';
 
 export const match = () => ({
-    'const __a = __expr': (vars, path) => {
+    'const __a = __expr': ({__expr}, path) => {
         const punctuators = [
             comma,
             semicolon,
@@ -21,6 +21,9 @@ export const match = () => ({
             question,
         ];
         
+        if (isPunctuator(openCurlyBrace, __expr))
+            return false;
+        
         if (path.isNextPunctuator(punctuators))
             return false;
         

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

@@ -12,6 +12,9 @@ import {
 export const report = () => 'Use semicolon instead of trailing comma';
 export const match = () => ({
     '__a(__args),': (vars, path) => {
+        if (path.isNextKeyword())
+            return true;
+        
         for (const token of path.getAllPrev()) {
             if (isPunctuator(token, colon))
                 return false;

package/lib/plugins/{remove-useless-semicolon → convert-semicolon-to-comma}/index.js

@@ -1,6 +1,6 @@
 import {isIdentifier} from '#types';
 
-export const report = () => 'Remove useless semicolon';
+export const report = () => `Use ',' instead of ';'`;
 
 export const match = () => ({
     '__a: __expr;': (vars, path) => {
@@ -15,5 +15,4 @@ export const match = () => ({
 
 export const replace = () => ({
     '__a: __expr;': '__a: __expr,',
-    'export;': 'export',
 });

package/lib/plugins.js

@@ -11,7 +11,7 @@ import * as convertFromToRequire from './plugins/convert-from-to-require/index.j
 import * as removeUselessComma from './plugins/remove-useless-comma/index.js';
 import * as removeInvalidCharacter from './plugins/remove-invalid-character/index.js';
 import * as removeUselessRoundBrace from './plugins/remove-useless-round-brace/index.js';
-import * as removeUselessSemicolon from './plugins/remove-useless-semicolon/index.js';
+import * as convertSemicolonToComma from './plugins/convert-semicolon-to-comma/index.js';
 import * as wrapAssignmentInParens from './plugins/wrap-assignment-in-parens/index.js';
 
 export const plugins = [
@@ -24,9 +24,9 @@ export const plugins = [
     ['add-missing-quote', addMissingQuote],
     ['add-const-to-export', addConstToExport],
     ['convert-comma-to-semicolon', convertCommaToSemicolon],
+    ['convert-semicolon-to-comma', convertSemicolonToComma],
     ['convert-from-to-require', convertFromToRequire],
     ['remove-useless-round-brace', removeUselessRoundBrace],
-    ['remove-useless-semicolon', removeUselessSemicolon],
     ['remove-useless-comma', removeUselessComma],
     ['remove-invalid-character', removeInvalidCharacter],
     ['wrap-assignment-in-parens', wrapAssignmentInParens],

package/lib/runner/path.js

@@ -8,9 +8,6 @@ import {
     isTemplateMiddle,
 } from '#types';
 
-const {isArray} = Array;
-const maybeArray = (a) => isArray(a) ? a : [a];
-
 export const createPath = ({tokens, start, end}) => ({
     tokens,
     start,
@@ -47,33 +44,12 @@ 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;
     
@@ -145,24 +121,6 @@ const createIsNextPunctuator = ({tokens, end}) => (punctuators) => {
     return isPunctuator(current, punctuators);
 };
 
-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) => {
     const SPACE = 1;
     const FUNCTION = 1;

package/lib/types/types.js

@@ -28,9 +28,10 @@ export const isKeyword = (token) => {
     const keywords = [
         'as',
         'await',
+        'const',
+        'continue',
         'var',
         'let',
-        'const',
         'export',
         'from',
         'import',

package/package.json

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