scichart 2.0.2146 → 2.0.2194

package/Charting/Visuals/createMaster.js

@@ -39,6 +39,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.sciChartDestinations = exports.createMultichart = void 0;
 // @ts-ignore
 var WasmModule2D = require("../../_wasm/scichart2d");
+var BuildStamp_1 = require("../../Core/BuildStamp");
 var Guard_1 = require("../../Core/Guard");
 var WebGlRenderContext2D_1 = require("../Drawing/WebGlRenderContext2D");
 var licenseManager2D_1 = require("./licenseManager2D");
@@ -56,8 +57,8 @@ var sciChartMaster = {
 /** @ignore */
 var sciChartMasterPromise;
 /** @ignore */
-exports.createMultichart = function (divElementId, options) { return __awaiter(void 0, void 0, void 0, function () {
-    var canvases, loader, loaderDiv, master, createChildSurface, wasmContext, sciChartSurface;
+var createMultichart = function (divElementId, options) { return __awaiter(void 0, void 0, void 0, function () {
+    var canvases, loader, loaderDiv, master, createChildSurface, wasmContext_1, sciChartSurface_1, err_1;
     var _a, _b, _c;
     return __generator(this, function (_d) {
         switch (_d.label) {
@@ -66,30 +67,42 @@ exports.createMultichart = function (divElementId, options) { return __awaiter(v
                 canvases = sciChartInitCommon_1.default.initCanvas(divElementId, (_a = options === null || options === void 0 ? void 0 : options.widthAspect) !== null && _a !== void 0 ? _a : 0, (_b = options === null || options === void 0 ? void 0 : options.heightAspect) !== null && _b !== void 0 ? _b : 0, sciChartInitCommon_1.default.ECanvasType.canvas2D);
                 loader = (_c = options === null || options === void 0 ? void 0 : options.loader) !== null && _c !== void 0 ? _c : new loader_1.DefaultSciChartLoader();
                 loaderDiv = loader.addChartLoader(canvases.domDivContainer, options === null || options === void 0 ? void 0 : options.theme);
-                if (!(!sciChartMaster.wasmContext || !sciChartMaster.createChildSurface || !sciChartMaster.getChildSurfaces)) return [3 /*break*/, 2];
+                _d.label = 1;
+            case 1:
+                _d.trys.push([1, 4, , 5]);
+                if (!(!sciChartMaster.wasmContext || !sciChartMaster.createChildSurface || !sciChartMaster.getChildSurfaces)) return [3 /*break*/, 3];
                 if (!sciChartMasterPromise) {
                     sciChartMasterPromise = createMaster();
                 }
                 return [4 /*yield*/, sciChartMasterPromise];
-            case 1:
+            case 2:
                 master = _d.sent();
                 sciChartMaster.wasmContext = master.wasmContext;
+                (0, BuildStamp_1.checkBuildStamp)(master.wasmContext);
                 sciChartMaster.createChildSurface = master.createChildSurface;
                 sciChartMaster.getChildSurfaces = master.getChildSurfaces;
                 monitorWebGL(sciChartMaster);
-                _d.label = 2;
-            case 2:
-                createChildSurface = sciChartMaster.createChildSurface, wasmContext = sciChartMaster.wasmContext;
-                sciChartSurface = createChildSurface(divElementId, canvases, options === null || options === void 0 ? void 0 : options.theme);
+                _d.label = 3;
+            case 3:
+                createChildSurface = sciChartMaster.createChildSurface, wasmContext_1 = sciChartMaster.wasmContext;
+                sciChartSurface_1 = createChildSurface(divElementId, canvases, options === null || options === void 0 ? void 0 : options.theme);
                 return [2 /*return*/, new Promise(function (resolve) {
                         setTimeout(function () {
                             loader.removeChartLoader(canvases.domDivContainer, loaderDiv);
-                            resolve({ wasmContext: wasmContext, sciChartSurface: sciChartSurface });
+                            resolve({ wasmContext: wasmContext_1, sciChartSurface: sciChartSurface_1 });
                         }, 0);
                     })];
+            case 4:
+                err_1 = _d.sent();
+                console.error(err_1);
+                // replace with div with error message
+                loader.removeChartLoader(canvases.domDivContainer, loaderDiv);
+                return [2 /*return*/, Promise.reject(err_1)];
+            case 5: return [2 /*return*/];
         }
     });
 }); };
+exports.createMultichart = createMultichart;
 /** @ignore */
 var monitorWebGL = function (master) {
     var wasmContext = sciChartMaster.wasmContext, getChildSurfaces = sciChartMaster.getChildSurfaces;
@@ -134,7 +147,7 @@ var createMaster = function () {
         return sciChartSurface;
     };
     var addDestination = function (wasmContext, canvasElementId, sciChartSurface, width, height, chartInitObj) {
-        var newDestination = SciChartSurfaceBase_1.createChartDestination(canvasElementId);
+        var newDestination = (0, SciChartSurfaceBase_1.createChartDestination)(canvasElementId);
         if (!newDestination) {
             sciChartSurface.delete();
             return;
@@ -144,12 +157,13 @@ var createMaster = function () {
         chartInitObj.SetFPSCounterEnabled(false);
         exports.sciChartDestinations.push({ canvasElementId: canvasElementId, sciChartSurface: sciChartSurface, width: width, height: height });
     };
-    return new Promise(function (resolve) {
+    return new Promise(function (resolve, reject) {
         // make sure canvas has event listener for context creation error
-        var canvas = SciChartSurfaceBase_1.getMasterCanvas();
-        var locateFile = SciChartSurfaceBase_1.getLocateFile(SciChartSurface_1.sciChartConfig);
+        var canvas = (0, SciChartSurfaceBase_1.getMasterCanvas)();
+        var locateFile = (0, SciChartSurfaceBase_1.getLocateFile)(SciChartSurface_1.sciChartConfig);
         // @ts-ignore
-        new WasmModule2D({ locateFile: locateFile, noInitialRun: true }).then(function (wasmContext) {
+        new WasmModule2D({ locateFile: locateFile, noInitialRun: true })
+            .then(function (wasmContext) {
             var getChildSurfaces = function () { return exports.sciChartDestinations.map(function (el) { return el.sciChartSurface; }); };
             // Create of replace child surface
             var createChildSurface = function (divElementId, canvases, theme) {
@@ -198,12 +212,15 @@ var createMaster = function () {
             wasmContext.SCRTSetGlobalSampleChartInterface(chartInitObj);
             /// create an object that native side can trigger the copy to from...
             var canvasCopyObj = wasmContext.SCRTCopyToDestinationInterface.implement({
-                CopyToDestination: SciChartSurfaceBase_1.copyToCanvas(SciChartSurfaceBase_1.SciChartSurfaceBase.domMasterCanvas)
+                CopyToDestination: (0, SciChartSurfaceBase_1.copyToCanvas)(SciChartSurfaceBase_1.SciChartSurfaceBase.domMasterCanvas)
             });
             wasmContext.SCRTSetGlobalCopyToDestinationInterface(canvasCopyObj);
             wasmContext.TSRSetDrawRequestsEnabled(true);
             // @ts-ignore
             wasmContext.callMain();
+        })
+            .catch(function () {
+            reject("Could not load SciChart WebAssembly module.\n                Check your build process and ensure that your scichart2d.wasm, scichart2d.data and scichart2d.js files are from the same version");
         });
     });
 };

package/Charting/Visuals/createSingle.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.initDrawEngineSingleChart = exports.createSingleInternal = exports.sciChartSingleDestinations = void 0;
 // @ts-ignore
 var WasmModule2D = require("../../_wasm/scichart2d");
+var BuildStamp_1 = require("../../Core/BuildStamp");
 var Guard_1 = require("../../Core/Guard");
 var WebGlHelper_1 = require("../../Core/WebGlHelper");
 var logger_1 = require("../../utils/logger");
@@ -14,8 +15,8 @@ var SciChartSurfaceBase_1 = require("./SciChartSurfaceBase");
 // Global variables
 exports.sciChartSingleDestinations = [];
 /** @ignore */
-exports.createSingleInternal = function (divElementId, options) {
-    return new Promise(function (resolve) {
+var createSingleInternal = function (divElementId, options) {
+    return new Promise(function (resolve, reject) {
         var _a;
         var canvases = sciChartInitCommon_1.default.initCanvas(divElementId, options === null || options === void 0 ? void 0 : options.widthAspect, options === null || options === void 0 ? void 0 : options.heightAspect);
         var loader = (_a = options === null || options === void 0 ? void 0 : options.loader) !== null && _a !== void 0 ? _a : new loader_1.DefaultSciChartLoader();
@@ -23,13 +24,19 @@ exports.createSingleInternal = function (divElementId, options) {
         var webGLSupport = WebGlHelper_1.WebGlHelper.getWebGlSupport();
         // console.log("webGLSupport", webGLSupport);
         if (webGLSupport === WebGlHelper_1.EWebGLSupport.WebGL2 || webGLSupport === WebGlHelper_1.EWebGLSupport.WebGL1) {
-            var locateFile = SciChartSurfaceBase_1.getLocateFile(SciChartSurface_1.sciChartConfig);
+            var locateFile = (0, SciChartSurfaceBase_1.getLocateFile)(SciChartSurface_1.sciChartConfig);
             // @ts-ignore
-            new WasmModule2D({ locateFile: locateFile, noInitialRun: true }).then(function (wasmContext) {
+            new WasmModule2D({ locateFile: locateFile, noInitialRun: true })
+                .then(function (wasmContext) {
                 loader.removeChartLoader(canvases.domDivContainer, loaderDiv);
                 // @ts-ignore
                 wasmContext.doNotCaptureKeyboard = true;
-                exports.initDrawEngineSingleChart(wasmContext, canvases, resolve, options === null || options === void 0 ? void 0 : options.theme);
+                (0, exports.initDrawEngineSingleChart)(wasmContext, canvases, resolve, options === null || options === void 0 ? void 0 : options.theme);
+                (0, BuildStamp_1.checkBuildStamp)(wasmContext);
+            })
+                .catch(function () {
+                loader.removeChartLoader(canvases.domDivContainer, loaderDiv);
+                reject("Could not load SciChart WebAssembly module.\n                    Check your build process and ensure that your scichart2d.wasm, scichart2d.data and scichart2d.js files are from the same version");
             });
         }
         else {
@@ -37,8 +44,9 @@ exports.createSingleInternal = function (divElementId, options) {
         }
     });
 };
+exports.createSingleInternal = createSingleInternal;
 /** @ignore */
-exports.initDrawEngineSingleChart = function (wasmContext, canvases, resolve, theme) {
+var initDrawEngineSingleChart = function (wasmContext, canvases, resolve, theme) {
     Guard_1.Guard.notNull(theme, "theme");
     var width = canvases.domCanvas2D.width;
     var height = canvases.domCanvas2D.height;
@@ -81,3 +89,4 @@ exports.initDrawEngineSingleChart = function (wasmContext, canvases, resolve, th
     // @ts-ignore
     wasmContext.callMain();
 };
+exports.initDrawEngineSingleChart = initDrawEngineSingleChart;

package/Charting/Visuals/licenseManager2D.js

@@ -38,6 +38,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.licenseManager = exports.updateLicenseDisplay = exports.getLicenseInfo = exports.applyLicense = exports.getLicenseCookie = exports.setCallbacks3D = exports.setUseLicenseWizard = exports.setRuntimeLicenseKey = exports.setLicenseCallback = exports.setDependencies = void 0;
 var app_1 = require("../../constants/app");
+var BuildStamp_1 = require("../../Core/BuildStamp");
 var Dictionary_1 = require("../../Core/Dictionary");
 var Color_1 = require("../../types/Color");
 var licensingClasses_1 = require("../../types/licensingClasses");
@@ -93,13 +94,14 @@ var fetchFromWizard = function (path) { return __awaiter(void 0, void 0, void 0,
 }); };
 var licenseDependencies = {
     fetchFromWizard: function (url) { return fetchFromWizard(url); },
-    setCookie: function (name, val, validDays) { return cookie_1.setCookie(name, val, validDays); },
-    getCookie: function (name) { return cookie_1.getCookie(name); },
+    setCookie: function (name, val, validDays) { return (0, cookie_1.setCookie)(name, val, validDays); },
+    getCookie: function (name) { return (0, cookie_1.getCookie)(name); },
     fetchForChallenge: function (url) { return fetch(url); },
     updateLicenseDisplay: function (licenseInfo, sciChartSurface, is2D, applyToOther) { return updateLicenseDisplayInternal(licenseInfo, sciChartSurface, is2D, applyToOther); },
     debug: function (message) { return console.log(message); }
 };
-exports.setDependencies = function (dependencies) { return (licenseDependencies = dependencies); };
+var setDependencies = function (dependencies) { return (licenseDependencies = dependencies); };
+exports.setDependencies = setDependencies;
 var isDebug = null;
 var debug = function (message) {
     if (isDebug === null) {
@@ -109,26 +111,30 @@ var debug = function (message) {
         licenseDependencies.debug(message);
     }
 };
+debug("SciChart version " + BuildStamp_1.libraryVersion);
 // tslint:disable: no-console
 var licenseCallback;
-exports.setLicenseCallback = function (callback) {
+var setLicenseCallback = function (callback) {
     licenseCallback = callback;
 };
+exports.setLicenseCallback = setLicenseCallback;
 var runtimeLicenseKey = "";
 var getRuntimeLicenseKey = function () { return runtimeLicenseKey; };
-exports.setRuntimeLicenseKey = function (value) {
+var setRuntimeLicenseKey = function (value) {
     var prev = runtimeLicenseKey;
     runtimeLicenseKey = value;
     if (runtimeLicenseKey !== prev && runtimeLicenseKey !== "") {
         if (licenseContext2D !== undefined) {
-            exports.applyLicense(licenseContext2D);
+            (0, exports.applyLicense)(licenseContext2D);
         }
     }
 };
+exports.setRuntimeLicenseKey = setRuntimeLicenseKey;
 var useLicenseWizard = true;
-exports.setUseLicenseWizard = function (value) {
+var setUseLicenseWizard = function (value) {
     useLicenseWizard = value;
 };
+exports.setUseLicenseWizard = setUseLicenseWizard;
 var retryTime = app_1.IS_TEST_ENV ? 0.1 : 5;
 var maxretries = app_1.IS_TEST_ENV ? 12 : 10;
 var serverLicenseEndpoint = "api/license";
@@ -144,7 +150,8 @@ var callbacks3D = {
     setNewLicense3D: function (keyCode) { return undefined; },
     updateLicenseDisplay3D: function () { return undefined; }
 };
-exports.setCallbacks3D = function (callbacks) { return (callbacks3D = callbacks); };
+var setCallbacks3D = function (callbacks) { return (callbacks3D = callbacks); };
+exports.setCallbacks3D = setCallbacks3D;
 var getlicenseFromWizard = function () { return __awaiter(void 0, void 0, void 0, function () {
     var response, keyCode, _a, requiresValidation, trialExpired, err_3;
     return __generator(this, function (_b) {
@@ -170,7 +177,7 @@ var getlicenseFromWizard = function () { return __awaiter(void 0, void 0, void 0
                 }
                 else if (trialExpired) {
                     checkStatus = licensingClasses_1.LicenseCheckStatus.NoLicenseInWizard;
-                    debug("No valid license available in licensing wizard. Trying again in " + retryTime + " seconds");
+                    debug("No valid license available in licensing wizard. Trying again in ".concat(retryTime, " seconds"));
                     wizardTimer = setTimeout(function () { return getlicenseFromWizard(); }, retryTime * 1000);
                 }
                 else {
@@ -179,7 +186,7 @@ var getlicenseFromWizard = function () { return __awaiter(void 0, void 0, void 0
                 return [3 /*break*/, 4];
             case 3:
                 checkStatus = licensingClasses_1.LicenseCheckStatus.NoLicenseInWizard;
-                debug("No license available in licensing wizard. Trying again in " + retryTime + " seconds");
+                debug("No license available in licensing wizard. Trying again in ".concat(retryTime, " seconds"));
                 wizardTimer = setTimeout(function () { return getlicenseFromWizard(); }, retryTime * 1000);
                 _b.label = 4;
             case 4: return [3 /*break*/, 6];
@@ -188,7 +195,7 @@ var getlicenseFromWizard = function () { return __awaiter(void 0, void 0, void 0
                 // Failed to connect.  Retry
                 getLicenseFailCounts += 1;
                 if (getLicenseFailCounts < maxretries) {
-                    debug("Could not find licensing wizard. Trying again in " + retryTime + " seconds");
+                    debug("Could not find licensing wizard. Trying again in ".concat(retryTime, " seconds"));
                     setTimeout(function () { return getlicenseFromWizard(); }, retryTime * 1000);
                 }
                 else {
@@ -200,7 +207,7 @@ var getlicenseFromWizard = function () { return __awaiter(void 0, void 0, void 0
                 return [3 /*break*/, 6];
             case 6:
                 if (licenseContext2D !== undefined) {
-                    exports.updateLicenseDisplay(exports.getLicenseInfo(licenseContext2D), sciChartSurface2D, true, true);
+                    (0, exports.updateLicenseDisplay)((0, exports.getLicenseInfo)(licenseContext2D), sciChartSurface2D, true, true);
                 }
                 callbacks3D.updateLicenseDisplay3D();
                 return [2 /*return*/];
@@ -208,10 +215,10 @@ var getlicenseFromWizard = function () { return __awaiter(void 0, void 0, void 0
     });
 }); };
 var setLicenseCookie = function (key, token, expirySeconds, lastValidated) {
-    var cookieVal = key + "," + token + "," + expirySeconds + "," + lastValidated;
+    var cookieVal = "".concat(key, ",").concat(token, ",").concat(expirySeconds, ",").concat(lastValidated);
     return licenseDependencies.setCookie("scLicense", cookieVal, 365);
 };
-exports.getLicenseCookie = function () {
+var getLicenseCookie = function () {
     var cookie;
     cookie = licenseDependencies.getCookie("scLicense");
     var parts = cookie.split(",");
@@ -226,9 +233,10 @@ exports.getLicenseCookie = function () {
     else
         return { key: parts[0], token: null, expiry: null, lastValidated: null };
 };
+exports.getLicenseCookie = getLicenseCookie;
 var refreshLicense = function () {
-    cookie_1.deleteCookie("scLicense");
-    exports.applyLicense(licenseContext2D);
+    (0, cookie_1.deleteCookie)("scLicense");
+    (0, exports.applyLicense)(licenseContext2D);
 };
 var setChallengeResponse = function (token) {
     var expirySeconds = -1;
@@ -253,7 +261,7 @@ var dolicenseChallenge = function () { return __awaiter(void 0, void 0, void 0,
                 _b.trys.push([1, 11, , 12]);
                 if (checkStatus !== licensingClasses_1.LicenseCheckStatus.ValidatingDeveloperLicense)
                     return [2 /*return*/];
-                debug("Attempting to validate license with " + server);
+                debug("Attempting to validate license with ".concat(server));
                 challenge = void 0;
                 orderId = void 0;
                 if (licenseContext2D !== undefined) {
@@ -264,9 +272,9 @@ var dolicenseChallenge = function () { return __awaiter(void 0, void 0, void 0,
                     (_a = callbacks3D.getLicenseChallenge3D(), challenge = _a.challenge, orderId = _a.orderId);
                 }
                 response = void 0;
-                queryString = "orderid=" + orderId + "&challenge=" + challenge;
+                queryString = "orderid=".concat(orderId, "&challenge=").concat(challenge);
                 if (!isDev) return [3 /*break*/, 3];
-                url = "/validate?" + queryString;
+                url = "/validate?".concat(queryString);
                 return [4 /*yield*/, licenseDependencies.fetchFromWizard(url)];
             case 2:
                 response = _b.sent();
@@ -291,7 +299,7 @@ var dolicenseChallenge = function () { return __awaiter(void 0, void 0, void 0,
                 if (!token.startsWith("Error")) {
                     expirySeconds = setChallengeResponse(token);
                     if (expirySeconds > 0) {
-                        key = exports.getLicenseCookie().key;
+                        key = (0, exports.getLicenseCookie)().key;
                         timeNow = Math.floor(new Date().getTime() / 1000);
                         setLicenseCookie(key, token, expirySeconds, timeNow);
                         checkStatus = licensingClasses_1.LicenseCheckStatus.LicenseOK;
@@ -322,15 +330,15 @@ var dolicenseChallenge = function () { return __awaiter(void 0, void 0, void 0,
                 // Failed to connect.  Retry
                 challengeFailCounts += 1;
                 if (challengeFailCounts < maxretries) {
-                    debug("Could not find " + server + "/" + serverLicenseEndpoint + ". Trying again in " + retryTime + " seconds");
+                    debug("Could not find ".concat(server, "/").concat(serverLicenseEndpoint, ". Trying again in ").concat(retryTime, " seconds"));
                     setTimeout(function () { return dolicenseChallenge(); }, retryTime * 1000);
                 }
                 else {
-                    expiry = exports.getLicenseCookie().expiry;
+                    expiry = (0, exports.getLicenseCookie)().expiry;
                     msg = isDev
                         ? "Please run the license wizard, ensure your license is activated, then refresh page to retry."
                         : "Please check that the endpoint is configured correctly.";
-                    console.error("Failed to connect to " + server + "/" + serverLicenseEndpoint + ".  License must be revalidated before " + expiry.toLocaleString() + ". " + msg);
+                    console.error("Failed to connect to ".concat(server, "/").concat(serverLicenseEndpoint, ".  License must be revalidated before ").concat(expiry.toLocaleString(), ". ").concat(msg));
                     challengeFailCounts = 0;
                     // Only actually show failure message if token has expired
                     if (new Date() > expiry)
@@ -339,7 +347,7 @@ var dolicenseChallenge = function () { return __awaiter(void 0, void 0, void 0,
                 return [3 /*break*/, 12];
             case 12:
                 if (licenseContext2D !== undefined) {
-                    exports.updateLicenseDisplay(exports.getLicenseInfo(licenseContext2D), sciChartSurface2D, true, true);
+                    (0, exports.updateLicenseDisplay)((0, exports.getLicenseInfo)(licenseContext2D), sciChartSurface2D, true, true);
                 }
                 callbacks3D.updateLicenseDisplay3D();
                 return [2 /*return*/];
@@ -357,12 +365,12 @@ var applyLicense2D = function (licenseContext, sciChartSurface, isSingle) {
     if (isSingle || shouldApplyLicense2D) {
         licenseContext2D = licenseContext;
         sciChartSurface2D = sciChartSurface;
-        exports.applyLicense(licenseContext);
+        (0, exports.applyLicense)(licenseContext);
     }
     if (!isSingle)
         shouldApplyLicense2D = false;
 };
-exports.applyLicense = function (licenseContext) {
+var applyLicense = function (licenseContext) {
     debug("applyLicense running");
     var licenseKey = "";
     var lt = licenseContext.SCRTCredentials.GetLicenseType();
@@ -396,7 +404,7 @@ exports.applyLicense = function (licenseContext) {
         }
     }
     // Get from cookie store
-    var licenseCookie = exports.getLicenseCookie();
+    var licenseCookie = (0, exports.getLicenseCookie)();
     if (licenseKey === "" && licenseCookie && licenseCookie.key !== "") {
         debug("Found license in cookie.");
         licenseKey = licenseCookie.key;
@@ -407,7 +415,7 @@ exports.applyLicense = function (licenseContext) {
             lt === licenseContext.SCRTLicenseType.LICENSE_TYPE_TRIAL ||
             lt === licenseContext.SCRTLicenseType.LICENSE_TYPE_REQUIRES_VALIDATION)) {
             debug("License cookie is invalid. Removing");
-            cookie_1.deleteCookie("scLicense");
+            (0, cookie_1.deleteCookie)("scLicense");
             licenseKey = "";
             lt = licenseContext.SCRTLicenseType.LICENSE_TYPE_NO_LICENSE;
         }
@@ -432,7 +440,7 @@ exports.applyLicense = function (licenseContext) {
             if (isRuntimeKey && isDev) {
                 // clear key
                 licenseContext.SCRTCredentials.ResetRuntimeLicense();
-                cookie_1.deleteCookie("scLicense");
+                (0, cookie_1.deleteCookie)("scLicense");
                 checkStatus = licensingClasses_1.LicenseCheckStatus.DevKeyInRuntimeKey;
             }
             else if (licenseCookie.expiry > new Date()) {
@@ -449,7 +457,7 @@ exports.applyLicense = function (licenseContext) {
                 }
                 var validationInterval = 60 * 60 * 24; // Once a day
                 var secondsSinceValidated = (new Date().getTime() - licenseCookie.lastValidated.getTime()) / 1000;
-                debug("License expires in " + (expirySeconds - timeNow) + " seconds.  Last validated " + secondsSinceValidated + " seconds ago");
+                debug("License expires in ".concat(expirySeconds - timeNow, " seconds.  Last validated ").concat(secondsSinceValidated, " seconds ago"));
                 if (secondsSinceValidated > validationInterval &&
                     checkStatus !== licensingClasses_1.LicenseCheckStatus.ValidatingDeveloperLicense) {
                     checkStatus = licensingClasses_1.LicenseCheckStatus.ValidatingDeveloperLicense;
@@ -474,10 +482,11 @@ exports.applyLicense = function (licenseContext) {
         }
     }
     if (licenseContext2D !== undefined) {
-        exports.updateLicenseDisplay(exports.getLicenseInfo(licenseContext2D), sciChartSurface2D, true, false);
+        (0, exports.updateLicenseDisplay)((0, exports.getLicenseInfo)(licenseContext2D), sciChartSurface2D, true, false);
     }
     callbacks3D.updateLicenseDisplay3D();
 };
+exports.applyLicense = applyLicense;
 var licenseModal;
 var openLicenseModal = function () {
     console.error("Modal not initialized");
@@ -494,7 +503,7 @@ var setNewLicense = function (keyCode) {
         trialExpired =
             licenseContext2D.SCRTCredentials.GetLicenseType() ===
                 licenseContext2D.SCRTLicenseType.LICENSE_TYPE_TRIAL_EXPIRED;
-        exports.updateLicenseDisplay(exports.getLicenseInfo(licenseContext2D), sciChartSurface2D, true, true);
+        (0, exports.updateLicenseDisplay)((0, exports.getLicenseInfo)(licenseContext2D), sciChartSurface2D, true, true);
     }
     var result3D = callbacks3D.setNewLicense3D(keyCode);
     if (result3D !== undefined) {
@@ -658,14 +667,17 @@ var convertLicenseType = function (sclt, licenseContext) {
     }
     return licenseType;
 };
-exports.getLicenseInfo = function (licenseContext) {
+var getLicenseInfo = function (licenseContext) {
     var sclt = licenseContext.SCRTCredentials.GetLicenseType();
     var licenseType = convertLicenseType(sclt, licenseContext);
     var daysRemaining = licenseContext.SCRTCredentials.GetLicenseDaysRemaining();
-    debug(licenseContext.SCRTCredentials.Dump());
+    if (isDebug) {
+        debug(licenseContext.SCRTCredentials.Dump());
+    }
     var error = licenseContext.SCRTCredentials.GetLicenseErrors();
     return { licenseType: licenseType, daysRemaining: daysRemaining, error: error };
 };
+exports.getLicenseInfo = getLicenseInfo;
 var licenseType2D;
 var licenseType3D;
 var previousCheckStatus;
@@ -692,7 +704,7 @@ var updateLicenseDisplayInternal = function (licenseInfo, sciChartSurface, is2D,
             licenseType3D = licenseType;
         // if (licenseType === LicenseType.Trial || licenseType === LicenseType.Full)
         //    checkStatus = LicenseCheckStatus.LicenseOK;
-        debug((is2D ? "2D" : "3D") + " license status changed");
+        debug("".concat(is2D ? "2D" : "3D", " license status changed"));
         sciChartSurface.invalidateElement();
         sciChartSurface.otherSurfaces.map(function (s) { return s.invalidateElement(); });
         // Update license message text
@@ -700,18 +712,18 @@ var updateLicenseDisplayInternal = function (licenseInfo, sciChartSurface, is2D,
         var contactSupportLink = "<a href=\"https://www.scichart.com/contact-us/\"  target=\"_blank\" style=\"color: orange\">contact support</a>";
         if (licenseType === licensingClasses_1.LicenseType.NoLicense) {
             premsg = "You need to have a license to use SciChart.  ";
-            postMsg = "Instructions can be seen at " + licensingLink;
+            postMsg = "Instructions can be seen at ".concat(licensingLink);
         }
         else if (licenseType === licensingClasses_1.LicenseType.Invalid) {
             if (error.startsWith("License is not valid for this domain"))
-                premsg = "Sorry! Your license key is invalid for this domain</br>Please " + contactSupportLink + " with your OrderID if you believe this to be incorrect.";
+                premsg = "Sorry! Your license key is invalid for this domain</br>Please ".concat(contactSupportLink, " with your OrderID if you believe this to be incorrect.");
             else
-                premsg = "Sorry! Your license key appears to be invalid</br>Please " + contactSupportLink + " with your OrderID if you believe this to be incorrect.";
-            postMsg = "Instructions can be seen at " + licensingLink;
+                premsg = "Sorry! Your license key appears to be invalid</br>Please ".concat(contactSupportLink, " with your OrderID if you believe this to be incorrect.");
+            postMsg = "Instructions can be seen at ".concat(licensingLink);
         }
         else if (licenseType === licensingClasses_1.LicenseType.Invalid_Developer) {
             premsg = "Sorry! You need a developer license to use SciChart on a domain not included in your runtime key.";
-            postMsg = "Instructions can be seen at " + licensingLink + "</br>\n                    Please " + contactSupportLink + " with your OrderID if you are experiencing issues.";
+            postMsg = "Instructions can be seen at ".concat(licensingLink, "</br>\n                    Please ").concat(contactSupportLink, " with your OrderID if you are experiencing issues.");
         }
         else if (licenseType === licensingClasses_1.LicenseType.Requres_Validation) {
             if (isDev) {
@@ -720,18 +732,22 @@ var updateLicenseDisplayInternal = function (licenseInfo, sciChartSurface, is2D,
             else {
                 premsg = "This runtime key must be validated by a server side key.";
             }
-            postMsg = "Instructions can be seen at " + licensingLink + "</br>\n                    Please " + contactSupportLink + " with your OrderID if you are experiencing issues.";
+            postMsg = "Instructions can be seen at ".concat(licensingLink, "</br>\n                    Please ").concat(contactSupportLink, " with your OrderID if you are experiencing issues.");
         }
         else if (licenseType === licensingClasses_1.LicenseType.Subscription_Expired) {
             premsg = "Sorry! Your support subscription has expired.<br>";
-            postMsg = "Please " + contactSupportLink + " us if you would like to renew your subscription.";
+            postMsg = "Please ".concat(contactSupportLink, " us if you would like to renew your subscription.");
         }
-        else if (licenseType === licensingClasses_1.LicenseType.Trial_Expired) {
+        else if (licenseType === licensingClasses_1.LicenseType.Trial_Expired && daysRemaining < 1) {
             premsg = "Sorry! Your trial has expired.";
-            postMsg = "Please " + contactSupportLink + " if you require an extension.";
+            postMsg = "Please ".concat(contactSupportLink, " if you require an extension.");
+        }
+        else if (licenseType === licensingClasses_1.LicenseType.Trial_Expired && daysRemaining > 1) {
+            premsg = "This version is too old to trial.";
+            postMsg = "Please ".concat(contactSupportLink, " if you require an extension.");
         }
         else if (licenseType === licensingClasses_1.LicenseType.Trial && daysRemaining <= 7) {
-            premsg = "You have " + daysRemaining + " day" + (daysRemaining === 1 ? "" : "s") + " remaining of the trial.";
+            premsg = "You have ".concat(daysRemaining, " day").concat(daysRemaining === 1 ? "" : "s", " remaining of the trial.");
         }
         else if (licenseType === licensingClasses_1.LicenseType.Full || (licenseType === licensingClasses_1.LicenseType.Trial && daysRemaining > 7)) {
             licenseMessageDiv.style.display = "none";
@@ -768,6 +784,8 @@ var updateLicenseDisplayInternal = function (licenseInfo, sciChartSurface, is2D,
             else if (checkStatus === licensingClasses_1.LicenseCheckStatus.DevKeyInRuntimeKey)
                 chartmsg = "<br><u>You have set a developer key as a runtime key, which will not work on any other machine.  Click for more information</u>";
             // tslint:disable-next-line: max-line-length
+            else if (licenseType === licensingClasses_1.LicenseType.Trial_Expired && daysRemaining > 1)
+                chartmsg = "<br><u>Please update to the latest version of SciChart. Click for more information</u>.";
             else if (checkStatus === licensingClasses_1.LicenseCheckStatus.NoLicenseInWizard &&
                 licenseType === licensingClasses_1.LicenseType.Trial_Expired) {
                 chartmsg = "<br><u>Please activate a serial key in the Licensing Wizard, or contact sales for an extension.  Click for more information</u>.";
@@ -808,10 +826,11 @@ var updateLicenseDisplayInternal = function (licenseInfo, sciChartSurface, is2D,
         });
     }
 };
-exports.updateLicenseDisplay = function (licenseInfo, sciChartSurface, is2D, applyToOther) { return licenseDependencies.updateLicenseDisplay(licenseInfo, sciChartSurface, is2D, applyToOther); };
+var updateLicenseDisplay = function (licenseInfo, sciChartSurface, is2D, applyToOther) { return licenseDependencies.updateLicenseDisplay(licenseInfo, sciChartSurface, is2D, applyToOther); };
+exports.updateLicenseDisplay = updateLicenseDisplay;
 exports.licenseManager = {
-    setRuntimeLicenseKey: function (value) { return exports.setRuntimeLicenseKey(value); },
-    setLicenseCallback: function (callback) { return exports.setLicenseCallback(callback); },
+    setRuntimeLicenseKey: function (value) { return (0, exports.setRuntimeLicenseKey)(value); },
+    setLicenseCallback: function (callback) { return (0, exports.setLicenseCallback)(callback); },
     setServerLicenseEndpoint: function (value) { return setServerLicenseEndpoint(value); },
     applyLicense2D: function (licenseContext, sciChartSurface, isSingle) {
         return applyLicense2D(licenseContext, sciChartSurface, isSingle);

package/Charting/Visuals/loader.js

@@ -27,7 +27,7 @@ var DefaultSciChartLoader = /** @class */ (function () {
         loaderContainerDiv.style.height = "100%";
         loaderContainerDiv.style.width = "100%";
         var loaderDiv = document.createElement("div");
-        var spinnerChunk = "<div><span style=\"background: " + theme.loadingAnimationForeground + "\"/></div>";
+        var spinnerChunk = "<div><span style=\"background: ".concat(theme.loadingAnimationForeground, "\"/></div>");
         loaderDiv.innerHTML = spinnerChunk.repeat(8);
         loaderDiv.classList.add("scichart_loader");
         loaderContainerDiv.appendChild(loaderDiv);

package/Charting/Visuals/sciChartInitCommon.js

@@ -9,7 +9,7 @@ var ECanvasType;
     ECanvasType[ECanvasType["canvas2D"] = 1] = "canvas2D";
     ECanvasType[ECanvasType["svg"] = 2] = "svg";
 })(ECanvasType || (ECanvasType = {}));
-var getCanvas2dId = function (divElementId) { return divElementId + "_2D"; };
+var getCanvas2dId = function (divElementId) { return "".concat(divElementId, "_2D"); };
 var getCanvasSizes = function (divWidth, divHeight, maxHeight, aspectWidth, aspectHeight) {
     if (aspectWidth === void 0) { aspectWidth = 0; }
     if (aspectHeight === void 0) { aspectHeight = 0; }
@@ -38,12 +38,12 @@ var getCanvasSizes = function (divWidth, divHeight, maxHeight, aspectWidth, aspe
     }
 };
 var getChartRootDomElement = function (divElementId) {
-    var chartRoot = document.querySelector("#" + divElementId);
+    var chartRoot = document.querySelector("#".concat(divElementId));
     if (!chartRoot) {
-        throw new Error("Check div element with id \"" + divElementId + "\" exists");
+        throw new Error("Check div element with id \"".concat(divElementId, "\" exists"));
     }
     if (chartRoot.nodeName.toLowerCase() !== "div") {
-        throw new Error("Element with id \"" + divElementId + "\" should be of type div");
+        throw new Error("Element with id \"".concat(divElementId, "\" should be of type div"));
     }
     return chartRoot;
 };
@@ -81,7 +81,7 @@ var initCanvas = function (divElementId, aspectWidth, aspectHeight, activeCanvas
     if (activeCanvas === ECanvasType.canvasWebGL) {
         // WebGL Canvas
         canvasWebGL = document.createElement("canvas");
-        canvasWebGL.id = divElementId + "_WebGL";
+        canvasWebGL.id = "".concat(divElementId, "_WebGL");
         canvasWebGL.style.position = "absolute";
         canvasWebGL.style.display = "block";
         var gl = WebGlHelper_1.WebGlHelper.getContext(canvasWebGL, {
@@ -108,7 +108,7 @@ var initCanvas = function (divElementId, aspectWidth, aspectHeight, activeCanvas
     canvas2D.onselectstart = function () { return false; };
     // SVG Root Element
     var svgRootElement = document.createElementNS("http://www.w3.org/2000/svg", "svg");
-    svgRootElement.id = divElementId + "_SVG";
+    svgRootElement.id = "".concat(divElementId, "_SVG");
     svgRootElement.setAttribute("width", width.toString());
     svgRootElement.setAttribute("height", height.toString());
     svgRootElement.setAttribute("role", "img");
@@ -121,7 +121,7 @@ var initCanvas = function (divElementId, aspectWidth, aspectHeight, activeCanvas
     chartRoot.appendChild(svgRootElement);
     // SVG Adorner Layer
     var svgAdornerLayer = document.createElementNS("http://www.w3.org/2000/svg", "svg");
-    svgAdornerLayer.id = divElementId + "_Adorner";
+    svgAdornerLayer.id = "".concat(divElementId, "_Adorner");
     svgAdornerLayer.setAttribute("width", width.toString());
     svgAdornerLayer.setAttribute("height", height.toString());
     svgAdornerLayer.setAttribute("role", "img");
@@ -132,9 +132,9 @@ var initCanvas = function (divElementId, aspectWidth, aspectHeight, activeCanvas
     chartRoot.appendChild(svgAdornerLayer);
     // Root Div Element
     var divRootElement = document.createElement("div");
-    divRootElement.id = divElementId + "_div";
+    divRootElement.id = "".concat(divElementId, "_div");
     divRootElement.style.width = "100%";
-    divRootElement.style.height = height + "px";
+    divRootElement.style.height = "".concat(height, "px");
     divRootElement.style.position = "relative";
     divRootElement.style.pointerEvents = "none";
     divRootElement.style.textAlign = "center";
@@ -216,12 +216,12 @@ var subscribeToResize = function (chartRoot, aspect, sciChartSurface) {
  * @param divElementId
  */
 var checkChartDivExists = function (divElementId) {
-    var numberOfElements = document.querySelectorAll("[id=" + divElementId + "]").length;
+    var numberOfElements = document.querySelectorAll("[id=".concat(divElementId, "]")).length;
     if (numberOfElements > 1) {
-        console.error("Please provide a unique ID for each chart div element, \"" + divElementId + "\" it is not a unique identifier");
+        console.error("Please provide a unique ID for each chart div element, \"".concat(divElementId, "\" it is not a unique identifier"));
     }
     else if (numberOfElements === 0) {
-        console.error("Chart div element with the ID \"" + divElementId + "\" is not present in the DOM");
+        console.error("Chart div element with the ID \"".concat(divElementId, "\" is not present in the DOM"));
     }
 };
 var sciChartInitCommon = {