Merge pull request #228 from doitintl/code-climate

More Code Climate

Author: avivl

dist/module.js

@@ -58893,9 +58893,9 @@ function () {
         return g.type === "alias";
       });
 
-      if (hll) {
-        numOfColumns += 1;
+      numOfColumns += 1;
 
+      if (hll) {
         if (hll.type === "hll_count.merge") {
           hllInd = numOfColumns;
         }
@@ -58906,8 +58906,6 @@ function () {
           query += " AS " + alias.params[0];
         }
       } else {
-        numOfColumns += 1;
-
         if (alias) {
           query += ",\n" + alias.params[0];
         } else {
@@ -58963,9 +58961,6 @@ function () {
 
     if (hll !== undefined) {
       this.hll = hll;
-    }
-
-    if (hll !== undefined) {
       return "HLL_COUNT.INIT (CAST(" + columnName.params[0] + " as NUMERIC)) as respondents_hll";
     }
 
@@ -58990,21 +58985,19 @@ function () {
 
       overParts.push("ORDER BY " + this.buildTimeColumn(false));
       var over = overParts.join(" ");
-      var curr = void 0;
+      var curr = query;
       var prev = void 0;
       var tmpval = query;
 
       switch (windows.type) {
         case "window":
           switch (windows.params[0]) {
             case "delta":
-              curr = query;
               prev = "lag(" + curr + ") OVER (" + over + ")";
               query = curr + " - " + prev;
               break;
 
             case "increase":
-              curr = query;
               prev = "lag(" + curr + ") OVER (" + over + ")";
               query = "(CASE WHEN " + curr + " >= " + prev + " THEN " + curr + " - " + prev;
               query += " WHEN " + prev + " IS NULL THEN NULL ELSE " + curr + " END)";
@@ -59017,7 +59010,6 @@ function () {
                 timeColumn = "min(" + timeColumn + ")";
               }
 
-              curr = query;
               prev = "lag(" + curr + ") OVER (" + over + ")";
               query = "(CASE WHEN " + curr + " >= " + prev + " THEN " + curr + " - " + prev;
               query += " WHEN " + prev + " IS NULL THEN NULL ELSE " + curr + " END)";
@@ -61756,19 +61748,25 @@ function () {
       };
     }
 
+    var res = null;
+
     if (format === "time_series") {
-      return ResponseParser._toTimeSeries(results);
+      res = ResponseParser._toTimeSeries(results);
     }
 
     if (format === "table") {
-      return ResponseParser._toTable(results);
+      res = ResponseParser._toTable(results);
     }
 
     if (format === "var") {
-      return ResponseParser._toVar(results);
+      res = ResponseParser._toVar(results);
     }
 
-    return [];
+    if (res === null) {
+      res = [];
+    }
+
+    return res;
   };
 
   ResponseParser._convertValues = function (v, type) {
@@ -61986,7 +61984,6 @@ function () {
   ResponseParser.prototype.transformAnnotationResponse = function (options, data) {
     var table = data.data;
     var timeColumnIndex = -1;
-    var titleColumnIndex = -1;
     var textColumnIndex = -1;
     var tagsColumnIndex = -1;
 

dist/module.js.map

@@ -280,8 +280,8 @@ export default class BigQueryQuery {
           g.type === "hll_count.merge" || g.type === "hll_count.extract"
       );
       const alias = _.find(column, (g: any) => g.type === "alias");
+      numOfColumns += 1;
       if (hll) {
-        numOfColumns += 1;
         if (hll.type === "hll_count.merge") {
           hllInd = numOfColumns;
         }
@@ -290,7 +290,6 @@ export default class BigQueryQuery {
           query += " AS " + alias.params[0];
         }
       } else {
-        numOfColumns += 1;
         if (alias) {
           query += ",\n" + alias.params[0];
         } else {
@@ -343,8 +342,6 @@ export default class BigQueryQuery {
     );
     if (hll !== undefined) {
       this.hll = hll;
-    }
-    if (hll !== undefined) {
       return (
         "HLL_COUNT.INIT (CAST(" +
         columnName.params[0] +
@@ -365,19 +362,17 @@ export default class BigQueryQuery {
       }
       overParts.push("ORDER BY " + this.buildTimeColumn(false));
       const over = overParts.join(" ");
-      let curr: string;
+      let curr = query;
       let prev: string;
       const tmpval = query;
       switch (windows.type) {
         case "window":
           switch (windows.params[0]) {
             case "delta":
-              curr = query;
               prev = "lag(" + curr + ") OVER (" + over + ")";
               query = curr + " - " + prev;
               break;
             case "increase":
-              curr = query;
               prev = "lag(" + curr + ") OVER (" + over + ")";
               query =
                 "(CASE WHEN " +
@@ -396,8 +391,6 @@ export default class BigQueryQuery {
               if (aggregate) {
                 timeColumn = "min(" + timeColumn + ")";
               }
-
-              curr = query;
               prev = "lag(" + curr + ") OVER (" + over + ")";
               query =
                 "(CASE WHEN " +

src/bigquery_query.ts

@@ -58,16 +58,20 @@ export default class ResponseParser {
     if (!results.rows) {
       return { data: [] };
     }
+    let res = null;
     if (format === "time_series") {
-      return ResponseParser._toTimeSeries(results);
+      res = ResponseParser._toTimeSeries(results);
     }
     if (format === "table") {
-      return ResponseParser._toTable(results);
+      res = ResponseParser._toTable(results);
     }
     if (format === "var") {
-      return ResponseParser._toVar(results);
+      res = ResponseParser._toVar(results);
     }
-    return [];
+    if (res === null) {
+      res = [];
+    }
+    return res;
   }
 
   public static _convertValues(v, type) {
@@ -137,7 +141,6 @@ export default class ResponseParser {
     }
     return res;
   }
-
   private static _toTimeSeries(results) {
     let timeIndex = -1;
     let metricIndex = -1;
@@ -272,7 +275,6 @@ export default class ResponseParser {
   public transformAnnotationResponse(options, data) {
     const table = data.data;
     let timeColumnIndex = -1;
-    const titleColumnIndex = -1;
     let textColumnIndex = -1;
     let tagsColumnIndex = -1;
     for (let i = 0; i < data.data.schema.fields.length; i++) {