fix: undefined log args (#20)

* test: simplify

* fix: undefined log args

Author: BFergerson

src/control/ContextReceiver.ts

@@ -132,7 +132,7 @@ namespace ContextReceiver {
             for (const varIndex in liveLog.logArguments) {
                 logTags.addData(new KeyStringValuePair()
                     .setKey(`argument.${varIndex}`)
-                    .setValue(tryFindVariable(liveLog.logArguments[varIndex], variables).toString() || 'undefined'));
+                    .setValue(tryFindVariable(liveLog.logArguments[varIndex], variables)?.toString() || 'undefined'));
             }
         }
 

src/model/instruments/LiveLog.ts

@@ -6,29 +6,6 @@ export default class LiveLog extends LiveInstrument {
     logFormat: string
     logArguments: string[]
 
-    createExpression(): string {
-        let logArgumentsExpression = this.logArguments
-            .map(arg => `data['${arg}'] = ${arg}.toString()`)
-            .join(';');
-        if (this.condition == null) {
-            return `(() => { 
-                let data = {success: true}; 
-                (data => {${logArgumentsExpression}})(data); 
-                return data;
-            })()`;
-        } else {
-            return `(() => {
-                if (${this.condition}) { 
-                    let data = {success: true}; 
-                    (data => {${logArgumentsExpression}})(data); 
-                    return data; 
-                } else { 
-                    return {success: false}; 
-                }
-            })()`;
-        }
-    }
-
     toJson(): any {
         return {
             ...super.toJson(),

test/LiveLogArgsTest.js

@@ -15,7 +15,9 @@ module.exports = function () {
             "line": TestUtils.getLineLabelNumber("done")
         }, null, 1, "arg i = {}", ["i"]).then(function (res) {
             assert.equal(res.status, 200);
-            simplePrimitives(); //trigger breakpoint
+
+            //trigger log (after listener is registered)
+            setTimeout(() => simplePrimitives(), 500);
         }).catch(function (err) {
             assert.fail(err)
         });
@@ -24,8 +26,6 @@ module.exports = function () {
     it('verify log data', async function () {
         this.timeout(2000)
 
-        setTimeout(() => simplePrimitives(), 1000);
-
         let event = await TestUtils.awaitMarkerEvent("LOG_HIT");
         let logResult = event.logResult
         assert.notEqual(logResult, undefined);

test/LiveLogUndefinedArgsTest.js

@@ -0,0 +1,50 @@
+const assert = require('assert');
+const TestUtils = require("./TestUtils.js");
+
+module.exports = function () {
+    function simplePrimitives() {
+        let i = undefined;
+        let i2 = null;
+        TestUtils.addLineLabel("done", () => TestUtils.getLineNumber())
+    }
+
+    it('add live log with undefined args', async function () {
+        simplePrimitives() //setup labels
+
+        await TestUtils.addLiveLog({
+            "source": TestUtils.getFilename()(),
+            "line": TestUtils.getLineLabelNumber("done")
+        }, null, 1, "arg i = {}, i2 = {}, i3 = {}", ["i", "i2", "i3"]).then(function (res) {
+            assert.equal(res.status, 200);
+
+            //trigger log (after listener is registered)
+            setTimeout(() => simplePrimitives(), 500);
+        }).catch(function (err) {
+            assert.fail(err)
+        });
+    });
+
+    it('verify log data', async function () {
+        this.timeout(200000)
+
+        let event = await TestUtils.awaitMarkerEvent("LOG_HIT");
+        let logResult = event.logResult
+        assert.notEqual(logResult, undefined);
+
+        let logs = logResult.logs
+        assert.notEqual(logs, undefined);
+        assert.equal(logs.length, 1);
+
+        let log = logs[0]
+        assert.notEqual(log, undefined);
+        assert.equal(log.content, "arg i = {}, i2 = {}, i3 = {}");
+
+        let args = log.arguments
+        assert.notEqual(args, undefined);
+        assert.equal(args.length, 3);
+
+        assert.equal(args[0], "undefined");
+        assert.equal(args[1], "undefined");
+        assert.equal(args[2], "undefined");
+    });
+};

test/test.js

@@ -8,4 +8,5 @@ describe("test simple primitives", require("./SimplePrimitivesLiveInstrumentTest
 describe("test simple collections", require("./SimpleCollectionsLiveInstrumentTest"));
 describe("test live log", require("./LiveLogTest"));
 describe("test live log with args", require("./LiveLogArgsTest"));
+describe("test live log with undefined args", require("./LiveLogUndefinedArgsTest"));
 describe("test hit limit", require("./HitLimitTest"));