Merge pull request #561 from lukecotter/chore-update-ts-eslint

chore: update typescript eslint to v8

.github/workflows/ci.yml

@@ -19,7 +19,7 @@ jobs:
       - name: Set up Node
         uses: actions/setup-node@v4
         with:
-          node-version: '16.x'
+          node-version: '20'
           cache: 'pnpm'
       - name: Install Packages
         run: HUSKY=0 pnpm install

.prettierignore

@@ -0,0 +1 @@
+build/

eslint.config.mjs

@@ -0,0 +1,48 @@
+import typescriptEslint from "@typescript-eslint/eslint-plugin";
+import tsParser from "@typescript-eslint/parser";
+import path from "node:path";
+import { fileURLToPath } from "node:url";
+import js from "@eslint/js";
+import { FlatCompat } from "@eslint/eslintrc";
+
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = path.dirname(__filename);
+const compat = new FlatCompat({
+    baseDirectory: __dirname,
+    recommendedConfig: js.configs.recommended,
+    allConfig: js.configs.all
+});
+
+export default [{
+    ignores: ["**/node_modules"],
+}, ...compat.extends(
+    "eslint:recommended",
+    "plugin:@typescript-eslint/eslint-recommended",
+    "plugin:@typescript-eslint/recommended",
+    "prettier",
+), {
+    plugins: {
+        "@typescript-eslint": typescriptEslint,
+    },
+
+    languageOptions: {
+        parser: tsParser,
+        ecmaVersion: "latest",
+        sourceType: "module",
+    },
+
+    rules: {
+        "no-console": "warn",
+        "@typescript-eslint/naming-convention": "warn",
+        semi: "warn",
+
+        "@typescript-eslint/no-unused-vars": ["error", {
+            argsIgnorePattern: "^_",
+            varsIgnorePattern: "^_",
+        }],
+
+        "@typescript-eslint/no-explicit-any": "warn",
+        curly: "warn",
+        eqeqeq: "warn",
+    },
+}];

lana-docs-site/docusaurus.config.ts

@@ -36,6 +36,7 @@ const config: Config = {
   },
 
   future: {
+    // eslint-disable-next-line @typescript-eslint/naming-convention
     experimental_faster: true,
   },
 

lana/package.json

@@ -183,8 +183,8 @@
   "devDependencies": {
     "@types/node": "~18.15.13",
     "@types/vscode": "~1.74.0",
-    "@typescript-eslint/eslint-plugin": "^7.18.0",
-    "@typescript-eslint/parser": "^7.18.0",
+    "@typescript-eslint/eslint-plugin": "^8.18.1",
+    "@typescript-eslint/parser": "^8.18.1",
     "typescript": "^5.7.2"
   }
 }

log-viewer/modules/Util.ts

@@ -11,12 +11,14 @@ export default function formatDuration(duration: number) {
   return `${millis}.${micros}ms`;
 }
 
