flatlint 1.89.0 → 1.90.1

package/ChangeLog

@@ -1,3 +1,13 @@
+2025.01.31, v1.90.1
+
+feature:
+- a1794be flatlint: compare: simplify
+
+2025.01.31, v1.90.0
+
+feature:
+- 441f386 flatlint: add-missing-round-brace: destructuring
+
 2025.01.30, v1.89.0
 
 feature:

package/README.md

@@ -77,6 +77,9 @@ const m = {
 -    z: z('hello'
 +    z: z('hello')
 }
+
+-{hello} = world;
++({hello} = world);
 ```
 
 </details>

package/lib/compare/collect-expression.js

@@ -51,5 +51,8 @@ export const collectExpression = ({currentTokenIndex, tokens, nextTemplateToken
     if (isNewLine(tokens[index - 1]))
         --index;
     
+    if (currentTokenIndex === index)
+        return currentTokenIndex;
+    
     return --index;
 };

package/lib/compare/compare.js

@@ -23,17 +23,21 @@ export const compare = (source, template, {index = 0} = {}) => {
     
     const n = tokens.length - 1;
     const templateTokensLength = templateTokens.length;
+    
     let isEqual = false;
     let start = 0;
     let end = 0;
     let delta = 0;
     
     for (; index < n; index++) {
+        const indexCheck = index;
         let skip = 0;
         
-        for (let templateIndex = 0; templateIndex < templateTokensLength; templateIndex++) {
+        for (const [templateIndex] of templateTokens.entries()) {
             let currentTokenIndex = index + templateIndex - skip;
             
+            checkIndexes(index, indexCheck);
+            
             if (currentTokenIndex > n)
                 return [NOT_OK];
             
@@ -64,11 +68,12 @@ export const compare = (source, template, {index = 0} = {}) => {
                     nextTemplateToken: templateTokens[templateIndex + 1],
                 });
                 
-                if (indexOfExpressionEnd >= n - 1) {
+                const sameTokensIndex = templateIndex === templateTokensLength - 1;
+                const outOfBound = indexOfExpressionEnd >= n;
+                
+                if (outOfBound || sameTokensIndex) {
                     end = indexOfExpressionEnd;
                     currentTokenIndex = end;
-                } else if (templateIndex === templateTokensLength - 1) {
-                    currentTokenIndex = end;
                 } else {
                     delta = indexOfExpressionEnd - currentTokenIndex;
                     index = indexOfExpressionEnd - templateIndex;
@@ -124,3 +129,13 @@ function compareAll(a, b) {
     
     return false;
 }
+
+function checkIndexes(index, indexCheck) {
+    /* c8 ignore start */
+    if (indexCheck > index + 1)
+        throw Error(`index should never decrease more then on one: ${index} > ${indexCheck}`);
+    
+    if (index < 0)
+        throw Error(`index should never be < zero: ${index}`);
+    /* c8 ignore end */
+}

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

@@ -1,5 +1,6 @@
 import {
     assign,
+    isKeyword,
     isOneOfKeywords,
     isOneOfPunctuators,
     semicolon,
@@ -9,10 +10,9 @@ export const report = () => 'Add missing assign';
 
 export const match = () => ({
     '__x __a __expr': ({__expr, __x}, path) => {
-        if (path.isNextKeyword())
-            return false;
+        const [first] = __expr;
         
-        if (path.isNextPunctuator(assign))
+        if (isKeyword(first))
             return false;
         
         if (!isOneOfKeywords(__x, ['const', 'let', 'var']))

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

@@ -20,4 +20,5 @@ export const replace = () => ({
     'if (__a.__b(__args) {': 'if (__a.__b(__args)) {',
     'if (__a(__args) {': 'if (__a(__args)) {',
     'if (__a(__args)': 'if (__a(__args))',
+    '{__a} = __expr;': '({__a} = __expr);',
 });

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

@@ -8,6 +8,7 @@ import {
     closeCurlyBrace,
     isOnlyWhitespaces,
     isKeyword,
+    openRoundBrace,
 } from '#types';
 
 export const report = () => 'Add missing semicolon';
@@ -25,6 +26,8 @@ export const match = () => ({
             semicolon,
             openCurlyBrace,
             question,
+            closeRoundBrace,
+            openRoundBrace,
         ];
         
         return !path.isNextPunctuator(punctuators);

package/lib/plugins/remove-useless-round-brace/index.js

@@ -1,6 +1,5 @@
 import {
     assign,
-    closeRoundBrace,
     hasRoundBraces,
     isBalancedRoundBraces,
     isPunctuator,
@@ -17,16 +16,22 @@ export const match = () => ({
         return !isBalancedRoundBraces(__expr);
     },
     
-    '__a);': ({__a}, path) => {
+    '__a);': (vars, path) => {
+        let result = false;
+        
         for (const current of path.getAllPrev()) {
-            if (isPunctuator(current, openRoundBrace))
-                return false;
+            if (isPunctuator(current, openRoundBrace)) {
+                result = false;
+                break;
+            }
             
-            if (isPunctuator(current, assign))
-                return true;
+            if (isPunctuator(current, assign)) {
+                result = true;
+                break;
+            }
         }
         
-        return false;
+        return result;
     },
 });
 

package/lib/runner/replacer.js

@@ -22,6 +22,7 @@ export const replace = (tokens, {fix, rule, plugin}) => {
         let index = 0;
         
         while (index < tokens.length - 1) {
+            log(`compare: ${rule}: ${from} -> ${to}`);
             const [ok, start, end] = compare(tokens, from, {
                 index,
             });
@@ -52,7 +53,7 @@ export const replace = (tokens, {fix, rule, plugin}) => {
             }
             
             if (fix) {
-                log(`${rule}: ${from} -> ${to}`);
+                log(`fix: ${rule}: ${from} -> ${to}`);
                 
                 const preparedTo = prepare(to);
                 const waysTo = findVarsWays(preparedTo);

package/lib/types/types.js

@@ -29,12 +29,8 @@ export const isIdentifier = (token, newToken) => {
 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 isKeyword = (token, name) => {
-    if (!token)
-        return false;
-    
     const {value} = token;
     
     if (!keyword.isKeyword(value))

package/package.json

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