New release. Green tests. Almost no ts errors

Author: Paul Korzhyk

jest.config.js

@@ -1,4 +1,9 @@
 module.exports = {
+    globals: {
+      "ts-jest": {
+        diagnostics: false,
+      },
+    },
     testEnvironment: "node",
     transform: {
       ".ts": "ts-jest"

lib/client.js

@@ -1,10 +1,9 @@
 "use strict";
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
         function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
         function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        function step(result) { result.done ? resolve(result.value) : new P(function (resolve) { resolve(result.value); }).then(fulfilled, rejected); }
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };

lib/clientStub.js

@@ -11,11 +11,10 @@ var __assign = (this && this.__assign) || function () {
     return __assign.apply(this, arguments);
 };
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
         function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
         function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        function step(result) { result.done ? resolve(result.value) : new P(function (resolve) { resolve(result.value); }).then(fulfilled, rejected); }
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
@@ -271,7 +270,7 @@ var DgraphClientStub = (function () {
                                     version: "1.0.x",
                                 }];
                         }
-                        return [2, __assign(__assign({}, JSON.parse(text)), { health: "OK" })];
+                        return [2, __assign({}, JSON.parse(text), { health: "OK" })];
                 }
             });
         });

lib/index.d.ts

@@ -3,4 +3,3 @@ export * from "./clientStub";
 export * from "./client";
 export * from "./txn";
 export * from "./errors";
-export * from "./zero";

lib/index.js

@@ -7,4 +7,3 @@ __export(require("./clientStub"));
 __export(require("./client"));
 __export(require("./txn"));
 __export(require("./errors"));
-__export(require("./zero"));

lib/txn.js

@@ -1,10 +1,9 @@
 "use strict";
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
         function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
         function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        function step(result) { result.done ? resolve(result.value) : new P(function (resolve) { resolve(result.value); }).then(fulfilled, rejected); }
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };

lib/zero.d.ts

