flatlint 1.21.2 → 1.23.0

package/ChangeLog

@@ -1,3 +1,13 @@
+2025.01.05, v1.23.0
+
+feature:
+- a38f979 flatlint: replacer: improve match
+
+2025.01.04, v1.22.0
+
+feature:
+- 807d059 flatlint: add-missing-semicolon: add
+
 2025.01.03, v1.21.2
 
 feature:

package/README.md

@@ -132,6 +132,15 @@ const a = class {
 
  </details>
 
+<details><summary>add missing semicolon</summary>
+
+```diff
+-const a = 5
++const a = 5;
+```
+
+ </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-args.js

@@ -1,12 +1,11 @@
 import {
     closeRoundBrace,
-    closeSquareBrace,
     NOT_OK,
     OK,
 } from '#types';
 import {equal} from './equal.js';
 
-export const collectArgs = ({currentTokenIndex, tokens, nextTemplateToken = closeRoundBrace}) => {
+export const collectArgs = ({currentTokenIndex, tokens}) => {
     const n = tokens.length;
     let index = currentTokenIndex;
     
@@ -18,12 +17,6 @@ export const collectArgs = ({currentTokenIndex, tokens, nextTemplateToken = clos
         
         if (equal(token, closeRoundBrace))
             break;
-        
-        if (equal(token, nextTemplateToken))
-            break;
-        
-        if (equal(token, closeSquareBrace))
-            break;
     }
     
     return [

package/lib/compare/compare.js

@@ -30,12 +30,6 @@ export const compare = (source, template) => {
     for (let index = 0; index < n; index++) {
         for (let templateIndex = 0; templateIndex < templateTokensLength; templateIndex++) {
             const currentTokenIndex = index + templateIndex - skip;
-            
-            if (currentTokenIndex > n) {
-                isEqual = false;
-                break;
-            }
-            
             const templateToken = templateTokens[templateIndex];
             const currentToken = tokens[currentTokenIndex];
             
@@ -61,6 +55,11 @@ export const compare = (source, template) => {
                     nextTemplateToken: templateTokens[templateIndex + 1],
                 });
                 
+                if (n === indexOfExpressionEnd) {
+                    end = indexOfExpressionEnd;
+                    continue;
+                }
+                
                 delta = indexOfExpressionEnd - currentTokenIndex;
                 index = indexOfExpressionEnd - templateIndex;
             } else if (isTemplateArrayToken(templateToken)) {

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

@@ -1,9 +1,5 @@
-export function report() {
-    return 'Add missing round braces';
-}
+export const report = () => 'Add missing round braces';
 
-export function replace() {
-    return {
-        'if __a > __b': 'if (__a > __b)',
-    };
-}
+export const replace = () => ({
+    'if __a > __b': 'if (__a > __b)',
+});

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

@@ -0,0 +1,23 @@
+import {isPunctuator} from '#types';
+
+export const report = () => 'Add missing semicolon';
+
+export const match = () => ({
+    'const __a = __expr': check,
+    '__a(__args)': check,
+});
+
+export const replace = () => ({
+    'const __a = __expr': 'const __a = __expr;',
+    '__a(__args)': '__a(__args);',
+});
+
+function check(vars, path) {
+    let last;
+    
+    for (const token of path.getNext()) {
+        last = token;
+    }
+    
+    return !isPunctuator(last, ';');
+}

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

@@ -1,9 +1,5 @@
-export function report() {
-    return 'Add missing square brace';
-}
+export const report = () => 'Add missing square brace';
 
-export function replace() {
-    return {
-        '[__array;': '[__array];',
-    };
-}
+export const replace = () => ({
+    '[__array;': '[__array];',
+});

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

@@ -5,7 +5,7 @@ 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')
+            if (isIdentifier(token, 'interface'))
                 return false;
         }
         

package/lib/plugins/wrap-assignment-in-parens/index.js

@@ -2,8 +2,6 @@ export function report() {
     return `Wrap the assignment in parentheses after '&&'`;
 }
 
-export function replace() {
-    return {
-        '__a && __b = __c': '__a && (__b = __c)',
-    };
-}
+export const replace = () => ({
+    '__a && __b = __c': '__a && (__b = __c)',
+});

package/lib/runner/path.js

@@ -1,8 +1,14 @@
+import {isNewLine} from '#types';
+
 export const createPath = ({tokens, start}) => ({
     getPrev: createGetPrev({
         tokens,
         start,
     }),
+    getNext: createGetNext({
+        tokens,
+        start,
+    }),
 });
 
 function createGetPrev({tokens, start}) {
@@ -12,3 +18,16 @@ function createGetPrev({tokens, start}) {
         }
     };
 }
+
+function createGetNext({tokens, start}) {
+    return function*() {
+        for (let i = start; i < tokens.length; ++i) {
+            const current = tokens[i];
+            
+            if (isNewLine(current))
+                continue;
+            
+            yield current;
+        }
+    };
+}

package/lib/runner/replacer.js

@@ -15,44 +15,48 @@ import {collectArgs} from '../compare/collect-args.js';
 const returns = (a) => () => a;
 const {entries} = Object;
 
-export const match = (tokens, {plugin}) => {
-    const match = plugin.match ?? returns([]);
-    let result = true;
-    
-    for (const [from, fn] of entries(match())) {
-        const [, start, end] = compare(tokens, from);
-        const current = tokens.slice(start, end);
-        
-        const waysFrom = findVarsWays(prepare(from));
-        const values = getValues(current, waysFrom);
-        
-        result = fn(values, createPath({
-            tokens,
-            start,
-            end,
-        }));
-    }
-    
-    return result;
-};
-
 export const replace = (tokens, {fix, rule, plugin}) => {
     const places = [];
     let isFixed = false;
+    const match = plugin.match?.() ?? returns({});
     
-    for (const [from, to] of entries(plugin.replace())) {
+    for (let [from, to] of entries(plugin.replace())) {
         const [ok, start, end] = compare(tokens, from);
         
         if (!ok)
             continue;
         
-        if (fix) {
-            runReplace(tokens, {
-                from,
-                to,
+        const values = getCurrentValues({
+            from,
+            start,
+            end,
+            tokens,
+        });
+        
+        const matchFn = match[from];
+        
+        if (matchFn) {
+            const is = matchFn(values, createPath({
+                tokens,
                 start,
                 end,
+            }));
+            
+            if (!is)
+                continue;
+        }
+        
+        if (fix) {
+            to = prepare(to);
+            const waysTo = findVarsWays(to);
+            
+            setValues({
+                values,
+                waysTo,
+                to,
             });
+            
+            tokens.splice(start, end - start, ...to);
             isFixed = true;
             continue;
         }
@@ -71,26 +75,6 @@ export const replace = (tokens, {fix, rule, plugin}) => {
     return [isFixed, places];
 };
 
-function runReplace(tokens, {from, to, start, end}) {
-    const current = tokens.slice(start, end);
-    
-    to = prepare(to);
-    from = prepare(from);
-    
-    const waysFrom = findVarsWays(from);
-    const values = getValues(current, waysFrom);
-    
-    const waysTo = findVarsWays(to);
-    
-    setValues({
-        values,
-        waysTo,
-        to,
-    });
-    
-    tokens.splice(start, end - start, ...to);
-}
-
 function findVarsWays(tokens) {
     const ways = {};
     
@@ -147,3 +131,11 @@ function setValues({to, waysTo, values}) {
         to.splice(index, 1, ...values[name]);
     }
 }
+
+function getCurrentValues({from, start, end, tokens}) {
+    const current = tokens.slice(start, end);
+    
+    const waysFrom = findVarsWays(prepare(from));
+    return getValues(current, waysFrom);
+}
+

package/lib/runner/runner.js

@@ -1,4 +1,4 @@
-import {match, replace} from './replacer.js';
+import {replace} from './replacer.js';
 
 export const run = (tokens, {fix, fixCount = fix ? 10 : 1, plugins}) => {
     const places = [];
@@ -7,16 +7,14 @@ export const run = (tokens, {fix, fixCount = fix ? 10 : 1, plugins}) => {
         const fixed = [];
         
         for (const {rule, plugin} of plugins) {
-            if (match(tokens, {plugin})) {
-                const [isFixed, newPlaces] = replace(tokens, {
-                    fix,
-                    rule,
-                    plugin,
-                });
-                
-                fixed.push(isFixed);
-                places.push(...newPlaces);
-            }
+            const [isFixed, newPlaces] = replace(tokens, {
+                fix,
+                rule,
+                plugin,
+            });
+            
+            fixed.push(isFixed);
+            places.push(...newPlaces);
         }
         
         if (!fixed.filter(Boolean).length)

package/lib/types/types.js

@@ -15,7 +15,12 @@ export const isStringLiteral = ({type}) => type === 'StringLiteral';
 export const isNumericLiteral = ({type}) => type === 'NumericLiteral';
 export const isNewLine = ({type}) => type === 'LineTerminatorSequence';
 export const notWhiteSpace = (a) => !isWhiteSpace(a);
-export const isPunctuator = ({type}) => type === 'Punctuator';
+export const isPunctuator = (token, value) => {
+    if (token.type !== 'Punctuator')
+        return false;
+    
+    return !value || token.value === value;
+};
 
 export const StringLiteral = (value) => ({
     type: 'StringLiteral',

package/package.json

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