Import isomorphic fetch differently (better?)

Make tslint test happier
Prettier clientStub

Author: Paul Korzhyk

lib/clientStub.d.ts

@@ -1,4 +1,3 @@
-import "isomorphic-fetch";
 import { Assigned, Mutation, Operation, Payload, Request, Response, TxnContext, UiKeywords } from "./types";
 export declare class DgraphClientStub {
     private readonly addr;

lib/clientStub.js

@@ -36,7 +36,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
     }
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-require("isomorphic-fetch");
+var fetch = require("isomorphic-fetch");
 var jwt = require("jsonwebtoken");
 var errors_1 = require("./errors");
 var AUTO_REFRESH_PREFETCH_TIME = 5000;
@@ -59,6 +59,9 @@ var DgraphClientStub = (function () {
                     case 1:
                         health = _a.sent();
                         version = health["version"] || health[0].version;
+                        if (version === undefined) {
+                            version = "1.0.x";
+                        }
                         this.legacyApi = version.startsWith("1.0.");
                         return [2, version];
                 }
@@ -144,10 +147,12 @@ var DgraphClientStub = (function () {
             }
             if (params.length > 0) {
                 url += "?";
-                url += params.map(function (_a) {
+                url += params
+                    .map(function (_a) {
                     var key = _a.key, value = _a.value;
                     return key + "=" + value;
-                }).join("&");
+                })
+                    .join("&");
             }
         }
         return this.callAPI(url, {
@@ -170,8 +175,13 @@ var DgraphClientStub = (function () {
             }
             body = JSON.stringify(obj);
         }
-        else if (mu.setNquads !== undefined || mu.deleteNquads !== undefined) {
-            body = "{\n                " + (mu.setNquads === undefined ? "" : "set {\n                    " + mu.setNquads + "\n                }") + "\n                " + (mu.deleteNquads === undefined ? "" : "delete {\n                    " + mu.deleteNquads + "\n                }") + "\n            }";
+        else if (mu.setNquads !== undefined ||
+            mu.deleteNquads !== undefined) {
+            body = "{\n                " + (mu.setNquads === undefined
+                ? ""
+                : "set {\n                    " + mu.setNquads + "\n                }") + "\n                " + (mu.deleteNquads === undefined
+                ? ""
+                : "delete {\n                    " + mu.deleteNquads + "\n                }") + "\n            }";
         }
         else if (mu.mutation !== undefined) {
             body = mu.mutation;
@@ -200,7 +210,8 @@ var DgraphClientStub = (function () {
         var url = "mutate";
         var nextDelim = "?";
         if (mu.startTs > 0) {
-            url += (!this.legacyApi ? "?startTs=" : "/") + mu.startTs.toString();
+            url +=
+                (!this.legacyApi ? "?startTs=" : "/") + mu.startTs.toString();
             nextDelim = "&";
         }
         if (mu.commitNow) {
@@ -249,11 +260,14 @@ var DgraphClientStub = (function () {
                             throw new Error("Pre v1.1 clients do not support Login methods");
                         }
                         body = {};
-                        if (userid === undefined && refreshToken === undefined && this.refreshToken === undefined) {
+                        if (userid === undefined &&
+                            refreshToken === undefined &&
+                            this.refreshToken === undefined) {
                             throw new Error("Cannot find login details: neither userid/password nor refresh token are specified");
                         }
                         if (userid === undefined) {
-                            body.refresh_token = refreshToken !== undefined ? refreshToken : this.refreshToken;
+                            body.refresh_token =
+                                refreshToken !== undefined ? refreshToken : this.refreshToken;
                         }
                         else {
                             body.userid = userid;
@@ -294,7 +308,9 @@ var DgraphClientStub = (function () {
         if (all === void 0) { all = false; }
         return __awaiter(this, void 0, void 0, function () {
             return __generator(this, function (_a) {
-                return [2, this.callAPI("health" + (all ? "?all" : ""), {})];
+                return [2, this.callAPI("health" + (all ? "?all" : ""), {
+                        acceptRawText: true,
+                    })];
             });
         });
     };
@@ -324,13 +340,14 @@ var DgraphClientStub = (function () {
             return;
         }
         this.cancelRefreshTimer();
-        var timeToWait = Math.max(2000, jwt.decode(accessToken).exp * 1000 - Date.now()
-            - AUTO_REFRESH_PREFETCH_TIME);
-        this.autoRefreshTimer = setTimeout(function () { return _this.refreshToken !== undefined ? _this.login() : 0; }, timeToWait);
+        var timeToWait = Math.max(2000, jwt.decode(accessToken).exp * 1000 -
+            Date.now() -
+            AUTO_REFRESH_PREFETCH_TIME);
+        this.autoRefreshTimer = (setTimeout(function () { return (_this.refreshToken !== undefined ? _this.login() : 0); }, timeToWait));
     };
     DgraphClientStub.prototype.callAPI = function (path, config) {
         return __awaiter(this, void 0, void 0, function () {
-            var url, response, json, errors;
+            var url, response, json, responseText, err, errors;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -345,9 +362,20 @@ var DgraphClientStub = (function () {
                         if (response.status >= 300 || response.status < 200) {
                             throw new Error("Invalid status code = " + response.status);
                         }
-                        return [4, response.json()];
+                        return [4, response.text()];
                     case 2:
-                        json = _a.sent();
+                        responseText = _a.sent();
+                        try {
+                            json = JSON.parse(responseText);
+                        }
+                        catch (e) {
+                            if (config.acceptRawText) {
+                                return [2, responseText];
+                            }
+                            err = (new Error("Response is not JSON"));
+                            err.responseText = responseText;
+                            throw err;
+                        }
                         errors = json.errors;
                         if (errors !== undefined) {
                             throw new errors_1.APIError(url, errors);

lib/types.d.ts

@@ -23,7 +23,7 @@ export interface Response {
 }
 export interface UiKeywords {
     keywords: {
-        "type": string;
+        type: string;
         name: string;
     }[];
 }
@@ -73,3 +73,6 @@ export interface TxnOptions {
     readOnly?: boolean;
     bestEffort?: boolean;
 }
+export interface ErrorNonJson extends Error {
+    responseText?: string;
+}

package.json

@@ -1,6 +1,6 @@
 {
   "name": "dgraph-js-http",
-  "version": "20.03.0",
+  "version": "20.3.1-rc5",
   "description": "A javascript HTTP client for Dgraph",
   "license": "Apache-2.0",
   "repository": {
@@ -42,5 +42,18 @@
   "dependencies": {
     "isomorphic-fetch": "^2.2.1",
     "jsonwebtoken": "^8.5.1"
+  },
+  "prettier": {
+    "arrowParens": "avoid",
+    "tabWidth": 4,
+    "trailingComma": "all",
+    "overrides": [
+      {
+        "files": "*.{json,yml}",
+        "options": {
+          "tabWidth": 2
+        }
+      }
+    ]
   }
 }