-export function debounce(callBack: void) {
+export function debounce<T extends unknown[]>(callBack: (...args: T) => unknown) {
   if (requestId) {
     window.cancelAnimationFrame(requestId);
   }
 
-  requestId = window.requestAnimationFrame(() => {
-    callBack;
-  });
+  return (...args: T) => {
+    requestId = window.requestAnimationFrame(() => {
+      callBack(...args);
+    });
+  };
 }

log-viewer/modules/components/database-view/DMLView.ts

@@ -350,7 +350,9 @@ export class DMLView extends LitElement {
       if (!group.isVisible()) {
         this.dmlTable?.blockRedraw();
         this.dmlTable?.getRows().forEach((row) => {
-          !row.isTreeExpanded() && row.treeExpand();
+          if (!row.isTreeExpanded()) {
+            row.treeExpand();
+          }
         });
         this.dmlTable?.restoreRedraw();
       }

log-viewer/modules/components/database-view/SOQLView.ts

@@ -483,7 +483,9 @@ export class SOQLView extends LitElement {
       if (!group.isVisible()) {
         this.soqlTable?.blockRedraw();
         this.soqlTable?.getRows().forEach((row) => {
-          !row.isTreeExpanded() && row.treeExpand();
+          if (!row.isTreeExpanded()) {
+            row.treeExpand();
+          }
         });
         this.soqlTable?.restoreRedraw();
       }

log-viewer/modules/components/find-widget/FindWidget.ts

@@ -247,7 +247,9 @@ export class FindWidget extends LitElement {
     if (e.key === 'f' && (e.metaKey || e.ctrlKey) && !e.shiftKey) {
       e.preventDefault();
 
-      !this.isVisble && !this.totalMatches && this._triggerFind();
+      if (!this.isVisble && !this.totalMatches) {
+        this._triggerFind();
+      }
       this._findInputClick();
       return;
     }
@@ -268,8 +270,10 @@ export class FindWidget extends LitElement {
       case 'Enter': {
         if (this._hasMatchValueChanged() || !this.totalMatches) {
           this._triggerFind();
+        } else if (this.nextMatchDirection) {
+          this._nextMatch();
         } else {
-          this.nextMatchDirection ? this._nextMatch() : this._previousMatch();
+          this._previousMatch();
         }
         break;
       }

log-viewer/modules/datagrid/module/RowKeyboardNavigation.ts

@@ -40,7 +40,9 @@ export class RowKeyboardNavigation extends Module {
     this.tableHolder ??= table.element.querySelector('.tabulator-tableholder') as HTMLElement;
 
     const selectedRow = table.getSelectedRows()[0];
-    !selectedRow && row.select();
+    if (!selectedRow) {
+      row.select();
+    }
     this.tableHolder?.focus();
   }
 

log-viewer/modules/datagrid/module/RowNavigation.ts

@@ -47,8 +47,12 @@ export class RowNavigation extends Module {
       row.select();
       table.restoreRedraw();
 
-      focusRow && this.tableHolder.focus();
-      row && setTimeout(() => this._scrollToRow(row, opts));
+      if (focusRow) {
+        this.tableHolder.focus();
+      }
+      if (row) {
+        setTimeout(() => this._scrollToRow(row, opts));
+      }
     }
   }
 
@@ -64,7 +68,9 @@ export class RowNavigation extends Module {
           elem.scrollIntoView({ behavior: 'auto', block: 'center', inline: 'start' });
         }
 
-        focusRow && elem.focus();
+        if (focusRow) {
+          elem.focus();
+        }
       });
     });
   }

log-viewer/modules/parsers/ApexLogParser.ts

