WIP: address some of the review comments; still need to fix eslint errors

Author: meowbmw

.c8rc.json

@@ -6,8 +6,8 @@
   "reporter": ["text", "html", "lcov"],
   "report-dir": "./coverage",
   "check-coverage": true,
-  "branches": 80,
-  "lines": 80,
-  "functions": 80,
-  "statements": 80
+  "branches": 95,
+  "lines": 95,
+  "functions": 95,
+  "statements": 95
 }

.github/workflows/ci.yml

@@ -1,6 +1,11 @@
 name: CI
 
-on: [push]
+on:
+  pull_request:
+    branches: [ "name" ]
+  push:
+    branches: [ "name" ]
+  workflow_dispatch:
 
 jobs:
   test:
@@ -15,7 +20,7 @@ jobs:
           node-version: '22'
 
       - name: Install dependencies
-        run: npm install
+        run: npm ci
 
       - name: Run build
         run: npm run build
@@ -26,5 +31,8 @@ jobs:
       - name: Run prettier
         run: npm run prettier-check
 
+      - name: Run lint
+        run: npm run lint
+
       - name: Run test & coverage
         run: npm run test:coverage

.gitignore

@@ -4,5 +4,5 @@ dist/
 sample_cases/
 wasm-toolchain
 coverage
-.vscode/settings.json
+.vscode
 reference

.prettierignore

@@ -7,4 +7,3 @@ build/**
 wasm-toolchain/**
 coverage/**
 .github/**
-**/*.json

.vscode/launch.json

@@ -1,22 +1,13 @@
-import eslint from "@eslint/js";
 import tseslint from "typescript-eslint";
+// @ts-expect-error Missing type definitions
+import { baseConfig } from "@schleifner/eslint-config-base/config.mjs";
 
 export default tseslint.config(
   {
     ignores: [
-      "**/node_modules/**",
       "dist/**",
-      "reference/**",
-      "sample_cases/**",
-      "sample_config/**",
-      "build/**",
-      "wasm-toolchain/**",
-      "coverage/**",
-      ".github/**",
-      "**/*.json",
-      "**/*.md",
+      "**/*.mjs",
     ],
   },
-  eslint.configs.recommended,
-  tseslint.configs.recommended
+  ...baseConfig
 );

eslint.config.mjs

@@ -29,7 +29,7 @@
     "build": "npx tsc --build ./tsconfig.json",
     "test": "mocha 'dist/tests/**/**.test.js'",
     "test:coverage": "c8 npm test",
-    "lint": "npx eslint sample_cases/",
+    "lint": "npx eslint plugins/ tests/",
     "watch": "npx tsc --build ./tsconfig.json --watch",
     "spell-check": "cspell \"**/*.{ts,js,md}\"",
     "prettier-check": "prettier --check \"**/*.{ts,js,json,md}\"",
@@ -39,6 +39,7 @@
     "eslint": ">=8.0.0"
   },
   "devDependencies": {
+    "@schleifner/eslint-config-base": "^2.0.0",
     "@types/eslint": "^9.6.1",
     "@types/mocha": "^10.0.10",
     "@types/node": "^22.14.1",

package.json

@@ -28,13 +28,10 @@ const dontOmitElse: RuleModule<"omittedElse", [], unknown, RuleListener> =
     defaultOptions: [],
     create(context) {
       // Check if the statement is part of an else-if chain
-      function isElseIf(node: TSESTree.Node) {
-        // Check parent relationship to determine if this is an else-if
+      function isElseIfChain(node: TSESTree.IfStatement) {
         const ancestors = context.sourceCode.getAncestors(node);
         const parent = ancestors.at(-1);
-        return (
-          parent && parent.type === "IfStatement" && parent.alternate === node
-        );
+        return parent?.type === "IfStatement" && parent.alternate === node;
       }
 
       // Helper function to check if a node will lead to early exit
@@ -64,7 +61,7 @@ const dontOmitElse: RuleModule<"omittedElse", [], unknown, RuleListener> =
       return {
         IfStatement(node) {
           // Skip if this is already an else-if
-          if (isElseIf(node)) {
+          if (isElseIfChain(node)) {
             return;
           }
           const hasElse = node.alternate !== null;

plugins/rules/dont-omit-else.ts

@@ -13,6 +13,24 @@ describe("Rule: dont-omit-else", () => {
         if (b) {}
         else {}
         `,
+        // Valid case: else-if chain - should be skipped by isElseIf check
+        `
+        if (a) {
+          doSomething();
+        } else if (b) {
+          doSomethingElse(); 
+        }
+        `,
+        // Valid case: else-if-else chain
+        `
+        if (a) {
+          doSomething();
+        } else if (b) {
+          doSomethingElse();
+        } else {
+          doDefault();
+        }
+        `,
         // Valid case: function with early return
         `
         function foo() {