flatlint 1.20.0 → 1.21.1

package/ChangeLog

@@ -1,3 +1,13 @@
+2025.01.03, v1.21.1
+
+feature:
+- eea4c32 flatlint: collect-args: simplify
+
+2025.01.03, v1.21.0
+
+feature:
+- d13da41 flatlint: add-missing-squire-brace: empty array
+
 2025.01.03, v1.20.0
 
 feature:

package/lib/compare/collect-args.js

@@ -1,33 +1,33 @@
 import {
-    CloseRoundBrace,
-    OpenRoundBrace,
-    Punctuator,
+    closeRoundBrace,
+    closeSquareBrace,
+    NOT_OK,
+    OK,
 } from '#types';
 import {equal} from './equal.js';
 
-export const collectArgs = ({currentTokenIndex, tokens, nextTemplateToken = Punctuator(')')}) => {
+export const collectArgs = ({currentTokenIndex, tokens, nextTemplateToken = closeRoundBrace}) => {
     const n = tokens.length;
-    const brace = Punctuator(']');
     let index = currentTokenIndex;
     
-    if (equal(tokens[index - 1], OpenRoundBrace) && equal(tokens[index], CloseRoundBrace))
-        return [false];
+    if (equal(tokens[index], closeRoundBrace))
+        return [NOT_OK];
     
     for (; index < n; index++) {
         const token = tokens[index];
         
-        if (equal(token, CloseRoundBrace))
+        if (equal(token, closeRoundBrace))
             break;
         
         if (equal(token, nextTemplateToken))
             break;
         
-        if (equal(token, brace))
+        if (equal(token, closeSquareBrace))
             break;
     }
     
     return [
-        true,
+        OK,
         --index,
     ];
 };

package/lib/compare/collect-array.js

@@ -1,26 +1,34 @@
 import {
-    CloseRoundBrace,
-    Punctuator,
+    closeRoundBrace,
+    closeSquareBrace,
+    semicolon,
+    OK,
+    NOT_OK,
 } from '#types';
 import {equal} from './equal.js';
 
-export const collectArray = ({currentTokenIndex, tokens, nextTemplateToken = Punctuator(';')}) => {
+export const collectArray = ({currentTokenIndex, tokens, nextTemplateToken = semicolon}) => {
     const n = tokens.length;
-    const brace = Punctuator(']');
     let index = currentTokenIndex;
     
+    if (equal(tokens[index], closeSquareBrace))
+        return [NOT_OK];
+    
     for (; index < n; index++) {
         const token = tokens[index];
         
-        if (equal(token, CloseRoundBrace))
+        if (equal(token, closeRoundBrace))
             break;
         
         if (equal(token, nextTemplateToken))
             break;
         
-        if (equal(token, brace))
+        if (equal(token, closeSquareBrace))
             break;
     }
     
-    return --index;
+    return [
+        OK,
+        --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/compare/compare.js

@@ -64,15 +64,19 @@ export const compare = (source, template) => {
                 delta = indexOfExpressionEnd - currentTokenIndex;
                 index = indexOfExpressionEnd - templateIndex;
             } else if (isTemplateArrayToken(templateToken)) {
-                const indexOfArrayEnd = collectArray({
+                const [ok, indexOfArrayEnd] = collectArray({
                     currentTokenIndex,
                     tokens,
                     templateToken,
                     nextTemplateToken: templateTokens[templateIndex + 1],
                 });
                 
-                delta = indexOfArrayEnd - currentTokenIndex;
-                index = indexOfArrayEnd - templateIndex;
+                if (!ok) {
+                    ++skip;
+                } else {
+                    delta = indexOfArrayEnd - currentTokenIndex;
+                    index = indexOfArrayEnd - templateIndex;
+                }
             } else if (!compareAll(currentToken, templateToken)) {
                 isEqual = false;
                 break;

package/lib/runner/replacer.js

@@ -113,29 +113,27 @@ function getValues(tokens, waysFrom) {
     
     for (const [name, index] of entries(waysFrom)) {
         let end = index;
+        let ok = true;
         
-        if (isTemplateArray(name)) {
-            end = collectArray({
+        if (isTemplateArray(name))
+            [ok, end] = collectArray({
                 currentTokenIndex: index,
                 tokens,
             });
-        } else if (isTemplateExpression(name)) {
+        else if (isTemplateExpression(name))
             end = collectExpression({
                 currentTokenIndex: index,
                 tokens,
             });
-        } else if (isTemplateArgs(name)) {
-            let ok = false;
-            
+        else if (isTemplateArgs(name))
             [ok, end] = collectArgs({
                 currentTokenIndex: index,
                 tokens,
             });
-            
-            if (!ok) {
-                values[name] = [];
-                continue;
-            }
+        
+        if (!ok) {
+            values[name] = [];
+            continue;
         }
         
         values[name] = tokens.slice(index, end + 1);

package/lib/types/types.js

@@ -67,5 +67,10 @@ 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 CloseRoundBrace = Punctuator(')');
+export const openRoundBrace = Punctuator('(');
+export const closeRoundBrace = Punctuator(')');
+export const closeSquareBrace = Punctuator(']');
+export const semicolon = Punctuator(';');
+
+export const OK = true;
+export const NOT_OK = false;

package/package.json

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