Skip to content

Commit 98cd0b6

Browse files
authored
Merge pull request #263 from ravendb/v4.2
RDBC-442 NodeSelector bug
2 parents 2e8c955 + 2593800 commit 98cd0b6

File tree

7 files changed

+23
-20
lines changed

7 files changed

+23
-20
lines changed

package-lock.json

Lines changed: 17 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,7 @@
8484
"@types/node-fetch": "^2.5.7",
8585
"@types/qs": "^6.9.5",
8686
"@types/semaphore": "^1.1.0",
87+
"@types/stream-json": "^1.5.1",
8788
"@types/uuid": "^8.3.0",
8889
"@types/verror": "^1.10.4",
8990
"abort-controller": "^3.0.0",

src/Http/NodeSelector.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ export class NodeSelector {
5252
}
5353

5454
const stateEtag: number = this._state.topology.etag || 0;
55-
const topologyEtag: number = this._state.topology.etag || 0;
55+
const topologyEtag: number = topology.etag || 0;
5656

5757
if (stateEtag >= topologyEtag && !forceUpdate) {
5858
return false;

src/Http/RavenCommandResponsePipeline.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -209,7 +209,7 @@ export class RavenCommandResponsePipeline<TStreamResult> extends EventEmitter {
209209
const opts = this._opts;
210210
let resultPromise: Promise<TStreamResult>;
211211
if (opts.jsonAsync) {
212-
const asm = Asm.connectTo(streams[streams.length - 1]);
212+
const asm = Asm.connectTo(streams[streams.length - 1] as any);
213213
resultPromise = new Promise(resolve => {
214214
asm.on("done", asm => resolve(asm.current));
215215
});

src/Mapping/Json/Streams/TransformKeysJsonStream.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ export class TransformKeysJsonStream extends FilterBase {
1111
private _getTransform: (key: string, stack: (string | null | number)[]) => CasingConvention;
1212

1313
constructor(opts: TransformJsonKeysStreamOptions) {
14-
super();
14+
super(null);
1515
opts = opts || { getCurrentTransform: (key, stack) => null };
1616
if (!opts.getCurrentTransform) {
1717
throwError("InvalidArgumentException", "getCurrentTransform() must not be empty.");
@@ -21,7 +21,7 @@ export class TransformKeysJsonStream extends FilterBase {
2121
}
2222

2323
private _transformKey(key) {
24-
const transformName = this._getTransform(key, this._stack);
24+
const transformName = this._getTransform(key, (this as any)._stack); // HACK: access private field
2525
if (!transformName) {
2626
return key;
2727
}

src/Types/stream-json/index.d.ts

Lines changed: 0 additions & 14 deletions
This file was deleted.

tsconfig.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,7 @@
1717
],
1818
"types": [
1919
"node",
20-
"mocha",
21-
"stream-json"
20+
"mocha"
2221
]
2322
},
2423
"files": [

0 commit comments

Comments
 (0)