flatlint 2.12.0 → 2.14.0

package/ChangeLog

@@ -1,3 +1,13 @@
+2025.03.18, v2.14.0
+
+feature:
+- 853d597 flatlint: convert-semicolon-to-comma: object-inside-array
+
+2025.03.18, v2.13.0
+
+feature:
+- c407722 flatlint: add-missing-comma: exclude tagged template litera
+
 2025.03.18, v2.12.0
 
 feature:

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

@@ -8,19 +8,10 @@ import {
 export const report = () => 'Add missing comma';
 
 export const match = () => ({
-    '"__a"': (vars, path) => {
-        if (path.isNextPunctuator(quote))
-            return true;
-        
-        if (path.isNextKeyword())
-            return false;
-        
-        if (path.isPrevPunctuator(assign))
+    '__a': ({__a}, path) => {
+        if (path.isNextTemplateHead())
             return false;
         
-        return path.isNextIdentifier();
-    },
-    '__a': ({__a}, path) => {
         const isType = isKeyword(__a, 'type');
         
         if (isType && path.isNextCompare('__a ='))
@@ -46,6 +37,18 @@ export const match = () => ({
         
         return !path.isNextPunctuator();
     },
+    '"__a"': (vars, path) => {
+        if (path.isNextPunctuator(quote))
+            return true;
+        
+        if (path.isNextKeyword())
+            return false;
+        
+        if (path.isPrevPunctuator(assign))
+            return false;
+        
+        return path.isNextIdentifier();
+    },
 });
 
 export const replace = () => ({

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

@@ -68,7 +68,13 @@ export const match = () => ({
             if (isOneOfKeywords(token, keywords))
                 return false;
             
-            if (isPunctuator(token, [assign, bitwiseAnd, dot, semicolon]))
+            if (isPunctuator(token, [
+                assign,
+                bitwiseAnd,
+                dot,
+                semicolon,
+                closeSquareBrace,
+            ]))
                 return false;
             
             if (isPunctuator(token, colon) && !isNextCall)
@@ -88,4 +94,3 @@ export const replace = () => ({
     ');': '),',
     '__a];': '__a],',
 });
-

package/lib/runner/path.js

@@ -11,6 +11,7 @@ import {
     isDeclarationKeyword,
     isNewLine,
     isWhiteSpace,
+    isTemplateHead,
 } from '#types';
 import {equalTemplate} from '../compare/equal.js';
 
@@ -58,6 +59,10 @@ export const createPath = ({tokens, start, end}) => ({
         tokens,
         end,
     }),
+    isNextTemplateHead: createIsNextTemplateHead({
+        tokens,
+        end,
+    }),
     isNextTemplateTail: createIsNextTemplateTail({
         tokens,
         end,
@@ -152,12 +157,21 @@ const createIsNextPunctuator = ({tokens, end}) => (punctuators) => {
 };
 
 const createIsNextTemplateTail = ({tokens, end}) => () => {
-    const current = getNext({
+    const next = getNext({
+        tokens,
+        end,
+    });
+    
+    return isTemplateTail(next);
+};
+
+const createIsNextTemplateHead = ({tokens, end}) => () => {
+    const next = getNext({
         tokens,
         end,
     });
     
-    return isTemplateTail(current);
+    return isTemplateHead(next);
 };
 
 const createGetPrev = ({tokens, start}) => () => {

package/lib/types/types.js

@@ -20,6 +20,7 @@ const isString = (a) => typeof a === 'string';
 
 export const isTemplateMiddle = (a) => a?.type === 'TemplateMiddle';
 export const isNoSubstitutionTemplate = (a) => a?.type === 'NoSubstitutionTemplate';
+export const isTemplateHead = (a) => a?.type === 'TemplateHead';
 export const isTemplateTail = (a) => a?.type === 'TemplateTail';
 export const isWhiteSpace = ({type}) => type === 'WhiteSpace';
 export const isIdentifier = (token, newToken) => {

package/package.json

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