sync d393d1c9c8eaaeaa1e4ad6764d5260561c876e8c .. be9b7f88aa409ee0915d…

…80a0cf7e87f30ba4f219 - fixes

src/Documents/BulkInsertOperation.ts

@@ -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/Changes/AggressiveCacheChange.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/ChangesObservable.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/DatabaseChanges.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/IChangesObservable.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/Commands/Batches/ForceRevisionCommandData.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/PutAttachmentCommandData.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/SingleNodeBatchCommand.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/TimeSeriesBatchCommandData.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 {

src/Documents/Commands/ConditionalGetDocumentsCommand.ts

@@ -8,7 +8,7 @@ import { DocumentConventions } from "../Conventions/DocumentConventions";
 import { readToEnd, stringToReadable } from "../../Utility/StreamUtil";
 import { RavenCommandResponsePipeline } from "../../Http/RavenCommandResponsePipeline";
 import { ObjectUtil } from "../../Utility/ObjectUtil";
-import { CONSTANTS, HEADERS } from "../../Constants";
+import { HEADERS } from "../../Constants";
 
 export class ConditionalGetDocumentsCommand extends RavenCommand<ConditionalGetResult> {
 
@@ -27,7 +27,7 @@ export class ConditionalGetDocumentsCommand extends RavenCommand<ConditionalGetR
 
     createRequest(node: ServerNode): HttpRequestParameters {
         const uri = node.url + "/databases/" + node.database + "/docs?id=" + this._urlEncode(this._id);
-        
+
         return {
             uri,
             method: "GET",

src/Documents/Commands/GetTcpInfoForRemoteTaskCommand.ts

@@ -1,6 +1,6 @@
 import { RavenCommand } from "../../Http/RavenCommand";
 import { TcpConnectionInfo } from "../../ServerWide/Commands/GetTcpInfoCommand";
-import { throwError } from "../../Exceptions/index";
+import { throwError } from "../../Exceptions";
 import { ServerNode } from "../../Http/ServerNode";
 import { HttpRequestParameters } from "../../Primitives/Http";
 import * as stream from "readable-stream";

src/Documents/Commands/HeadAttachmentCommand.ts

@@ -1,10 +1,10 @@
-import { RavenCommand, ResponseDisposeHandling } from "./../../Http/RavenCommand";
-import { HttpCache } from "./../../Http/HttpCache";
-import { HttpRequestParameters, HttpResponse } from "./../../Primitives/Http";
+import { RavenCommand, ResponseDisposeHandling } from "../../Http/RavenCommand";
+import { HttpCache } from "../../Http/HttpCache";
+import { HttpRequestParameters, HttpResponse } from "../../Primitives/Http";
 import { StringUtil } from "../../Utility/StringUtil";
 import { throwError } from "../../Exceptions";
 import { ServerNode } from "../../Http/ServerNode";
-import { StatusCodes } from "./../../Http/StatusCode";
+import { StatusCodes } from "../../Http/StatusCode";
 import * as stream from "readable-stream";
 import { getRequiredEtagHeader } from "../../Utility/HttpUtil";
 import { HEADERS } from "../../Constants";

src/Documents/Commands/MultiGet/MultiGetCommand.ts

@@ -8,15 +8,12 @@ import { ServerNode } from "../../../Http/ServerNode";
 import { StatusCodes } from "../../../Http/StatusCode";
 import { getEtagHeader } from "../../../Utility/HttpUtil";
 import { DocumentConventions } from "../../Conventions/DocumentConventions";
-import { TypeUtil } from "../../../Utility/TypeUtil";
 import { throwError } from "../../../Exceptions";
 import { IDisposable } from "../../../Types/Contracts";
 import { RequestExecutor } from "../../../Http/RequestExecutor";
 import { AggressiveCacheOptions } from "../../../Http/AggressiveCacheOptions";
-import { CONSTANTS, HEADERS } from "../../../Constants";
+import { HEADERS } from "../../../Constants";
 import { ServerCasing, ServerResponse } from "../../../Types";
-import { ConditionalGetResult } from "../ConditionalGetDocumentsCommand";
-import { ObjectUtil } from "../../../Utility/ObjectUtil";
 import { camelCase } from "change-case";
 import { SessionInfo } from "../../Session/IDocumentSession";
 

src/Documents/DocumentStoreBase.ts

@@ -23,7 +23,7 @@ import { IDocumentSession } from "./Session/IDocumentSession";
 import { DocumentSession } from "./Session/DocumentSession";
 import { DocumentConventions } from "./Conventions/DocumentConventions";
 import { RequestExecutor } from "../Http/RequestExecutor";
-import { IndexCreation } from "../Documents/Indexes/IndexCreation";
+import { IndexCreation } from "./Indexes/IndexCreation";
 import { PutIndexesOperation } from "./Operations/Indexes/PutIndexesOperation";
 import { BulkInsertOperation, BulkInsertOptions } from "./BulkInsertOperation";
 import { IDatabaseChanges } from "./Changes/IDatabaseChanges";
@@ -174,7 +174,7 @@ export abstract class DocumentStoreBase
         if (!index) {
             return null;
         }
-        
+
         return index;
     }
 

src/Documents/Identity/HiloIdGenerator.ts

@@ -1,10 +1,8 @@
-import { IDocumentStore } from "../../Documents/IDocumentStore";
+import { IDocumentStore } from "../IDocumentStore";
 import { DateUtil } from "../../Utility/DateUtil";
-import { StringUtil } from "../../Utility/StringUtil";
 import { HiloReturnCommand } from "./Commands/HiloReturnCommand";
 import { NextHiloCommand, HiLoResult } from "./Commands/NextHiloCommand";
 import { HiloRangeValue } from "./HiloRangeValue";
-import { DocumentConventions } from "../Conventions/DocumentConventions";
 import { Lazy } from "../Lazy";
 import { NextId } from "./NextId";
 

src/Documents/Indexes/AutoIndexDefinition.ts

@@ -1,4 +1,4 @@
-import { IndexPriority, IndexState, IndexType } from "./Enums";
+import { IndexType } from "./Enums";
 import { AutoIndexFieldOptions } from "./AutoIndexFieldOptions";
 import { IndexDefinitionBase } from "./IndexDefinitionBase";
 

src/Documents/Indexes/IndexDefinition.ts

@@ -1,5 +1,5 @@
-import { throwError } from "../../Exceptions/index";
-import { IndexPriority, IndexLockMode, IndexType, IndexState } from "./Enums";
+import { throwError } from "../../Exceptions";
+import { IndexLockMode, IndexType } from "./Enums";
 import { IndexFieldOptions } from "./IndexFieldOptions";
 import { DocumentConventions } from "../Conventions/DocumentConventions";
 import { IndexDefinitionHelper } from "./IndexDefinitionHelper";

src/Documents/Indexes/IndexDefinitionHelper.ts

@@ -1,5 +1,5 @@
 import { IndexType } from "./Enums";
-import { throwError } from "../../Exceptions/index";
+import { throwError } from "../../Exceptions";
 import { StringUtil } from "../../Utility/StringUtil";
 import * as XRegExp from "xregexp";
 import { IndexSourceType } from "./IndexSourceType";
@@ -39,7 +39,7 @@ export class IndexDefinitionHelper {
 
     /**
      * Extract runtime enum notation
-     * @param provider
+     * @param functionBody
      */
     public static extractEnumNotation(functionBody: string): string {
         functionBody = functionBody.trim();

src/Documents/Indexes/IndexTypeExtensions.ts

@@ -1,4 +1,4 @@
-import { IndexType } from "../Indexes/Enums";
+import { IndexType } from "./Enums";
 
 export class IndexTypeExtensions {
 

src/Documents/Indexes/TimeSeries/AbstractCsharpTimeSeriesIndexCreationTask.ts

@@ -2,7 +2,6 @@ import { AbstractGenericTimeSeriesIndexCreationTask } from "./AbstractGenericTim
 import { TimeSeriesIndexDefinition } from "./TimeSeriesIndexDefinition";
 import { TimeSeriesIndexDefinitionBuilder } from "./TimeSeriesIndexDefinitionBuilder";
 import { DocumentConventions } from "../../Conventions/DocumentConventions";
-import { AbstractTimeSeriesIndexCreationTask } from "./AbstractTimeSeriesIndexCreationTask";
 
 export abstract class AbstractCsharpTimeSeriesIndexCreationTask extends AbstractGenericTimeSeriesIndexCreationTask {
     public map: string;

src/Documents/Operations/Attachments/GetAttachmentOperation.ts

@@ -1,7 +1,7 @@
 import { IOperation, OperationResultType } from "../OperationAbstractions";
-import { AttachmentDetails } from "./../../Attachments/index";
-import { getEtagHeader } from "./../../../Utility/HttpUtil";
-import { HttpRequestParameters, HttpResponse } from "./../../../Primitives/Http";
+import { AttachmentDetails } from "../../Attachments";
+import { getEtagHeader } from "../../../Utility/HttpUtil";
+import { HttpRequestParameters, HttpResponse } from "../../../Primitives/Http";
 import { AttachmentResult, AttachmentType } from "../../Attachments";
 import { RavenCommand, ResponseDisposeHandling } from "../../../Http/RavenCommand";
 import { HttpCache } from "../../../Http/HttpCache";

src/Documents/Operations/CompareExchange/CompareExchangeResult.ts

@@ -2,7 +2,6 @@ import { DocumentConventions } from "../../Conventions/DocumentConventions";
 import { throwError } from "../../../Exceptions";
 import { TypeUtil } from "../../../Utility/TypeUtil";
 import { CompareExchangeResultClass, ServerCasing, ServerResponse } from "../../../Types";
-import { COMPARE_EXCHANGE } from "../../../Constants";
 import { DocumentType } from "../../DocumentAbstractions";
 import { ObjectUtil } from "../../../Utility/ObjectUtil";
 

src/Documents/Operations/CompareExchange/CompareExchangeValueResultParser.ts

@@ -5,7 +5,7 @@ import { TypeUtil } from "../../../Utility/TypeUtil";
 import { ObjectUtil } from "../../../Utility/ObjectUtil";
 import { CONSTANTS } from "../../../Constants";
 import { MetadataAsDictionary, MetadataDictionary } from "../../../Mapping/MetadataAsDictionary";
-import { ClassConstructor, CompareExchangeResultClass, EntityConstructor } from "../../../Types";
+import { CompareExchangeResultClass, EntityConstructor } from "../../../Types";
 
 export interface CompareExchangeResultItem {
     index: number;

src/Documents/Operations/CompareExchange/GetCompareExchangeValuesOperation.ts

@@ -12,7 +12,6 @@ import { CompareExchangeValueResultParser, GetCompareExchangeValuesResponse } fr
 import * as stream from "readable-stream";
 import { StringBuilder } from "../../../Utility/StringBuilder";
 import { TypeUtil } from "../../../Utility/TypeUtil";
-import { QueryResult } from "../../Queries/QueryResult";
 
 export interface GetCompareExchangeValuesParameters<T> {
     keys?: string[];

src/Documents/Operations/Configuration/GetClientConfigurationOperation.ts

@@ -2,7 +2,7 @@ import * as stream from "readable-stream";
 import { ServerNode } from "../../../Http/ServerNode";
 import { RavenCommand } from "../../../Http/RavenCommand";
 import { HttpRequestParameters } from "../../../Primitives/Http";
-import { ClientConfiguration } from "../Configuration/ClientConfiguration";
+import { ClientConfiguration } from "./ClientConfiguration";
 import { DocumentConventions } from "../../Conventions/DocumentConventions";
 import { IMaintenanceOperation, OperationResultType } from "../OperationAbstractions";
 

src/Documents/Operations/ConnectionStrings/GetConnectionStringsOperation.ts

@@ -10,7 +10,6 @@ import { DocumentConventions } from "../../Conventions/DocumentConventions";
 import { OperationResultType, IMaintenanceOperation } from "../OperationAbstractions";
 import { RavenCommand } from "../../../Http/RavenCommand";
 import { ServerNode } from "../../../Http/ServerNode";
-import { OlapEtlConfiguration } from "../Etl/Olap/OlapEtlConfiguration";
 
 export interface GetConnectionStringsResult {
     ravenConnectionStrings: Record<string, RavenConnectionString>;

src/Documents/Operations/Counters/GetCountersOperation.ts

@@ -1,5 +1,5 @@
 import { IOperation, OperationResultType } from "../OperationAbstractions";
-import { CountersDetail } from "../Counters/CountersDetail";
+import { CountersDetail } from "./CountersDetail";
 import { IDocumentStore } from "../../IDocumentStore";
 import { DocumentConventions } from "../../Conventions/DocumentConventions";
 import { HttpCache } from "../../../Http/HttpCache";
@@ -83,7 +83,7 @@ export class GetCounterValuesCommand extends RavenCommand<CountersDetail> {
                     .append(encodeURIComponent(this._counters[0]));
             }
         }
-        
+
         if (this._returnFullResults && req.method === "GET") {
             // if we dropped to Post, _returnFullResults is part of the request content
             pathBuilder.append("&full=true");

src/Documents/Operations/DatabaseStatistics.ts

@@ -1,4 +1,4 @@
-import { IndexInformation } from "../../Documents/Operations/IndexInformation";
+import { IndexInformation } from "./IndexInformation";
 import { Size } from "../../Utility/SizeUtil";
 
 export interface DatabaseStatistics {