flatlint 1.21.0 → 1.21.1

package/ChangeLog

@@ -1,3 +1,8 @@
+2025.01.03, v1.21.1
+
+feature:
+- eea4c32 flatlint: collect-args: simplify
+
 2025.01.03, v1.21.0
 
 feature:

package/lib/compare/collect-args.js

@@ -3,7 +3,6 @@ import {
     closeSquareBrace,
     NOT_OK,
     OK,
-    OpenRoundBrace,
 } from '#types';
 import {equal} from './equal.js';
 
@@ -11,7 +10,7 @@ export const collectArgs = ({currentTokenIndex, tokens, nextTemplateToken = clos
     const n = tokens.length;
     let index = currentTokenIndex;
     
-    if (equal(tokens[index - 1], OpenRoundBrace) && equal(tokens[index], closeRoundBrace))
+    if (equal(tokens[index], closeRoundBrace))
         return [NOT_OK];
     
     for (; index < n; index++) {

package/lib/compare/collect-expression.js

@@ -1,11 +1,12 @@
-import {Punctuator} from '#types';
+import {
+    closeRoundBrace,
+    openRoundBrace,
+    semicolon,
+} from '#types';
 import {equal} from './equal.js';
 
-export const collectExpression = ({currentTokenIndex, tokens, nextTemplateToken = Punctuator(';')}) => {
+export const collectExpression = ({currentTokenIndex, tokens, nextTemplateToken = semicolon}) => {
     const n = tokens.length;
-    const closeBrace = Punctuator(')');
-    const openBrace = Punctuator('(');
-    const semicolon = Punctuator(';');
     let index = currentTokenIndex;
     
     for (; index < n; index++) {
@@ -17,10 +18,10 @@ export const collectExpression = ({currentTokenIndex, tokens, nextTemplateToken
         if (equal(token, nextTemplateToken))
             break;
         
-        if (equal(token, openBrace))
+        if (equal(token, openRoundBrace))
             break;
         
-        if (equal(token, closeBrace))
+        if (equal(token, closeRoundBrace))
             break;
     }
     

package/lib/runner/replacer.js

@@ -147,4 +147,3 @@ function setValues({to, waysTo, values}) {
         to.splice(index, 1, ...values[name]);
     }
 }
-

package/lib/types/types.js

@@ -67,7 +67,7 @@ export const isTemplateArrayToken = (a) => isIdentifier(a) && isTemplateArray(a.
 export const isTemplateExpressionToken = (a) => isIdentifier(a) && isTemplateExpression(a.value);
 export const isTemplateArgsToken = (a) => isIdentifier(a) && isTemplateArgs(a.value);
 
-export const OpenRoundBrace = Punctuator('(');
+export const openRoundBrace = Punctuator('(');
 export const closeRoundBrace = Punctuator(')');
 export const closeSquareBrace = Punctuator(']');
 export const semicolon = Punctuator(';');

package/package.json

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