@opentap/runner-client 2.19.0-alpha.1.3 → 2.20.0-alpha.1.1

package/lib/RunnerClient.js

@@ -1,3 +1,4 @@
+"use strict";
 var __extends = (this && this.__extends) || (function () {
     var extendStatics = function (d, b) {
         extendStatics = Object.setPrototypeOf ||
@@ -13,8 +14,10 @@ var __extends = (this && this.__extends) || (function () {
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
     };
 })();
-import { Image, RepositoryPackageReference, Session } from './DTOs';
-import { BaseClient } from './BaseClient';
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.RunnerClient = void 0;
+var DTOs_1 = require("./DTOs");
+var BaseClient_1 = require("./BaseClient");
 var RunnerClient = /** @class */ (function (_super) {
     __extends(RunnerClient, _super);
     function RunnerClient(baseSubject, options) {
@@ -26,7 +29,7 @@ var RunnerClient = /** @class */ (function (_super) {
             created with the base image and base settings. */
             startSession: function (testPlanRepositoryReference, timeout) {
                 return _this.request('StartDefaultSession', testPlanRepositoryReference !== null && testPlanRepositoryReference !== void 0 ? testPlanRepositoryReference : null, { timeout: timeout })
-                    .then(function (sessionJs) { return Session.fromJS(sessionJs); })
+                    .then(function (sessionJs) { return DTOs_1.Session.fromJS(sessionJs); })
                     .then(_this.success())
                     .catch(_this.error());
             },
@@ -41,7 +44,7 @@ var RunnerClient = /** @class */ (function (_super) {
                     imageOverride: imageOverride !== null && imageOverride !== void 0 ? imageOverride : null,
                 };
                 return _this.request('StartDefaultSessionOverrideImage', defaultSessionRequest, { timeout: timeout })
-                    .then(function (sessionJs) { return Session.fromJS(sessionJs); })
+                    .then(function (sessionJs) { return DTOs_1.Session.fromJS(sessionJs); })
                     .then(_this.success())
                     .catch(_this.error());
             },
@@ -49,7 +52,7 @@ var RunnerClient = /** @class */ (function (_super) {
             creation process */
             getImage: function () {
                 return _this.request('GetDefaultImage')
-                    .then(function (imageJs) { return Image.fromJS(imageJs); })
+                    .then(function (imageJs) { return DTOs_1.Image.fromJS(imageJs); })
                     .then(_this.success())
                     .catch(_this.error());
             },
@@ -57,7 +60,7 @@ var RunnerClient = /** @class */ (function (_super) {
             base image */
             setImage: function (image) {
                 return _this.request('SetDefaultImage', image)
-                    .then(function (imageJs) { return Image.fromJS(imageJs); })
+                    .then(function (imageJs) { return DTOs_1.Image.fromJS(imageJs); })
                     .then(_this.success())
                     .catch(_this.error());
             },
@@ -66,7 +69,7 @@ var RunnerClient = /** @class */ (function (_super) {
             getSettings: function () {
                 return _this.request('GetDefaultSettings')
                     .then(function (repositoryPackageReferenceJs) {
-                    return repositoryPackageReferenceJs ? RepositoryPackageReference.fromJS(repositoryPackageReferenceJs) : undefined;
+                    return repositoryPackageReferenceJs ? DTOs_1.RepositoryPackageReference.fromJS(repositoryPackageReferenceJs) : undefined;
                 })
                     .then(_this.success())
                     .catch(_this.error());
@@ -87,7 +90,7 @@ 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(function (imageJs) { return Image.fromJS(imageJs); })
+                .then(function (imageJs) { return DTOs_1.Image.fromJS(imageJs); })
                 .then(this.success())
                 .catch(this.error())
             : Promise.reject('imageId is not defined');
@@ -98,7 +101,7 @@ var RunnerClient = /** @class */ (function (_super) {
      */
     RunnerClient.prototype.getImages = function () {
         return this.request('GetImages')
-            .then(function (imageArrayJs) { return imageArrayJs.map(function (imageJs) { return Image.fromJS(imageJs); }); })
+            .then(function (imageArrayJs) { return imageArrayJs.map(function (imageJs) { return DTOs_1.Image.fromJS(imageJs); }); })
             .then(this.success())
             .catch(this.error());
     };
@@ -108,7 +111,7 @@ var RunnerClient = /** @class */ (function (_super) {
      */
     RunnerClient.prototype.getSessions = function () {
         return this.request('GetSessions')
-            .then(function (sessionArrayJs) { return sessionArrayJs.map(function (sessionJs) { return Session.fromJS(sessionJs); }); })
+            .then(function (sessionArrayJs) { return sessionArrayJs.map(function (sessionJs) { return DTOs_1.Session.fromJS(sessionJs); }); })
             .then(this.success())
             .catch(this.error());
     };
@@ -121,7 +124,7 @@ var RunnerClient = /** @class */ (function (_super) {
     RunnerClient.prototype.resolveImage = function (images, timeout) {
         return (images === null || images === void 0 ? void 0 : images.length) > 0
             ? this.request('ResolveImage', images, { timeout: timeout })
-                .then(function (imageJs) { return Image.fromJS(imageJs); })
+                .then(function (imageJs) { return DTOs_1.Image.fromJS(imageJs); })
                 .then(this.success())
                 .catch(this.error())
             : Promise.reject('images list is not defined or is empty');
@@ -135,7 +138,7 @@ var RunnerClient = /** @class */ (function (_super) {
     RunnerClient.prototype.resolveImageDryRun = function (images, timeout) {
         return (images === null || images === void 0 ? void 0 : images.length) > 0
             ? this.request('ResolveImageDryRun', images, { timeout: timeout })
-                .then(function (imageJs) { return Image.fromJS(imageJs); })
+                .then(function (imageJs) { return DTOs_1.Image.fromJS(imageJs); })
                 .then(this.success())
                 .catch(this.error())
             : Promise.reject('images list is not defined or is empty');
@@ -156,7 +159,7 @@ var RunnerClient = /** @class */ (function (_super) {
      */
     RunnerClient.prototype.startSession = function () {
         return this.request('StartSession')
-            .then(function (sessionJs) { return Session.fromJS(sessionJs); })
+            .then(function (sessionJs) { return DTOs_1.Session.fromJS(sessionJs); })
             .then(this.success())
             .catch(this.error());
     };
@@ -166,7 +169,7 @@ var RunnerClient = /** @class */ (function (_super) {
      */
     RunnerClient.prototype.getSessionManagerImage = function () {
         return this.request('GetSessionManagerImage')
-            .then(function (imageJs) { return Image.fromJS(imageJs); })
+            .then(function (imageJs) { return DTOs_1.Image.fromJS(imageJs); })
             .then(this.success())
             .catch(this.error());
     };
@@ -178,7 +181,7 @@ var RunnerClient = /** @class */ (function (_super) {
     RunnerClient.prototype.startImageSession = function (image) {
         return image
             ? this.request('StartImageSession', image)
-                .then(function (sessionJs) { return Session.fromJS(sessionJs); })
+                .then(function (sessionJs) { return DTOs_1.Session.fromJS(sessionJs); })
                 .then(this.success())
                 .catch(this.error())
             : Promise.reject('image is not defined');
@@ -192,5 +195,5 @@ var RunnerClient = /** @class */ (function (_super) {
         return this.request('UpdateRunner', runnerUpdateRequest).then(this.success()).catch(this.error());
     };
     return RunnerClient;
-}(BaseClient));
-export { RunnerClient };
+}(BaseClient_1.BaseClient));
+exports.RunnerClient = RunnerClient;

package/lib/SessionClient.js

@@ -1,3 +1,4 @@
+"use strict";
 var __extends = (this && this.__extends) || (function () {
     var extendStatics = function (d, b) {
         extendStatics = Object.setPrototypeOf ||
@@ -24,52 +25,11 @@ 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); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-var __generator = (this && this.__generator) || function (thisArg, body) {
-    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
-    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
-    function verb(n) { return function (v) { return step([n, v]); }; }
-    function step(op) {
-        if (f) throw new TypeError("Generator is already executing.");
-        while (_) try {
-            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
-            if (y = 0, t) op = [op[0] & 2, t.value];
-            switch (op[0]) {
-                case 0: case 1: t = op; break;
-                case 4: _.label++; return { value: op[1], done: false };
-                case 5: _.label++; y = op[1]; op = [0]; continue;
-                case 7: op = _.ops.pop(); _.trys.pop(); continue;
-                default:
-                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
-                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
-                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
-                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
-                    if (t[2]) _.ops.pop();
-                    _.trys.pop(); continue;
-            }
-            op = body.call(thisArg, _);
-        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
-        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
-    }
-};
-var __asyncValues = (this && this.__asyncValues) || function (o) {
-    if (!Symbol.asyncIterator) throw new TypeError("Symbol.asyncIterator is not defined.");
-    var m = o[Symbol.asyncIterator], i;
-    return m ? m.call(o) : (o = typeof __values === "function" ? __values(o) : o[Symbol.iterator](), i = {}, verb("next"), verb("throw"), verb("return"), i[Symbol.asyncIterator] = function () { return this; }, i);
-    function verb(n) { i[n] = o[n] && function (v) { return new Promise(function (resolve, reject) { v = o[n](v), settle(resolve, reject, v.done, v.value); }); }; }
-    function settle(resolve, reject, d, v) { Promise.resolve(v).then(function(v) { resolve({ value: v, done: d }); }, reject); }
-};
-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';
-import { BaseClient } from './BaseClient';
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.SessionClient = void 0;
+var DTOs_1 = require("./DTOs");
+var nats_ws_1 = require("nats.ws");
+var BaseClient_1 = require("./BaseClient");
 var SessionClient = /** @class */ (function (_super) {
     __extends(SessionClient, _super);
     function SessionClient(baseSubject, options) {
@@ -89,9 +49,9 @@ var SessionClient = /** @class */ (function (_super) {
                     return;
                 }
                 try {
-                    var jsonCodec = JSONCodec();
+                    var jsonCodec = (0, nats_ws_1.JSONCodec)();
                     var logListJson = jsonCodec.decode(encodedMessage === null || encodedMessage === void 0 ? void 0 : encodedMessage.data);
-                    var logList = LogList.fromJS(logListJson);
+                    var logList = DTOs_1.LogList.fromJS(logListJson);
                     sessionLogsHandler(logList, error);
                 }
                 catch (error) {
@@ -111,9 +71,9 @@ var SessionClient = /** @class */ (function (_super) {
                 return;
             }
             try {
-                var jsonCodec = JSONCodec();
+                var jsonCodec = (0, nats_ws_1.JSONCodec)();
                 var sessionEventJs = jsonCodec.decode(encodedMessage === null || encodedMessage === void 0 ? void 0 : encodedMessage.data);
-                var sessionEvent = SessionEvent.fromJS(sessionEventJs);
+                var sessionEvent = DTOs_1.SessionEvent.fromJS(sessionEventJs);
                 eventHandler(sessionEvent, error);
             }
             catch (error) {
@@ -130,99 +90,38 @@ var SessionClient = /** @class */ (function (_super) {
      * @returns Subscription array: Result and Test Run subscriptions
      */
     SessionClient.prototype.connectSessionResults = function (resultHandler, testRunHandler, options) {
-        var _this = this;
-        var jsonCodec = JSONCodec();
-        var resultSubscription = this.subscribe('OnResult', __assign({}, options));
-        var testRunSubscription = this.subscribe('OnTestRun', __assign({}, options));
-        (function () { return __awaiter(_this, void 0, void 0, function () {
-            var resultSubscription_1, resultSubscription_1_1, message, resultJs, result, e_1_1;
-            var e_1, _a;
-            return __generator(this, function (_b) {
-                switch (_b.label) {
-                    case 0:
-                        _b.trys.push([0, 5, 6, 11]);
-                        resultSubscription_1 = __asyncValues(resultSubscription);
-                        _b.label = 1;
-                    case 1: return [4 /*yield*/, resultSubscription_1.next()];
-                    case 2:
-                        if (!(resultSubscription_1_1 = _b.sent(), !resultSubscription_1_1.done)) return [3 /*break*/, 4];
-                        message = resultSubscription_1_1.value;
-                        try {
-                            resultJs = jsonCodec.decode(message === null || message === void 0 ? void 0 : message.data);
-                            result = Result.fromJS(resultJs);
-                            resultHandler(result, null);
-                        }
-                        catch (error) {
-                            resultHandler(undefined, error);
-                        }
-                        _b.label = 3;
-                    case 3: return [3 /*break*/, 1];
-                    case 4: return [3 /*break*/, 11];
-                    case 5:
-                        e_1_1 = _b.sent();
-                        e_1 = { error: e_1_1 };
-                        return [3 /*break*/, 11];
-                    case 6:
-                        _b.trys.push([6, , 9, 10]);
-                        if (!(resultSubscription_1_1 && !resultSubscription_1_1.done && (_a = resultSubscription_1.return))) return [3 /*break*/, 8];
-                        return [4 /*yield*/, _a.call(resultSubscription_1)];
-                    case 7:
-                        _b.sent();
-                        _b.label = 8;
-                    case 8: return [3 /*break*/, 10];
-                    case 9:
-                        if (e_1) throw e_1.error;
-                        return [7 /*endfinally*/];
-                    case 10: return [7 /*endfinally*/];
-                    case 11: return [2 /*return*/];
-                }
-            });
-        }); })();
-        (function () { return __awaiter(_this, void 0, void 0, function () {
-            var testRunSubscription_1, testRunSubscription_1_1, message, testRunJs, testRun, e_2_1;
-            var e_2, _a;
-            return __generator(this, function (_b) {
-                switch (_b.label) {
-                    case 0:
-                        _b.trys.push([0, 5, 6, 11]);
-                        testRunSubscription_1 = __asyncValues(testRunSubscription);
-                        _b.label = 1;
-                    case 1: return [4 /*yield*/, testRunSubscription_1.next()];
-                    case 2:
-                        if (!(testRunSubscription_1_1 = _b.sent(), !testRunSubscription_1_1.done)) return [3 /*break*/, 4];
-                        message = testRunSubscription_1_1.value;
-                        try {
-                            testRunJs = jsonCodec.decode(message === null || message === void 0 ? void 0 : message.data);
-                            testRun = TestRun.fromJS(testRunJs);
-                            testRunHandler(testRun, null);
-                        }
-                        catch (error) {
-                            testRunHandler(undefined, error);
-                        }
-                        _b.label = 3;
-                    case 3: return [3 /*break*/, 1];
-                    case 4: return [3 /*break*/, 11];
-                    case 5:
-                        e_2_1 = _b.sent();
-                        e_2 = { error: e_2_1 };
-                        return [3 /*break*/, 11];
-                    case 6:
-                        _b.trys.push([6, , 9, 10]);
-                        if (!(testRunSubscription_1_1 && !testRunSubscription_1_1.done && (_a = testRunSubscription_1.return))) return [3 /*break*/, 8];
-                        return [4 /*yield*/, _a.call(testRunSubscription_1)];
-                    case 7:
-                        _b.sent();
-                        _b.label = 8;
-                    case 8: return [3 /*break*/, 10];
-                    case 9:
-                        if (e_2) throw e_2.error;
-                        return [7 /*endfinally*/];
-                    case 10: return [7 /*endfinally*/];
-                    case 11: return [2 /*return*/];
-                }
-            });
-        }); })();
-        return [resultSubscription, testRunSubscription];
+        return [
+            this.subscribe('OnResult', __assign(__assign({}, options), { callback: function (error, encodedMessage) {
+                    if (error) {
+                        resultHandler(undefined, error);
+                        return;
+                    }
+                    try {
+                        var jsonCodec = (0, nats_ws_1.JSONCodec)();
+                        var resultJs = jsonCodec.decode(encodedMessage === null || encodedMessage === void 0 ? void 0 : encodedMessage.data);
+                        var result = DTOs_1.Result.fromJS(resultJs);
+                        resultHandler(result, error);
+                    }
+                    catch (error) {
+                        resultHandler(undefined, error);
+                    }
+                } })),
+            this.subscribe('OnTestRun', __assign(__assign({}, options), { callback: function (error, encodedMessage) {
+                    if (error) {
+                        testRunHandler(undefined, error);
+                        return;
+                    }
+                    try {
+                        var jsonCodec = (0, nats_ws_1.JSONCodec)();
+                        var testRunJs = jsonCodec.decode(encodedMessage === null || encodedMessage === void 0 ? void 0 : encodedMessage.data);
+                        var testRun = DTOs_1.TestRun.fromJS(testRunJs);
+                        testRunHandler(testRun, error);
+                    }
+                    catch (error) {
+                        testRunHandler(undefined, error);
+                    }
+                } })),
+        ];
     };
     /**
      * Unsubscibe from session events
@@ -244,7 +143,7 @@ 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(function (logListJs) { return LogList.fromJS(logListJs); })
+            .then(function (logListJs) { return DTOs_1.LogList.fromJS(logListJs); })
             .then(this.success())
             .catch(this.error());
     };
@@ -291,7 +190,7 @@ var SessionClient = /** @class */ (function (_super) {
      */
     SessionClient.prototype.getStatus = function (timeout) {
         return this.request('GetStatus', timeout)
-            .then(function (runStatusJs) { return RunStatus.fromJS(runStatusJs); })
+            .then(function (runStatusJs) { return DTOs_1.RunStatus.fromJS(runStatusJs); })
             .then(this.success())
             .catch(this.error());
     };
@@ -348,7 +247,7 @@ var SessionClient = /** @class */ (function (_super) {
      */
     SessionClient.prototype.resourcesOpen = function () {
         return this.request('ResourcesOpen')
-            .then(function (testPlanJs) { return TestPlan.fromJS(testPlanJs); })
+            .then(function (testPlanJs) { return DTOs_1.TestPlan.fromJS(testPlanJs); })
             .then(this.success())
             .catch(this.error());
     };
@@ -358,7 +257,7 @@ var SessionClient = /** @class */ (function (_super) {
      */
     SessionClient.prototype.resourcesClose = function () {
         return this.request('ResourcesClose')
-            .then(function (testPlanJs) { return TestPlan.fromJS(testPlanJs); })
+            .then(function (testPlanJs) { return DTOs_1.TestPlan.fromJS(testPlanJs); })
             .then(this.success())
             .catch(this.error());
     };
@@ -369,7 +268,7 @@ var SessionClient = /** @class */ (function (_super) {
      */
     SessionClient.prototype.getSettings = function (contextId) {
         return this.request('GetSettings', contextId)
-            .then(function (settingArrayJs) { return settingArrayJs.map(function (settingJs) { return Setting.fromJS(settingJs); }); })
+            .then(function (settingArrayJs) { return settingArrayJs.map(function (settingJs) { return DTOs_1.Setting.fromJS(settingJs); }); })
             .then(this.success())
             .catch(this.error());
     };
@@ -382,7 +281,7 @@ var SessionClient = /** @class */ (function (_super) {
     SessionClient.prototype.setSettings = function (contextId, settings) {
         var setSettingsRequest = { contextId: contextId, settings: settings };
         return this.request('SetSettings', setSettingsRequest)
-            .then(function (settingArrayJs) { return settingArrayJs.map(function (settingJs) { return Setting.fromJS(settingJs); }); })
+            .then(function (settingArrayJs) { return settingArrayJs.map(function (settingJs) { return DTOs_1.Setting.fromJS(settingJs); }); })
             .then(this.success())
             .catch(this.error());
     };
@@ -393,7 +292,7 @@ var SessionClient = /** @class */ (function (_super) {
      */
     SessionClient.prototype.getTestPlan = function (properties) {
         return this.request('GetTestPlan', properties)
-            .then(function (testPlanJs) { return TestPlan.fromJS(testPlanJs); })
+            .then(function (testPlanJs) { return DTOs_1.TestPlan.fromJS(testPlanJs); })
             .then(this.success())
             .catch(this.error());
     };
@@ -404,7 +303,7 @@ var SessionClient = /** @class */ (function (_super) {
      */
     SessionClient.prototype.setTestPlan = function (plan) {
         return this.request('SetTestPlan', plan)
-            .then(function (testPlanJs) { return TestPlan.fromJS(testPlanJs); })
+            .then(function (testPlanJs) { return DTOs_1.TestPlan.fromJS(testPlanJs); })
             .then(this.success())
             .catch(this.error());
     };
@@ -423,7 +322,7 @@ var SessionClient = /** @class */ (function (_super) {
     SessionClient.prototype.getValidationErrors = function () {
         return this.request('GetValidationErrors')
             .then(function (testStepValidationErrorArrayJs) {
-            return testStepValidationErrorArrayJs.map(function (testStepValidationErrorJs) { return TestStepValidationError.fromJS(testStepValidationErrorJs); });
+            return testStepValidationErrorArrayJs.map(function (testStepValidationErrorJs) { return DTOs_1.TestStepValidationError.fromJS(testStepValidationErrorJs); });
         })
             .then(this.success())
             .catch(this.error());
@@ -435,7 +334,7 @@ var SessionClient = /** @class */ (function (_super) {
      */
     SessionClient.prototype.commonStepSettings = function (commonSettings) {
         return this.request('CommonStepSettings', commonSettings)
-            .then(function (commonSettingsJs) { return CommonSettings.fromJS(commonSettingsJs); })
+            .then(function (commonSettingsJs) { return DTOs_1.CommonSettings.fromJS(commonSettingsJs); })
             .then(this.success())
             .catch(this.error());
     };
@@ -448,7 +347,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(function (commonContextJs) { return DTOs_1.CommonContext.fromJS(commonContextJs); })
             .then(this.success())
             .catch(this.error());
     };
@@ -466,7 +365,7 @@ var SessionClient = /** @class */ (function (_super) {
      */
     SessionClient.prototype.getUserInput = function (id) {
         return this.request('GetUserInput', id)
-            .then(function (interactionJs) { return Interaction.fromJS(interactionJs); })
+            .then(function (interactionJs) { return DTOs_1.Interaction.fromJS(interactionJs); })
             .then(this.success())
             .catch(this.error());
     };
@@ -477,7 +376,7 @@ var SessionClient = /** @class */ (function (_super) {
      */
     SessionClient.prototype.setUserInput = function (interaction) {
         return this.request('SetUserInput', interaction)
-            .then(function (interactionJs) { return Interaction.fromJS(interactionJs); })
+            .then(function (interactionJs) { return DTOs_1.Interaction.fromJS(interactionJs); })
             .then(this.success())
             .catch(this.error());
     };
@@ -493,7 +392,7 @@ var SessionClient = /** @class */ (function (_super) {
             propertyName: propertyName,
         };
         return this.request('GetContextMenu', propertyReferenceRequest)
-            .then(function (settingArrayJs) { return settingArrayJs.map(function (settingJs) { return Setting.fromJS(settingJs); }); })
+            .then(function (settingArrayJs) { return settingArrayJs.map(function (settingJs) { return DTOs_1.Setting.fromJS(settingJs); }); })
             .then(this.success())
             .catch(this.error());
     };
@@ -511,7 +410,7 @@ var SessionClient = /** @class */ (function (_super) {
             contextMenu: contextMenu,
         };
         return this.request('SetContextMenu', setContextMenuRequest)
-            .then(function (settingArrayJs) { return settingArrayJs.map(function (settingJs) { return Setting.fromJS(settingJs); }); })
+            .then(function (settingArrayJs) { return settingArrayJs.map(function (settingJs) { return DTOs_1.Setting.fromJS(settingJs); }); })
             .then(this.success())
             .catch(this.error());
     };
@@ -527,7 +426,7 @@ var SessionClient = /** @class */ (function (_super) {
             propertyName: propertyName,
         };
         return this.request('GetDataGrid', propertyReferenceRequest)
-            .then(function (dataGridControlJs) { return DataGridControl.fromJS(dataGridControlJs); })
+            .then(function (dataGridControlJs) { return DTOs_1.DataGridControl.fromJS(dataGridControlJs); })
             .then(this.success())
             .catch(this.error());
     };
@@ -538,7 +437,7 @@ 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(function (dataGridControlJs) { return DataGridControl.fromJS(dataGridControlJs); })
+            .then(function (dataGridControlJs) { return DTOs_1.DataGridControl.fromJS(dataGridControlJs); })
             .then(this.success())
             .catch(this.error());
     };
@@ -556,7 +455,7 @@ var SessionClient = /** @class */ (function (_super) {
             typeName: typeName,
         };
         return this.request('AddDataGridItemType', addDataGridItemTypeRequest)
-            .then(function (dataGridControlJs) { return DataGridControl.fromJS(dataGridControlJs); })
+            .then(function (dataGridControlJs) { return DTOs_1.DataGridControl.fromJS(dataGridControlJs); })
             .then(this.success())
             .catch(this.error());
     };
@@ -572,7 +471,7 @@ var SessionClient = /** @class */ (function (_super) {
             propertyName: propertyName,
         };
         return this.request('AddDataGridItem', propertyReferenceRequest)
-            .then(function (dataGridControlJs) { return DataGridControl.fromJS(dataGridControlJs); })
+            .then(function (dataGridControlJs) { return DTOs_1.DataGridControl.fromJS(dataGridControlJs); })
             .then(this.success())
             .catch(this.error());
     };
@@ -588,7 +487,7 @@ var SessionClient = /** @class */ (function (_super) {
             propertyName: propertyName,
         };
         return this.request('GetDataGridTypes', propertyReferenceRequest)
-            .then(function (listItemTypeArrayJs) { return listItemTypeArrayJs.map(function (listItemTypeJs) { return ListItemType.fromJS(listItemTypeJs); }); })
+            .then(function (listItemTypeArrayJs) { return listItemTypeArrayJs.map(function (listItemTypeJs) { return DTOs_1.ListItemType.fromJS(listItemTypeJs); }); })
             .then(this.success())
             .catch(this.error());
     };
@@ -598,7 +497,7 @@ var SessionClient = /** @class */ (function (_super) {
      */
     SessionClient.prototype.getStepTypes = function () {
         return this.request('GetStepTypes')
-            .then(function (testStepTypeArrayJs) { return testStepTypeArrayJs.map(function (testStepTypeJs) { return TestStepType.fromJS(testStepTypeJs); }); })
+            .then(function (testStepTypeArrayJs) { return testStepTypeArrayJs.map(function (testStepTypeJs) { return DTOs_1.TestStepType.fromJS(testStepTypeJs); }); })
             .then(this.success())
             .catch(this.error());
     };
@@ -613,7 +512,7 @@ var SessionClient = /** @class */ (function (_super) {
      */
     SessionClient.prototype.getBreakpoints = function () {
         return this.request('GetBreakpoints')
-            .then(function (breakPointsJs) { return BreakPoints.fromJS(breakPointsJs); })
+            .then(function (breakPointsJs) { return DTOs_1.BreakPoints.fromJS(breakPointsJs); })
             .then(this.success())
             .catch(this.error());
     };
@@ -624,7 +523,7 @@ var SessionClient = /** @class */ (function (_super) {
      */
     SessionClient.prototype.setBreakpoints = function (breakPointsDto) {
         return this.request('SetBreakpoints', breakPointsDto)
-            .then(function (breakPointsJs) { return BreakPoints.fromJS(breakPointsJs); })
+            .then(function (breakPointsJs) { return DTOs_1.BreakPoints.fromJS(breakPointsJs); })
             .then(this.success())
             .catch(this.error());
     };
@@ -642,7 +541,7 @@ var SessionClient = /** @class */ (function (_super) {
      */
     SessionClient.prototype.runTestPlan = function (parameters) {
         return this.request('RunTestPlan', parameters)
-            .then(function (runStatusJs) { return RunStatus.fromJS(runStatusJs); })
+            .then(function (runStatusJs) { return DTOs_1.RunStatus.fromJS(runStatusJs); })
             .then(this.success())
             .catch(this.error());
     };
@@ -663,7 +562,7 @@ var SessionClient = /** @class */ (function (_super) {
      */
     SessionClient.prototype.getImage = function () {
         return this.request('GetImage')
-            .then(function (imageJs) { return Image.fromJS(imageJs); })
+            .then(function (imageJs) { return DTOs_1.Image.fromJS(imageJs); })
             .then(this.success())
             .catch(this.error());
     };
@@ -678,7 +577,7 @@ var SessionClient = /** @class */ (function (_super) {
      */
     SessionClient.prototype.getWatchDog = function () {
         return this.request('GetWatchDog')
-            .then(function (watchDogJs) { return WatchDog.fromJS(watchDogJs); })
+            .then(function (watchDogJs) { return DTOs_1.WatchDog.fromJS(watchDogJs); })
             .then(this.success())
             .catch(this.error());
     };
@@ -688,7 +587,7 @@ var SessionClient = /** @class */ (function (_super) {
      */
     SessionClient.prototype.setWatchDog = function (watchDog) {
         return this.request('SetWatchDog', watchDog)
-            .then(function (watchDogJs) { return WatchDog.fromJS(watchDogJs); })
+            .then(function (watchDogJs) { return DTOs_1.WatchDog.fromJS(watchDogJs); })
             .then(this.success())
             .catch(this.error());
     };
@@ -699,5 +598,5 @@ var SessionClient = /** @class */ (function (_super) {
         return this.request('GetSettingsTypes').then(this.success()).catch(this.error());
     };
     return SessionClient;
-}(BaseClient));
-export { SessionClient };
+}(BaseClient_1.BaseClient));
+exports.SessionClient = SessionClient;