flatlint 1.23.0 → 1.24.1

package/ChangeLog

@@ -1,3 +1,13 @@
+2025.01.05, v1.24.1
+
+feature:
+- 4c6c3c9 flatlint: with-plugins: add-missing-semicolon
+
+2025.01.05, v1.24.0
+
+feature:
+- b6252d0 flatlint: path: getPrev -> getAllPrev
+
 2025.01.05, v1.23.0
 
 feature:

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,4 +1,8 @@
-import {isPunctuator} from '#types';
+import {
+    comma,
+    isPunctuator,
+    semicolon,
+} from '#types';
 
 export const report = () => 'Add missing semicolon';
 
@@ -13,11 +17,13 @@ export const replace = () => ({
 });
 
 function check(vars, path) {
-    let last;
+    if (path.isEndsWithPunctuator(comma))
+        return false;
     
-    for (const token of path.getNext()) {
-        last = token;
+    for (const token of path.getAllNext()) {
+        if (isPunctuator(token, semicolon))
+            return false;
     }
     
-    return !isPunctuator(last, ';');
+    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/plugins.js

@@ -6,12 +6,14 @@ import * as convertCommaToSemicolon from './plugins/convert-comma-to-semicolon/i
 import * as convertFromToRequire from './plugins/convert-from-to-require/index.js';
 import * as removeUselessRoundBrace from './plugins/remove-useless-round-brace/index.js';
 import * as addConstToExport from './plugins/add-const-to-export/index.js';
+import * as addMissingSemicolon from './plugins/add-missing-semicolon/index.js';
 
 export const plugins = [
     ['wrap-assignment-in-parens', wrapAssignmentInParens],
     ['add-missing-round-braces', addMissingRoundBraces],
     ['add-missing-squire-brace', addMissingSquireBrace],
     ['add-missing-quote', addMissingQuote],
+    ['add-missing-semicolon', addMissingSemicolon],
     ['add-const-to-export', addConstToExport],
     ['convert-comma-to-semicolon', convertCommaToSemicolon],
     ['convert-from-to-require', convertFromToRequire],

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

@@ -136,6 +136,6 @@ function getCurrentValues({from, start, end, tokens}) {
     const current = tokens.slice(start, end);
     
     const waysFrom = findVarsWays(prepare(from));
+    
     return getValues(current, waysFrom);
 }
-

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) => ({
@@ -76,6 +81,7 @@ export const openRoundBrace = Punctuator('(');
 export const closeRoundBrace = Punctuator(')');
 export const closeSquareBrace = Punctuator(']');
 export const semicolon = Punctuator(';');
+export const comma = Punctuator(',');
 
 export const OK = true;
 export const NOT_OK = false;

package/package.json

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