RDBC-430 Get rid of string-builder from node.js client

ml054 · ml054 · commit 58f2148ef85b · 2020-12-02T16:46:09.000+01:00
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -100,7 +100,6 @@
     "safe-memory-cache": "^2.0.0",
     "semaphore": "^1.1.0",
     "stream-json": "^1.7.1",
-    "string-builder": "^0.1.7",
     "util.promisify": "^1.0.1",
     "uuid": "^8.3.1",
     "verror": "^1.10.0",
diff --git a/src/Documents/Commands/QueryCommand.ts b/src/Documents/Commands/QueryCommand.ts
@@ -5,10 +5,10 @@ import { DocumentConventions } from "../Conventions/DocumentConventions";
 import { IndexQuery, writeIndexQuery } from "../Queries/IndexQuery";
 import { throwError } from "../../Exceptions";
 import { ServerNode } from "../../Http/ServerNode";
-import * as StringBuilder from "string-builder";
 import { JsonSerializer } from "../../Mapping/Json/Serializer";
 import * as stream from "readable-stream";
 import { RavenCommandResponsePipeline } from "../../Http/RavenCommandResponsePipeline";
+import { StringBuilder } from "../../Utility/StringBuilder";
 
 export interface QueryCommandOptions {
     metadataOnly?: boolean;
diff --git a/src/Documents/Operations/CompareExchange/GetCompareExchangeValuesOperation.ts b/src/Documents/Operations/CompareExchange/GetCompareExchangeValuesOperation.ts
@@ -1,4 +1,3 @@
-import * as StringBuilder from "string-builder";
 import { HttpRequestParameters } from "../../../Primitives/Http";
 import { IOperation, OperationResultType } from "../OperationAbstractions";
 import { CompareExchangeValue } from "./CompareExchangeValue";
@@ -11,6 +10,7 @@ import { RavenCommand } from "../../../Http/RavenCommand";
 import { ServerNode } from "../../../Http/ServerNode";
 import { CompareExchangeValueResultParser, GetCompareExchangeValuesResponse } from "./CompareExchangeValueResultParser";
 import * as stream from "readable-stream";
+import { StringBuilder } from "../../../Utility/StringBuilder";
 
 export interface GetCompareExchangeValuesParameters<T> {
     keys?: string[];
@@ -112,12 +112,12 @@ export class GetCompareExchangeValuesCommand<T> extends RavenCommand<{ [key: str
 
             if (this._operation.start) {
                 pathBuilder.append("&start=")
-                    .append(this._operation.start.toString());
+                    .append(this._operation.start);
             }
 
             if (this._operation.pageSize) {
                 pathBuilder.append("&pageSize=")
-                    .append(this._operation.pageSize.toString());
+                    .append(this._operation.pageSize);
             }
         }
 
diff --git a/src/Documents/Operations/Counters/GetCountersOperation.ts b/src/Documents/Operations/Counters/GetCountersOperation.ts
@@ -7,11 +7,11 @@ import { RavenCommand } from "../../../Http/RavenCommand";
 import { throwError } from "../../../Exceptions";
 import { ServerNode } from "../../../Http/ServerNode";
 import { HttpRequestParameters } from "../../../Primitives/Http";
-import * as StringBuilder from "string-builder";
 import { DocumentCountersOperation } from "./DocumentCountersOperation";
 import { CounterOperation } from "./CounterOperation";
 import { CounterBatch } from "./CounterBatch";
 import * as stream from "readable-stream";
+import { StringBuilder } from "../../../Utility/StringBuilder";
 
 export class GetCountersOperation implements IOperation<CountersDetail> {
     private readonly _docId: string;
diff --git a/src/Documents/Operations/DeleteByQueryOperation.ts b/src/Documents/Operations/DeleteByQueryOperation.ts
@@ -7,10 +7,10 @@ import { DocumentConventions } from "../Conventions/DocumentConventions";
 import { IDocumentStore } from "../IDocumentStore";
 import { RavenCommand } from "../../Http/RavenCommand";
 import { ServerNode } from "../../Http/ServerNode";
-import * as StringBuilder from "string-builder";
 import { TypeUtil } from "../../Utility/TypeUtil";
 import { QueryOperationOptions } from "../Queries/QueryOperationOptions";
 import * as stream from "readable-stream";
+import { StringBuilder } from "../../Utility/StringBuilder";
 
 export class DeleteByQueryOperation implements IOperation<OperationIdResult> {
 
@@ -67,7 +67,7 @@ export class DeleteByIndexCommand extends RavenCommand<OperationIdResult> {
 
         if (!TypeUtil.isNullOrUndefined(this._options.maxOpsPerSecond)) {
             path.append("&maxOpsPerSec=")
-                .append(this._options.maxOpsPerSecond.toString());
+                .append(this._options.maxOpsPerSecond);
         }
 
         path
@@ -76,7 +76,7 @@ export class DeleteByIndexCommand extends RavenCommand<OperationIdResult> {
 
         if (this._options.staleTimeout) {
             path.append("&staleTimeout=")
-                .append(this._options.staleTimeout.toString());
+                .append(this._options.staleTimeout);
         }
 
         const body = writeIndexQuery(this._conventions, this._queryToDelete);
diff --git a/src/Documents/Session/AbstractDocumentQuery.ts b/src/Documents/Session/AbstractDocumentQuery.ts
@@ -40,7 +40,6 @@ import { QueryResult } from "../Queries/QueryResult";
 import { DocumentType } from "../DocumentAbstractions";
 import { QueryEventsEmitter } from "./QueryEvents";
 import { EventEmitter } from "events";
-import * as StringBuilder from "string-builder";
 import { StringUtil } from "../../Utility/StringUtil";
 import { IntersectMarkerToken } from "./Tokens/IntersectMarkerToken";
 import { DocumentConventions } from "../Conventions/DocumentConventions";
@@ -82,6 +81,7 @@ import { passResultToCallback } from "../../Utility/PromiseUtil";
 import * as os from "os";
 import { GraphQueryToken } from "./Tokens/GraphQueryToken";
 import { IncludesUtil } from "./IncludesUtil";
+import { StringBuilder } from "../../Utility/StringBuilder";
 
 /**
  * A query against a Raven index
diff --git a/src/Documents/Session/DocumentQueryHelper.ts b/src/Documents/Session/DocumentQueryHelper.ts
@@ -1,8 +1,8 @@
-import * as StringBuilder from "string-builder";
 import { CloseSubclauseToken } from "./Tokens/CloseSubclauseToken";
 import { QueryToken } from "./Tokens/QueryToken";
 import { OpenSubclauseToken } from "./Tokens/OpenSubclauseToken";
 import { IntersectMarkerToken } from "./Tokens/IntersectMarkerToken";
+import { StringBuilder } from "../../Utility/StringBuilder";
 
 export class DocumentQueryHelper {
     public static addSpaceIfNeeded(
diff --git a/src/Documents/Session/Operations/Lazy/LazyLoadOperation.ts b/src/Documents/Session/Operations/Lazy/LazyLoadOperation.ts
@@ -1,4 +1,3 @@
-import * as StringBuilder from "string-builder";
 import { ILazyOperation } from "./ILazyOperation";
 import { ObjectTypeDescriptor } from "../../../../Types";
 import { InMemoryDocumentSessionOperations } from "../../InMemoryDocumentSessionOperations";
@@ -9,6 +8,7 @@ import { GetResponse } from "../../../Commands/MultiGet/GetResponse";
 import { GetDocumentsResult, GetDocumentsCommand } from "../../../Commands/GetDocumentsCommand";
 import { stringToReadable } from "../../../../Utility/StreamUtil";
 import { StringUtil } from "../../../../Utility/StringUtil";
+import { StringBuilder } from "../../../../Utility/StringBuilder";
 
 export class LazyLoadOperation<T extends object> implements ILazyOperation {
     private readonly _clazz: ObjectTypeDescriptor<T>;
diff --git a/src/Documents/Session/Operations/QueryOperation.ts b/src/Documents/Session/Operations/QueryOperation.ts
@@ -6,7 +6,6 @@ import { Stopwatch } from "../../../Utility/Stopwatch";
 import { getLogger } from "../../../Utility/LogUtil";
 import { QueryCommand } from "../../Commands/QueryCommand";
 import { throwError } from "../../../Exceptions";
-import * as StringBuilder from "string-builder";
 import {
     DocumentType,
 } from "../../DocumentAbstractions";
@@ -15,6 +14,7 @@ import { TypeUtil } from "../../../Utility/TypeUtil";
 import { StringUtil } from "../../../Utility/StringUtil";
 import { Reference } from "../../../Utility/Reference";
 import { NESTED_OBJECT_TYPES_PROJECTION_FIELD } from "../DocumentQuery";
+import { StringBuilder } from "../../../Utility/StringBuilder";
 
 const log = getLogger({ module: "QueryOperation" });
 
diff --git a/src/Documents/Session/Operations/StreamOperation.ts b/src/Documents/Session/Operations/StreamOperation.ts
@@ -1,5 +1,4 @@
 import * as stream from "readable-stream";
-import * as StringBuilder from "string-builder";
 import { InMemoryDocumentSessionOperations } from "../InMemoryDocumentSessionOperations";
 import { QueryStreamCommand } from "../../Commands/QueryStreamCommand";
 import { IndexQuery } from "../../Queries/IndexQuery";
@@ -14,6 +13,7 @@ import { RavenCommandResponsePipeline } from "../../../Http/RavenCommandResponse
 import { getDocumentResultsAsObjects } from "../../../Mapping/Json/Streams/Pipelines";
 import { TransformKeysJsonStream } from "../../../Mapping/Json/Streams/TransformKeysJsonStream";
 import { getTransformJsonKeysProfile } from "../../../Mapping/Json/Streams/TransformJsonKeysProfiles";
+import { StringBuilder } from "../../../Utility/StringBuilder";
 
 export class StreamOperation {
     private readonly _session: InMemoryDocumentSessionOperations;
@@ -73,11 +73,11 @@ export class StreamOperation {
             }
 
             if ("start" in opts) {
-                sb.append("start=").append(opts.start.toString()).append("&");
+                sb.append("start=").append(opts.start).append("&");
             }
 
             if ("pageSize" in opts && opts.pageSize !== Number.MAX_VALUE) {
-                sb.append("pageSize=").append(opts.pageSize.toString()).append("&");
+                sb.append("pageSize=").append(opts.pageSize).append("&");
             }
         }
 
diff --git a/src/Documents/Session/Tokens/CounterIncludesToken.ts b/src/Documents/Session/Tokens/CounterIncludesToken.ts
@@ -1,5 +1,5 @@
 import { QueryToken } from "./QueryToken";
-import * as StringBuilder from "string-builder";
+import { StringBuilder } from "../../../Utility/StringBuilder";
 
 export class CounterIncludesToken extends QueryToken {
      private _sourcePath: string;
diff --git a/src/Documents/Session/Tokens/ExplanationToken.ts b/src/Documents/Session/Tokens/ExplanationToken.ts
@@ -1,5 +1,5 @@
 import { QueryToken } from "./QueryToken";
-import * as StringBuilder from "string-builder";
+import { StringBuilder } from "../../../Utility/StringBuilder";
 
 export class ExplanationToken extends QueryToken {
     private readonly _optionsParameterName: string;
diff --git a/src/Documents/Session/Tokens/FacetToken.ts b/src/Documents/Session/Tokens/FacetToken.ts
@@ -4,10 +4,10 @@ import { StringUtil } from "../../../Utility/StringUtil";
 import { Facet } from "../../Queries/Facets/Facet";
 import { FacetAggregation, FacetOptions } from "../../Queries/Facets";
 import { FacetBase } from "../../Queries/Facets/FacetBase";
-import * as StringBuilder from "string-builder";
 import { GenericRangeFacet } from "../../Queries/Facets/GenericRangeFacet";
 import { RangeFacet } from "../../Queries/Facets/RangeFacet";
 import { QueryFieldUtil } from "../../Queries/QueryFieldUtil";
+import { StringBuilder } from "../../../Utility/StringBuilder";
 
 export interface FacetTokenSetupDocumentIdOptions {
     facetSetupDocumentId: string;
diff --git a/src/Documents/Session/Tokens/GraphQueryToken.ts b/src/Documents/Session/Tokens/GraphQueryToken.ts
@@ -1,5 +1,5 @@
 import { QueryToken } from "./QueryToken";
-import * as StringBuilder from "string-builder";
+import { StringBuilder } from "../../../Utility/StringBuilder";
 
 export class GraphQueryToken extends QueryToken {
     private readonly _query: string;
diff --git a/src/Documents/Session/Tokens/HighlightingToken.ts b/src/Documents/Session/Tokens/HighlightingToken.ts
@@ -1,5 +1,5 @@
 import { QueryToken } from "./QueryToken";
-import * as StringBuilder from "string-builder";
+import { StringBuilder } from "../../../Utility/StringBuilder";
 
 export class HighlightingToken extends QueryToken {
     private readonly _fieldName: string;
@@ -29,9 +29,9 @@ export class HighlightingToken extends QueryToken {
         this._writeField(writer, this._fieldName);
         writer
             .append(",")
-            .append(this._fragmentLength.toString())
+            .append(this._fragmentLength)
             .append(",")
-            .append(this._fragmentCount.toString());
+            .append(this._fragmentCount);
         if (this._optionsParameterName) {
             writer
                 .append(",$")
diff --git a/src/Documents/Session/Tokens/MoreLikeThisToken.ts b/src/Documents/Session/Tokens/MoreLikeThisToken.ts
@@ -1,7 +1,7 @@
 import { WhereToken } from "./WhereToken";
 import { QueryToken } from "./QueryToken";
-import * as StringBuilder from "string-builder";
 import { DocumentQueryHelper } from "../DocumentQueryHelper";
+import { StringBuilder } from "../../../Utility/StringBuilder";
 
 export class MoreLikeThisToken extends WhereToken {
 
diff --git a/src/Documents/Session/Tokens/QueryToken.ts b/src/Documents/Session/Tokens/QueryToken.ts
@@ -1,4 +1,4 @@
-import * as StringBuilder from "string-builder";
+import { StringBuilder } from "../../../Utility/StringBuilder";
 
 export abstract class QueryToken {
 
diff --git a/src/Documents/Session/Tokens/TimingsToken.ts b/src/Documents/Session/Tokens/TimingsToken.ts
@@ -1,5 +1,5 @@
-import * as StringBuilder from "string-builder";
 import { QueryToken } from "./QueryToken";
+import { StringBuilder } from "../../../Utility/StringBuilder";
 
 export class TimingsToken extends QueryToken {
      private constructor() {
diff --git a/src/Documents/Session/Tokens/WithEdgesToken.ts b/src/Documents/Session/Tokens/WithEdgesToken.ts
@@ -1,6 +1,6 @@
 import { QueryToken } from "./QueryToken";
-import * as StringBuilder from "string-builder";
 import { StringUtil } from "../../../Utility/StringUtil";
+import { StringBuilder } from "../../../Utility/StringBuilder";
 
 export class WithEdgesToken extends QueryToken {
     private readonly _alias: string;
diff --git a/src/Documents/Session/Tokens/WithToken.ts b/src/Documents/Session/Tokens/WithToken.ts
@@ -1,5 +1,5 @@
 import { QueryToken } from "./QueryToken";
-import * as StringBuilder from "string-builder";
+import { StringBuilder } from "../../../Utility/StringBuilder";
 
 export class WithToken extends QueryToken {
     private readonly _alias: string;
diff --git a/src/Documents/Subscriptions/DocumentSubscriptions.ts b/src/Documents/Subscriptions/DocumentSubscriptions.ts
@@ -18,7 +18,7 @@ import { ToggleOngoingTaskStateOperation } from "../Operations/OngoingTasks/Togg
 import { SubscriptionIncludeBuilder } from "../Session/Loaders/SubscriptionIncludeBuilder";
 import * as os from "os";
 import { IncludesUtil } from "../Session/IncludesUtil";
-import StringBuilder = require("string-builder");
+import { StringBuilder } from "../../Utility/StringBuilder";
 
 export class DocumentSubscriptions implements IDisposable {
     private readonly _store: DocumentStore;
diff --git a/src/Http/RavenCommandResponsePipeline.ts b/src/Http/RavenCommandResponsePipeline.ts
@@ -17,8 +17,7 @@ import {
     lastChunk
 } from "../Mapping/Json/Streams/CollectResultStream";
 import { throwError, getError } from "../Exceptions";
-import * as StringBuilder from "string-builder";
-import { 
+import {
     TransformJsonKeysStreamOptions, 
     TransformKeysJsonStream } from "../Mapping/Json/Streams/TransformKeysJsonStream";
 import { 
@@ -28,6 +27,7 @@ import { TypeUtil } from "../Utility/TypeUtil";
 import * as Asm from "stream-json/Assembler";
 import { DocumentConventions } from "../Documents/Conventions/DocumentConventions";
 import { ErrorFirstCallback } from "../Types/Callbacks";
+import { StringBuilder } from "../Utility/StringBuilder";
 
 export interface RavenCommandResponsePipelineOptions<TResult> {
     collectBody?: boolean | ((body: string) => void);
diff --git a/src/Types/string-builder.d.ts b/src/Types/string-builder.d.ts
diff --git a/src/Utility/StringBuilder.ts b/src/Utility/StringBuilder.ts
@@ -0,0 +1,43 @@
+import { Stream } from "stream";
+
+export class StringBuilder {
+    private s: any[] = [];
+    private readonly newline: string;
+
+    public constructor(v?: any) {
+        this.append(v);
+
+        Stream.call(this);
+
+        const isWindows = process.platform === "win32";
+        this.newline = isWindows ? "\r\n" : "\n";
+    }
+
+    public append(v: any) {
+        // tslint:disable-next-line:triple-equals
+        if (v != null) {
+            this.s.push(v);
+        }
+
+        return this;
+    }
+
+    public appendLine(v: any) {
+        this.s.push(this.newline);
+
+        // tslint:disable-next-line:triple-equals
+        if (v != null) {
+            this.s.push(v);
+        }
+
+        return this;
+    }
+
+    public clear() {
+        this.s.length = 0;
+    }
+
+    public toString() {
+        return this.s.length === 0 ? "" : this.s.join("");
+    }
+}
diff --git a/src/Utility/StringUtil.ts b/src/Utility/StringUtil.ts
@@ -3,7 +3,7 @@ import { TypeUtil } from "./TypeUtil";
 import { throwError } from "../Exceptions";
 import * as changeCase from "change-case";
 import { CasingConvention } from "./ObjectUtil";
-import StringBuilder = require("string-builder");
+import { StringBuilder } from "./StringBuilder";
 
 export class StringUtil {
     private static readonly letterRe: RegExp = XRegExp("^\\p{L}$") as RegExp;
diff --git a/tsconfig.imports-check.json b/tsconfig.imports-check.json
@@ -4,8 +4,7 @@
   "include": [
     "./src/**/*",
     "./src/Types/global.d.ts",
-    "./src/Types/readable-stream.d.ts",
-    "./src/Types/string-builder.d.ts"
+    "./src/Types/readable-stream.d.ts"
   ],
   "exclude": [
     "node_modules",
diff --git a/tsconfig.json b/tsconfig.json
@@ -24,8 +24,7 @@
   "files": [
     "./src/index.ts",
     "./src/Types/global.d.ts",
-    "./src/Types/readable-stream.d.ts",
-    "./src/Types/string-builder.d.ts"
+    "./src/Types/readable-stream.d.ts"
   ],
   "exclude": [
     "node_modules",
diff --git a/tsconfig.test.json b/tsconfig.test.json
