flatlint 1.22.0 → 1.24.0

package/ChangeLog

@@ -1,3 +1,13 @@
+2025.01.05, v1.24.0
+
+feature:
+- b6252d0 flatlint: path: getPrev -> getAllPrev
+
+2025.01.05, v1.23.0
+
+feature:
+- a38f979 flatlint: replacer: improve match
+
 2025.01.04, v1.22.0
 
 feature:

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;
     

package/lib/compare/compare.js

@@ -55,8 +55,6 @@ export const compare = (source, template) => {
                     nextTemplateToken: templateTokens[templateIndex + 1],
                 });
                 
-                debugger;
-                
                 if (n === indexOfExpressionEnd) {
                     end = indexOfExpressionEnd;
                     continue;
@@ -111,4 +109,3 @@ function compareAll(a, b) {
     
     return false;
 }
-

package/lib/flatlint.js

@@ -2,6 +2,9 @@ import {loadPlugins} from '@putout/engine-loader';
 import {parse} from '#parser';
 import {run} from '#runner';
 
+const getValue = (token) => token.value;
+const print = (tokens) => tokens.map(getValue).join('');
+
 export function lint(source, overrides = {}) {
     const {fix = true, plugins: pluginNames = []} = overrides;
     const plugins = loadPlugins({
@@ -23,9 +26,3 @@ export function lint(source, overrides = {}) {
         places,
     ];
 }
-
-function print(tokens) {
-    return tokens
-        .map((token) => token.value)
-        .join('');
-}

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

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

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

@@ -4,7 +4,7 @@ export const report = () => 'Remove useless coma';
 
 export const match = () => ({
     '__a(__args) {},': (vars, path) => {
-        for (const token of path.getPrev()) {
+        for (const token of path.getAllPrev()) {
             if (isIdentifier(token, 'class'))
                 return true;
         }

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

@@ -4,7 +4,7 @@ export const report = () => 'Remove useless semicolon';
 
 export const match = () => ({
     '__a: __expr;': (vars, path) => {
-        for (const token of path.getPrev()) {
+        for (const token of path.getAllPrev()) {
             if (isIdentifier(token, 'interface'))
                 return false;
         }

package/lib/runner/path.js

@@ -1,33 +1,59 @@
-import {isNewLine} from '#types';
+import {isNewLine, isPunctuator} from '#types';
 
-export const createPath = ({tokens, start}) => ({
-    getPrev: createGetPrev({
+export const createPath = ({tokens, start, end}) => ({
+    getAllPrev: createGetAllPrev({
         tokens,
         start,
     }),
-    getNext: createGetNext({
+    getAllNext: createGetAllNext({
         tokens,
-        start,
+        end,
+    }),
+    isNextPunctuator: createIsNextPunctuator({
+        tokens,
+        end,
+    }),
+    isEndsWithPunctuator: createIsEndsWithPunctuator({
+        tokens,
+        end,
+    }),
+    isNext: createIsNext({
+        tokens,
+        end,
     }),
 });
 
-function createGetPrev({tokens, start}) {
-    return function*() {
-        for (let i = start; i >= 0; --i) {
-            yield tokens[i];
-        }
-    };
-}
+const createIsNextPunctuator = ({tokens, end}) => (punctuator) => {
+    const current = tokens[end];
+    
+    if (!current)
+        return false;
+    
+    return isPunctuator(current, punctuator);
+};
+
+const createIsEndsWithPunctuator = ({tokens, end}) => (punctuator) => {
+    const current = tokens[end - 1];
+    return isPunctuator(current, punctuator);
+};
+
+const createIsNext = ({tokens, end}) => () => {
+    return Boolean(tokens[end]);
+};
+
+const createGetAllPrev = ({tokens, start}) => function*() {
+    for (let i = start; i >= 0; --i) {
+        yield tokens[i];
+    }
+};
 
-function createGetNext({tokens, start}) {
-    return function*() {
-        for (let i = start; i < tokens.length; ++i) {
-            const current = tokens[i];
-            
-            if (isNewLine(current))
-                continue;
-            
-            yield current;
-        }
-    };
-}
+const createGetAllNext = ({tokens, end}) => function*() {
+    for (let i = end; i < tokens.length; ++i) {
+        const current = tokens[i];
+        
+        if (isNewLine(current))
+            continue;
+        
+        yield current;
+    }
+};

package/lib/runner/replacer.js

@@ -15,45 +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);
-        
-        debugger;
-        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;
         }
@@ -72,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 = {};
     
@@ -148,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,11 +15,16 @@ 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 = (token, value) => {
+export const isPunctuator = (token, punctuator) => {
     if (token.type !== 'Punctuator')
         return false;
     
-    return !value || token.value === value;
+    if (!punctuator)
+        return true;
+    
+    const punctuatorValue = punctuator.value || punctuator;
+    
+    return token.value === punctuatorValue;
 };
 
 export const StringLiteral = (value) => ({

package/package.json

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