flatlint 1.28.0 → 1.30.0

package/ChangeLog

@@ -1,3 +1,14 @@
+2025.01.09, v1.30.0
+
+feature:
+- 2379871 flatlint: remoe-useless-comma: improve
+
+2025.01.09, v1.29.0
+
+feature:
+- 8d308ac flatlint: remove-useless-comma: curly
+- f070e0c flatlint: convert-coma-to-semicolon: return
+
 2025.01.08, v1.28.0
 
 feature:

package/README.md

@@ -24,6 +24,11 @@ npm i flatlint
 ```diff
 -const a = 5,
 +const a = 5;
+
+function x() {
+-   return m,
++   return m;
+}
 ```
 
 </details>
@@ -106,6 +111,17 @@ const a = {
 
  </details>
 
+<details><summary>remove useless comma</summary>
+
+```diff
+function x() {
+    return m;
+-},
++}
+```
+
+ </details>
+
 <details><summary>add missing quote</summary>
 
 ```diff

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/convert-comma-to-semicolon/index.js

@@ -15,4 +15,5 @@ export const match = () => ({
 export const replace = () => ({
     'const __a = __b,': 'const __a = __b;',
     '__a(__args),': '__a(__args);',
+    'return __expr,': 'return __expr;',
 });

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

@@ -1,4 +1,11 @@
-import {isIdentifier} from '#types';
+import {
+    closeCurlyBrace,
+    closeRoundBrace,
+    isIdentifier,
+    isPunctuator,
+    openCurlyBrace,
+    openSquireBrace,
+} from '#types';
 
 export const report = () => 'Remove useless coma';
 
@@ -11,9 +18,25 @@ export const match = () => ({
         
         return false;
     },
+    '},': (vars, path) => {
+        for (const token of path.getAllPrev()) {
+            if (isPunctuator(token, openSquireBrace))
+                return false;
+        }
+        
+        if (path.isNextPunctuator(closeRoundBrace))
+            return true;
+        
+        if (path.isNextPunctuator(closeCurlyBrace))
+            return false;
+        
+        return path.isNextIdentifier('const');
+    },
 });
 
 export const replace = () => ({
     '__a(__args) {},': '__a(__args) {}',
     '__a(),': '__a()',
+    '},': '}',
+    '}),': '})',
 });

package/lib/runner/path.js

@@ -2,12 +2,17 @@ import {
     isIdentifier,
     isNewLine,
     isPunctuator,
+    isWhiteSpace,
 } from '#types';
 
 export const createPath = ({tokens, start, end}) => ({
     tokens,
     start,
     end,
+    isNextIdentifier: createIsNextIdentifier({
+        tokens,
+        end,
+    }),
     getAllPrev: createGetAllPrev({
         tokens,
         start,
@@ -30,8 +35,42 @@ 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 = next({
+        tokens,
+        end,
+    });
+    
+    if (!current)
+        return false;
+    
+    return isIdentifier(current, value);
+};
+
 const createIsNextPunctuator = ({tokens, end}) => (punctuator) => {
-    const current = tokens[end];
+    const current = next({
+        tokens,
+        end,
+    });
     
     if (!current)
         return false;

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;
     
@@ -83,6 +89,11 @@ export const closeSquareBrace = 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;
 export const NOT_OK = false;

package/package.json

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