@nxtedition/lib 27.0.8 → 27.0.10

package/app.d.ts

@@ -7,7 +7,7 @@ import type { BehaviorSubject } from 'rxjs'
 import type { Subscription } from 'rxjs'
 
 export function makeApp<
-  Records,
+  Records extends Record<string, unknown> = Record<string, unknown>,
   RpcMethods extends Record<string, RpcMethodDef> = Record<string, RpcMethodDef>,
   Config = Record<string, unknown>,
 >(
@@ -31,8 +31,8 @@ export interface AppConfig<Config = Record<string, unknown>> {
 }
 
 export interface App<
-  Records,
-  RpcMethods extends Record<string, RpcMethodDef>,
+  Records extends Record<string, unknown> = Record<string, unknown>,
+  RpcMethods extends Record<string, RpcMethodDef> = Record<string, RpcMethodDef>,
   Config = Record<string, unknown>,
 > {
   ds: DeepstreamClientWithNxt<Records, RpcMethods>
@@ -61,8 +61,10 @@ export interface App<
   signal: AbortSignal
 }
 
-export interface DeepstreamClientWithNxt<Records, RpcMethods extends Record<string, RpcMethodDef>>
-  extends DeepstreamClient<Records, RpcMethods> {
+export interface DeepstreamClientWithNxt<
+  Records extends Record<string, unknown> = Record<string, unknown>,
+  RpcMethods extends Record<string, RpcMethodDef> = Record<string, RpcMethodDef>,
+> extends DeepstreamClient<Records, RpcMethods> {
   nxt: NxtDeepstreamClient<Records, RpcMethods>
 }
 

package/couch.d.ts

@@ -1,5 +1,4 @@
 import type { Logger } from './logger.js'
-import type { HttpError } from 'http-errors'
 import type { Readable } from 'node:stream'
 import type { Dispatcher } from 'undici'
 
@@ -52,7 +51,7 @@ interface ChangesOptions {
   live?: boolean
   heartbeat?: number
   retry?: (
-    err: HttpError,
+    err: unknown,
     retryCount: number,
     params: {
       since?: string | 0 | null

package/deepstream.d.ts

@@ -8,12 +8,12 @@ type Paths<T> = keyof T & string
 type Get<Data, Path extends string> = Path extends keyof Data ? Data[Path] : unknown
 
 export function makeDeepstream<
-  Records,
+  Records extends Record<string, unknown> = Record<string, unknown>,
   RpcMethods extends Record<string, RpcMethodDef> = Record<string, RpcMethodDef>,
 >(client: DeepstreamClient<Records, RpcMethods>): NxtDeepstreamClient<Records, RpcMethods>
 
 export interface NxtDeepstreamClient<
-  Records,
+  Records extends Record<string, unknown> = Record<string, unknown>,
   RpcMethods extends Record<string, RpcMethodDef> = Record<string, RpcMethodDef>,
 > {
   ds: DeepstreamClient<Records, RpcMethods> & { nxt: NxtDeepstreamClient<Records, RpcMethods> }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nxtedition/lib",
-  "version": "27.0.8",
+  "version": "27.0.10",
   "license": "UNLICENSED",
   "author": "Robert Nagy <robert.nagy@boffins.se>",
   "type": "module",
@@ -44,14 +44,15 @@
     "under-pressure.js"
   ],
   "scripts": {
-    "test": "node --test-timeout 60000 --test"
+    "test": "node --test-timeout 60000 --test",
+    "test:types": "tsd"
   },
   "dependencies": {
     "@elastic/elasticsearch": "^8.17.1",
     "@elastic/transport": "^8.9.3",
     "@nxtedition/nxt-undici": "^7.1.4",
     "@nxtedition/sched": "^1.0.2",
-    "@nxtedition/template": "^1.0.2",
+    "@nxtedition/template": "^1.0.3",
     "@nxtedition/weak-cache": "^1.0.1",
     "diff": "5.2.0",
     "eslint": "^9.38.0",
@@ -92,5 +93,5 @@
     "pino": ">=7.0.0",
     "rxjs": "^7.0.0"
   },
-  "gitHead": "7f7389b0cae3822a99eb801f0c0dd0723fe5e140"
+  "gitHead": "ff46833af43b6a73524b89dcc1d4eeee2523ee08"
 }

package/sequence.js

@@ -85,18 +85,13 @@ export class Sequence {
           if (typeof part === 'string') {
             const [sequenceStr, id] = part.split(ID_SEP)
             const sequence = parseInt(sequenceStr)
-            assert(Number.isFinite(sequence) && sequence >= 0)
             this.#parts.push(id, sequence)
             this.#identity = null
             this.#count += part
           } else if (typeof part === 'number') {
-            assert(Number.isFinite(part) && part >= 0)
-            assert(Number.isFinite(identity))
             this.#parts.push('', part)
             this.#count += part
           } else if (part != null) {
-            assert(Number.isFinite(part.sequence) && part.sequence >= 0)
-            assert(typeof part.id === 'string' && part.id.length > 0)
             this.#parts.push(part.id, part.sequence)
             this.#identity = null
             this.#count += part.sequence
@@ -108,23 +103,13 @@ export class Sequence {
       } else if (typeof value === 'string') {
         const [countStr, token] = value.split('-')
         const count = parseInt(countStr)
-        if (!Number.isFinite(count) || count < 0) {
-          throw new Error('invalid sequence count')
-        }
-
         if (token) {
           for (const str of token.split('_')) {
             const [sequenceStr, id] = str.split(ID_SEP)
             const sequence = parseInt(sequenceStr)
-            if (!Number.isFinite(sequence) || sequence < 0) {
-              throw new Error('invalid sequence part')
-            }
             this.#parts.push(id, sequence)
           }
-        } else if (count > 0) {
-          throw new Error('invalid sequence parts')
         }
-
         this.#count = count
         this.#value = value
       } else if (value instanceof Sequence) {
@@ -133,7 +118,36 @@ export class Sequence {
         this.#parts = value.#parts.slice()
         this.#identity = value.#identity
       } else {
-        assert(false)
+        throw new Error('invalid sequence value')
+      }
+
+      if (!Number.isInteger(this.#count) || this.#count < 0) {
+        throw new Error('invalid sequence count')
+      }
+
+      if (!Array.isArray(this.#parts)) {
+        throw new Error('invalid sequence parts')
+      }
+
+      {
+        let count = 0
+        for (let n = 0; n < this.#parts.length; n += 2) {
+          const id = this.#parts[n + 0]
+          if (typeof id !== 'string' || id.length === 0) {
+            throw new Error('invalid identity part')
+          }
+
+          const sequence = this.#parts[n + 1]
+          if (!Number.isInteger(sequence) || sequence < 0) {
+            throw new Error('invalid sequence part')
+          }
+
+          count += sequence
+        }
+
+        if (count !== this.#count) {
+          throw new Error('sequence count mismatch')
+        }
       }
 
       if (identity != null) {