force to provide param, even undefined, to enable ts-check

YieldRay · YieldRay · commit 2e2801d9d97e · 2024-01-27T18:19:22.000+08:00
diff --git a/src/client.test.ts b/src/client.test.ts
@@ -16,8 +16,8 @@ Deno.test('client', async () => {
             result: 'bar',
         }).toString()
     )
-    assertEquals(await client.request('foo'), 'bar')
-    assertEquals(await client.notify('foo'), undefined)
+    assertEquals(await client.request('foo', undefined), 'bar')
+    assertEquals(await client.notify('foo', undefined), undefined)
 })
 
 Deno.test('client/batch', async () => {
@@ -31,14 +31,14 @@ Deno.test('client/batch', async () => {
         )
     )
 
-    assertEquals(await client.batch(client.createRequest('foo')), [{
+    assertEquals(await client.batch(client.createRequest('foo', undefined)), [{
         status: 'fulfilled',
         value: 'bar',
     }])
 
     assertEquals(
         await client.batch(
-            client.createRequest('foo'),
+            client.createRequest('foo', undefined),
         ),
         [{
             status: 'fulfilled',
@@ -48,9 +48,9 @@ Deno.test('client/batch', async () => {
 
     assertEquals(
         await client.batch(
-            client.createRequest('foo1'),
-            client.createRequest('foo2'),
-            client.createRequest('foo3'),
+            client.createRequest('foo1', undefined),
+            client.createRequest('foo2', undefined),
+            client.createRequest('foo3', undefined),
         ),
         [{
             status: 'fulfilled',
@@ -66,16 +66,16 @@ Deno.test('client/batch', async () => {
 
     assertEquals(
         await client.batch(
-            client.createNotification('foo'),
+            client.createNotification('foo', undefined),
         ),
         [],
     )
 
     assertEquals(
         await client.batch(
-            client.createNotification('foo1'),
-            client.createNotification('foo2'),
-            client.createNotification('foo3'),
+            client.createNotification('foo1', undefined),
+            client.createNotification('foo2', undefined),
+            client.createNotification('foo3', undefined),
         ),
         [],
     )
@@ -92,9 +92,9 @@ Deno.test('client/batch', async () => {
 
     assertInstanceOf(
         await client.batch(
-            client.createRequest('foo1'),
-            client.createRequest('foo2'),
-            client.createRequest('foo3'),
+            client.createRequest('foo1', undefined),
+            client.createRequest('foo2', undefined),
+            client.createRequest('foo3', undefined),
         ).catch((e) => e),
         JSONRPCError,
     )
@@ -115,9 +115,9 @@ Deno.test('client/batch', async () => {
 
     assertEquals(
         await client.batch(
-            client.createRequest('foo1'),
-            client.createRequest('foo2'),
-            client.createRequest('foo3'),
+            client.createRequest('foo1', undefined),
+            client.createRequest('foo2', undefined),
+            client.createRequest('foo3', undefined),
         ),
         [{
             status: 'rejected',
@@ -150,22 +150,22 @@ Deno.test('client/JSONRPCClientParseError', async () => {
     client = new JSONRPCClient(() => `malformed json`)
 
     assertInstanceOf(
-        await client.request('foo').catch((
+        await client.request('foo', undefined).catch((
             e,
         ) => e),
         JSONRPCClientParseError,
     )
 
     assertInstanceOf(
-        await client.batch(client.createRequest('foo')).catch((
+        await client.batch(client.createRequest('foo', undefined)).catch((
             e,
         ) => e),
         JSONRPCClientParseError,
     )
 
     assertInstanceOf(
         await new JSONRPCClient(() => `{"incorrect": "response object"}`)
-            .request('foo').catch((
+            .request('foo', undefined).catch((
                 e,
             ) => e),
         JSONRPCClientParseError,
@@ -178,7 +178,7 @@ Deno.test('client/JSONRPCClientParseError', async () => {
                 result: 6,
             })}`
         )
-            .request('foo').catch((
+            .request('foo', undefined).catch((
                 e,
             ) => e),
         JSONRPCClientParseError,
@@ -195,16 +195,16 @@ Deno.test('client/JSONRPCClientParseError', async () => {
 
     assertInstanceOf(
         await client.batch(
-            client.createRequest('foo'),
+            client.createRequest('foo', undefined),
         ).catch((e) => e),
         JSONRPCClientParseError,
     )
 
     assertInstanceOf(
         await client.batch(
-            client.createRequest('foo1'),
-            client.createRequest('foo2'),
-            client.createRequest('foo3'),
+            client.createRequest('foo1', undefined),
+            client.createRequest('foo2', undefined),
+            client.createRequest('foo3', undefined),
         ).catch((e) => e),
         JSONRPCClientParseError,
     )
@@ -217,9 +217,9 @@ Deno.test('client/JSONRPCClientParseError', async () => {
 
     assertInstanceOf(
         await client.batch(
-            client.createRequest('foo1'),
-            client.createRequest('foo2'),
-            client.createRequest('foo3'),
+            client.createRequest('foo1', undefined),
+            client.createRequest('foo2', undefined),
+            client.createRequest('foo3', undefined),
         ).catch((e) => e),
         JSONRPCClientParseError,
     )
@@ -239,9 +239,9 @@ Deno.test('client/JSONRPCClientParseError', async () => {
 
     assertEquals(
         await client.batch(
-            client.createRequest('foo1'),
-            client.createRequest('foo2'),
-            client.createRequest('foo3'),
+            client.createRequest('foo1', undefined),
+            client.createRequest('foo2', undefined),
+            client.createRequest('foo3', undefined),
         ).catch((e) => e.message),
         'ERR_MSG',
     )
@@ -258,9 +258,9 @@ Deno.test('client/JSONRPCClientParseError', async () => {
 
     assertInstanceOf(
         await client.batch(
-            client.createRequest('foo1'),
-            client.createRequest('foo2'),
-            client.createRequest('foo3'),
+            client.createRequest('foo1', undefined),
+            client.createRequest('foo2', undefined),
+            client.createRequest('foo3', undefined),
         ).catch((e) => e),
         JSONRPCClientParseError,
     )
@@ -288,13 +288,19 @@ Deno.test({
             }).then((res) => res.text())
         )
 
-        assertInstanceOf(await client.request('system.listMethods'), Array)
+        assertInstanceOf(
+            await client.request('system.listMethods', undefined),
+            Array,
+        )
 
-        assertEquals(await client.notify('system.listMethods'), undefined)
+        assertEquals(
+            await client.notify('system.listMethods', undefined),
+            undefined,
+        )
 
         const [r1, r2] = await client.batch(
-            client.createRequest('system.listMethods'),
-            client.createRequest('system.listMethods'),
+            client.createRequest('system.listMethods', undefined),
+            client.createRequest('system.listMethods', undefined),
         ) as JSONRPCFulfilledResult[]
 
         assertObjectMatch(r1, { status: 'fulfilled' })
diff --git a/src/client.ts b/src/client.ts
@@ -51,7 +51,7 @@ export class JSONRPCClient<
 
     public createRequest<T extends keyof Methods>(
         method: T extends string ? T : never,
-        params?: Parameters<Methods[T]>[0],
+        params: Parameters<Methods[T]>[0],
     ): JSONRPCRequest {
         const id = getIDFromGenerator(this.idGenerator)
         const request = new JSONRPCRequest({
@@ -64,7 +64,7 @@ export class JSONRPCClient<
 
     public createNotification<T extends keyof Methods>(
         method: T extends string ? T : never,
-        params?: Parameters<Methods[T]>[0],
+        params: Parameters<Methods[T]>[0],
     ): JSONRPCNotification {
         const notification = new JSONRPCNotification({
             method,
@@ -78,7 +78,7 @@ export class JSONRPCClient<
      */
     public async request<T extends keyof Methods>(
         method: T extends string ? T : never,
-        params?: Parameters<Methods[T]>[0],
+        params: Parameters<Methods[T]>[0],
     ): Promise<ReturnType<Methods[T]>> {
         const request = this.createRequest(method, params)
         // responded json string
@@ -119,7 +119,7 @@ export class JSONRPCClient<
      */
     public async notify<T extends keyof Methods>(
         method: T extends string ? T : never,
-        params?: Parameters<Methods[T]>[0],
+        params: Parameters<Methods[T]>[0],
     ): Promise<void> {
         const notification = this.createNotification(method, params)
         await this.requestForResponse(JSON.stringify(notification))
diff --git a/src/index.test.ts b/src/index.test.ts
@@ -34,6 +34,7 @@ Deno.test('JSONRPCClient/JSONRPCServer', async () => {
         await client.request(
             // deno-lint-ignore no-explicit-any
             'no_such_method' as any,
+            undefined,
         ).catch((e) => e),
         {
             code: -32601,

Original file line number	Diff line number	Diff line change
`@@ -34,6 +34,7 @@ Deno.test('JSONRPCClient/JSONRPCServer', async () => {`
`34`	`34`	`await client.request(`
`35`	`35`	`// deno-lint-ignore no-explicit-any`
`36`	`36`	`'no_such_method' as any,`
	`37`	`+ undefined,`
`37`	`38`	`).catch((e) => e),`
`38`	`39`	`{`
`39`	`40`	`code: -32601,`