flatlint 1.80.1 → 1.82.0

package/ChangeLog

@@ -1,3 +1,13 @@
+2025.01.23, v1.82.0
+
+feature:
+- e1b595d flatlint: convert-comma-to-semicolon: exclude prev punctuator
+
+2025.01.22, v1.81.0
+
+feature:
+- 92d7b03 flatlint: move out keywords
+
 2025.01.22, v1.80.1
 
 feature:

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

@@ -39,7 +39,12 @@ export const match = () => ({
         
         return !path.isNextPunctuator(quote);
     },
-    '__a.__b = __expr,': ({}, path) => !path.isNextPunctuator([quote, openCurlyBrace]),
+    '__a.__b = __expr,': ({__expr}, path) => {
+        if (path.isPrevPunctuator())
+            return false;
+        
+        return !path.isNextPunctuator([quote, openCurlyBrace]);
+    },
 });
 
 export const replace = () => ({
@@ -63,3 +68,4 @@ const check = ({__x}, path) => {
     
     return path.isNextKeyword() && !path.isNextIdentifier('new');
 };
+

package/lib/runner/path.js

@@ -29,6 +29,10 @@ export const createPath = ({tokens, start, end}) => ({
         tokens,
         end,
     }),
+    isPrevPunctuator: createIsPrevPunctuator({
+        tokens,
+        start,
+    }),
     isInsideTemplate: createIsInsideTemplate({
         tokens,
         end,
@@ -66,6 +70,25 @@ const next = ({tokens, end}) => {
     }
 };
 
+const prev = ({tokens, start}) => {
+    let i = start;
+    
+    while (--i) {
+        const token = tokens[i];
+        
+        if (!token)
+            return token;
+        
+        if (isNewLine(token))
+            continue;
+        
+        if (isWhiteSpace(token))
+            continue;
+        
+        return token;
+    }
+};
+
 const createIsNext = ({tokens, end}) => () => {
     return Boolean(next({
         tokens,
@@ -118,6 +141,18 @@ const createIsNextPunctuator = ({tokens, end}) => (punctuators) => {
     return isPunctuator(current, punctuators);
 };
 
+const createIsPrevPunctuator = ({tokens, start}) => (punctuators) => {
+    const current = prev({
+        tokens,
+        start,
+    });
+    
+    if (!current)
+        return false;
+    
+    return isPunctuator(current, punctuators);
+};
+
 const createIsPrevIdentifier = ({tokens, start}) => (value) => {
     const SPACE = 1;
     const FUNCTION = 1;

package/lib/types/types.js

@@ -1,4 +1,4 @@
-import {keywords} from './keywords.js';
+import * as keyword from '@putout/operator-keyword';
 
 const {isArray} = Array;
 const maybeArray = (a) => isArray(a) ? a : [a];
@@ -32,12 +32,12 @@ export const isKeyword = (token, name) => {
     if (!token)
         return false;
     
-    for (const keyword of keywords) {
-        if (isIdentifier(token, keyword))
-            return true;
-    }
+    const {value} = token;
     
-    return false;
+    if (!keyword.isKeyword(value))
+        return false;
+    
+    return isIdentifier(token, name);
 };
 
 export const isOneOfPunctuators = (token, punctuators) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "flatlint",
-  "version": "1.80.1",
+  "version": "1.82.0",
   "description": "JavaScript tokens-based linter",
   "main": "lib/flatlint.js",
   "type": "module",
@@ -81,6 +81,7 @@
   },
   "dependencies": {
     "@putout/engine-loader": "^15.1.1",
+    "@putout/operator-keyword": "^1.0.0",
     "debug": "^4.4.0",
     "js-tokens": "^9.0.1"
   },

package/lib/types/keywords.js

@@ -1,22 +0,0 @@
-export const keywords = [
-    'as',
-    'await',
-    'const',
-    'continue',
-    'for',
-    'function',
-    'var',
-    'let',
-    'new',
-    'else',
-    'export',
-    'from',
-    'import',
-    'return',
-    'throw',
-    'of',
-    'if',
-    'yield',
-    'typeof',
-    'while',
-];