@nxtedition/deepstream.io-client-js 31.0.15 → 31.0.17

package/package.json

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

package/src/client.d.ts

@@ -8,7 +8,7 @@ import type RpcHandler from './rpc/rpc-handler.js'
 import type { RpcStats, RpcMethodDef } from './rpc/rpc-handler.js'
 
 export default function <
-  Records extends Record<string, unknown> = Record<string, unknown>,
+  Records,
   Methods extends Record<string, RpcMethodDef> = Record<string, RpcMethodDef>,
 >(url: string, options?: unknown): DeepstreamClient<Records, Methods>
 
@@ -79,7 +79,7 @@ type EventKey = keyof EventConstants
 type EventName = EventConstants[EventKey]
 
 export interface DeepstreamClient<
-  Records extends Record<string, unknown> = Record<string, unknown>,
+  Records = Record<string, unknown>,
   Methods extends Record<string, RpcMethodDef> = Record<string, RpcMethodDef>,
 > {
   nuid: () => string

package/src/client.test-d.ts

@@ -72,6 +72,8 @@ ds.record.set('c', 'a.b1', 'test')
 ds.record.set('x:domain', 'd1', 'test')
 const id = 'id'
 ds.record.set(`${id}:domain`, 'd2.d3', 'test')
+expectError(ds.record.set(`${id}:domain`, 'd2.d3', 22))
+ds.record.set(`${id}:domain`, ['d2', 'd3'] as const, 'test')
 
 expectAssignable<string>(await ds.record.get(`${id}:domain`, 'd2.d3'))
 
@@ -98,8 +100,7 @@ const daRec = ds.record.getRecord('o')
 daRec.set({ o0: {} })
 
 daRec.update('o0', (x) => ({ ...x, o1: {} }))
+expectError(daRec.set('o0.x1', {}))
+daRec.set('o0.o1', {})
 expectError(daRec.update((x) => 'x'))
 expectError(daRec.update('o0', (x) => ({ ...x, o1: '22' })))
-
-ds.record.set('foo', { num: [22, true] })
-ds.record.set('foo', { num: ['22'] })

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

@@ -1,10 +1,10 @@
 import type { Observable } from 'rxjs'
 import type DsRecord from './record.js'
-import type { EmptyObject, Get, Paths } from './record.js'
+import type { EmptyObject, Get } from './record.js'
 
-export default class RecordHandler<
-  Lookup extends Record<string, unknown> = Record<string, unknown>,
-> {
+type Lookup<Table, Name> = Name extends keyof Table ? Table[Name] : unknown
+
+export default class RecordHandler<Records = Record<string, unknown>> {
   VOID: 0
   CLIENT: 1
   SERVER: 2
@@ -20,9 +20,7 @@ export default class RecordHandler<
   connected: boolean
   stats: RecordStats
 
-  getRecord<Name extends string, Data = Name extends keyof Lookup ? Lookup[Name] : unknown>(
-    name: Name,
-  ): DsRecord<Data>
+  getRecord<Name extends string, Data = Lookup<Records, Name>>(name: Name): DsRecord<Data>
 
   provide: (
     pattern: string,
@@ -34,13 +32,15 @@ export default class RecordHandler<
 
   set: {
     // without path:
-    <Name extends string>(name: Name, data: Lookup[Name] | EmptyObject): void
+    <Name extends string>(name: Name, data: Lookup<Records, Name> | EmptyObject): void
 
     // with path:
     <Name extends string, Path extends string | string[]>(
       name: Name,
       path: Path,
-      data: Path extends Paths<Lookup[Name]> ? Get<Lookup[Name], Path> : never,
+      data: unknown extends Get<Lookup<Records, Name>, Path>
+        ? never
+        : Get<Lookup<Records, Name>, Path>,
     ): void
   }
 
@@ -48,48 +48,48 @@ export default class RecordHandler<
     // without path:
     <Name extends string>(
       name: Name,
-      updater: (data: Lookup[Name]) => Lookup[Name] | EmptyObject,
+      updater: (data: Lookup<Records, Name>) => Lookup<Records, Name> | EmptyObject,
     ): Promise<void>
 
     // with path:
     <Name extends string, Path extends string | string[]>(
       name: Name,
       path: Path,
-      updater: (data: Get<Lookup[Name], Path>) => Get<Lookup[Name], Path>,
+      updater: (data: Get<Lookup<Records, Name>, Path>) => Get<Lookup<Records, Name>, Path>,
     ): Promise<void>
   }
 
   observe: {
     // without path:
-    <Name extends string>(name: Name): Observable<Lookup[Name]>
+    <Name extends string>(name: Name): Observable<Lookup<Records, Name>>
 
     // with path:
     <Name extends string, Path extends string | string[]>(
       name: Name,
       path: Path,
-    ): Observable<Get<Lookup[Name], Path>>
+    ): Observable<Get<Lookup<Records, Name>, Path>>
 
     // with state:
-    <Name extends string>(name: Name, state: number): Observable<Lookup[Name]>
+    <Name extends string>(name: Name, state: number): Observable<Lookup<Records, Name>>
 
     // with path and state:
     <Name extends string, Path extends string | string[]>(
       name: Name,
       path: Path,
       state: number,
-    ): Observable<Get<Lookup[Name], Path>>
+    ): Observable<Get<Lookup<Records, Name>, Path>>
   }
 
   get: {
     // without path:
-    <Name extends string>(name: Name, state?: number): Promise<Lookup[Name]>
+    <Name extends string>(name: Name, state?: number): Promise<Lookup<Records, Name>>
 
     // with path:
     <Name extends string, Path extends string | string[]>(
       name: Name,
       path: Path,
       state?: number,
-    ): Promise<Get<Lookup[Name], Path>>
+    ): Promise<Get<Lookup<Records, Name>, Path>>
   }
 
   observe2: {
@@ -100,7 +100,7 @@ export default class RecordHandler<
       name: string
       version: string
       state: number
-      data: Lookup[Name]
+      data: Lookup<Records, Name>
     }>
 
     // with path:
@@ -111,7 +111,7 @@ export default class RecordHandler<
       name: string
       version: string
       state: number
-      data: Get<Lookup[Name], Path>
+      data: Get<Lookup<Records, Name>, Path>
     }>
 
     // with state:
@@ -122,7 +122,7 @@ export default class RecordHandler<
       name: string
       version: string
       state: number
-      data: Lookup[Name]
+      data: Lookup<Records, Name>
     }>
 
     // with path and state:
@@ -134,7 +134,7 @@ export default class RecordHandler<
       name: string
       version: string
       state: number
-      data: Get<Lookup[Name], Path>
+      data: Get<Lookup<Records, Name>, Path>
     }>
   }
 }

package/src/record/record.d.ts

@@ -64,7 +64,10 @@ export default class Record<Data = unknown> {
 
   set: {
     // with path
-    <P extends string | string[]>(path: P, dataAtPath: Get<Data, P>): void
+    <P extends string | readonly string[]>(
+      path: P,
+      dataAtPath: unknown extends Get<Data, P> ? never : Get<Data, P>,
+    ): void
     // without path
     (data: SettablePossibleEmpty<Data>): void
   }

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

@@ -2,7 +2,9 @@ import RpcResponse from './rpc-response.js'
 
 export type RpcMethodDef = [arguments: unknown, response: unknown]
 
-export default class RpcHandler<Methods extends Record<string, RpcMethodDef>> {
+export default class RpcHandler<
+  Methods extends Record<string, RpcMethodDef> = Record<string, RpcMethodDef>,
+> {
   connected: boolean
   stats: RpcStats