*: bump eslint

Author: tharvik

.github/workflows/lint-test-build.yml

@@ -18,7 +18,8 @@ jobs:
           key: datasets-${{ hashFiles('datasets/**') }}
       - run: datasets/populate
 
-  lint-lib:
+  lint-most:
+    needs: [build-cli, build-lib, build-lib-node, build-lib-web, build-server, build-webapp]
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
@@ -32,97 +33,8 @@ jobs:
             ~/.cache/Cypress
           key: npm-${{ runner.os }}-${{ hashFiles('package-lock.json') }}
       - run: npm ci
-      - run: npm --workspace=discojs run lint
-
-  lint-lib-node:
-    needs: build-lib
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-node@v4
-        with:
-          node-version-file: .nvmrc
-      - uses: actions/cache@v4
-        with:
-          path: |
-            ~/.npm
-            ~/.cache/Cypress
-          key: npm-${{ runner.os }}-${{ hashFiles('package-lock.json') }}
-      - run: npm ci
-      - run: npm --workspace=discojs run build
-      - run: npm --workspace=discojs-node run lint
-
-  lint-lib-web:
-    needs: build-lib
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-node@v4
-        with:
-          node-version-file: .nvmrc
-      - uses: actions/cache@v4
-        with:
-          path: |
-            ~/.npm
-            ~/.cache/Cypress
-          key: npm-${{ runner.os }}-${{ hashFiles('package-lock.json') }}
-      - run: npm ci
-      - run: npm --workspace=discojs run build
-      - run: npm --workspace=discojs-web run lint
-
-  lint-server:
-    needs: [build-lib, build-lib-node]
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-node@v4
-        with:
-          node-version-file: .nvmrc
-      - uses: actions/cache@v4
-        with:
-          path: |
-            ~/.npm
-            ~/.cache/Cypress
-          key: npm-${{ runner.os }}-${{ hashFiles('package-lock.json') }}
-      - run: npm ci
-      - run: npm --workspace={discojs,discojs-node} run build
-      - run: npm --workspace=server run lint
-
-  lint-cli:
-    needs: [build-lib, build-lib-node, build-server]
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-node@v4
-        with:
-          node-version-file: .nvmrc
-      - uses: actions/cache@v4
-        with:
-          path: |
-            ~/.npm
-            ~/.cache/Cypress
-          key: npm-${{ runner.os }}-${{ hashFiles('package-lock.json') }}
-      - run: npm ci
-      - run: npm --workspace={discojs,discojs-node,server} run build
-      - run: npm --workspace=cli run lint
-
-  lint-webapp:
-    needs: [build-lib, build-lib-web]
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-node@v4
-        with:
-          node-version-file: .nvmrc
-      - uses: actions/cache@v4
-        with:
-          path: |
-            ~/.npm
-            ~/.cache/Cypress
-          key: npm-${{ runner.os }}-${{ hashFiles('package-lock.json') }}
-      - run: npm ci
-      - run: npm --workspace={discojs,discojs-web} run build
-      - run: npm --workspace=webapp run lint
+      - run: npm --workspaces run build
+      - run: npm run lint
 
   lint-docs-examples:
     needs: [build-lib, build-lib-node, build-server]
@@ -283,73 +195,8 @@ jobs:
       - run: npm run build
         working-directory: docs/examples
 
-  test-lib:
-    needs: [build-lib, download-datasets]
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-      - uses: actions/cache@v4
-        with:
-          path: datasets
-          key: datasets-${{ hashFiles('datasets/**') }}
-      - uses: actions/setup-node@v4
-        with:
-          node-version-file: .nvmrc
-      - uses: actions/cache@v4
-        with:
-          path: |
-            ~/.npm
-            ~/.cache/Cypress
-          key: npm-${{ runner.os }}-${{ hashFiles('package-lock.json') }}
-      - run: npm ci
-      - run: npm --workspace=discojs test
-
-  test-lib-node:
-    needs: [build-lib, download-datasets]
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-      - uses: actions/cache@v4
-        with:
-          path: datasets
-          key: datasets-${{ hashFiles('datasets/**') }}
-      - uses: actions/setup-node@v4
-        with:
-          node-version-file: .nvmrc
-      - uses: actions/cache@v4
-        with:
-          path: |
-            ~/.npm
-            ~/.cache/Cypress
-          key: npm-${{ runner.os }}-${{ hashFiles('package-lock.json') }}
-      - run: npm ci
-      - run: npm --workspace=discojs run build
-      - run: npm --workspace=discojs-node test
-
-  test-lib-web:
-    needs: [build-lib]
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-      - uses: actions/cache@v4
-        with:
-          path: datasets
-          key: datasets-${{ hashFiles('datasets/**') }}
-      - uses: actions/setup-node@v4
-        with:
-          node-version-file: .nvmrc
-      - uses: actions/cache@v4
-        with:
-          path: |
-            ~/.npm
-            ~/.cache/Cypress
-          key: npm-${{ runner.os }}-${{ hashFiles('package-lock.json') }}
-      - run: npm ci
-      - run: npm --workspace=discojs run build
-      - run: npm --workspace=discojs-web test
-
-  test-server:
-    needs: [build-lib, build-lib-node, download-datasets]
+  test-most:
+    needs: [build-lib, build-lib-node, build-lib-web, build-server, download-datasets]
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
@@ -367,8 +214,8 @@ jobs:
             ~/.cache/Cypress
           key: npm-${{ runner.os }}-${{ hashFiles('package-lock.json') }}
       - run: npm ci
