mobility-toolbox-js 2.0.0-beta.34 → 2.0.0-beta.37

package/api/RealtimeAPI.test.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=RealtimeAPI.test.d.ts.map

package/api/RealtimeAPI.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"RealtimeAPI.test.d.ts","sourceRoot":"","sources":["../../src/api/RealtimeAPI.test.js"],"names":[],"mappings":""}

package/api/RealtimeAPI.test.js

@@ -0,0 +1,67 @@
+import { RealtimeAPI, RealtimeModes } from '.';
+describe('RealtimeAPI', () => {
+    let api;
+    let get;
+    beforeEach(() => {
+        get = jest.fn((params, cb) => {
+            cb({ content: 'content' });
+        });
+        api = new RealtimeAPI();
+        api.wsApi = {
+            get,
+        };
+    });
+    describe('#getFullTrajectory() calls fullTrajectory channel', () => {
+        test('without parameters', (done) => {
+            api.getFullTrajectory().then(() => {
+                expect(get.mock.calls.length).toBe(1);
+                expect(get.mock.calls[0][0]).toEqual({
+                    channel: 'full_trajectory',
+                });
+                done();
+            });
+        });
+        [null, RealtimeModes.TOPOGRAPHIC].forEach((mode) => {
+            describe(`using mode ${mode}`, () => {
+                test('using id', (done) => {
+                    api.getFullTrajectory('foo', mode).then(() => {
+                        expect(get.mock.calls.length).toBe(1);
+                        expect(get.mock.calls[0][0]).toEqual({
+                            channel: 'full_trajectory_foo',
+                        });
+                        done();
+                    });
+                });
+                test('using id and generalizationLevel param', (done) => {
+                    api.getFullTrajectory('foo', mode, 5).then(() => {
+                        expect(get.mock.calls.length).toBe(1);
+                        expect(get.mock.calls[0][0]).toEqual({
+                            channel: 'full_trajectory_foo_gen5',
+                        });
+                        done();
+                    });
+                });
+            });
+        });
+        describe('using schematic mode ', () => {
+            test('using id', (done) => {
+                api.getFullTrajectory('foo', RealtimeModes.SCHEMATIC).then(() => {
+                    expect(get.mock.calls.length).toBe(1);
+                    expect(get.mock.calls[0][0]).toEqual({
+                        channel: 'full_trajectory_schematic_foo',
+                    });
+                    done();
+                });
+            });
+            test("doesn't use generalizationLevel param", (done) => {
+                api.getFullTrajectory('foo', RealtimeModes.SCHEMATIC, 10).then(() => {
+                    expect(get.mock.calls.length).toBe(1);
+                    expect(get.mock.calls[0][0]).toEqual({
+                        channel: 'full_trajectory_schematic_foo',
+                    });
+                    done();
+                });
+            });
+        });
+    });
+});

package/api/RoutingAPI.d.ts

@@ -1,5 +1,9 @@
-import HttpAPI, { HttpApiOptions } from '../common/api/HttpAPI';
+import HttpAPI from '../common/api/HttpAPI';
 import { RoutingParameters, RoutingResponse } from '../../types';
+export declare type RoutingAPIOptions = {
+    url?: string;
+    apiKey?: string;
+};
 /**
  * Access to the [geOps Routing service](https://developer.geops.io/apis/routing).
  *
@@ -19,7 +23,7 @@ declare class RoutingAPI extends HttpAPI {
      * @param {string} [options.url='https://api.geops.io/routing/v1/'] Service url.
      * @param {string} options.apiKey Access key for [geOps services](https://developer.geops.io/).
      */
