flatlint 1.21.1 → 1.22.0

package/ChangeLog

@@ -1,3 +1,13 @@
+2025.01.04, v1.22.0
+
+feature:
+- 807d059 flatlint: add-missing-semicolon: add
+
+2025.01.03, v1.21.2
+
+feature:
+- 8e24b66 flatlint: convert-comma-to-semicolon: rm match
+
 2025.01.03, v1.21.1
 
 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

@@ -18,12 +18,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,13 @@ export const compare = (source, template) => {
                     nextTemplateToken: templateTokens[templateIndex + 1],
                 });
                 
+                debugger;
+                
+                if (n === indexOfExpressionEnd) {
+                    end = indexOfExpressionEnd;
+                    continue;
+                }
+                
                 delta = indexOfExpressionEnd - currentTokenIndex;
                 index = indexOfExpressionEnd - templateIndex;
             } else if (isTemplateArrayToken(templateToken)) {
@@ -110,3 +111,4 @@ function compareAll(a, b) {
     
     return false;
 }
+

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,19 @@
+import {isNewLine, 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, ';');
+    },
+});
+
+export const replace = () => ({
+    'const __a = __expr': 'const __a = __expr;',
+});

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

@@ -1,16 +1,4 @@
-import {isIdentifier} from '#types';
-
 export const report = () => 'Use semicolon instead of trailing comma';
-export const match = () => ({
-    '__a: __expr;': (vars, path) => {
-        for (const token of path.getPrev()) {
-            if (isIdentifier(token, 'interface'))
-                return false;
-        }
-        
-        return true;
-    },
-});
 export const replace = () => ({
     'const __a = __b,': 'const __a = __b;',
 });

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

@@ -26,6 +26,7 @@ export const match = (tokens, {plugin}) => {
         const waysFrom = findVarsWays(prepare(from));
         const values = getValues(current, waysFrom);
         
+        debugger;
         result = fn(values, createPath({
             tokens,
             start,

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.1",
+  "version": "1.22.0",
   "description": "JavaScript tokens-based linter",
   "main": "lib/flatlint.js",
   "type": "module",