sync d393d1c9c8eaaeaa1e4ad6764d5260561c876e8c .. be9b7f88aa409ee0915d80a0cf7e87f30ba4f219 - fixes

Author: ml054

package-lock.json

@@ -146,12 +146,15 @@ export class BulkInsertOperation {
         return false;
     }
 
-    public on(event: "progress", handler: (value: BulkInsertOnProgressEventArgs) => void) {
+    public on(event: "progress", handler: (value: BulkInsertOnProgressEventArgs) => void): this {
         this._emitter.on("progress", handler);
+        this._onProgressInitialized = true;
+        return this;
     }
 
-    public off(event: "progress", handler: (value: BulkInsertOnProgressEventArgs) => void) {
+    public off(event: "progress", handler: (value: BulkInsertOnProgressEventArgs) => void): this {
         this._emitter.off("progress", handler);
+        return this;
     }
 
     get useCompression(): boolean {
@@ -191,6 +194,26 @@ export class BulkInsertOperation {
         await this._requestExecutor.execute(bulkInsertGetIdRequest);
         this._operationId = bulkInsertGetIdRequest.result;
         this._nodeTag = bulkInsertGetIdRequest.nodeTag;
+
+        if (this._onProgressInitialized && !this._unsubscribeChanges) {
+            const observable = this._store.changes()
+                .forOperationId(this._operationId);
+
+            const handler = value => {
+                const state = value.state;
+                if (state && state.status === "InProgress") {
+                    this._emitter.emit("progress", new BulkInsertOnProgressEventArgs(state.progress));
+                }
+            }
+
+            observable.on("data", handler);
+
+            this._unsubscribeChanges = {
+                dispose(): void {
+                    observable.off("data", handler)
+                }
+            };
+        }
     }
 
     private static _typeCheckStoreArgs(

src/Documents/BulkInsertOperation.ts

@@ -1,5 +1,5 @@
 import { DatabaseChange } from "./DatabaseChange";
-import { DocumentChange, DocumentChangeTypes } from "./DocumentChange";
+import { DocumentChange } from "./DocumentChange";
 import { IndexChange } from "./IndexChange";
 
 export class AggressiveCacheChange implements DatabaseChange {

src/Documents/Changes/AggressiveCacheChange.ts

@@ -19,9 +19,9 @@ export class ChangesObservable<T, TConnectionState extends IChangesConnectionSta
         this._filter = filter;
     }
 
-    public on(event: "data", handler: (value: T) => void);
-    public on(event: "error", handler: (error: Error) => void);
-    public on(event: "data" | "error", handler: ((value: T) => void) | ((error: Error) => void)) {
+    public on(event: "data", handler: (value: T) => void): this;
+    public on(event: "error", handler: (error: Error) => void): this;
+    public on(event: "data" | "error", handler: ((value: T) => void) | ((error: Error) => void)): this {
         switch (event) {
             case "data":
                 // since allow multiple subscriptions on single object we cant register it multiple times
@@ -49,15 +49,15 @@ export class ChangesObservable<T, TConnectionState extends IChangesConnectionSta
         return this;
     }
 
-    public removeListener(event: "data", handler: (value: T) => void);
-    public removeListener(event: "error", handler: (error: Error) => void);
-    public removeListener(event: "data" | "error", handler: ((value: T) => void) | ((error: Error) => void)) {
+    public removeListener(event: "data", handler: (value: T) => void): this;
+    public removeListener(event: "error", handler: (error: Error) => void): this;
+    public removeListener(event: "data" | "error", handler: ((value: T) => void) | ((error: Error) => void)): this {
         return this.off(event as any, handler as any);
     }
 
-    public off(event: "data", handler: (value: T) => void);
-    public off(event: "error", handler: (error: Error) => void);
-    public off(event: "data" | "error", handler: ((value: T) => void) | ((error: Error) => void)) {
+    public off(event: "data", handler: (value: T) => void): this;
+    public off(event: "error", handler: (error: Error) => void): this;
+    public off(event: "data" | "error", handler: ((value: T) => void) | ((error: Error) => void)): this {
 
         switch (event) {
             case "data":

src/Documents/Changes/ChangesObservable.ts

@@ -100,16 +100,18 @@ export class DatabaseChanges implements IDatabaseChanges {
         return this._client && this._client.readyState === WebSocket.OPEN;
     }
 
-    public on(eventName: "connectionStatus", handler: () => void);
-    public on(eventName: "error", handler: (error: Error) => void);
-    public on(eventName: "connectionStatus" | "error", handler) {
+    public on(eventName: "connectionStatus", handler: () => void): this;
+    public on(eventName: "error", handler: (error: Error) => void): this;
+    public on(eventName: "connectionStatus" | "error", handler): this {
         this._emitter.addListener(eventName, handler);
+        return this;
     }
 
-    public off(eventName: "connectionStatus", handler: () => void);
-    public off(eventName: "error", handler: (error: Error) => void);
-    public off(eventName: "connectionStatus" | "error", handler) {
+    public off(eventName: "connectionStatus", handler: () => void): this;
+    public off(eventName: "error", handler: (error: Error) => void): this;
+    public off(eventName: "connectionStatus" | "error", handler): this {
         this._emitter.removeListener(eventName, handler);
+        return this;
     }
 
     public ensureConnectedNow(): Promise<IDatabaseChanges> {

src/Documents/Changes/DatabaseChanges.ts

@@ -3,15 +3,15 @@ export interface IChangesObservable<T> extends IObservable<T> {
 }
 
 export interface IObservable<T> {
-    on(event: "data", handler: (value: T) => void);
+    on(event: "data", handler: (value: T) => void): this;
 
-    on(event: "error", handler: (error: Error) => void);
+    on(event: "error", handler: (error: Error) => void): this;
 
-    off(event: "data", handler: (value: T) => void);
+    off(event: "data", handler: (value: T) => void): this;
 
-    off(event: "error", handler: (error: Error) => void);
+    off(event: "error", handler: (error: Error) => void): this;
 
-    removeListener(event: "data", handler: (value: T) => void);
+    removeListener(event: "data", handler: (value: T) => void): this;
 
-    removeListener(event: "error", handler: (error: Error) => void);
+    removeListener(event: "error", handler: (error: Error) => void): this;
 }

src/Documents/Changes/IChangesObservable.ts

@@ -1,5 +1,5 @@
 import { CommandType, ICommandData } from "../CommandData";
-import { throwError } from "../../../Exceptions/index";
+import { throwError } from "../../../Exceptions";
 import { DocumentConventions } from "../../Conventions/DocumentConventions";
 
 export class ForceRevisionCommandData implements ICommandData {
@@ -22,4 +22,4 @@ export class ForceRevisionCommandData implements ICommandData {
             Type: this.type
         }
     }
-}
+}

src/Documents/Commands/Batches/ForceRevisionCommandData.ts

@@ -1,5 +1,5 @@
 import { ICommandData, CommandType } from "../CommandData";
-import { AttachmentData } from "./../../Attachments/index";
+import { AttachmentData } from "../../Attachments";
 import { StringUtil } from "../../../Utility/StringUtil";
 import { throwError } from "../../../Exceptions";
 import { DocumentConventions } from "../../Conventions/DocumentConventions";

src/Documents/Commands/Batches/PutAttachmentCommandData.ts

@@ -3,10 +3,10 @@ import { BatchCommandResult } from "../../Session/Operations/BatchCommandResult"
 import { IDisposable } from "../../../Types/Contracts";
 import { DocumentConventions } from "../../Conventions/DocumentConventions";
 import { ICommandData } from "../CommandData";
-import { AttachmentData } from "../../Attachments/index";
+import { AttachmentData } from "../../Attachments";
 import { BatchOptions } from "./BatchOptions";
 import { TransactionMode } from "../../Session/TransactionMode";
-import { throwError } from "../../../Exceptions/index";
+import { throwError } from "../../../Exceptions";
 import { PutAttachmentCommandData } from "./PutAttachmentCommandData";
 import { HttpRequestParameters } from "../../../Primitives/Http";
 import { HeadersBuilder } from "../../../Utility/HttpUtil";

src/Documents/Commands/Batches/SingleNodeBatchCommand.ts

@@ -1,5 +1,5 @@
 import { CommandType } from "../CommandData";
-import { AppendOperation, DeleteOperation, TimeSeriesOperation } from "../../Operations/TimeSeries/TimeSeriesOperation";
+import { AppendOperation, DeleteOperation } from "../../Operations/TimeSeries/TimeSeriesOperation";
 import { TimeSeriesCommandData } from "./TimeSeriesCommandData";
 
 export class TimeSeriesBatchCommandData extends TimeSeriesCommandData {