-    constructor(options: HttpApiOptions);
+    constructor(options: RoutingAPIOptions);
     /**
      * Route.
      *

package/api/RoutingAPI.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"RoutingAPI.d.ts","sourceRoot":"","sources":["../../src/api/RoutingAPI.ts"],"names":[],"mappings":"AAAA,OAAO,OAAO,EAAE,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAChE,OAAO,EAAE,iBAAiB,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAEjE;;;;;;;;;;GAUG;AACH,cAAM,UAAW,SAAQ,OAAO;IAC9B;;;;;;OAMG;gBACS,OAAO,EAAE,cAAc;IAOnC;;;;;;OAMG;IACH,KAAK,CACH,MAAM,EAAE,iBAAiB,EACzB,MAAM,EAAE,WAAW,GAClB,OAAO,CAAC,eAAe,CAAC;CAG5B;AAED,eAAe,UAAU,CAAC"}
+{"version":3,"file":"RoutingAPI.d.ts","sourceRoot":"","sources":["../../src/api/RoutingAPI.ts"],"names":[],"mappings":"AAAA,OAAO,OAAO,MAAM,uBAAuB,CAAC;AAC5C,OAAO,EAAE,iBAAiB,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAEjE,oBAAY,iBAAiB,GAAG;IAC9B,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB,CAAC;AAEF;;;;;;;;;;GAUG;AACH,cAAM,UAAW,SAAQ,OAAO;IAC9B;;;;;;OAMG;gBACS,OAAO,EAAE,iBAAiB;IAItC;;;;;;OAMG;IACH,KAAK,CACH,MAAM,EAAE,iBAAiB,EACzB,MAAM,EAAE,WAAW,GAClB,OAAO,CAAC,eAAe,CAAC;CAG5B;AAED,eAAe,UAAU,CAAC"}

package/api/RoutingAPI.js

@@ -1,32 +1,4 @@
-"use strict";
-var __extends = (this && this.__extends) || (function () {
-    var extendStatics = function (d, b) {
-        extendStatics = Object.setPrototypeOf ||
-            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
-            function (d, b) { for (var p in b) if (Object.prototype.hasOwnProperty.call(b, p)) d[p] = b[p]; };
-        return extendStatics(d, b);
-    };
-    return function (d, b) {
-        if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
-        extendStatics(d, b);
-        function __() { this.constructor = d; }
-        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
-    };
-})();
-var __assign = (this && this.__assign) || function () {
-    __assign = Object.assign || function(t) {
-        for (var s, i = 1, n = arguments.length; i < n; i++) {
-            s = arguments[i];
-            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
-                t[p] = s[p];
-        }
-        return t;
-    };
-    return __assign.apply(this, arguments);
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-var HttpAPI_1 = require("../common/api/HttpAPI");
+import HttpAPI from '../common/api/HttpAPI';
 /**
  * Access to the [geOps Routing service](https://developer.geops.io/apis/routing).
  *
@@ -38,8 +10,7 @@ var HttpAPI_1 = require("../common/api/HttpAPI");
  * });
  *
  */
