@opentap/runner-client 1.0.0-beta.78 → 1.0.0-beta.80

package/lib/RunnerClient.d.ts

@@ -1,6 +1,6 @@
-import { ConnectionOptions } from 'nats.ws';
+import { Image, Session } from './DTOs';
 import { BaseClient } from './BaseClient';
-import { Image, Links, Session } from './DTOs';
+import { ConnectionOptions } from 'nats.ws';
 export declare class RunnerClient extends BaseClient {
     private http;
     private baseUrl;
@@ -45,29 +45,4 @@ export declare class RunnerClient extends BaseClient {
      * @returns {{Promise<Session>}}
      */
     startImageSession(image: Image): Promise<Session>;
-    /**
-     * Retrives the already running sessions
-     */
-    getSessions(): Promise<Session[]>;
-    protected processGetSessions(response: Response): Promise<Session[]>;
-    /**
-     * Register a self-started Session to a SessionManager.
-     */
-    registerSession(session: Session): Promise<Session>;
-    protected processRegisterSession(response: Response): Promise<Session>;
-    /**
-     * Shutdown Sessions and SessionManager
-     */
-    shutdown(): Promise<void>;
-    protected processShutdown(response: Response): Promise<void>;
-    /**
-     * Links to other applications or services
-     */
-    getLinks(): Promise<Links>;
-    protected processGetLinks(response: Response): Promise<Links>;
-    /**
-     * Retrieve settings types used in creating a Settings TapPackage
-     */
-    getSettingsTypes(): Promise<string[]>;
-    protected processGetSettingsTypes(response: Response): Promise<string[]>;
 }

package/lib/RunnerClient.js

@@ -13,8 +13,8 @@ var __extends = (this && this.__extends) || (function () {
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
     };
 })();
+import { Image, Session } from './DTOs';
 import { BaseClient } from './BaseClient';
