@nxtedition/deepstream.io-client-js 32.0.9 → 32.0.11

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nxtedition/deepstream.io-client-js",
-  "version": "32.0.9",
+  "version": "32.0.11",
   "description": "the javascript client for deepstream.io",
   "homepage": "http://deepstream.io",
   "type": "module",

package/src/client.test-d.ts

@@ -109,6 +109,7 @@ expectAssignable<string>(await ds.record.get('p', 'p1', { signal: new AbortContr
 expectAssignable<string>(await ds.record.get('p', { path: 'p1' }))
 expectAssignable<string | undefined>(await ds.record.get('p', 'p2'))
 expectAssignable<unknown>(await ds.record.get('p', 'x1'))
+expectAssignable<string | undefined>(await ds.record.get('possiblyEmpty', 'pe1'))
 
 // observe with options
 expectAssignable<Observable<{ p1: string; p2?: string; p3: { p4: string } }>>(

package/src/record/record.d.ts

@@ -1,6 +1,15 @@
 import type RecordHandler from './record-handler.js'
-import type { Get } from 'type-fest'
-export type { Get, Paths } from 'type-fest'
+import type { Get as _Get, AllUnionFields } from 'type-fest'
+export type { Paths } from 'type-fest'
+
+// HACK: Wrap type-fest's Get to get rid of EmptyObject from union
+type RemoveSymbolKeys<T> = {
+  [K in keyof T as K extends symbol ? never : K]: T[K]
+}
+export type Get<BaseType, Path extends string | readonly string[]> = _Get<
+  RemoveSymbolKeys<AllUnionFields<BaseType>>,
+  Path
+>
 
 export interface WhenOptions {
   signal?: AbortSignal

package/src/rpc/rpc-handler.d.ts

@@ -25,7 +25,7 @@ export default class RpcHandler<
       ReturnValue extends Name extends keyof Methods ? Methods[Name][1] : unknown,
     >(
       name: Name,
-      args: Args,
+      args?: Args,
     ): Promise<ReturnValue>
     <
       Name extends keyof Methods | string,
@@ -33,7 +33,7 @@ export default class RpcHandler<
       ReturnValue extends Name extends keyof Methods ? Methods[Name][1] : unknown,
     >(
       name: Name,
-      args: Args,
+      args: Args | undefined,
       callback: (error: unknown, response: ReturnValue) => void,
     ): void
   }

package/src/rpc/rpc-handler.test-d.ts

@@ -11,6 +11,10 @@ const ds = make<Record<string, unknown>, Methods>('')
 ds.rpc.provide('greet', (_args, _response) => {})
 ds.rpc.provide('greet', (_args, _response) => ({ message: 'hello' }))
 ds.rpc.provide('greet', async (_args, _response) => ({ message: 'hello' }))
+// async callback that uses response.send() directly — returns Promise<void>
+ds.rpc.provide('greet', async (_args, response) => {
+  response.send({ message: 'hello' })
+})
 
 // provide: returning the wrong shape is an error
 expectError(ds.rpc.provide('greet', (_args, _response) => ({ notMessage: 'hello' })))
@@ -22,3 +26,15 @@ ds.rpc.provide('greet', (_args, response) => {
 
 // provide: return type is UnprovideFn | void
 expectAssignable<(() => void) | void>(ds.rpc.provide('greet', () => {}))
+
+// make: args is optional (no args)
+expectAssignable<Promise<{ message: string }>>(ds.rpc.make('greet'))
+// make: args provided
+expectAssignable<Promise<{ message: string }>>(ds.rpc.make('greet', { name: 'world' }))
+// make: args explicitly undefined
+expectAssignable<Promise<{ message: string }>>(ds.rpc.make('greet', undefined))
+// make: callback form — args required positionally but can be undefined
+ds.rpc.make('greet', undefined, (err, res) => {
+  expectType<unknown>(err)
+  expectAssignable<{ message: string } | undefined>(res)
+})