flatlint 1.4.1 → 1.5.1

package/ChangeLog

@@ -1,3 +1,13 @@
+2024.12.29, v1.5.1
+
+feature:
+- d65021c flatlint: parser: preprocess: improve
+
+2024.12.29, v1.5.0
+
+feature:
+- 5ff09d3 flatlint: add-missing-quote: call
+
 2024.12.29, v1.4.1
 
 feature:

package/README.md

@@ -53,6 +53,9 @@ npm i flatlint
 ```diff
 -const a = 'hello
 +const a = 'hello'
+
+-fn('hello);
++fn('hello');
 ```
 
  </details>

package/lib/compare/compare.js

@@ -1,4 +1,4 @@
-import {prepare} from '../tokenizer/index.js';
+import {prepare} from '../parser/index.js';
 import {
     isId,
     isIdentifier,

package/lib/flatlint.js

@@ -1,6 +1,6 @@
 import {loadPlugins} from '@putout/engine-loader';
 import {run} from './runner/runner.js';
-import {parse} from './tokenizer/index.js';
+import {parse} from './parser/index.js';
 
 export function lint(source, overrides = {}) {
     const {fix = true, plugins: pluginNames = []} = overrides;

package/lib/{tokenizer → parser}/index.js

@@ -2,40 +2,23 @@ import tokenize from 'js-tokens';
 import {
     isNewLine,
     isStringLiteral,
-    Punctuator,
-    StringLiteral,
 } from '#types';
+import {parseStringLiteral} from './string-literal.js';
 
 const isString = (a) => typeof a === 'string';
 
-const closeQuotes = (tokens) => {
+const preprocess = (tokens) => {
     const n = tokens.length;
     
     for (let i = 0; i < n; i++) {
         const token = tokens[i];
         
-        if (isStringLiteral(token)) {
-            const {closed, value} = token;
-            
-            const quote = Punctuator(value.at(0));
-            const newTokens = [];
-            
-            if (closed) {
-                const literal = StringLiteral(value.slice(1, -1));
-                newTokens.push(quote, literal, quote);
-            } else if (value.endsWith(';')) {
-                const literal = StringLiteral(value.slice(1, -1));
-                const semicolon = Punctuator(';');
-                
-                newTokens.push(quote, literal, semicolon);
-            } else {
-                const literal = StringLiteral(value.slice(1));
-                newTokens.push(quote, literal);
-            }
-            
-            tokens.splice(i, 1, ...newTokens);
-            ++i;
-        }
+        if (isStringLiteral(token))
+            i = parseStringLiteral({
+                token,
+                tokens,
+                i,
+            });
     }
 };
 
@@ -44,7 +27,7 @@ export const prepare = (a) => {
         return a;
     
     const array = Array.from(tokenize(a));
-    closeQuotes(array);
+    preprocess(array);
     
     return array;
 };

package/lib/parser/string-literal.js

@@ -0,0 +1,47 @@
+import {Punctuator, StringLiteral} from '#types';
+
+export function parseStringLiteral({i, token, tokens}) {
+    const {closed} = token;
+    let {value} = token;
+    
+    const quote = Punctuator(value.at(0));
+    const newTokens = [quote];
+    
+    if (closed) {
+        const literal = StringLiteral(value.slice(1, -1));
+        newTokens.push(literal, quote);
+        tokens.splice(i, 1, ...newTokens);
+        ++i;
+    } else {
+        let count = 0;
+        
+        if (value.endsWith(';')) {
+            const semicolon = Punctuator(';');
+            
+            value = value.slice(0, -1);
+            newTokens.push(semicolon);
+            ++count;
+        }
+        
+        if (value.endsWith(')')) {
+            const brace = Punctuator(')');
+            
+            value = value.slice(0, -1);
+            const {length} = newTokens;
+            const start = !count ? length : length - 1;
+            
+            newTokens.splice(start, 0, brace);
+            ++count;
+        }
+        
+        ++count;
+        
+        const literal = StringLiteral(value.slice(1));
+        newTokens.splice(1, 0, literal);
+        
+        tokens.splice(i, 1, ...newTokens);
+        i += count;
+    }
+    
+    return i;
+}

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

@@ -5,5 +5,6 @@ export function report() {
 export function replace() {
     return {
         'const __a = "__b': 'const __a = "__b"',
+        '__a("__b)': '__a("__b")',
     };
 }

package/lib/runner/replacer.js

@@ -1,7 +1,7 @@
 import {compare} from '../compare/compare.js';
 import {traverse} from '../traverser/traverser.js';
 import {is} from '../types/types.js';
-import {prepare} from '../tokenizer/index.js';
+import {prepare} from '../parser/index.js';
 
 const {entries} = Object;
 

package/package.json

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