flatlint 2.1.6 → 2.1.7

package/ChangeLog

@@ -1,3 +1,8 @@
+2025.03.01, v2.1.7
+
+feature:
+- 180fc5e flatlint: add-missing-comma: type
+
 2025.03.01, v2.1.6
 
 feature:

package/lib/compare/compare.js

@@ -9,13 +9,7 @@ import {
 import {collectArray} from './collect-array.js';
 import {collectExpression} from './collect-expression.js';
 import {collectArgs} from './collect-args.js';
-import {
-    equal,
-    equalAny,
-    equalId,
-    equalQuote,
-    equalStr,
-} from './equal.js';
+import {equalTemplate} from './equal.js';
 
 export const compare = (source, template, {index = 0} = {}) => {
     const templateTokens = prepare(template);
@@ -92,7 +86,7 @@ export const compare = (source, template, {index = 0} = {}) => {
                     delta = indexOfArrayEnd - currentTokenIndex;
                     index = indexOfArrayEnd - templateIndex;
                 }
-            } else if (!compareAll(currentToken, templateToken)) {
+            } else if (!equalTemplate(currentToken, templateToken)) {
                 isEqual = false;
                 break;
             }
@@ -113,23 +107,6 @@ export const compare = (source, template, {index = 0} = {}) => {
     return [NOT_OK];
 };
 
-const comparators = [
-    equal,
-    equalId,
-    equalStr,
-    equalAny,
-    equalQuote,
-];
-
-function compareAll(a, b) {
-    for (const currentCompare of comparators) {
-        if (currentCompare(a, b))
-            return true;
-    }
-    
-    return false;
-}
-
 function checkIndexes(index, indexCheck) {
     /* c8 ignore start */
     if (indexCheck > index + 1)

package/lib/compare/equal.js

@@ -7,6 +7,23 @@ import {
     isStringLiteral,
 } from '#types';
 
+const comparators = [
+    equal,
+    equalId,
+    equalStr,
+    equalAny,
+    equalQuote,
+];
+
+export function equalTemplate(a, b) {
+    for (const currentCompare of comparators) {
+        if (currentCompare(a, b))
+            return true;
+    }
+    
+    return false;
+}
+
 export function equal(a, b) {
     return a.type === b.type && a.value === b.value;
 }

package/lib/parser/parser.js

@@ -3,6 +3,7 @@ import {
     isMultilineComment,
     isNewLine,
     isStringLiteral,
+    isWhiteSpace,
 } from '#types';
 import {parseStringLiteral} from './string-literal.js';
 
@@ -21,7 +22,7 @@ const preprocess = (tokens) => {
     }
 };
 
-export const prepare = (a) => {
+export const prepare = (a, {cutWhiteSpaces = false} = {}) => {
     if (!isString(a))
         return a;
     
@@ -31,9 +32,25 @@ export const prepare = (a) => {
     
     preprocess(array);
     
+    if (cutWhiteSpaces)
+        return runCutWhiteSpaces(array);
+    
     return array;
 };
 
+function runCutWhiteSpaces(array) {
+    const result = [];
+    
+    for (const current of array) {
+        if (isWhiteSpace(current))
+            continue;
+        
+        result.push(current);
+    }
+    
+    return result;
+}
+
 export const parse = (source) => {
     return getTokensWithLocation(prepare(source));
 };

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

@@ -18,7 +18,12 @@ export const match = () => ({
         return path.isNextIdentifier();
     },
     '__a': ({__a}, path) => {
-        if (isKeyword(__a))
+        const isType = isKeyword(__a, 'type');
+        
+        if (isType && path.isNextCompare('__a ='))
+            return false;
+        
+        if (!isType && isKeyword(__a))
             return false;
         
         if (path.isNextKeyword())

package/lib/runner/path.js

@@ -12,7 +12,7 @@ import {
     isNewLine,
     isWhiteSpace,
 } from '#types';
-import {equal} from '../compare/equal.js';
+import {equalTemplate} from '../compare/equal.js';
 
 export const createPath = ({tokens, start, end}) => ({
     tokens,
@@ -217,8 +217,6 @@ const createGetAllNext = ({tokens, end}) => function*() {
         
         yield tokens[i];
     }
-    /* c8 ignore start */
-    /* c8 ignore end */
 };
 
 const createIsNextCompare = ({tokens, end}) => (template) => {
@@ -227,15 +225,19 @@ const createIsNextCompare = ({tokens, end}) => (template) => {
         end,
     });
     
-    const n = template.length;
-    const templateTokens = prepare(template);
+    const templateTokens = prepare(template, {
+        cutWhiteSpaces: true,
+    });
+    
+    const n = templateTokens.length;
+    
     let i = 0;
     
     for (const token of getAllNext()) {
         if (i === n)
             break;
         
-        if (!equal(token, templateTokens[i]))
+        if (!equalTemplate(token, templateTokens[i]))
             return false;
         
         ++i;

package/package.json

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