flatlint 1.16.0 → 1.18.0

package/ChangeLog

@@ -1,3 +1,13 @@
+2025.01.02, v1.18.0
+
+feature:
+- 99d6dbf flatlint: remove-useless-arrow: add
+
+2025.01.02, v1.17.0
+
+feature:
+- a4056ef flatlint: remove-useless-semicolon: add
+
 2025.01.02, v1.16.0
 
 feature:

package/README.md

@@ -87,6 +87,17 @@ npm i flatlint
 
  </details>
 
+<details><summary>remove useless semicolon</summary>
+
+```diff
+const a = {
+-    b: 'hello';
++    b: 'hello',
+}
+```
+
+ </details>
+
 <details><summary>add missing quote</summary>
 
 ```diff
@@ -99,6 +110,17 @@ npm i flatlint
 
  </details>
 
+<details><summary>Remove useless arrow</summary>
+
+```diff
+-function parse(source) => {
++function parse(source) {
+    return source;
+}
+```
+
+ </details>
+
 ## Template literals
 
 **FlatLint** uses language similar to 🐊[**PutoutScript**](https://github.com/coderaiser/putout/blob/master/docs/putout-script.md#-putoutscript).

package/lib/compare/collect-array.js

@@ -1,4 +1,7 @@
-import {Punctuator} from '#types';
+import {
+    CloseRoundBrace,
+    Punctuator,
+} from '#types';
 import {equal} from './equal.js';
 
 export const collectArray = ({currentTokenIndex, tokens, nextTemplateToken = Punctuator(';')}) => {
@@ -9,6 +12,9 @@ export const collectArray = ({currentTokenIndex, tokens, nextTemplateToken = Pun
     for (; index < n; index++) {
         const token = tokens[index];
         
+        if (equal(token, CloseRoundBrace))
+            break;
+        
         if (equal(token, nextTemplateToken))
             break;
         

package/lib/compare/compare.js

@@ -27,6 +27,12 @@ export const compare = (source, template) => {
     for (let index = 0; index < n; index++) {
         for (let templateIndex = 0; templateIndex < templateTokensLength; templateIndex++) {
             const currentTokenIndex = index + templateIndex;
+            
+            if (currentTokenIndex > n) {
+                isEqual = false;
+                break;
+            }
+            
             const templateToken = templateTokens[templateIndex];
             const currentToken = tokens[currentTokenIndex];
             

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

@@ -0,0 +1,5 @@
+export const report = () => 'Remove useless arrow';
+
+export const replace = () => ({
+    'function __a(__array) => {': 'function __a(__array) {',
+});

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

@@ -0,0 +1,18 @@
+import {isIdentifier} from '#types';
+
+export const report = () => 'Remove useless semicolon';
+
+export const match = () => ({
+    '__a: __expr;': (vars, path) => {
+        for (const token of path.getPrev()) {
+            if (isIdentifier(token) && token.value === 'interface')
+                return false;
+        }
+        
+        return true;
+    },
+});
+
+export const replace = () => ({
+    '__a: __expr;': '__a: __expr,',
+});

package/lib/runner/path.js

@@ -0,0 +1,13 @@
+export const createPath = ({tokens, start, end}) => {
+    return {
+        getPrev: createGetPrev({tokens, start}),
+    };
+};
+
+function createGetPrev({tokens, start}) {
+    return function*() {
+        for (let i = start; i >= 0; --i) {
+            yield tokens[i];
+        }
+    };
+}

package/lib/runner/replacer.js

@@ -8,9 +8,35 @@ import {
 } from '#types';
 import {collectArray} from '../compare/collect-array.js';
 import {collectExpression} from '../compare/collect-expression.js';
+import {createPath} from './path.js';
 
+const returns = (a) => () => a;
 const {entries} = Object;
 
+export const match = (tokens, {plugin}) => {
+    const match = plugin.match ?? returns([]);
+    
+    for (const [from, fn] of entries(match())) {
+        const [ok, start, end] = compare(tokens, from);
+        
+        if (!ok)
+            continue;
+        
+        const current = tokens.slice(start, end);
+        
+        const waysFrom = findVarsWays(prepare(from));
+        const values = getValues(current, waysFrom);
+        
+        return fn(values, createPath({
+            tokens,
+            start,
+            end,
+        }));
+    }
+    
+    return true;
+};
+
 export const replace = (tokens, {fix, rule, plugin}) => {
     const places = [];
     
@@ -109,3 +135,4 @@ function setValues({to, waysTo, values}) {
         to.splice(index, 1, ...values[name]);
     }
 }
+

package/lib/runner/runner.js

@@ -1,15 +1,16 @@
-import {replace} from './replacer.js';
+import {match, replace} from './replacer.js';
 
 export const run = (tokens, {fix, fixCount = 10, plugins}) => {
     const places = [];
     
     while (--fixCount >= 0) {
         for (const {rule, plugin} of plugins) {
-            places.push(...replace(tokens, {
-                fix,
-                rule,
-                plugin,
-            }));
+            if (match(tokens, {plugin}))
+                places.push(...replace(tokens, {
+                    fix,
+                    rule,
+                    plugin,
+                }));
             
             if (!fix) {
                 fixCount = 0;

package/lib/types/types.js

@@ -53,3 +53,6 @@ export const isTemplateArray = (a) => a === ARRAY;
 export const isTemplateExpression = (a) => a === EXPR;
 export const isTemplateArrayToken = (a) => isIdentifier(a) && isTemplateArray(a.value);
 export const isTemplateExpressionToken = (a) => isIdentifier(a) && isTemplateExpression(a.value);
+
+export const OpenRoundBrace = Punctuator('(');
+export const CloseRoundBrace = Punctuator(')');

package/package.json

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