Update dependencies, including new lint rules. Move to simpler tsconf…

…ig so that eslint can easily find the correct file. Fix small lint issues with new rules.
peggyjs · Jan 27, 2024 · c14e8ae · c14e8ae
1 parent 2e3cfd4
commit c14e8ae
Show file tree

Hide file tree

Showing 15 changed files with 371 additions and 272 deletions.
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -18,7 +18,7 @@ module.exports = {
     "build",
   ],
   parserOptions: {
-    project: "tsconfig.json",
+    project: true,
   },
   overrides: [
     {

diff --git a/lib/compiler/passes/generate-bytecode.js b/lib/compiler/passes/generate-bytecode.js
@@ -579,10 +579,10 @@ function generateBytecode(ast, options) {
       buildCondition(
         SOMETIMES_MATCH,
         checkCode,                // if (result.length < min) {
-        /* eslint-disable indent -- Clarity */
+        /* eslint-disable @stylistic/indent -- Clarity */
         [op.POP, op.POP_CURR_POS, //   currPos = savedPos;    stack:[  ]
          op.PUSH_FAILED],         //   result = peg$FAILED;   stack:[ peg$FAILED ]
-        /* eslint-enable indent */
+        /* eslint-enable @stylistic/indent */
         [op.NIP]                  // }                        stack:[ [elem...] ]
       )
     );
@@ -623,11 +623,11 @@ function generateBytecode(ast, options) {
               -expressionMatch,
               [op.IF_ERROR],          //   if (item === peg$FAILED) {
               // If element FAILED, rollback currPos to saved value.
-              /* eslint-disable indent -- Clarity */
+              /* eslint-disable @stylistic/indent -- Clarity */
               [op.POP,                //                          stack:[ pos ]
                op.POP_CURR_POS,       //     peg$currPos = pos;   stack:[  ]
                op.PUSH_FAILED],       //     item = peg$FAILED;   stack:[ peg$FAILED ]
-              /* eslint-enable indent */
+              /* eslint-enable @stylistic/indent */
               // Else, just drop saved currPos.
               [op.NIP]                //   }                      stack:[ item ]
             )

diff --git a/lib/compiler/passes/generate-js.js b/lib/compiler/passes/generate-js.js
@@ -1413,7 +1413,7 @@ function generateJS(ast, options) {
 
     return new SourceNode(
       // This expression has a better readability when on two lines
-      // eslint-disable-next-line function-call-argument-newline
+      // eslint-disable-next-line @stylistic/function-call-argument-newline
       null, null, options.grammarSource,
       parts.map(s => (s instanceof SourceNode ? s : s + "\n"))
     );
@@ -1653,7 +1653,7 @@ function generateJS(ast, options) {
     const parts = generators[options.format || "bare"]();
 
     return new SourceNode(
-      // eslint-disable-next-line function-call-argument-newline -- This expression has a better readability when on two lines
+      // eslint-disable-next-line @stylistic/function-call-argument-newline -- This expression has a better readability when on two lines
       null, null, options.grammarSource,
       parts.map(s => (s instanceof SourceNode ? s : s + "\n"))
     );

diff --git a/lib/peg.d.ts b/lib/peg.d.ts
@@ -125,13 +125,13 @@ declare namespace ast {
      * Added by the `generateBytecode` pass and contain data for
      * bytecodes to refer back to via index.
      */
-     literals?: string[];
-     classes?: GrammarCharacterClass[];
-     expectations?: GrammarExpectation[];
-     importedNames?: string[];
-     functions?: FunctionConst[];
-     locations?: LocationRange[];
-   }
+    literals?: string[];
+    classes?: GrammarCharacterClass[];
+    expectations?: GrammarExpectation[];
+    importedNames?: string[];
+    functions?: FunctionConst[];
+    locations?: LocationRange[];
+  }
 
   /**
    * Base interface for all initializer nodes with the code.
@@ -222,11 +222,11 @@ declare namespace ast {
   interface Action extends CodeBlockExpr<"action"> {
     expression: (
         Labeled
-      | Prefixed
-      | Primary
-      | Repeated
-      | Sequence
-      | Suffixed
+        | Prefixed
+        | Primary
+        | Repeated
+        | Sequence
+        | Suffixed
     );
   }