Merge pull request #15 from jsonjoy-com/linter

Linter

Author: streamich

package.json

@@ -41,8 +41,8 @@
   "scripts": {
     "prettier": "prettier --ignore-path .gitignore --write \"src/**/*.{ts,tsx,js,jsx}\"",
     "prettier:check": "prettier --ignore-path .gitignore --list-different 'src/**/*.{ts,tsx,js,jsx}'",
-    "lint": "yarn tslint",
-    "tslint": "tslint 'src/**/*.{js,jsx,ts,tsx}' -t verbose --project .",
+    "lint": "oxlint ./src/",
+    "lint:fix": "oxlint ./src/ --fix --fix-suggestions",
     "clean": "rimraf lib typedocs coverage gh-pages yarn-error.log db dist",
     "build": "tsc --project tsconfig.build.json --module commonjs --target es2020 --outDir lib",
     "jest": "node -r ts-node/register ./node_modules/.bin/jest",
@@ -107,6 +107,7 @@
     "jest": "^29.7.0",
     "nano-theme": "^1.4.2",
     "nice-ui": "^1.9.2",
+    "oxlint": "^0.9.9",
     "prettier": "^3.2.5",
     "react": "^18.3.1",
     "react-dom": "^18.3.1",

src/__tests__/e2e/demo-client.ts

@@ -44,7 +44,6 @@ export const setupDemoServerStreamingClient = (codec: RpcCodec) => {
   const contentType = 'application/x.' + protocolSpecifier;
   const client = new StreamingRpcClient({
     send: async (messages) => {
-      const port = +(process.env.PORT || 9999);
       const url = `http${secure ? 's' : ''}://${host}/rpc`;
       codec.req.encoder.writer.reset();
       codec.msg.encodeBatch(codec.req, messages);

src/__tests__/e2e/json-crdt-server/clients.spec.ts

@@ -25,7 +25,7 @@ if (process.env.TEST_E2E) {
     for (const codec of list) {
       const setup: ApiTestSetup = async () => setupFetchRpcClient(codec);
       describe(`protocol: application/x.${codec.specifier()}`, () => {
-        runUtilTests(setup, {staticOnly: true});
+        runUtilTests(setup);
         runPubsubTests(setup, {staticOnly: true});
         runPresenceTests(setup, {staticOnly: true});
         runBlockTests(setup, {staticOnly: true});
@@ -39,7 +39,7 @@ if (process.env.TEST_E2E) {
     for (const codec of list) {
       const setup: ApiTestSetup = async () => setupStreamingRpcClient(codec);
       describe(`protocol: application/x.${codec.specifier()}`, () => {
-        runUtilTests(setup, {staticOnly: true});
+        runUtilTests(setup);
         runPubsubTests(setup, {staticOnly: true});
         runPresenceTests(setup, {staticOnly: true});
         runBlockTests(setup, {staticOnly: true});

src/__tests__/e2e/json-crdt-server/demo-server.spec.ts

@@ -22,27 +22,27 @@ if (process.env.TEST_E2E && process.env.TEST_E2E_DEMO_SERVER) {
     });
   });
 
-  // describe('FetchRpcClient', () => {
-  //   const codec = cborCodec();
-  //   const setup: ApiTestSetup = async () => setupDemoServerFetchClient(codec);
-  //   describe(`protocol: application/x.${codec.specifier()}`, () => {
-  //     runUtilTests(setup, {staticOnly: true});
-  //     runPubsubTests(setup, {staticOnly: true});
-  //     runPresenceTests(setup, {staticOnly: true});
-  //     runBlockTests(setup, {staticOnly: true});
-  //   });
-  // });
+  describe('FetchRpcClient', () => {
+    const codec = cborCodec();
+    const setup: ApiTestSetup = async () => setupDemoServerFetchClient(codec);
+    describe(`protocol: application/x.${codec.specifier()}`, () => {
+      runUtilTests(setup);
+      runPubsubTests(setup, {staticOnly: true});
+      runPresenceTests(setup, {staticOnly: true});
+      runBlockTests(setup, {staticOnly: true});
+    });
+  });
 
-  // describe('StreamingRpcClient', () => {
-  //   const codec = cborCodec();
-  //   const setup: ApiTestSetup = async () => setupDemoServerStreamingClient(codec);
-  //   describe(`protocol: application/x.${codec.specifier()}`, () => {
-  //     runUtilTests(setup, {staticOnly: true});
-  //     runPubsubTests(setup, {staticOnly: true});
-  //     runPresenceTests(setup, {staticOnly: true});
-  //     runBlockTests(setup, {staticOnly: true});
-  //   });
-  // });
+  describe('StreamingRpcClient', () => {
+    const codec = cborCodec();
+    const setup: ApiTestSetup = async () => setupDemoServerStreamingClient(codec);
+    describe(`protocol: application/x.${codec.specifier()}`, () => {
+      runUtilTests(setup);
+      runPubsubTests(setup, {staticOnly: true});
+      runPresenceTests(setup, {staticOnly: true});
+      runBlockTests(setup, {staticOnly: true});
+    });
+  });
 } else {
   test.skip('set TEST_E2E=1 env var to run this test suite', () => {});
 }

src/__tests__/e2e/run.ts

@@ -23,7 +23,7 @@ const startServer = async () => {
   const cp = spawn('yarn', [`demo:e2e:${suite}:${server}`], {
     shell: true,
   });
-  process.on('exit', (code) => {
+  process.on('exit', () => {
     cp.kill();
   });
   cp.stdout.on('data', (data) => {
@@ -58,7 +58,7 @@ const runTests = async () => {
     },
     stdio: 'inherit',
   });
-  process.on('exit', (code) => {
+  process.on('exit', () => {
     cp.kill();
   });
   cp.on('close', (code) => {

src/__tests__/e2e/sample-api/clients.spec.ts

@@ -18,7 +18,7 @@ if (process.env.TEST_E2E) {
     for (const codec of list) {
       const setup: ApiTestSetup = async () => setupFetchRpcClient(codec);
       describe(`protocol: application/x.${codec.specifier()}`, () => {
-        runApiTests(setup, {staticOnly: true});
+        runApiTests(setup);
       });
     }
   });
@@ -28,7 +28,7 @@ if (process.env.TEST_E2E) {
     for (const codec of list) {
       const setup: ApiTestSetup = async () => setupStreamingRpcClient(codec);
       describe(`protocol: application/x.${codec.specifier()}`, () => {
-        runApiTests(setup, {staticOnly: true});
+        runApiTests(setup);
       });
     }
   });

src/__tests__/json-crdt-server/block.ts

@@ -184,7 +184,7 @@ export const runBlockTests = (_setup: ApiTestSetup, params: {staticOnly?: true}
           text: 'Hell',
         });
         const patch1 = model.api.flush();
-        const newResult = await call('block.new', {
+        await call('block.new', {
           id,
           batch: {
             patches: [

src/__tests__/json-crdt-server/util.ts

@@ -1,7 +1,7 @@
 import type {JsonCrdtTestSetup} from '../../__demos__/json-crdt-server/__tests__/setup';
 import type {ApiTestSetup} from '../../common/rpc/__tests__/runApiTests';
 
-export const runUtilTests = (_setup: ApiTestSetup, params: {staticOnly?: true} = {}) => {
+export const runUtilTests = (_setup: ApiTestSetup) => {
   const setup = _setup as JsonCrdtTestSetup;
 
   describe('util.*', () => {

src/browser/index.ts

@@ -104,6 +104,7 @@ describe('.stop()', () => {
     await new Promise((r) => setTimeout(r, 1));
     expect(onSend).toHaveBeenCalledTimes(2);
     expect(onClose).toHaveBeenCalledTimes(1);
+    expect(channel).toBe(undefined);
   });
 });
 
@@ -126,6 +127,7 @@ describe('.send$() method', () => {
     expect(onSend).toHaveBeenCalledTimes(1);
     expect(onSend).toHaveBeenCalledWith('asdf');
     expect(persistent.open$.getValue()).toBe(true);
+    expect(channel).not.toBe(undefined);
   });
 
   test('buffers and sends message out once channel is connected', async () => {
@@ -144,6 +146,7 @@ describe('.send$() method', () => {
     await future;
     expect(onSend).toHaveBeenCalledTimes(1);
     expect(onSend).toHaveBeenCalledWith(new Uint8Array([1, 2, 3]));
+    expect(channel).not.toBe(undefined);
   });
 
   test('does not send messages once .stop() is executed', async () => {
@@ -161,10 +164,11 @@ describe('.send$() method', () => {
     await firstValueFrom(persistent.send$('foo').pipe(take(1)));
     expect(onSend).toHaveBeenCalledTimes(2);
     persistent.stop();
-    const a = of(firstValueFrom(persistent.send$('bar').pipe(take(1))));
+    of(firstValueFrom(persistent.send$('bar').pipe(take(1))));
     await new Promise((r) => setTimeout(r, 1));
     ws()._open();
     await new Promise((r) => setTimeout(r, 1));
     expect(onSend).toHaveBeenCalledTimes(2);
+    expect(channel).toBe(undefined);
   });
 });