flatlint 1.24.1 → 1.26.0

package/ChangeLog

@@ -1,3 +1,14 @@
+2025.01.07, v1.26.0
+
+feature:
+- 0ba6115 flatlint: add-missing-quote: round brace before quote
+- 0aca502 flatlint: add-missing-round-brace: improve
+
+2025.01.06, v1.25.0
+
+feature:
+- 9016c56 flatlint: add-missing-round-brace: improve
+
 2025.01.05, v1.24.1
 
 feature:

package/README.md

@@ -37,13 +37,21 @@ npm i flatlint
 
 </details>
 
-<details><summary>add missing round braces in if statement</summary>
+<details><summary>add missing round brace</summary>
 
 ```diff
 -if a > 5 {
 +if (a > 5) {
     alert();
 }
+
+-a('hello'
++a('hello');
+
+const m = {
+-    z: z('hello'
++    z: z('hello')
+}
 ```
 
  </details>

package/lib/compare/collect-args.js

@@ -1,5 +1,6 @@
 import {
     closeRoundBrace,
+    isNewLine,
     NOT_OK,
     OK,
 } from '#types';
@@ -17,6 +18,9 @@ export const collectArgs = ({currentTokenIndex, tokens}) => {
         
         if (equal(token, closeRoundBrace))
             break;
+        
+        if (isNewLine(token))
+            break;
     }
     
     return [

package/lib/compare/compare.js

@@ -29,7 +29,8 @@ export const compare = (source, template) => {
     
     for (let index = 0; index < n; index++) {
         for (let templateIndex = 0; templateIndex < templateTokensLength; templateIndex++) {
-            const currentTokenIndex = index + templateIndex - skip;
+            let currentTokenIndex = index + templateIndex - skip;
+            
             const templateToken = templateTokens[templateIndex];
             const currentToken = tokens[currentTokenIndex];
             
@@ -43,6 +44,8 @@ export const compare = (source, template) => {
                 
                 if (!ok) {
                     ++skip;
+                } else if (templateIndex === templateTokensLength - 1) {
+                    currentTokenIndex = end;
                 } else {
                     delta = end - currentTokenIndex;
                     index = end - templateIndex;

package/lib/flatlint.js

@@ -3,7 +3,9 @@ import {parse} from '#parser';
 import {run} from '#runner';
 
 const getValue = (token) => token.value;
-const print = (tokens) => tokens.map(getValue).join('');
+const print = (tokens) => tokens
+    .map(getValue)
+    .join('');
 
 export function lint(source, overrides = {}) {
     const {fix = true, plugins: pluginNames = []} = overrides;

package/lib/parser/string-literal.js

@@ -1,4 +1,10 @@
-import {Punctuator, StringLiteral} from '#types';
+import {
+    closeRoundBrace,
+    comma,
+    Punctuator,
+    semicolon,
+    StringLiteral,
+} from '#types';
 
 export function parseStringLiteral({i, token, tokens}) {
     const {closed} = token;
@@ -17,15 +23,19 @@ export function parseStringLiteral({i, token, tokens}) {
         let count = 0;
         
         if (value.endsWith(';')) {
-            const semicolon = Punctuator(';');
-            
             value = value.slice(0, -1);
             newTokens.push(semicolon);
             ++count;
         }
         
+        if (value.endsWith(',')) {
+            value = value.slice(0, -1);
+            newTokens.push(comma);
+            ++count;
+        }
+        
         if (value.endsWith(')')) {
-            const brace = Punctuator(')');
+            const brace = closeRoundBrace;
             
             value = value.slice(0, -1);
             const {length} = newTokens;

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

@@ -1,6 +1,11 @@
 export const report = () => 'Add missing quote';
 
+export const match = () => ({
+    '__a("__b': (vars, path) => !path.isNextPunctuator(vars.quote),
+});
+
 export const replace = () => ({
     'const __a = "__b;': 'const __a = "__b";',
     '__a("__b)': '__a("__b")',
+    '__a("__b': '__a("__b")',
 });

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

@@ -1,5 +1,12 @@
+import {closeRoundBrace} from '#types';
+
 export const report = () => 'Add missing round braces';
 
+export const match = () => ({
+    '__a(__args': (vars, path) => !path.isNextPunctuator(closeRoundBrace),
+});
+
 export const replace = () => ({
     'if __a > __b': 'if (__a > __b)',
+    '__a(__args': '__a(__args)',
 });

package/lib/runner/path.js

@@ -13,16 +13,22 @@ export const createPath = ({tokens, start, end}) => ({
         tokens,
         end,
     }),
-    isEndsWithPunctuator: createIsEndsWithPunctuator({
+    isEndsWithPunctuator: createIsCurrentPunctuator({
         tokens,
         end,
     }),
-    isNext: createIsNext({
+    isCurrentPunctuator: createIsCurrentPunctuator({
         tokens,
         end,
     }),
 });
 
+const createIsCurrentPunctuator = ({tokens, end}) => (punctuator) => {
+    const current = tokens[end - 1];
+    
+    return isPunctuator(current, punctuator);
+};
+
 const createIsNextPunctuator = ({tokens, end}) => (punctuator) => {
     const current = tokens[end];
     
@@ -32,15 +38,6 @@ const createIsNextPunctuator = ({tokens, end}) => (punctuator) => {
     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];

package/lib/runner/replacer.js

@@ -1,3 +1,4 @@
+import debug from 'debug';
 import {compare} from '#compare';
 import {prepare} from '#parser';
 import {traverse} from '#traverser';
@@ -14,6 +15,7 @@ import {collectArgs} from '../compare/collect-args.js';
 
 const returns = (a) => () => a;
 const {entries} = Object;
+const log = debug('flatlint');
 
 export const replace = (tokens, {fix, rule, plugin}) => {
     const places = [];
@@ -47,6 +49,7 @@ export const replace = (tokens, {fix, rule, plugin}) => {
         }
         
         if (fix) {
+            log(`${rule}: ${from} -> ${to}`);
             to = prepare(to);
             const waysTo = findVarsWays(to);
             

package/lib/traverser/traverser.js

@@ -1,7 +1,7 @@
 import {
     isIdentifier,
     isStringLiteral,
-} from '../types/types.js';
+} from '#types';
 
 const maybeCall = (fn, a) => fn?.(a);
 

package/lib/types/types.js

@@ -22,7 +22,7 @@ export const isPunctuator = (token, punctuator) => {
     if (!punctuator)
         return true;
     
-    const punctuatorValue = punctuator.value || punctuator;
+    const punctuatorValue = punctuator.value;
     
     return token.value === punctuatorValue;
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "flatlint",
-  "version": "1.24.1",
+  "version": "1.26.0",
   "description": "JavaScript tokens-based linter",
   "main": "lib/flatlint.js",
   "type": "module",
@@ -76,6 +76,7 @@
   },
   "dependencies": {
     "@putout/engine-loader": "^15.0.1",
+    "debug": "^4.4.0",
     "js-tokens": "^9.0.1",
     "putout": "^37.0.0"
   },