Comment out debug console output. Uncomment for tests.

Renamed query return object fields using camelCase and more closely matching TransactionResult properties.

Author: robbear

client/src/sdk/LocalConnection.js

@@ -224,7 +224,7 @@ class LocalConnection extends Connection {
      * @param {string} [params.path=''] -
      * @param {string[]} [params.inputs=[]] -
      * @param {string[]} [params.persist=[]] - Name(s) of relation(s) to persist.
-     * @return {Object} - {txn_output, query_output, problems}
+     * @return {Object} - {txnOutput, resultOutput, problems}
      */
     query(params) {
         return new Promise((resolve, reject) => {
@@ -256,14 +256,14 @@ class LocalConnection extends Connection {
                     // TransactionResult to look at the top-level output. The expected
                     // values appear correct in the response, but we run into AnyType
                     // types in the TransactionResult top-level output.
-                    console.dir(JSON.parse(res.response.text));
-                    console.dir(res.transactionResult);
+                    //console.dir(JSON.parse(res.response.text));
+                    //console.dir(res.transactionResult);
 
                     const tr = res.transactionResult;
-                    const txn_output = tr.output;
-                    const query_output = tr.actions[0].result.output;
+                    const txnOutput = tr.output;
+                    const resultOutput = tr.actions[0].result.output;
                     const problems = tr.problems;
-                    resolve({txn_output, query_output, problems});
+                    resolve({txnOutput, resultOutput, problems});
                 })
                 .catch(error => reject(error))
         })

client/test/sdk/LocalConnection.test.js

@@ -158,31 +158,31 @@ describe('LocalConnection', () => {
                 out: 'bar',
                 query: 'def bar = 2',
             }).then(res => {
-                assert(res.query_output[0].columns[0][0] === 2);
+                assert(res.resultOutput[0].columns[0][0] === 2);
             });
         })
         it(`def p = {(1,); (2,); (3,)}`, () => {
             return defaultConnection.query({
                 out: 'p',
                 query: 'def p = {(1,); (2,); (3,)}',
             }).then(res => {
-                assert(setsEqual(new Set(res.query_output[0].columns[0]), new Set([1,2,3])));
+                assert(setsEqual(new Set(res.resultOutput[0].columns[0]), new Set([1,2,3])));
             });
         })
         it(`def p = {(1.1,); (2.2,); (3.4,)}`, () => {
             return defaultConnection.query({
                 out: 'p',
                 query: 'def p = {(1.1,); (2.2,); (3.4,)}',
             }).then(res => {
-                assert(setsEqual(new Set(res.query_output[0].columns[0]), new Set([1.1,2.2,3.4])));
+                assert(setsEqual(new Set(res.resultOutput[0].columns[0]), new Set([1.1,2.2,3.4])));
             });
         })
         it(`def p = {(parse_decimal[64, 2, \"1.1\"],); (parse_decimal[64, 2, \"2.2\"],); (parse_decimal[64, 2, \"3.4\"],)}`, () => {
             return defaultConnection.query({
                 out: 'p',
                 query: 'def p = {(parse_decimal[64, 2, \"1.1\"],); (parse_decimal[64, 2, \"2.2\"],); (parse_decimal[64, 2, \"3.4\"],)}',
             }).then(res => {
-                assert(setsEqual(new Set(res.query_output[0].columns[0]), new Set([1.1,2.2,3.4])));
+                assert(setsEqual(new Set(res.resultOutput[0].columns[0]), new Set([1.1,2.2,3.4])));
             });
         })
         it(`def p = {(1, 5); (2, 7); (3, 9)}`, () => {
@@ -192,7 +192,7 @@ describe('LocalConnection', () => {
             }).then(res => {
                 let success = [];
                 success = [[1,2,3],[5,7,9]].map((X,i) => {
-                    return setsEqual(new Set(X), new Set(res.query_output[0].columns[i]));
+                    return setsEqual(new Set(X), new Set(res.resultOutput[0].columns[i]));
                 });
                 assert.deepStrictEqual(success, [true, true]);
             });
@@ -204,28 +204,28 @@ describe('LocalConnection', () => {
             return defaultConnection.query({
                 query: 'def output = 2',
             }).then(res => {
-                assert(res.txn_output[0].columns[0][0] === 2);
+                assert(res.txnOutput[0].columns[0][0] === 2);
             });
         })
         it(`def output = {(1,); (2,); (3,)}`, () => {
             return defaultConnection.query({
                 query: 'def output = {(1,); (2,); (3,)}',
             }).then(res => {
-                assert(setsEqual(new Set(res.txn_output[0].columns[0]), new Set([1,2,3])));
+                assert(setsEqual(new Set(res.txnOutput[0].columns[0]), new Set([1,2,3])));
             });
         })
         it(`def output = {(1.1,); (2.2,); (3.4,)}`, () => {
             return defaultConnection.query({
                 query: 'def output = {(1.1,); (2.2,); (3.4,)}',
             }).then(res => {
-                assert(setsEqual(new Set(res.txn_output[0].columns[0]), new Set([1.1,2.2,3.4])));
+                assert(setsEqual(new Set(res.txnOutput[0].columns[0]), new Set([1.1,2.2,3.4])));
             });
         })
         it(`def output = {(parse_decimal[64, 2, \"1.1\"],); (parse_decimal[64, 2, \"2.2\"],); (parse_decimal[64, 2, \"3.4\"],)}`, () => {
             return defaultConnection.query({
                 query: 'def output = {(parse_decimal[64, 2, \"1.1\"],); (parse_decimal[64, 2, \"2.2\"],); (parse_decimal[64, 2, \"3.4\"],)}',
             }).then(res => {
-                assert(setsEqual(new Set(res.txn_output[0].columns[0]), new Set([1.1,2.2,3.4])));
+                assert(setsEqual(new Set(res.txnOutput[0].columns[0]), new Set([1.1,2.2,3.4])));
             });
         })
         it(`def output = {(1, 5); (2, 7); (3, 9)}`, () => {
@@ -234,7 +234,7 @@ describe('LocalConnection', () => {
             }).then(res => {
                 let success = [];
                 success = [[1,2,3],[5,7,9]].map((X,i) => {
-                    return setsEqual(new Set(X), new Set(res.txn_output[0].columns[i]));
+                    return setsEqual(new Set(X), new Set(res.txnOutput[0].columns[i]));
                 });
                 assert.deepStrictEqual(success, [true, true]);
             });
@@ -269,7 +269,7 @@ describe('LocalConnection', () => {
                 persist: ['p'],
                 query: 'def p = {(1,); (2,); (3,)}'
             }).then(res => {
-                assert(setsEqual(new Set(res.query_output[0].columns[0]), new Set([1,2,3])));
+                assert(setsEqual(new Set(res.resultOutput[0].columns[0]), new Set([1,2,3])));
             });
         })
         it(`cardinality of relation p is equal to 3`, () => {