Merge pull request #312 from ml054/RDBC-586

RDBC-586 node.js client - better type hinting for new TS

Author: ml054

src/Documents/Session/Tokens/TimeSeriesIncludesToken.ts

@@ -48,11 +48,11 @@ export class TimeSeriesIncludesToken extends QueryToken {
         }
 
         if ("count" in this._range) {
-            TimeSeriesIncludesToken._writeCountRangeTo(writer, this._range);
+            TimeSeriesIncludesToken._writeCountRangeTo(writer, this._range as TimeSeriesCountRange);
         } else if ("time" in this._range) {
-            TimeSeriesIncludesToken._writeTimeRangeTo(writer, this._range);
+            TimeSeriesIncludesToken._writeTimeRangeTo(writer, this._range as TimeSeriesTimeRange);
         } else if ("from" in this._range && "to" in this._range) {
-            TimeSeriesIncludesToken._writeRangeTo(writer, this._range);
+            TimeSeriesIncludesToken._writeRangeTo(writer, this._range as TimeSeriesRange);
         } else {
             throwError("InvalidArgumentException", "Not supported time range type: " + this._range);
         }

test/Ported/Issues/RDBC_538.ts

@@ -64,7 +64,7 @@ import { assertThat } from "../../Utils/AssertExtensions";
 
                     let key: string;
 
-                    await new Promise((resolve, reject) => {
+                    await new Promise<void>((resolve, reject) => {
                         subscription.on("error", reject);
                         subscription.on("batch", (batch, callback) => {
                             key = batch.items[0].id;

test/Ported/Issues/RavenDB_15497.ts

@@ -1,7 +1,5 @@
 import {
-    DisableIndexOperation,
-    GetIndexStatisticsOperation,
-    IDocumentStore
+    IDocumentStore, StopIndexOperation
 } from "../../../src";
 import { disposeTestDocumentStore, testContext } from "../../Utils/TestUtil";
 import { assertThat, assertThrows } from "../../Utils/AssertExtensions";
@@ -23,15 +21,6 @@ describe("RavenDB_15497", function () {
         const index = new Index();
         await index.execute(store);
 
-        await store.maintenance.send(new DisableIndexOperation(index.getIndexName()));
-
-        const indexStats = await store.maintenance.send(new GetIndexStatisticsOperation(index.getIndexName()));
-
-        assertThat(indexStats.state)
-            .isEqualTo("Disabled");
-        assertThat(indexStats.status)
-            .isEqualTo("Disabled");
-
         {
             const session = store.openSession();
             const user = new User();
@@ -47,6 +36,10 @@ describe("RavenDB_15497", function () {
             await session.saveChanges();
         }
 
+        await testContext.waitForIndexing(store);
+
+        await store.maintenance.send(new StopIndexOperation(index.getIndexName()));
+
         {
             const session = store.openSession();
             const user = new User();
@@ -65,7 +58,7 @@ describe("RavenDB_15497", function () {
                 assertThat(e.message)
                     .contains("System.TimeoutException");
                 assertThat(e.message)
-                    .contains("could not verify that 1 indexes has caught up with the changes as of etag");
+                    .contains("could not verify that");
             });
         }
     });
@@ -82,4 +75,4 @@ class Index extends AbstractJavaScriptIndexCreationTask<User, Pick<User, "name">
             }
         });
     }
-}
+}

test/Ported/Issues/RavenDB_16262.ts

@@ -31,7 +31,7 @@ describe("RavenDB_16262Test", function () {
 
         const sub = store.subscriptions.getSubscriptionWorker<Product>(name);
         try {
-            await new Promise((resolve, reject) => {
+            await new Promise<void>((resolve, reject) => {
                 sub.on("error", reject);
                 sub.on("batch", async (batch, callback) => {
                     assertThat(batch.items.length)
@@ -65,4 +65,4 @@ describe("RavenDB_16262Test", function () {
             sub.dispose();
         }
     });
-});
+});

test/Ported/Issues/RavenDB_16975.ts

@@ -33,7 +33,7 @@ describe("RavenDB_16975Test", function () {
 
         const sub = store.subscriptions.getSubscriptionWorker<User>(id);
         try {
-            await new Promise((resolve, reject) => {
+            await new Promise<void>((resolve, reject) => {
                 sub.on("error", reject);
                 sub.on("batch", async (batch, callback) => {
 

test/Utils/ReplicationTestContext.ts

@@ -7,7 +7,7 @@ import {
     ModifyOngoingTaskResult,
     IMaintenanceOperation,
     OngoingTaskType,
-    DeleteOngoingTaskOperation, UpdateExternalReplicationOperation, GetDatabaseRecordOperation
+    DeleteOngoingTaskOperation, UpdateExternalReplicationOperation, GetDatabaseRecordOperation, PullReplicationAsSink
 } from "../../src";
 import { Stopwatch } from "../../src/Utility/Stopwatch";
 import { DocumentType } from "../../src";
@@ -63,7 +63,7 @@ export class ReplicationTestContext {
         let op: IMaintenanceOperation<ModifyOngoingTaskResult>;
 
         if ("hubDefinitionName" in watcher) {
-            op = new UpdatePullReplicationAsSinkOperation(watcher);
+            op = new UpdatePullReplicationAsSinkOperation(watcher as PullReplicationAsSink);
         } else {
             op = new UpdateExternalReplicationOperation(watcher);
         }