-var RoutingAPI = /** @class */ (function (_super) {
-    __extends(RoutingAPI, _super);
+class RoutingAPI extends HttpAPI {
     /**
      * Constructor
      *
@@ -47,8 +18,8 @@ var RoutingAPI = /** @class */ (function (_super) {
      * @param {string} [options.url='https://api.geops.io/routing/v1/'] Service url.
      * @param {string} options.apiKey Access key for [geOps services](https://developer.geops.io/).
      */
-    function RoutingAPI(options) {
-        return _super.call(this, __assign({ url: 'https://api.geops.io/routing/v1/' }, (options || {}))) || this;
+    constructor(options) {
+        super(Object.assign({ url: 'https://api.geops.io/routing/v1/' }, options));
     }
     /**
      * Route.
@@ -57,9 +28,8 @@ var RoutingAPI = /** @class */ (function (_super) {
      * @param {RequestInit} config Options for the fetch request.
      * @return {Promise<RoutingResponse>} An GeoJSON feature collection with coordinates in [EPSG:4326](http://epsg.io/4326).
      */
-    RoutingAPI.prototype.route = function (params, config) {
+    route(params, config) {
         return this.fetch('', params, config);
-    };
-    return RoutingAPI;
-}(HttpAPI_1.default));
-exports.default = RoutingAPI;
+    }
+}
+export default RoutingAPI;

package/api/RoutingAPI.test.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=RoutingAPI.test.d.ts.map

package/api/RoutingAPI.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"RoutingAPI.test.d.ts","sourceRoot":"","sources":["../../src/api/RoutingAPI.test.js"],"names":[],"mappings":""}

package/api/RoutingAPI.test.js

@@ -0,0 +1,29 @@
+import fetch from 'jest-fetch-mock';
+import RoutingAPI from './RoutingAPI';
+let api;
+describe('RoutingAPI', () => {
+    beforeEach(() => {
+        global.fetch = fetch;
+        fetch.resetMocks();
+        api = new RoutingAPI({ apiKey: 'apiKey' });
+    });
+    describe('#route', () => {
+        test('should success', (done) => {
+            fetch.mockResponseOnce(JSON.stringify(global.fetchRouteResponse));
+            return api
+                .route({
+                mot: 'bus',
+                via: '47.3739194713294,8.538274823394632|47.37595378493421,8.537490375951839',
+            })
+                .then((featureCollection) => {
+                // Correct url
+                expect(fetch.mock.calls[0][0]).toEqual('https://api.geops.io/routing/v1/?key=apiKey&mot=bus&via=47.3739194713294%2C8.538274823394632%7C47.37595378493421%2C8.537490375951839');
+                // Correct search result (for bus mot)
+                expect(featureCollection.features[0].geometry.type).toEqual('LineString');
+                expect(featureCollection.features[0].properties.lines).toBeDefined();
+                expect(featureCollection.features[0].properties.station_to).toBeDefined();
+                done();
+            });
+        });
+    });
+});

package/api/StopsAPI.d.ts

@@ -20,7 +20,7 @@ declare class StopsAPI extends HttpAPI {
      * @param {string} options.apiKey Access key for [geOps services](https://developer.geops.io/).
      */
     constructor(options?: {
-        url?: string;
+        url?: string | undefined;
         apiKey: string;
     });
     /**

package/api/StopsAPI.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"StopsAPI.d.ts","sourceRoot":"","sources":["../../src/api/StopsAPI.js"],"names":[],"mappings":";AAEA;;;;;;;;;;;GAWG;AACH;IACE;;;;;;OAMG;IACH;QAH4B,GAAG,GAApB,MAAM;QACU,MAAM,EAAtB,MAAM;OAIhB;IAED;;;;;;OAMG;IACH,oDAHW,eAAe,GACd,iCAAiC,CAM5C;CACF"}
+{"version":3,"file":"StopsAPI.d.ts","sourceRoot":"","sources":["../../src/api/StopsAPI.js"],"names":[],"mappings":";AAEA;;;;;;;;;;;GAWG;AACH;IACE;;;;;;OAMG;IACH;QAH4B,GAAG;QACJ,MAAM,EAAtB,MAAM;OAIhB;IAED;;;;;;OAMG;IACH,oDAHW,eAAe,GACd,iCAAiC,CAM5C;CACF"}

package/api/StopsAPI.js

@@ -1,32 +1,4 @@
-"use strict";
-var __extends = (this && this.__extends) || (function () {
-    var extendStatics = function (d, b) {
-        extendStatics = Object.setPrototypeOf ||
-            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
-            function (d, b) { for (var p in b) if (Object.prototype.hasOwnProperty.call(b, p)) d[p] = b[p]; };
-        return extendStatics(d, b);
-    };
-    return function (d, b) {
-        if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
-        extendStatics(d, b);
-        function __() { this.constructor = d; }
-        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
-    };
-})();
-var __assign = (this && this.__assign) || function () {
-    __assign = Object.assign || function(t) {
-        for (var s, i = 1, n = arguments.length; i < n; i++) {
-            s = arguments[i];
-            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
-                t[p] = s[p];
-        }
-        return t;
-    };
-    return __assign.apply(this, arguments);
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-var HttpAPI_1 = require("../common/api/HttpAPI");
+import HttpAPI from '../common/api/HttpAPI';
 /**
  * Access to the [Stops service](https://developer.geops.io/apis/5dcbd702a256d90001cf1361/).
  *
@@ -39,8 +11,7 @@ var HttpAPI_1 = require("../common/api/HttpAPI");
  * });
  *
  */
-var StopsAPI = /** @class */ (function (_super) {
-    __extends(StopsAPI, _super);
+class StopsAPI extends HttpAPI {
     /**
      * Constructor
      *
@@ -48,9 +19,8 @@ var StopsAPI = /** @class */ (function (_super) {
      * @param {string} [options.url='https://api.geops.io/stops/v1/'] Service url.
      * @param {string} options.apiKey Access key for [geOps services](https://developer.geops.io/).
      */
-    function StopsAPI(options) {
-        if (options === void 0) { options = {}; }
-        return _super.call(this, __assign({ url: 'https://api.geops.io/stops/v1/' }, options)) || this;
+    constructor(options = {}) {
+        super(Object.assign({ url: 'https://api.geops.io/stops/v1/' }, options));
     }
     /**
      * Search.
@@ -59,12 +29,10 @@ var StopsAPI = /** @class */ (function (_super) {
      * @param {AbortController} abortController Abort controller used to cancel the request.
      * @return {Promise<GeoJSONFeatureCollection>} An GeoJSON feature collection with coordinates in [EPSG:4326](http://epsg.io/4326).
      */
-    StopsAPI.prototype.search = function (params, abortController) {
-        if (abortController === void 0) { abortController = {}; }
+    search(params, abortController = {}) {
         return this.fetch('', params, {
             signal: abortController.signal,
         });
-    };
-    return StopsAPI;
-}(HttpAPI_1.default));
-exports.default = StopsAPI;
+    }
+}
+export default StopsAPI;

package/api/StopsAPI.test.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=StopsAPI.test.d.ts.map

package/api/StopsAPI.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"StopsAPI.test.d.ts","sourceRoot":"","sources":["../../src/api/StopsAPI.test.js"],"names":[],"mappings":""}

package/api/StopsAPI.test.js

@@ -0,0 +1,26 @@
+import fetch from 'jest-fetch-mock';
+import StopsAPI from './StopsAPI';
+let api;
+describe('StopsAPI', () => {
+    beforeEach(() => {
+        global.fetch = fetch;
+        fetch.resetMocks();
+        api = new StopsAPI({ apiKey: 'apiKey' });
+    });
+    describe('#search', () => {
+        test('should success', (done) => {
+            fetch.mockResponseOnce(JSON.stringify(global.stopsSearchResponse));
+            return api
+                .search({
+                q: 'Bern',
+            })
+                .then((featureCollection) => {
+                // Correct url
+                expect(fetch.mock.calls[0][0]).toEqual('https://api.geops.io/stops/v1/?key=apiKey&q=Bern');
+                // Correct search result
+                expect(featureCollection.features[0].properties.name).toEqual('Bern');
+                done();
+            });
+        });
+    });
+});

package/api/index.d.ts

@@ -1,5 +1,4 @@
-declare module '.';
-export { default as RoutingAPI } from './RoutingAPI';
-export { default as StopsAPI } from './StopsAPI';
-export { default as RealtimeAPI, RealtimeModes } from './RealtimeAPI';
+export { default as RoutingAPI } from "./RoutingAPI";
+export { default as StopsAPI } from "./StopsAPI";
+export { default as RealtimeAPI, RealtimeModes } from "./RealtimeAPI";
 //# sourceMappingURL=index.d.ts.map

package/api/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/api/index.ts"],"names":[],"mappings":"AAAA,OAAO,QAAQ,GAAG,CAAC;AAEnB,OAAO,EAAE,OAAO,IAAI,UAAU,EAAE,MAAM,cAAc,CAAC;AACrD,OAAO,EAAE,OAAO,IAAI,QAAQ,EAAE,MAAM,YAAY,CAAC;AACjD,OAAO,EAAE,OAAO,IAAI,WAAW,EAAE,aAAa,EAAE,MAAM,eAAe,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/api/index.js"],"names":[],"mappings":""}

package/api/index.js

@@ -1,10 +1,3 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.RealtimeModes = exports.RealtimeAPI = exports.StopsAPI = exports.RoutingAPI = void 0;
-var RoutingAPI_1 = require("./RoutingAPI");
-Object.defineProperty(exports, "RoutingAPI", { enumerable: true, get: function () { return RoutingAPI_1.default; } });
-var StopsAPI_1 = require("./StopsAPI");
-Object.defineProperty(exports, "StopsAPI", { enumerable: true, get: function () { return StopsAPI_1.default; } });
-var RealtimeAPI_1 = require("./RealtimeAPI");
-Object.defineProperty(exports, "RealtimeAPI", { enumerable: true, get: function () { return RealtimeAPI_1.default; } });
-Object.defineProperty(exports, "RealtimeModes", { enumerable: true, get: function () { return RealtimeAPI_1.RealtimeModes; } });
+export { default as RoutingAPI } from './RoutingAPI';
+export { default as StopsAPI } from './StopsAPI';
+export { default as RealtimeAPI, RealtimeModes } from './RealtimeAPI';

package/api/typedefs.js

@@ -1,3 +1,4 @@
+"use strict";
 /**
  * @typedef {Object} Departure
  * @property {number} time Timestamp in ms.

package/common/api/HttpAPI.d.ts

@@ -1,5 +1,5 @@
 import BaseObject from 'ol/Object';
-export declare type HttpApiOptions = {
+export declare type HttpAPIOptions = {
     url: string;
     apiKey?: string;
 };
@@ -20,7 +20,7 @@ export declare type HttpApiOptions = {
 declare class HttpAPI extends BaseObject {
     url: string;
     apiKey?: string;
-    constructor(options: HttpApiOptions);
+    constructor(options: HttpAPIOptions);
     /**
      * Append the apiKey before sending the request.
      * @ignore

package/common/api/HttpAPI.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"HttpAPI.d.ts","sourceRoot":"","sources":["../../../src/common/api/HttpAPI.ts"],"names":[],"mappings":"AAAA,OAAO,UAAU,MAAM,WAAW,CAAC;AAGnC,oBAAY,cAAc,GAAG;IAC3B,GAAG,EAAE,MAAM,CAAC;IACZ,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB,CAAC;AACF;;;;;;;;;;;;;GAaG;AACH,cAAM,OAAQ,SAAQ,UAAU;IAC9B,GAAG,EAAE,MAAM,CAAC;IAEZ,MAAM,CAAC,EAAE,MAAM,CAAC;gBAEJ,OAAO,EAAE,cAAc;IASnC;;;OAGG;IACH,KAAK,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,WAAW,GAAG,OAAO,CAAC,GAAG,CAAC;CA6BvE;AAED,eAAe,OAAO,CAAC"}
+{"version":3,"file":"HttpAPI.d.ts","sourceRoot":"","sources":["../../../src/common/api/HttpAPI.ts"],"names":[],"mappings":"AAAA,OAAO,UAAU,MAAM,WAAW,CAAC;AAGnC,oBAAY,cAAc,GAAG;IAC3B,GAAG,EAAE,MAAM,CAAC;IACZ,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB,CAAC;AACF;;;;;;;;;;;;;GAaG;AACH,cAAM,OAAQ,SAAQ,UAAU;IAC9B,GAAG,EAAE,MAAM,CAAC;IAEZ,MAAM,CAAC,EAAE,MAAM,CAAC;gBAEJ,OAAO,EAAE,cAAc;IASnC;;;OAGG;IACH,KAAK,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,WAAW,GAAG,OAAO,CAAC,GAAG,CAAC;CAmCvE;AAED,eAAe,OAAO,CAAC"}

package/common/api/HttpAPI.js

@@ -1,33 +1,5 @@
-"use strict";
-var __extends = (this && this.__extends) || (function () {
-    var extendStatics = function (d, b) {
-        extendStatics = Object.setPrototypeOf ||
-            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
-            function (d, b) { for (var p in b) if (Object.prototype.hasOwnProperty.call(b, p)) d[p] = b[p]; };
-        return extendStatics(d, b);
-    };
-    return function (d, b) {
-        if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
-        extendStatics(d, b);
-        function __() { this.constructor = d; }
-        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
-    };
-})();
-var __assign = (this && this.__assign) || function () {
-    __assign = Object.assign || function(t) {
-        for (var s, i = 1, n = arguments.length; i < n; i++) {
-            s = arguments[i];
-            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
-                t[p] = s[p];
-        }
-        return t;
-    };
-    return __assign.apply(this, arguments);
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-var Object_1 = require("ol/Object");
-var getUrlWithParams_1 = require("../utils/getUrlWithParams");
+import BaseObject from 'ol/Object';
+import getUrlWithParams from '../utils/getUrlWithParams';
 /**
  * Common class to access to a geOps api using http.
  *
@@ -42,32 +14,34 @@ var getUrlWithParams_1 = require("../utils/getUrlWithParams");
  * @classproperty {string} url Url of the service.
  * @classproperty {string} apiKey Api key to access the service.
  */
-var HttpAPI = /** @class */ (function (_super) {
-    __extends(HttpAPI, _super);
-    function HttpAPI(options) {
-        var _this = _super.call(this) || this;
+class HttpAPI extends BaseObject {
+    constructor(options) {
+        super();
         /** @ignore */
-        _this.url = options.url;
+        this.url = options.url;
         /** @ignore */
-        _this.apiKey = options.apiKey;
-        return _this;
+        this.apiKey = options.apiKey;
     }
     /**
      * Append the apiKey before sending the request.
      * @ignore
      */
-    HttpAPI.prototype.fetch = function (path, params, config) {
-        if (!this.apiKey && !/key=/.test(this.url)) {
+    fetch(path, params, config) {
+        if (!this.url) {
+            // eslint-disable-next-line no-console
+            return Promise.reject(new Error(`No url defined for request to ${this.url}/${path}`));
+        }
+        if (!this.url && !this.apiKey && !/key=/.test(this.url)) {
             // eslint-disable-next-line no-console
-            return Promise.reject(new Error("No apiKey defined for request to ".concat(this.url)));
+            return Promise.reject(new Error(`No apiKey defined for request to ${this.url}`));
         }
         // Clean requets parameters, removing undefined and null values.
-        var searchParams = params || {};
-        var url = (0, getUrlWithParams_1.default)("".concat(this.url).concat(path || ''), __assign({ key: this.apiKey }, searchParams));
+        const searchParams = params || {};
+        const url = getUrlWithParams(`${this.url}${path || ''}`, Object.assign({ key: this.apiKey }, searchParams));
         // We use toString  because of TYpeScript bug that only accept a string in fetch method.
-        return fetch(url.toString(), config).then(function (response) {
+        return fetch(url.toString(), config).then((response) => {
             try {
-                return response.json().then(function (data) {
+                return response.json().then((data) => {
                     if (data.error) {
                         throw new Error(data.error);
                     }
@@ -78,7 +52,6 @@ var HttpAPI = /** @class */ (function (_super) {
                 return Promise.reject(new Error(err));
             }
         });
-    };
-    return HttpAPI;
-}(Object_1.default));
-exports.default = HttpAPI;
+    }
+}
+export default HttpAPI;

package/common/api/HttpAPI.test.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=HttpAPI.test.d.ts.map

package/common/api/HttpAPI.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"HttpAPI.test.d.ts","sourceRoot":"","sources":["../../../src/common/api/HttpAPI.test.js"],"names":[],"mappings":""}

package/common/api/HttpAPI.test.js

@@ -0,0 +1,54 @@
+import fetch from 'jest-fetch-mock';
+import API from './HttpAPI';
+let api;
+describe('HttpAPI', () => {
+    beforeEach(() => {
+        global.fetch = fetch;
+        fetch.resetMocks();
+        api = new API({ url: 'https://foo.ch', apiKey: 'apiKey' });
+    });
+    describe('#fetch', () => {
+        test('should success', () => {
+            fetch.mockResponseOnce(JSON.stringify({ foo: 'bar' }));
+            return api
+                .fetch('/path', {
+                q: 'Bern',
+                fooUndefined: undefined,
+                fooNull: null,
+                fooEmpty: '',
+            })
+                .then((response) => {
+                // Correct url
+                expect(fetch.mock.calls[0][0]).toEqual('https://foo.ch/path?key=apiKey&q=Bern&fooEmpty=');
+                // Correct search result
+                expect(response).toEqual({ foo: 'bar' });
+            });
+        });
+        describe('should display error message', () => {
+            test('reject error', (done) => {
+                fetch.mockRejectOnce(new Error('Fake error message'));
+                return api.fetch().catch((err) => {
+                    expect(err.name).toEqual('Error');
+                    expect(err.message).toEqual('Fake error message');
+                    done();
+                });
+            });
+            test('if the response is invalid json', (done) => {
+                fetch.mockResponseOnce('invalid json');
+                api.fetch().catch((err) => {
+                    expect(err.name).toEqual('FetchError');
+                    expect(err.message).toEqual('invalid json response body at  reason: Unexpected token i in JSON at position 0');
+                    done();
+                });
+            });
+            test('if the response contains an error message', (done) => {
+                fetch.mockResponseOnce('{"error":"foo2"}');
+                api.fetch().catch((err) => {
+                    expect(err.name).toEqual('Error');
+                    expect(err.message).toEqual('foo2');
+                    done();
+                });
+            });
+        });
+    });
+});

package/common/api/WebSocketAPI.d.ts

@@ -27,14 +27,14 @@ declare class WebSocketAPI {
      */
     private connect;
     /** @ignore */
-    websocket: WebSocket;
+    websocket: WebSocket | null | undefined;
     /**
      * Close the websocket definitively.
      *
      * @private
      */
     private close;
-    messagesOnOpen: any[];
+    messagesOnOpen: any[] | undefined;
     /**
      * Sends a message to the websocket.
      *
@@ -42,6 +42,8 @@ declare class WebSocketAPI {
      * @private
      */
     private send;
+    addEvents(onMessage: any, onError: any): void;
+    removeEvents(onMessage: any, onError: any): void;
     /**
      * Listen to websocket messages.
      *
@@ -62,13 +64,15 @@ declare class WebSocketAPI {
     private unlisten;
     /**
      * Sends a get request to the websocket.
+     * The callback is called only once, when the response is received or when the call returns an error.
      *
      * @param {Object} params Parameters for the websocket get request
-     * @param {function} cb callback on listen
-     * @param {function} errorCb Callback on error
+     * @param {function} onMessage callback on message event
+     * @param {function} onError Callback on error and close event
      * @private
      */
     private get;
+    requests: any[] | undefined;
     /**
      * Subscribe to a given channel.
      *

package/common/api/WebSocketAPI.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"WebSocketAPI.d.ts","sourceRoot":"","sources":["../../../src/common/api/WebSocketAPI.js"],"names":[],"mappings":";AAAA;;;;GAIG;AACH;IAiEE;;;;;;;;;;OAUG;IACH,gCAKC;IA5ED,yBA0DC;IAoBD;;;;;;OAMG;IACH,gBAiBC;IAZC,cAAc;IACd,qBAAmC;IAarC;;;;OAIG;IACH,cAOC;IAFG,sBAAwB;IAI5B;;;;;OAKG;IACH,aAsBC;IAED;;;;;;;;OAQG;IACH,eAsCC;IAED;;;;;;OAMG;IACH,iBAiBC;IAED;;;;;;;OAOG;IACH,YAIC;IAED;;;;;;;;OAQG;IACH,kBAqBC;IAED;;;;;OAKG;IACH,oBA8BC;IAfC,mBAEC;IAeH;;OAEG;IACH,uCAYC;CACF"}
+{"version":3,"file":"WebSocketAPI.d.ts","sourceRoot":"","sources":["../../../src/common/api/WebSocketAPI.js"],"names":[],"mappings":";AAAA;;;;GAIG;AACH;IAiEE;;;;;;;;;;OAUG;IACH,gCAKC;IA5ED,yBA0DC;IAoBD;;;;;;OAMG;IACH,gBAiBC;IAZC,cAAc;IACd,wCAAmC;IAarC;;;;OAIG;IACH,cAOC;IAFG,kCAAwB;IAI5B;;;;;OAKG;IACH,aAsBC;IAED,8CASC;IAED,iDASC;IAED;;;;;;;;OAQG;IACH,eAgCC;IAED;;;;;;OAMG;IACH,iBAQC;IAED;;;;;;;;OAQG;IACH,YA4CC;IAlBG,4BAAkB;IAoBtB;;;;;;;;OAQG;IACH,kBAqBC;IAED;;;;;OAKG;IACH,oBAwBC;IAfC,mBAEC;IAeH;;OAEG;IACH,uCAYC;CACF"}