-      - run: npm --workspace={discojs,discojs-node} run build
-      - run: npm --workspace=server test
+      - run: npm --workspace={discojs,discojs-{node,web},server} run build
+      - run: npx vitest --run
 
   test-webapp:
     needs: [build-lib, build-lib-web, download-datasets]

cli/package.json

@@ -10,7 +10,6 @@
 		"train_gpt": "npm run build && node dist/train_gpt.js",
 		"hellaswag_gpt": "npm run build && node dist/hellaswag_gpt.js",
 		"build": "tsc --build",
-		"lint": "eslint .",
 		"test": ": nothing"
 	},
 	"author": "",

discojs-node/package.json

@@ -7,7 +7,6 @@
 	"scripts": {
 		"watch": "nodemon --ext ts --ignore dist --watch ../discojs/dist --watch . --exec npm run",
 		"build": "tsc --build",
-		"lint": "eslint .",
 		"test": "cd .. && vitest --run --project=discojs-node"
 	},
 	"repository": {

discojs-web/package.json

@@ -7,7 +7,6 @@
 	"scripts": {
 		"watch": "nodemon --ext ts --ignore dist --watch ../discojs/dist --watch . --exec npm run",
 		"build": "tsc --build",
-		"lint": "eslint .",
 		"test": "cd .. && vitest --run --project=discojs-web"
 	},
 	"repository": {

discojs-web/src/loaders/csv.ts

@@ -24,7 +24,8 @@ export function load(file: File): Dataset<Partial<Record<string, string>>> {
         skipEmptyLines: true, // TODO needed to avoid parsing last empty line
         complete(results) {
           if (results.errors.length > 0) {
-            reject(results.errors);
+            const error = results.errors[0]
+            reject(new Error(error.message));
             return;
           }
 

discojs/package.json

@@ -7,7 +7,6 @@
 	"scripts": {
 		"watch": "nodemon --ext ts --ignore dist --exec npm run",
 		"build": "tsc --build",
-		"lint": "eslint .",
 		"test": "cd .. && vitest --run --project=discojs"
 	},
 	"repository": {

discojs/src/client/event_connection.ts

@@ -1,9 +1,8 @@
 import createDebug from "debug";
 import WebSocket from "isomorphic-ws";
 import * as msgpack from "@msgpack/msgpack";
-
 import type { Peer, SignalData } from './decentralized/peer.js'
-import { type NodeID } from './types.js'
+import type { NodeID } from './types.js'
 import * as decentralizedMessages from './decentralized/messages.js'
 import { type, type NarrowMessage, type Message } from './messages.js'
 import { timeout } from './utils.js'
@@ -130,7 +129,7 @@ export class WebSocketServer extends EventEmitter<{ [K in type]: NarrowMessage<K
   disconnect(): Promise<void> {
     return new Promise((resolve, reject) => {
       this.socket.onclose = () => resolve()
-      this.socket.onerror = (e) => reject(e.message)
+      this.socket.onerror = (e) => reject(new Error(e.message))
       this.socket.close()
     })
   }

discojs/src/dataset/dataset.spec.ts

@@ -169,7 +169,7 @@ describe("dataset", () => {
     expect(sequences.last()?.size).to.equal(contextLength + 1)
     sequences = sequences.pop()
     let i = 0
-    for await (const tokens of sequences) {
+    for (const tokens of sequences) {
       // each sequence has length contextLength + 1 (for the label)
       expect(tokens.toArray()).to.deep.equal(
         expectedTokens.slice(i, i + contextLength + 1).toArray()

discojs/src/serialization/model.spec.ts

@@ -65,9 +65,6 @@ describe('serialization', () => {
       await getRawWeights(model),
       await getRawWeights(decoded)
     )
-    assert.deepEqual(
-      model.config,
-      (decoded as models.GPT).config
-    )
+    assert.deepEqual(model.config, decoded.config);
   })
 })

discojs/src/utils/async_iterator.spec.ts

@@ -1,6 +1,5 @@
 import { describe, expect, it } from "vitest";
-
-import { split, gather } from "./async_iterator.js";
+import { gather, split } from "./async_iterator.js";
 
 // Array.fromAsync not yet widely used (2024)
 async function arrayFromAsync<T>(iter: AsyncIterable<T>): Promise<T[]> {
@@ -40,24 +39,16 @@ describe("split", () => {
 
   it("throws returned when iterator throws", async () => {
     const [gen, ret] = split(
-      // eslint-disable-next-line require-yield, @typescript-eslint/require-await
-      (async function* () {
+      (
+      // eslint-disable-next-line @typescript-eslint/require-await
+      async function* () {
         throw new Error();
       })(),
     );
 
-    try {
+    await expect(async () => {
       for await (const _ of gen);
-    } catch {
-      // expected
-    }
-
-    try {
-      await ret;
-    } catch {
-      return; // all good
-    }
-
-    expect(false, "should have thrown").to.be.true;
+    }).rejects.toThrow();
+    await expect(ret).rejects.toThrow();
   });
 });