@@ -85,7 +85,9 @@ export class ApexLogParser {
       lastEntry.text += '\n' + line;
     } else if (hasType) {
       const message = `Unsupported log event name: ${type}`;
-      !this.parsingErrors.includes(message) && this.parsingErrors.push(message);
+      if (!this.parsingErrors.includes(message)) {
+        this.parsingErrors.push(message);
+      }
     } else if (lastEntry && line.startsWith('*** Skipped')) {
       this.addLogIssue(
         lastEntry.timestamp,
@@ -2782,7 +2784,7 @@ const basicExitLogEvents: LogEventType[] = [
   'SESSION_CACHE_REMOVE_END',
 ];
 
-const logEventNames = [
+const _logEventNames = [
   'BULK_DML_RETRY',
   'BULK_HEAP_ALLOCATE',
   'CALLOUT_REQUEST',
@@ -3036,6 +3038,6 @@ const logEventNames = [
   'SESSION_CACHE_REMOVE_END',
 ] as const;
 
-export type LogEventType = (typeof logEventNames)[number];
+export type LogEventType = (typeof _logEventNames)[number];
 
 export { DMLBeginLine, SOQLExecuteBeginLine, SOQLExecuteExplainLine };

log-viewer/modules/timeline/Timeline.ts

@@ -807,7 +807,7 @@ function onMouseMove(evt: MouseEvent) {
     if (clRect) {
       lastMouseX = evt.clientX - clRect.left;
       lastMouseY = evt.clientY - clRect.top;
-      debounce(showTooltip(lastMouseX, lastMouseY, false));
+      debounce(showTooltip)(lastMouseX, lastMouseY, false);
     }
   }
 }
@@ -865,7 +865,7 @@ function handleMouseDown(): void {
 
 function handleMouseUp(): void {
   stopDragging();
-  debounce(showTooltip(lastMouseX, lastMouseY, false));
+  debounce(showTooltip)(lastMouseX, lastMouseY, false);
 }
 
 function stopDragging() {
@@ -912,7 +912,8 @@ function handleScroll(evt: WheelEvent) {
       const maxWidth = state.zoom * timelineRoot.exitStamp - displayWidth;
       state.offsetX = Math.max(0, Math.min(maxWidth, state.offsetX + deltaX));
     }
-    debounce(showTooltip(lastMouseX, lastMouseY, false));
+
+    debounce(showTooltip)(lastMouseX, lastMouseY, false);
   }
 }
 

log-viewer/package.json

@@ -21,11 +21,10 @@
   },
   "devDependencies": {
     "@types/tabulator-tables": "^6.2.3",
-    "@typescript-eslint/eslint-plugin": "^7.18.0",
-    "@typescript-eslint/parser": "^7.18.0",
+    "@typescript-eslint/eslint-plugin": "^8.18.1",
+    "@typescript-eslint/parser": "^8.18.1",
     "concurrently": "^9.1.0",
     "http-server": "^14.1.1",
-    "node-sass": "^9.0.0",
     "postcss": "^8.4.49",
     "sass": "^1.78.0",
     "typescript": "^5.7.2"

package.json

@@ -2,6 +2,8 @@
   "name": "lana-ws",
   "private": true,
   "devDependencies": {
+    "@eslint/eslintrc": "^3.2.0",
+    "@eslint/js": "^9.17.0",
     "@rollup/plugin-commonjs": "^28.0.2",
     "@rollup/plugin-json": "^6.1.0",
     "@rollup/plugin-node-resolve": "^16.0.0",
@@ -10,9 +12,10 @@
     "@swc/helpers": "^0.5.15",
     "@swc/jest": "^0.2.37",
     "@types/jest": "^29.5.14",
-    "@typescript-eslint/eslint-plugin": "^7.18.0",
-    "@typescript-eslint/parser": "^7.18.0",
+    "@typescript-eslint/eslint-plugin": "^8.18.1",
+    "@typescript-eslint/parser": "^8.18.1",
     "concurrently": "^9.1.0",
+    "eslint": "^9.17.0",
     "eslint-config-prettier": "^9.1.0",
     "husky": "^9.1.7",
     "jest": "^29.7.0",
@@ -34,7 +37,7 @@
     "build:dev": "rm -rf lana/out && concurrently -r -g 'rollup -c rollup.config.mjs' 'tsc --noemit --skipLibCheck -p log-viewer/tsconfig.json' 'tsc --noemit --skipLibCheck -p lana/tsconfig.json'",
     "watch": "rm -rf lana/out && rollup -w -c rollup.config.mjs",
     "prepare": "husky",
-    "lint": "concurrently -r -g 'eslint . --ext ts' 'prettier --cache **/*.{ts,css,md,scss} --check' 'tsc --noemit --skipLibCheck -p log-viewer/tsconfig.json' 'tsc --noemit --skipLibCheck -p lana/tsconfig.json'",
+    "lint": "concurrently -r -g \"eslint '**/*.ts/'\" \"prettier --cache **/*.{ts,css,md,scss} --check\" \"tsc --noemit --skipLibCheck -p log-viewer/tsconfig.json\" \"tsc --noemit --skipLibCheck -p lana/tsconfig.json\"",
     "test": "jest",
     "test:ci": "jest --runInBand",
     "prettier-format": "prettier '**/*.ts' --cache --write"