-import { ApiException, ErrorResponse, Links, Session } from './DTOs';
 var RunnerClient = /** @class */ (function (_super) {
     __extends(RunnerClient, _super);
     function RunnerClient(baseSubject, options) {
@@ -29,7 +29,10 @@ var RunnerClient = /** @class */ (function (_super) {
      */
     RunnerClient.prototype.getImage = function (imageId) {
         return (imageId === null || imageId === void 0 ? void 0 : imageId.length) > 0
-            ? this.request('GetImage', imageId).then(this.success()).catch(this.error())
+            ? this.request('GetImage', imageId)
+                .then(function (imageJs) { return Image.fromJS(imageJs); })
+                .then(this.success())
+                .catch(this.error())
             : Promise.reject('imageId is not defined');
     };
     /**
@@ -37,7 +40,10 @@ var RunnerClient = /** @class */ (function (_super) {
      * @returns {{Promise<Image[]>}}
      */
     RunnerClient.prototype.getImages = function () {
-        return this.request('GetImages').then(this.success()).catch(this.error());
+        return this.request('GetImages')
+            .then(function (imageArrayJs) { return imageArrayJs.map(function (imageJs) { return Image.fromJS(imageJs); }); })
+            .then(this.success())
+            .catch(this.error());
     };
     /**
      * Create a OpenTAP package configuration image from a list image inputs consisting of user specified packages and repositories.
@@ -46,7 +52,10 @@ var RunnerClient = /** @class */ (function (_super) {
      */
     RunnerClient.prototype.resolveImage = function (images) {
         return (images === null || images === void 0 ? void 0 : images.length) > 0
-            ? this.request('ResolveImage', images).then(this.success()).catch(this.error())
+            ? this.request('ResolveImage', images)
+                .then(function (imageJs) { return Image.fromJS(imageJs); })
+                .then(this.success())
+                .catch(this.error())
             : Promise.reject('images list is not defined or is empty');
     };
     /**
@@ -64,14 +73,20 @@ var RunnerClient = /** @class */ (function (_super) {
      * @returns {{Promise<Session>}}
      */
     RunnerClient.prototype.startSession = function () {
-        return this.request('StartSession').then(this.success()).catch(this.error());
+        return this.request('StartSession')
+            .then(function (sessionJs) { return Session.fromJS(sessionJs); })
+            .then(this.success())
+            .catch(this.error());
     };
     /**
      * Get the session manager image.
      * @returns {{Promise<Image>}}
      */
     RunnerClient.prototype.getSessionManagerImage = function () {
-        return this.request('GetSessionManagerImage').then(this.success()).catch(this.error());
+        return this.request('GetSessionManagerImage')
+            .then(function (imageJs) { return Image.fromJS(imageJs); })
+            .then(this.success())
+            .catch(this.error());
     };
     /**
      * Start a session based on an image.
@@ -80,258 +95,12 @@ var RunnerClient = /** @class */ (function (_super) {
      */
     RunnerClient.prototype.startImageSession = function (image) {
         return image
-            ? this.request('StartImageSession', image).then(this.success()).catch(this.error())
+            ? this.request('StartImageSession', image)
+                .then(function (sessionJs) { return Session.fromJS(sessionJs); })
+                .then(this.success())
+                .catch(this.error())
             : Promise.reject('image is not defined');
     };
-    /**
-     * Retrives the already running sessions
-     */
-    RunnerClient.prototype.getSessions = function () {
-        var _this = this;
-        var url_ = this.baseUrl + '/sessions';
-        url_ = url_.replace(/[?&]$/, '');
-        var options_ = {
-            method: 'GET',
-            headers: {
-                Accept: 'application/json',
-            },
-        };
-        return this.http.fetch(url_, options_).then(function (_response) {
-            return _this.processGetSessions(_response);
-        });
-    };
-    RunnerClient.prototype.processGetSessions = function (response) {
-        var _this = this;
-        var status = response.status;
-        var _headers = {};
-        if (response.headers && response.headers.forEach) {
-            response.headers.forEach(function (v, k) { return (_headers[k] = v); });
-        }
-        if (status === 200) {
-            return response.text().then(function (_responseText) {
-                var result200 = null;
-                var resultData200 = _responseText === '' ? null : JSON.parse(_responseText, _this.jsonParseReviver);
-                if (Array.isArray(resultData200)) {
-                    result200 = [];
-                    for (var _i = 0, resultData200_1 = resultData200; _i < resultData200_1.length; _i++) {
-                        var item = resultData200_1[_i];
-                        result200.push(Session.fromJS(item));
-                    }
-                }
-                else {
-                    result200 = null;
-                }
-                return result200;
-            });
-        }
-        else if (status !== 200 && status !== 204) {
-            return response.text().then(function (_responseText) {
-                return throwException('An unexpected server error occurred.', status, _responseText, _headers);
-            });
-        }
-        return Promise.resolve(null);
-    };
-    /**
-     * Register a self-started Session to a SessionManager.
-     */
-    RunnerClient.prototype.registerSession = function (session) {
-        var _this = this;
-        var url_ = this.baseUrl + '/sessions/register';
-        url_ = url_.replace(/[?&]$/, '');
-        var content_ = JSON.stringify(session);
-        var options_ = {
-            body: content_,
-            method: 'POST',
-            headers: {
-                'Content-Type': 'application/json',
-                Accept: 'application/json',
-            },
-        };
-        return this.http.fetch(url_, options_).then(function (_response) {
-            return _this.processRegisterSession(_response);
-        });
-    };
-    RunnerClient.prototype.processRegisterSession = function (response) {
-        var _this = this;
-        var status = response.status;
-        var _headers = {};
-        if (response.headers && response.headers.forEach) {
-            response.headers.forEach(function (v, k) { return (_headers[k] = v); });
-        }
-        if (status === 200) {
-            return response.text().then(function (_responseText) {
-                var result200 = null;
-                var resultData200 = _responseText === '' ? null : JSON.parse(_responseText, _this.jsonParseReviver);
-                result200 = Session.fromJS(resultData200);
-                return result200;
-            });
-        }
-        else if (status === 400) {
-            return response.text().then(function (_responseText) {
-                var result400 = null;
-                var resultData400 = _responseText === '' ? null : JSON.parse(_responseText, _this.jsonParseReviver);
-                result400 = ErrorResponse.fromJS(resultData400);
-                return throwException('A server side error occurred.', status, _responseText, _headers, result400);
-            });
-        }
-        else if (status !== 200 && status !== 204) {
-            return response.text().then(function (_responseText) {
-                return throwException('An unexpected server error occurred.', status, _responseText, _headers);
-            });
-        }
-        return Promise.resolve(null);
-    };
-    /**
-     * Shutdown Sessions and SessionManager
-     */
-    RunnerClient.prototype.shutdown = function () {
-        var _this = this;
-        var url_ = this.baseUrl + '/sessionmanager';
-        url_ = url_.replace(/[?&]$/, '');
-        var options_ = {
-            method: 'DELETE',
-            headers: {},
-        };
-        return this.http.fetch(url_, options_).then(function (_response) {
-            return _this.processShutdown(_response);
-        });
-    };
-    RunnerClient.prototype.processShutdown = function (response) {
-        var _this = this;
-        var status = response.status;
-        var _headers = {};
-        if (response.headers && response.headers.forEach) {
-            response.headers.forEach(function (v, k) { return (_headers[k] = v); });
-        }
-        if (status === 200) {
-            return response.text().then(function () {
-                return;
-            });
-        }
-        else if (status === 400) {
-            return response.text().then(function (_responseText) {
-                var result400 = null;
-                var resultData400 = _responseText === '' ? null : JSON.parse(_responseText, _this.jsonParseReviver);
-                result400 = ErrorResponse.fromJS(resultData400);
-                return throwException('A server side error occurred.', status, _responseText, _headers, result400);
-            });
-        }
-        else if (status !== 200 && status !== 204) {
-            return response.text().then(function (_responseText) {
-                return throwException('An unexpected server error occurred.', status, _responseText, _headers);
-            });
-        }
-        return Promise.resolve(null);
-    };
-    /**
-     * Links to other applications or services
-     */
-    RunnerClient.prototype.getLinks = function () {
-        var _this = this;
-        var url_ = this.baseUrl + '/links';
-        url_ = url_.replace(/[?&]$/, '');
-        var options_ = {
-            method: 'GET',
-            headers: {
-                Accept: 'application/json',
-            },
-        };
-        return this.http.fetch(url_, options_).then(function (_response) {
-            return _this.processGetLinks(_response);
-        });
-    };
-    RunnerClient.prototype.processGetLinks = function (response) {
-        var _this = this;
-        var status = response.status;
-        var _headers = {};
-        if (response.headers && response.headers.forEach) {
-            response.headers.forEach(function (v, k) { return (_headers[k] = v); });
-        }
-        if (status === 200) {
-            return response.text().then(function (_responseText) {
-                var result200 = null;
-                var resultData200 = _responseText === '' ? null : JSON.parse(_responseText, _this.jsonParseReviver);
-                result200 = Links.fromJS(resultData200);
-                return result200;
-            });
-        }
-        else if (status === 400) {
-            return response.text().then(function (_responseText) {
-                var result400 = null;
-                var resultData400 = _responseText === '' ? null : JSON.parse(_responseText, _this.jsonParseReviver);
-                result400 = ErrorResponse.fromJS(resultData400);
-                return throwException('A server side error occurred.', status, _responseText, _headers, result400);
-            });
-        }
-        else if (status !== 200 && status !== 204) {
-            return response.text().then(function (_responseText) {
-                return throwException('An unexpected server error occurred.', status, _responseText, _headers);
-            });
-        }
-        return Promise.resolve(null);
-    };
-    /**
-     * Retrieve settings types used in creating a Settings TapPackage
-     */
-    RunnerClient.prototype.getSettingsTypes = function () {
-        var _this = this;
-        var url_ = this.baseUrl + '/componentsettings/types';
-        url_ = url_.replace(/[?&]$/, '');
-        var options_ = {
-            method: 'GET',
-            headers: {
-                Accept: 'application/json',
-            },
-        };
-        return this.http.fetch(url_, options_).then(function (_response) {
-            return _this.processGetSettingsTypes(_response);
-        });
-    };
-    RunnerClient.prototype.processGetSettingsTypes = function (response) {
-        var _this = this;
-        var status = response.status;
-        var _headers = {};
-        if (response.headers && response.headers.forEach) {
-            response.headers.forEach(function (v, k) { return (_headers[k] = v); });
-        }
-        if (status === 200) {
-            return response.text().then(function (_responseText) {
-                var result200 = null;
-                var resultData200 = _responseText === '' ? null : JSON.parse(_responseText, _this.jsonParseReviver);
-                if (Array.isArray(resultData200)) {
-                    result200 = [];
-                    for (var _i = 0, resultData200_2 = resultData200; _i < resultData200_2.length; _i++) {
-                        var item = resultData200_2[_i];
-                        result200.push(item);
-                    }
-                }
-                else {
-                    result200 = null;
-                }
-                return result200;
-            });
-        }
-        else if (status === 400) {
-            return response.text().then(function (_responseText) {
-                var result400 = null;
-                var resultData400 = _responseText === '' ? null : JSON.parse(_responseText, _this.jsonParseReviver);
-                result400 = ErrorResponse.fromJS(resultData400);
-                return throwException('A server side error occurred.', status, _responseText, _headers, result400);
-            });
-        }
-        else if (status !== 200 && status !== 204) {
-            return response.text().then(function (_responseText) {
-                return throwException('An unexpected server error occurred.', status, _responseText, _headers);
-            });
-        }
-        return Promise.resolve(null);
-    };
     return RunnerClient;
 }(BaseClient));
 export { RunnerClient };
-function throwException(message, status, response, headers, result) {
-    if (result !== null && result !== undefined)
-        throw result;
-    else
-        throw new ApiException(message, status, response, headers, null);
-}

package/lib/SessionClient.d.ts

@@ -128,6 +128,11 @@ export declare class SessionClient extends BaseClient {
      * @return Test plan changed
      */
     setTestPlan(plan: TestPlan): Promise<TestPlan>;
+    /**
+     * Set the name of the test plan
+     * @param {string} testPlanName
+     */
+    SetTestPlanName(testPlanName: string): Promise<void>;
     /**
      * Retrieve all validation errors present in the test plan
      * @return Retrieved validation errors for loaded TestPlan

package/lib/SessionClient.js

@@ -24,7 +24,7 @@ var __assign = (this && this.__assign) || function () {
     };
     return __assign.apply(this, arguments);
 };
-import { LogList, Result, SessionEvent, TestRun, } from './DTOs';
+import { BreakPoints, CommonContext, CommonSettings, DataGridControl, Image, Interaction, ListItemType, LogList, Result, RunStatus, SessionEvent, Setting, TestPlan, TestRun, TestStepType, TestStepValidationError, WatchDog, } from './DTOs';
 import { JSONCodec } from 'nats.ws/cjs/nats.js';
 import { BaseClient } from './BaseClient';
 var SessionClient = /** @class */ (function (_super) {
@@ -128,7 +128,10 @@ var SessionClient = /** @class */ (function (_super) {
      */
     SessionClient.prototype.getSessionLogs = function (id, levels, excludedSources, filterText, offset, limit) {
         var getSessionLogsRequest = { id: id, levels: levels, excludedSources: excludedSources, filterText: filterText, offset: offset, limit: limit };
-        return this.request('GetSessionLogs', getSessionLogsRequest).then(this.success()).catch(this.error());
+        return this.request('GetSessionLogs', getSessionLogsRequest)
+            .then(function (logListJs) { return LogList.fromJS(logListJs); })
+            .then(this.success())
+            .catch(this.error());
     };
     /**
      * Retrieve session log indexes
@@ -172,7 +175,10 @@ var SessionClient = /** @class */ (function (_super) {
      * @return RunStatus retrieved
      */
     SessionClient.prototype.getStatus = function (timeout) {
-        return this.request('GetStatus', timeout).then(this.success()).catch(this.error());
+        return this.request('GetStatus', timeout)
+            .then(function (runStatusJs) { return RunStatus.fromJS(runStatusJs); })
+            .then(this.success())
+            .catch(this.error());
     };
     /**
      * Upload test plan XML
@@ -210,14 +216,20 @@ var SessionClient = /** @class */ (function (_super) {
      * @return Test plan resources opened.
      */
     SessionClient.prototype.resourcesOpen = function () {
-        return this.request('ResourcesOpen').then(this.success()).catch(this.error());
+        return this.request('ResourcesOpen')
+            .then(function (testPlanJs) { return TestPlan.fromJS(testPlanJs); })
+            .then(this.success())
+            .catch(this.error());
     };
     /**
      * Test plan resources closed
      * @return Test plan resources closed.
      */
     SessionClient.prototype.resourcesClose = function () {
-        return this.request('ResourcesClose').then(this.success()).catch(this.error());
+        return this.request('ResourcesClose')
+            .then(function (testPlanJs) { return TestPlan.fromJS(testPlanJs); })
+            .then(this.success())
+            .catch(this.error());
     };
     /**
      * Retrieve test plan or test step settings
@@ -225,7 +237,10 @@ var SessionClient = /** @class */ (function (_super) {
      * @return List of settings retrieved
      */
     SessionClient.prototype.getSettings = function (contextId) {
-        return this.request('GetSettings', contextId).then(this.success()).catch(this.error());
+        return this.request('GetSettings', contextId)
+            .then(function (settingArrayJs) { return settingArrayJs.map(function (settingJs) { return Setting.fromJS(settingJs); }); })
+            .then(this.success())
+            .catch(this.error());
     };
     /**
      * Change test plan or test step settings
@@ -235,7 +250,10 @@ var SessionClient = /** @class */ (function (_super) {
      */
     SessionClient.prototype.setSettings = function (contextId, settings) {
         var setSettingsRequest = { contextId: contextId, settings: settings };
-        return this.request('SetSettings', setSettingsRequest).then(this.success()).catch(this.error());
+        return this.request('SetSettings', setSettingsRequest)
+            .then(function (settingArrayJs) { return settingArrayJs.map(function (settingJs) { return Setting.fromJS(settingJs); }); })
+            .then(this.success())
+            .catch(this.error());
     };
     /**
      * Retrieve test plan structure
@@ -243,7 +261,10 @@ var SessionClient = /** @class */ (function (_super) {
      * @return Test plan retrieved
      */
     SessionClient.prototype.getTestPlan = function (properties) {
-        return this.request('GetTestPlan', properties).then(this.success()).catch(this.error());
+        return this.request('GetTestPlan', properties)
+            .then(function (testPlanJs) { return TestPlan.fromJS(testPlanJs); })
+            .then(this.success())
+            .catch(this.error());
     };
     /**
      * Change test plan structure
@@ -251,14 +272,29 @@ var SessionClient = /** @class */ (function (_super) {
      * @return Test plan changed
      */
     SessionClient.prototype.setTestPlan = function (plan) {
-        return this.request('SetTestPlan', plan).then(this.success()).catch(this.error());
+        return this.request('SetTestPlan', plan)
+            .then(function (testPlanJs) { return TestPlan.fromJS(testPlanJs); })
+            .then(this.success())
+            .catch(this.error());
+    };
+    /**
+     * Set the name of the test plan
+     * @param {string} testPlanName
+     */
+    SessionClient.prototype.SetTestPlanName = function (testPlanName) {
+        return this.request('SetTestPlanName', testPlanName).then(this.success()).catch(this.error());
     };
     /**
      * Retrieve all validation errors present in the test plan
      * @return Retrieved validation errors for loaded TestPlan
      */
     SessionClient.prototype.getValidationErrors = function () {
-        return this.request('GetValidationErrors').then(this.success()).catch(this.error());
+        return this.request('GetValidationErrors')
+            .then(function (testStepValidationErrorArrayJs) {
+            return testStepValidationErrorArrayJs.map(function (testStepValidationErrorJs) { return TestStepValidationError.fromJS(testStepValidationErrorJs); });
+        })
+            .then(this.success())
+            .catch(this.error());
     };
     /**
      * Retrieve or change common test step settings
@@ -266,7 +302,10 @@ var SessionClient = /** @class */ (function (_super) {
      * @return Common test step settings retrieved or changed
      */
     SessionClient.prototype.commonStepSettings = function (commonSettings) {
-        return this.request('CommonStepSettings', commonSettings).then(this.success()).catch(this.error());
+        return this.request('CommonStepSettings', commonSettings)
+            .then(function (commonSettingsJs) { return CommonSettings.fromJS(commonSettingsJs); })
+            .then(this.success())
+            .catch(this.error());
     };
     /**
      * Retrieve or invoke common test step settings context menu items
@@ -277,6 +316,7 @@ var SessionClient = /** @class */ (function (_super) {
     SessionClient.prototype.commonStepSettingsContextMenu = function (propertyName, commonContext) {
         var commonStepSettingsContextRequest = { propertyName: propertyName, commonContext: commonContext };
         return this.request('CommonStepSettingsContextMenu', commonStepSettingsContextRequest)
+            .then(function (commonContextJs) { return CommonContext.fromJS(commonContextJs); })
             .then(this.success())
             .catch(this.error());
     };
@@ -293,7 +333,10 @@ var SessionClient = /** @class */ (function (_super) {
      * @return Retrieved pending user input
      */
     SessionClient.prototype.getUserInput = function (id) {
-        return this.request('GetUserInput', id).then(this.success()).catch(this.error());
+        return this.request('GetUserInput', id)
+            .then(function (interactionJs) { return Interaction.fromJS(interactionJs); })
+            .then(this.success())
+            .catch(this.error());
     };
     /**
      * Modify or answer pending user input based on ID
@@ -301,7 +344,10 @@ var SessionClient = /** @class */ (function (_super) {
      * @returns {Promise<Interaction>}
      */
     SessionClient.prototype.setUserInput = function (interaction) {
-        return this.request('SetUserInput', interaction).then(this.success()).catch(this.error());
+        return this.request('SetUserInput', interaction)
+            .then(function (interactionJs) { return Interaction.fromJS(interactionJs); })
+            .then(this.success())
+            .catch(this.error());
     };
     /**
      * Property context menu
@@ -314,7 +360,10 @@ var SessionClient = /** @class */ (function (_super) {
             contextId: contextId,
             propertyName: propertyName,
         };
-        return this.request('GetContextMenu', propertyReferenceRequest).then(this.success()).catch(this.error());
+        return this.request('GetContextMenu', propertyReferenceRequest)
+            .then(function (settingArrayJs) { return settingArrayJs.map(function (settingJs) { return Setting.fromJS(settingJs); }); })
+            .then(this.success())
+            .catch(this.error());
     };
     /**
      * Property context menu
@@ -329,7 +378,10 @@ var SessionClient = /** @class */ (function (_super) {
             propertyName: propertyName,
             contextMenu: contextMenu,
         };
-        return this.request('SetContextMenu', setContextMenuRequest).then(this.success()).catch(this.error());
+        return this.request('SetContextMenu', setContextMenuRequest)
+            .then(function (settingArrayJs) { return settingArrayJs.map(function (settingJs) { return Setting.fromJS(settingJs); }); })
+            .then(this.success())
+            .catch(this.error());
     };
     /**
      * Get data grid
@@ -342,7 +394,10 @@ var SessionClient = /** @class */ (function (_super) {
             contextId: contextId,
             propertyName: propertyName,
         };
-        return this.request('GetDataGrid', propertyReferenceRequest).then(this.success()).catch(this.error());
+        return this.request('GetDataGrid', propertyReferenceRequest)
+            .then(function (dataGridControlJs) { return DataGridControl.fromJS(dataGridControlJs); })
+            .then(this.success())
+            .catch(this.error());
     };
     /**
      * Set data grid
@@ -350,7 +405,10 @@ var SessionClient = /** @class */ (function (_super) {
      */
     SessionClient.prototype.setDataGrid = function (contextId, propertyName, dataGridControl) {
         var setDataGridRequest = { contextId: contextId, propertyName: propertyName, dataGridControl: dataGridControl };
-        return this.request('SetDataGrid', setDataGridRequest).then(this.success()).catch(this.error());
+        return this.request('SetDataGrid', setDataGridRequest)
+            .then(function (dataGridControlJs) { return DataGridControl.fromJS(dataGridControlJs); })
+            .then(this.success())
+            .catch(this.error());
     };
     /**
      * Add item type to data grid
@@ -365,7 +423,10 @@ var SessionClient = /** @class */ (function (_super) {
             propertyName: propertyName,
             typeName: typeName,
         };
-        return this.request('AddDataGridItemType', addDataGridItemTypeRequest).then(this.success()).catch(this.error());
+        return this.request('AddDataGridItemType', addDataGridItemTypeRequest)
+            .then(function (dataGridControlJs) { return DataGridControl.fromJS(dataGridControlJs); })
+            .then(this.success())
+            .catch(this.error());
     };
     /**
      * Add item to data grid
@@ -378,7 +439,10 @@ var SessionClient = /** @class */ (function (_super) {
             contextId: contextId,
             propertyName: propertyName,
         };
-        return this.request('AddDataGridItem', propertyReferenceRequest).then(this.success()).catch(this.error());
+        return this.request('AddDataGridItem', propertyReferenceRequest)
+            .then(function (dataGridControlJs) { return DataGridControl.fromJS(dataGridControlJs); })
+            .then(this.success())
+            .catch(this.error());
     };
     /**
      * Get item types available in the data grid
@@ -391,14 +455,20 @@ var SessionClient = /** @class */ (function (_super) {
             contextId: contextId,
             propertyName: propertyName,
         };
-        return this.request('GetDataGridTypes', propertyReferenceRequest).then(this.success()).catch(this.error());
+        return this.request('GetDataGridTypes', propertyReferenceRequest)
+            .then(function (listItemTypeArrayJs) { return listItemTypeArrayJs.map(function (listItemTypeJs) { return ListItemType.fromJS(listItemTypeJs); }); })
+            .then(this.success())
+            .catch(this.error());
     };
     /**
      * Retrieve static available step type information.
      * @return StepTypes retrieved
      */
     SessionClient.prototype.getTestStepTypes = function () {
-        return this.request('GetTestStepTypes').then(this.success()).catch(this.error());
+        return this.request('GetTestStepTypes')
+            .then(function (testStepTypeArrayJs) { return testStepTypeArrayJs.map(function (testStepTypeJs) { return TestStepType.fromJS(testStepTypeJs); }); })
+            .then(this.success())
+            .catch(this.error());
     };
     /**
      * Pause test plan execution at next possible test step
@@ -410,7 +480,10 @@ var SessionClient = /** @class */ (function (_super) {
      * Retrieve breakpoints set in test plan
      */
     SessionClient.prototype.getBreakpoints = function () {
-        return this.request('SetPauseNext').then(this.success()).catch(this.error());
+        return this.request('SetPauseNext')
+            .then(function (breakPointsJs) { return BreakPoints.fromJS(breakPointsJs); })
+            .then(this.success())
+            .catch(this.error());
     };
     /**
      * Set breakpoints in test plan
@@ -418,7 +491,10 @@ var SessionClient = /** @class */ (function (_super) {
      * @return BreakPoints retrieved
      */
     SessionClient.prototype.setBreakpoints = function (breakPointsDto) {
-        return this.request('SetBreakpoints', breakPointsDto).then(this.success()).catch(this.error());
+        return this.request('SetBreakpoints', breakPointsDto)
+            .then(function (breakPointsJs) { return BreakPoints.fromJS(breakPointsJs); })
+            .then(this.success())
+            .catch(this.error());
     };
     /**
      * Jump test plan execution to step. Execution state must be 'breaking'.
@@ -433,7 +509,10 @@ var SessionClient = /** @class */ (function (_super) {
      * @return RunStatus retrieved
      */
     SessionClient.prototype.runTestPlanMetadata = function (parameters) {
-        return this.request('RunTestPlanMetadata', parameters).then(this.success()).catch(this.error());
+        return this.request('RunTestPlanMetadata', parameters)
+            .then(function (runStatusJs) { return RunStatus.fromJS(runStatusJs); })
+            .then(this.success())
+            .catch(this.error());
     };
     /**
      * Abort test plan execution
@@ -451,7 +530,10 @@ var SessionClient = /** @class */ (function (_super) {
      * Retrieves installed packages in this session
      */
     SessionClient.prototype.getImage = function () {
-        return this.request('GetImage').then(this.success()).catch(this.error());
+        return this.request('GetImage')
+            .then(function (imageJs) { return Image.fromJS(imageJs); })
+            .then(this.success())
+            .catch(this.error());
     };
     /**
      * Retrieves session readiness
@@ -463,14 +545,20 @@ var SessionClient = /** @class */ (function (_super) {
      * Retrieves watchdog
      */
     SessionClient.prototype.getWatchDog = function () {
-        return this.request('GetWatchDog').then(this.success()).catch(this.error());
+        return this.request('GetWatchDog')
+            .then(function (watchDogJs) { return WatchDog.fromJS(watchDogJs); })
+            .then(this.success())
+            .catch(this.error());
     };
     /**
      * Sets a new watchdog
      * @param {WatchDog} watchDog
      */
     SessionClient.prototype.setWatchDog = function (watchDog) {
-        return this.request('SetWatchDog', watchDog).then(this.success()).catch(this.error());
+        return this.request('SetWatchDog', watchDog)
+            .then(function (watchDogJs) { return WatchDog.fromJS(watchDogJs); })
+            .then(this.success())
+            .catch(this.error());
     };
     /**
      * Retrieve settings types used in creating a Settings TapPackage

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opentap/runner-client",
-  "version": "1.0.0-beta.78",
+  "version": "1.0.0-beta.80",
   "description": "This is the TypeScript Client for the OpenTAP Runner Plugin.",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",