flatlint 1.29.0 → 1.30.0

package/ChangeLog

@@ -1,3 +1,8 @@
+2025.01.09, v1.30.0
+
+feature:
+- 2379871 flatlint: remoe-useless-comma: improve
+
 2025.01.09, v1.29.0
 
 feature:

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

@@ -1,7 +1,9 @@
+import {quote} from '#types';
+
 export const report = () => 'Add missing quote';
 
 export const match = () => ({
-    '__a("__b': (vars, path) => !path.isNextPunctuator(vars.quote),
+    '__a("__b': (vars, path) => !path.isNextPunctuator(quote),
 });
 
 export const replace = () => ({

package/lib/plugins/remove-useless-comma/index.js

@@ -1,4 +1,6 @@
 import {
+    closeCurlyBrace,
+    closeRoundBrace,
     isIdentifier,
     isPunctuator,
     openCurlyBrace,
@@ -22,10 +24,13 @@ export const match = () => ({
                 return false;
         }
         
-        if (path.isNextIdentifier('const'))
+        if (path.isNextPunctuator(closeRoundBrace))
             return true;
         
-        return !path.isNextPunctuator(openCurlyBrace);
+        if (path.isNextPunctuator(closeCurlyBrace))
+            return false;
+        
+        return path.isNextIdentifier('const');
     },
 });
 
@@ -33,4 +38,5 @@ export const replace = () => ({
     '__a(__args) {},': '__a(__args) {}',
     '__a(),': '__a()',
     '},': '}',
+    '}),': '})',
 });

package/lib/runner/path.js

@@ -35,8 +35,30 @@ export const createPath = ({tokens, start, end}) => ({
     }),
 });
 
+const next = ({tokens, end}) => {
+    let i = end - 1;
+    
+    while (++i) {
+        const token = tokens[i];
+        
+        if (!token)
+            return token;
+        
+        if (isNewLine(token))
+            continue;
+        
+        if (isWhiteSpace(token))
+            continue;
+        
+        return token;
+    }
+};
+
 const createIsNextIdentifier = ({tokens, end}) => (value) => {
-    const current = tokens[end];
+    const current = next({
+        tokens,
+        end,
+    });
     
     if (!current)
         return false;
@@ -45,14 +67,14 @@ const createIsNextIdentifier = ({tokens, end}) => (value) => {
 };
 
 const createIsNextPunctuator = ({tokens, end}) => (punctuator) => {
-    let current = tokens[end];
+    const current = next({
+        tokens,
+        end,
+    });
     
     if (!current)
         return false;
     
-    if (isWhiteSpace(current))
-        current = tokens[end + 1];
-    
     return isPunctuator(current, punctuator);
 };
 

package/lib/types/types.js

@@ -2,6 +2,9 @@ const isString = (a) => typeof a === 'string';
 
 export const isWhiteSpace = ({type}) => type === 'WhiteSpace';
 export const isIdentifier = (token, value = token.value) => {
+    if (!token)
+        return false;
+    
     const {type} = token;
     const is = type === 'IdentifierName';
     
@@ -16,6 +19,9 @@ export const isNumericLiteral = ({type}) => type === 'NumericLiteral';
 export const isNewLine = ({type}) => type === 'LineTerminatorSequence';
 export const notWhiteSpace = (a) => !isWhiteSpace(a);
 export const isPunctuator = (token, punctuator) => {
+    if (!token)
+        return false;
+    
     if (token.type !== 'Punctuator')
         return false;
     
@@ -87,6 +93,7 @@ export const openCurlyBrace = Punctuator('{');
 export const closeCurlyBrace = Punctuator('}');
 export const openSquireBrace = Punctuator('[');
 export const closeSquireBrace = Punctuator(']');
+export const quote = Punctuator(`'`);
 
 export const OK = true;
 export const NOT_OK = false;

package/package.json

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