Start9/patch-db
2
0
Fork 0
mirror of https://github.com/Start9Labs/patch-db.git synced 2026-03-30 20:04:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat: make watch$ strictNullCheck compatible

Browse Source
This commit is contained in:
waterplea
2022-05-26 16:52:00 +03:00
committed by Lucy Cifferello
parent 8e7c893d48
commit 770602169e
1 changed files with 34 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
client/lib/store.ts
View File

@@ -1,5 +1,5 @@
import { DBCache, Dump, Http, Revision, Update } from './types' import { DBCache, Dump, Http, Revision, Update } from './types'
import { BehaviorSubject, Observable } from 'rxjs' import { BehaviorSubject, Observable, ReplaySubject } from 'rxjs'
import { applyOperation, getValueByPointer, Operation } from './json-patch-lib' import { applyOperation, getValueByPointer, Operation } from './json-patch-lib'
import BTree from 'sorted-btree' import BTree from 'sorted-btree'
@@ -11,7 +11,7 @@ export interface StashEntry {
export class Store<T extends { [key: string]: any }> { export class Store<T extends { [key: string]: any }> {
cache: DBCache<T> cache: DBCache<T>
sequence$: BehaviorSubject<number> sequence$: BehaviorSubject<number>
private watchedNodes: { [path: string]: BehaviorSubject<any> } = { } private watchedNodes: { [path: string]: ReplaySubject<any> } = {}
private stash = new BTree<number, StashEntry>() private stash = new BTree<number, StashEntry>()
constructor( constructor(
@@ -23,16 +23,16 @@ export class Store<T extends { [key: string]: any }> {
} }
watch$(): Observable<T> watch$(): Observable<T>
watch$<P1 extends keyof T> (p1: P1): Observable<T[P1]> watch$<P1 extends keyof T>(p1: P1): Observable<NonNullable<T[P1]>>
watch$<P1 extends keyof T, P2 extends keyof T[P1]> (p1: P1, p2: P2): Observable<T[P1][P2]> watch$<P1 extends keyof T, P2 extends keyof NonNullable<T[P1]>>(p1: P1, p2: P2): Observable<NonNullable<NonNullable<T[P1]>[P2]>>
watch$<P1 extends keyof T, P2 extends keyof T[P1], P3 extends keyof T[P1][P2]> (p1: P1, p2: P2, p3: P3): Observable<T[P1][P2][P3]> watch$<P1 extends keyof T, P2 extends keyof NonNullable<T[P1]>, P3 extends keyof NonNullable<NonNullable<T[P1]>[P2]>>(p1: P1, p2: P2, p3: P3): Observable<NonNullable<NonNullable<NonNullable<T[P1]>[P2]>[P3]>>
watch$<P1 extends keyof T, P2 extends keyof T[P1], P3 extends keyof T[P1][P2], P4 extends keyof T[P1][P2][P3]> (p1: P1, p2: P2, p3: P3, p4: P4): Observable<T[P1][P2][P3][P4]> watch$<P1 extends keyof T, P2 extends keyof NonNullable<T[P1]>, P3 extends keyof NonNullable<NonNullable<T[P1]>[P2]>, P4 extends keyof NonNullable<NonNullable<NonNullable<T[P1]>[P2]>[P3]>>(p1: P1, p2: P2, p3: P3, p4: P4): Observable<NonNullable<NonNullable<NonNullable<NonNullable<T[P1]>[P2]>[P3]>[P4]>>
watch$<P1 extends keyof T, P2 extends keyof T[P1], P3 extends keyof T[P1][P2], P4 extends keyof T[P1][P2][P3], P5 extends keyof T[P1][P2][P3][P4]> (p1: P1, p2: P2, p3: P3, p4: P4, p5: P5): Observable<T[P1][P2][P3][P4][P5]> watch$<P1 extends keyof T, P2 extends keyof NonNullable<T[P1]>, P3 extends keyof NonNullable<NonNullable<T[P1]>[P2]>, P4 extends keyof NonNullable<NonNullable<NonNullable<T[P1]>[P2]>[P3]>, P5 extends keyof NonNullable<NonNullable<NonNullable<NonNullable<T[P1]>[P2]>[P3]>[P4]>>(p1: P1, p2: P2, p3: P3, p4: P4, p5: P5): Observable<NonNullable<NonNullable<NonNullable<NonNullable<NonNullable<T[P1]>[P2]>[P3]>[P4]>[P5]>>
watch$<P1 extends keyof T, P2 extends keyof T[P1], P3 extends keyof T[P1][P2], P4 extends keyof T[P1][P2][P3], P5 extends keyof T[P1][P2][P3][P4], P6 extends keyof T[P1][P2][P3][P4][P5]> (p1: P1, p2: P2, p3: P3, p4: P4, p5: P5, p6: P6): Observable<T[P1][P2][P3][P4][P5][P6]> watch$<P1 extends keyof T, P2 extends keyof NonNullable<T[P1]>, P3 extends keyof NonNullable<NonNullable<T[P1]>[P2]>, P4 extends keyof NonNullable<NonNullable<NonNullable<T[P1]>[P2]>[P3]>, P5 extends keyof NonNullable<NonNullable<NonNullable<NonNullable<T[P1]>[P2]>[P3]>[P4]>, P6 extends keyof NonNullable<NonNullable<NonNullable<NonNullable<NonNullable<T[P1]>[P2]>[P3]>[P4]>[P5]>>(p1: P1, p2: P2, p3: P3, p4: P4, p5: P5, p6: P6): Observable<NonNullable<NonNullable<NonNullable<NonNullable<NonNullable<NonNullable<T[P1]>[P2]>[P3]>[P4]>[P5]>[P6]>>
watch$(...args: (string | number)[]): Observable<any> { watch$(...args: (string | number)[]): Observable<any> {
const path = `/${args.join('/')}` const path = `/${args.join('/')}`
if (!this.watchedNodes[path]) { if (!this.watchedNodes[path]) {
this.watchedNodes[path] = new BehaviorSubject(getValueByPointer(this.cache.data, path)) this.watchedNodes[path] = new ReplaySubject(1)
} }
return this.watchedNodes[path].asObservable() return this.watchedNodes[path].asObservable()
} }
@@ -58,6 +58,14 @@ export class Store<T extends { [key: string]: any }> {
} }
} }
private updateValue(path: string): void {
const value = getValueByPointer(this.cache.data, path)
if (value !== undefined) {
this.watchedNodes[path].next(value)
}
}
private handleRevision(revision: Revision): void { private handleRevision(revision: Revision): void {
// stash the revision // stash the revision
this.stash.set(revision.id, { revision, undo: [] }) this.stash.set(revision.id, { revision, undo: [] })
@@ -139,8 +147,7 @@ export class Store<T extends { [key: string]: any }> {
if (this.watchedNodes[path].observers.length === 0) return kill(path) if (this.watchedNodes[path].observers.length === 0) return kill(path)
if (path.includes(revisionPath) || revisionPath.includes(path)) { if (path.includes(revisionPath) || revisionPath.includes(path)) {
const val = getValueByPointer(this.cache.data, path) this.updateValue(path)
this.watchedNodes[path].next(val)
} }
}) })
} }