flatlint 1.13.0 → 1.15.0

package/ChangeLog

@@ -1,3 +1,13 @@
+2025.01.02, v1.15.0
+
+feature:
+- e018137 flatlint: replacer: simplify
+
+2025.01.01, v1.14.0
+
+feature:
+- 2361298 flatlint: __expr
+
 2025.01.01, v1.13.0
 
 feature:

package/README.md

@@ -95,8 +95,9 @@ npm i flatlint
 **FlatLint** uses language similar to 🐊[**PutoutScript**](https://github.com/coderaiser/putout/blob/master/docs/putout-script.md#-putoutscript).
 
 It can look similar, but has a couple differences:
-- ✅it may not be valid **JavaScript**, it can be couple tokens that can be fixed;
-- ✅it counts each symbol as a token;
+
+- ✅ it may not be valid **JavaScript**, it can be couple tokens that can be fixed;
+- ✅ it counts each symbol as a token;
 
 ### `__a`
 
@@ -108,6 +109,10 @@ it can be only one quote `'__a` - this is valid, since **FlatLint** is tokens ba
 Collects everything that looks like array elements, it can start from squire brace `[__array;`, but that's not important
 to end with it, since it used to fix error patterns.
 
+### `__expr`
+
+Collects everything that looks like expression.
+
 ## API
 
 ```js

package/lib/compare/collect-array.js

@@ -1,7 +1,7 @@
 import {Punctuator} from '#types';
 import {equal} from './equal.js';
 
-export const collectArray = ({currentTokenIndex, tokens, nextTemplateToken}) => {
+export const collectArray = ({currentTokenIndex, tokens, nextTemplateToken = Punctuator(';')}) => {
     const n = tokens.length;
     const brace = Punctuator(']');
     let index = currentTokenIndex;
@@ -18,4 +18,3 @@ export const collectArray = ({currentTokenIndex, tokens, nextTemplateToken}) =>
     
     return --index;
 };
-

package/lib/compare/collect-expression.js

@@ -0,0 +1,28 @@
+import {Punctuator} from '#types';
+import {equal} from './equal.js';
+
+export const collectExpression = ({currentTokenIndex, tokens, nextTemplateToken = Punctuator(';')}) => {
+    const n = tokens.length;
+    const closeBrace = Punctuator(')');
+    const openBrace = Punctuator('(');
+    const semicolon = Punctuator(';');
+    let index = currentTokenIndex;
+    
+    for (; index < n; index++) {
+        const token = tokens[index];
+        
+        if (equal(token, semicolon))
+            break;
+        
+        if (equal(token, nextTemplateToken))
+            break;
+        
+        if (equal(token, openBrace))
+            break;
+        
+        if (equal(token, closeBrace))
+            break;
+    }
+    
+    return --index;
+};

package/lib/compare/compare.js

@@ -1,6 +1,10 @@
 import {prepare} from '#parser';
-import {isTemplateArrayToken} from '#types';
+import {
+    isTemplateArrayToken,
+    isTemplateExpressionToken,
+} from '#types';
 import {collectArray} from './collect-array.js';
+import {collectExpression} from './collect-expression.js';
 import {
     equal,
     equalAny,
@@ -26,7 +30,17 @@ export const compare = (source, template) => {
             const templateToken = templateTokens[templateIndex];
             const currentToken = tokens[currentTokenIndex];
             
-            if (isTemplateArrayToken(templateToken)) {
+            if (isTemplateExpressionToken(templateToken)) {
+                const indexOfExpressionEnd = collectExpression({
+                    currentTokenIndex,
+                    tokens,
+                    templateToken,
+                    nextTemplateToken: templateTokens[templateIndex + 1],
+                });
+                
+                delta = indexOfExpressionEnd - currentTokenIndex;
+                index = indexOfExpressionEnd - templateIndex;
+            } else if (isTemplateArrayToken(templateToken)) {
                 const indexOfArrayEnd = collectArray({
                     currentTokenIndex,
                     tokens,

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

@@ -1,7 +1,6 @@
 export const report = () => 'Remove useless round brace';
 
 export const replace = () => ({
-    'const __a = __b)': 'const __a = __b',
-    'const __a = "__b")': 'const __a = "__b"',
+    'const __a = __expr);': 'const __a = __expr;',
     'from "__b")': 'from "__b"',
 });

package/lib/runner/replacer.js

@@ -1,14 +1,14 @@
+import {compare} from '#compare';
+import {prepare} from '#parser';
+import {traverse} from '#traverser';
 import {
     is,
     isTemplateArray,
-    Punctuator,
+    isTemplateExpression,
 } from '#types';
-import {prepare} from '#parser';
-import {compare} from '#compare';
-import {traverse} from '#traverser';
 import {collectArray} from '../compare/collect-array.js';
+import {collectExpression} from '../compare/collect-expression.js';
 
-const {isArray} = Array;
 const {entries} = Object;
 
 export const replace = (tokens, {fix, rule, plugin}) => {
@@ -85,24 +85,20 @@ function getValues(tokens, waysFrom) {
     const values = {};
     
     for (const [name, index] of entries(waysFrom)) {
-        if (isTemplateArray(name)) {
-            debugger;
-            const endOfArray = collectArray({
+        let end = index;
+        
+        if (isTemplateArray(name))
+            end = collectArray({
+                currentTokenIndex: index,
+                tokens,
+            });
+        else if (isTemplateExpression(name))
+            end = collectExpression({
                 currentTokenIndex: index,
                 tokens,
-                nextTemplateToken: Punctuator(';'),
             });
-            
-            if (index === endOfArray) {
-                values[name] = tokens[index];
-                continue;
-            }
-            
-            values[name] = tokens.slice(index, endOfArray + 1);
-            continue;
-        }
         
-        values[name] = tokens[index];
+        values[name] = tokens.slice(index, end + 1);
     }
     
     return values;
@@ -110,14 +106,6 @@ function getValues(tokens, waysFrom) {
 
 function setValues({to, waysTo, values}) {
     for (const [name, index] of entries(waysTo)) {
-        const current = values[name];
-        
-        if (!isArray(current)) {
-            to[index] = values[name];
-            continue;
-        }
-        
         to.splice(index, 1, ...values[name]);
     }
 }
-

package/lib/runner/runner.js

@@ -1,7 +1,6 @@
 import {replace} from './replacer.js';
 
 export const run = (tokens, {fix, fixCount = 10, plugins}) => {
-    debugger;
     const places = [];
     
     while (--fixCount >= 0) {
@@ -12,7 +11,7 @@ export const run = (tokens, {fix, fixCount = 10, plugins}) => {
                 plugin,
             }));
             
-            if (!fix || places.length) {
+            if (!fix) {
                 fixCount = 0;
                 break;
             }

package/lib/types/types.js

@@ -31,11 +31,13 @@ const LINKED_NODE = /^__[a-z]$/;
 const ANY = '__';
 const QUOTE = /^['"]$/;
 const ARRAY = '__array';
+const EXPR = '__expr';
 
 const ALL = [
     ANY,
     LINKED_NODE,
     ARRAY,
+    EXPR,
 ];
 
 function check(str, item) {
@@ -48,4 +50,6 @@ function check(str, item) {
 export const isId = (a) => LINKED_NODE.test(a);
 export const isQuote = (a) => QUOTE.test(a);
 export const isTemplateArray = (a) => a === ARRAY;
+export const isTemplateExpression = (a) => a === EXPR;
 export const isTemplateArrayToken = (a) => isIdentifier(a) && isTemplateArray(a.value);
+export const isTemplateExpressionToken = (a) => isIdentifier(a) && isTemplateExpression(a.value);

package/package.json

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