flatlint 1.14.0 → 1.15.0

package/ChangeLog

@@ -1,3 +1,8 @@
+2025.01.02, v1.15.0
+
+feature:
+- e018137 flatlint: replacer: simplify
+
 2025.01.01, v1.14.0
 
 feature:

package/README.md

@@ -96,8 +96,8 @@ npm i flatlint
 
 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`
 

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;

package/lib/compare/collect-expression.js

@@ -1,7 +1,7 @@
 import {Punctuator} from '#types';
 import {equal} from './equal.js';
 
-export const collectExpression = ({currentTokenIndex, tokens, nextTemplateToken}) => {
+export const collectExpression = ({currentTokenIndex, tokens, nextTemplateToken = Punctuator(';')}) => {
     const n = tokens.length;
     const closeBrace = Punctuator(')');
     const openBrace = Punctuator('(');

package/lib/runner/replacer.js

@@ -5,12 +5,10 @@ import {
     is,
     isTemplateArray,
     isTemplateExpression,
-    Punctuator,
 } from '#types';
 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}) => {
@@ -87,39 +85,20 @@ function getValues(tokens, waysFrom) {
     const values = {};
     
     for (const [name, index] of entries(waysFrom)) {
-        if (isTemplateArray(name)) {
-            const endOfArray = collectArray({
+        let end = index;
+        
+        if (isTemplateArray(name))
+            end = collectArray({
                 currentTokenIndex: index,
                 tokens,
-                nextTemplateToken: Punctuator(';'),
             });
-            
-            if (index === endOfArray) {
-                values[name] = tokens[index];
-                continue;
-            }
-            
-            values[name] = tokens.slice(index, endOfArray + 1);
-            continue;
-        }
-        
-        if (isTemplateExpression(name)) {
-            const endOfArray = collectExpression({
+        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;
@@ -127,13 +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/package.json

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