@@ -1,6 +1,6 @@
 {
   "name": "dgraph-js-http",
-  "version": "1.1.0-rc21",
+  "version": "2003.0.0",
   "description": "A javascript HTTP client for Dgraph",
   "license": "Apache-2.0",
   "repository": {

lib/zero.js

@@ -1,7 +1,7 @@
 import { DgraphClientStub } from "./clientStub";
 import { ERR_NO_CLIENTS } from "./errors";
 import { Txn } from "./txn";
-import { Operation, Payload, UiKeywords, TxnOptions, Response } from "./types";
+import { Operation, Payload, Response, TxnOptions, UiKeywords } from "./types";
 import { stringifyMessage } from "./util";
 
 /**
@@ -96,14 +96,14 @@ export class DgraphClient {
      * getHealth gets client or cluster health
      */
     public async getHealth(all: boolean = true): Promise<Response> {
-      return await this.anyClient().getHealth(all);
+      return this.anyClient().getHealth(all);
     }
 
     /**
      * getState gets cluster state
      */
     public async getState(): Promise<Response> {
-      return await this.anyClient().getState();
+      return this.anyClient().getState();
     }
 
     /**

package.json

@@ -41,8 +41,10 @@ export class DgraphClientStub {
 
     public async detectApiVersion(): Promise<string> {
         const health = await this.health();
-        this.legacyApi = health.version.startsWith("1.0.");
-        return health.version;
+        // tslint:disable-next-line
+        const version: string = health.version || health[0].version;
+        this.legacyApi = version.startsWith("1.0.");
+        return version;
     }
 
     public alter(op: Operation): Promise<Payload> {
@@ -296,35 +298,20 @@ export class DgraphClientStub {
       return this.callAPI("ui/keywords", {});
     }
 
-
     /**
      * Gets instance or cluster health, based on the all param
-     *
-     * @param {boolean} [all=false] Whether to get the health of the full cluster 
-     * @returns {Promise<Response>} Health in JSON
-     * @memberof DgraphClientStub
      */
     public async getHealth(all: boolean = false): Promise<Response> {
-      const url = "health" + (all? "?all" : "");
-
-      return await this.callAPI(url, {
-        method: "GET",
-      });
+      return this.callAPI(`health${all ? "?all" : ""}`, {});
     }
 
     /**
      * Gets the state of the cluster
-     *
-     * @returns {Promise<Response>} State in JSON
-     * @memberof DgraphClientStub
      */
     public async getState(): Promise<Response> {
-      return await this.callAPI("state", {
-        method: "GET",
-      });
+      return this.callAPI("state", {});
     }
 
-
     public setAutoRefresh(val: boolean) {
         if (!val) {
           this.cancelRefreshTimer();
@@ -335,7 +322,7 @@ export class DgraphClientStub {
 
     private cancelRefreshTimer() {
       if (this.autoRefreshTimer !== undefined) {
-        clearTimeout(<any>this.autoRefreshTimer);
+        clearTimeout(this.autoRefreshTimer);
         this.autoRefreshTimer = undefined;
       }
     }
@@ -348,11 +335,12 @@ export class DgraphClientStub {
 
       const timeToWait = Math.max(
           2000,
-          jwt.decode(accessToken).exp * 1000 - Date.now()
+          (<{exp: number}>jwt.decode(accessToken)).exp * 1000 - Date.now()
               - AUTO_REFRESH_PREFETCH_TIME);
 
-      this.autoRefreshTimer = <any>setTimeout(
-          () => this.refreshToken && this.login(),
+      // tslint:disable-next-line no-unsafe-any
+      this.autoRefreshTimer = setTimeout(
+          () => this.refreshToken !== undefined ? this.login() : 0,
           timeToWait,
       );
     }
@@ -364,20 +352,25 @@ export class DgraphClientStub {
           config.headers["X-Dgraph-AccessToken"] = this.accessToken;
         }
 
+        // tslint:disable-next-line no-unsafe-any
         const response = await fetch(url, config);
 
+        // tslint:disable-next-line no-unsafe-any
         if (response.status >= 300 || response.status < 200) {
+            // tslint:disable-next-line no-unsafe-any
             throw new Error(`Invalid status code = ${response.status}`);
         }
 
+        // tslint:disable-next-line no-unsafe-any
         const json = await response.json();
-        const errors = (<{ errors: APIResultError[] }><any>json).errors; // tslint:disable-line no-any
+        // tslint:disable-next-line no-unsafe-any
+        const errors = (<{ errors: APIResultError[] }>json).errors;
 
         if (errors !== undefined) {
             throw new APIError(url, errors);
         }
 
-        return json;
+        return <T>json;
     }
 
     private getURL(path: string): string {

src/client.ts

@@ -11,7 +11,4 @@ export * from "./client";
 export * from "./txn";
 
 // Export error constants.
-export * from "./errors"
-
-// Export DgraphZero class
-export * from "./zero"
+export * from "./errors";

src/clientStub.ts

@@ -1,5 +1,5 @@
 import { DgraphClient } from "./client";
-import { ERR_ABORTED, ERR_FINISHED, ERR_BEST_EFFORT_REQUIRED_READ_ONLY } from "./errors";
+import { ERR_ABORTED, ERR_BEST_EFFORT_REQUIRED_READ_ONLY, ERR_FINISHED } from "./errors";
 import { Assigned, Mutation, Request, Response, TxnContext, TxnOptions } from "./types";
 import {
     isAbortedError,
@@ -27,20 +27,20 @@ export class Txn {
     private finished: boolean = false;
     private mutated: boolean = false;
 
-    constructor(dc: DgraphClient, options?: TxnOptions) {
+    constructor(dc: DgraphClient, options: TxnOptions = {}) {
         this.dc = dc;
 
-        if (options && options.bestEffort && !options.readOnly) {
-            this.dc.debug('Client attempted to query using best-effort without setting the transaction to read-only');
+        if (options.bestEffort && !options.readOnly) {
+            this.dc.debug("Client attempted to query using best-effort without setting the transaction to read-only");
             throw ERR_BEST_EFFORT_REQUIRED_READ_ONLY;
         }
 
         this.ctx = {
           start_ts: 0,
           keys: [],
           preds: [],
-          readOnly: options && options.readOnly,
-          bestEffort: options && options.bestEffort,
+          readOnly: options.readOnly,
+          bestEffort: options.bestEffort,
         };
     }
 
@@ -73,7 +73,7 @@ export class Txn {
             timeout: this.dc.getQueryTimeout(),
             debug: options.debug,
             readOnly: this.ctx.readOnly,
-            bestEffort: this.ctx.bestEffort
+            bestEffort: this.ctx.bestEffort,
         };
         if (vars !== undefined) {
             const varsObj: { [k: string]: string } = {};

src/index.ts

@@ -77,6 +77,6 @@ export interface Latency {
 }
 
 export interface TxnOptions {
-    readOnly?: boolean,
-    bestEffort?: boolean
-}
+    readOnly?: boolean;
+    bestEffort?: boolean;
+}