flatlint 1.39.2 → 1.40.0

package/ChangeLog

@@ -1,3 +1,15 @@
+2025.01.13, v1.40.0
+
+feature:
+- 5a1f09b flatlint: convert-comma-to-semicolon: use __x for keyword
+- e85093b flatlint: types: isOperator -> isKeywrod
+- 7c4afc1 flatlint: add-missing-comma: exclude await
+
+2025.01.12, v1.39.3
+
+feature:
+- 159980f flatlint: equal: __a: Identifier, NumericLiteral
+
 2025.01.12, v1.39.2
 
 fix:

package/lib/compare/equal.js

@@ -1,6 +1,7 @@
 import {
     isId,
     isIdentifier,
+    isNumericLiteral,
     isPunctuator,
     isQuote,
     isStringLiteral,
@@ -38,7 +39,7 @@ export function equalId(a, b) {
     if (!isIdentifier(b))
         return false;
     
-    if (isPunctuator(a))
+    if (!isIdentifier(a) && !isNumericLiteral(a))
         return false;
     
     return isId(b.value);

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

@@ -1,13 +1,10 @@
-import {isIdentifier, isOperator} from '#types';
+import {isKeyword} from '#types';
 
 export const report = () => 'Add missing comma';
 
 export const match = () => ({
     __a: ({__a}, path) => {
-        if (!isIdentifier(__a))
-            return false;
-        
-        if (isOperator(__a))
+        if (isKeyword(__a))
             return false;
         
         return !path.isNextPunctuator();
@@ -17,3 +14,4 @@ export const match = () => ({
 export const replace = () => ({
     __a: '__a,',
 });
+

package/lib/plugins/convert-comma-to-semicolon/index.js

@@ -1,5 +1,7 @@
 import {
     colon,
+    isKeyword,
+    isOneOfKeywords,
     isPunctuator,
     quote,
 } from '#types';
@@ -14,24 +16,25 @@ export const match = () => ({
         
         return true;
     },
-    'let __a = __b,': check,
-    'var __a = __b': check,
-    'let __a,': check,
-    'var __a,': check,
+    '__x __a = __b,': check,
+    '__x __a,': check,
     'return __expr,': ({}, path) => !path.isNextPunctuator(quote),
 });
 
 export const replace = () => ({
     'from "__a",': 'from "__a";',
-    'var __a,': 'var __a;',
-    'let __a,': 'let __a;',
-    'var __a = __b,': 'var __a = __b;',
-    'let __a = __b,': 'let __a = __b;',
-    'const __a = __b,': 'const __a = __b;',
+    '__x __a,': '__x __a;',
+    '__x __a = __b,': '__x __a = __b;',
     '__a(__args),': '__a(__args);',
     'return __expr,': 'return __expr;',
 });
 
-const check = (vars, path) => {
-    return path.isNextOperator();
+const check = ({__x}, path) => {
+    if (!isOneOfKeywords(__x, ['var', 'let', 'const']))
+        return false;
+    
+    if (!path.isNext())
+        return true;
+    
+    return path.isNextKeyword();
 };

package/lib/runner/path.js

@@ -1,7 +1,7 @@
 import {
     isIdentifier,
     isNewLine,
-    isOperator,
+    isKeyword,
     isPunctuator,
     isWhiteSpace,
 } from '#types';
@@ -25,7 +25,7 @@ export const createPath = ({tokens, start, end}) => ({
         tokens,
         end,
     }),
-    isNextOperator: createIsNextOperator({
+    isNextKeyword: createIsNextKeyword({
         tokens,
         end,
     }),
@@ -103,13 +103,16 @@ const createIsNextIdentifier = ({tokens, end}) => (value) => {
     return isIdentifier(current, value);
 };
 
-const createIsNextOperator = ({tokens, end}) => () => {
+const createIsNextKeyword = ({tokens, end}) => () => {
     const current = next({
         tokens,
         end,
     });
     
-    return isOperator(current);
+    if (!current)
+        return false;
+    
+    return isKeyword(current);
 };
 
 const createIsNextPunctuator = ({tokens, end}) => (punctuators) => {

package/lib/types/types.js

@@ -1,3 +1,5 @@
+const {isArray} = Array;
+const maybeArray = (a) => isArray(a) ? a : [a];
 const isString = (a) => typeof a === 'string';
 
 export const isWhiteSpace = ({type}) => type === 'WhiteSpace';
@@ -15,8 +17,9 @@ export const isStringLiteral = ({type}) => type === 'StringLiteral';
 export const isNumericLiteral = ({type}) => type === 'NumericLiteral';
 export const isNewLine = ({type}) => type === 'LineTerminatorSequence';
 export const notWhiteSpace = (a) => !isWhiteSpace(a);
-export const isOperator = (token) => {
-    const operators = [
+export const isKeyword = (token) => {
+    const keywords = [
+        'await',
         'var',
         'let',
         'const',
@@ -27,13 +30,23 @@ export const isOperator = (token) => {
         'function',
     ];
     
-    for (const operator of operators) {
-        if (isIdentifier(token, operator))
+    for (const keyword of keywords) {
+        if (isIdentifier(token, keyword))
             return true;
     }
     
     return false;
 };
+
+export const isOneOfKeywords = (token, keywords) => {
+    for (const keyword of keywords) {
+        if (isIdentifier(token, keyword))
+            return true;
+    }
+    
+    return false;
+};
+
 export const isPunctuator = (token, punctuator) => {
     if (token.type !== 'Punctuator')
         return false;
@@ -113,3 +126,4 @@ export const quote = Punctuator(`'`);
 
 export const OK = true;
 export const NOT_OK = false;
+

package/package.json

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