@cubejs-client/core 0.33.47 → 0.33.58

package/index.d.ts

@@ -96,9 +96,13 @@ declare module '@cubejs-client/core' {
      */
     subscribe?: boolean;
     /**
-     * A Cube.js API instance. If not provided will be taken from `CubeProvider`
+     * A Cube API instance. If not provided will be taken from `CubeProvider`
      */
     cubejsApi?: CubejsApi;
+    /**
+     * If enabled, all members of the 'number' type will be automatically converted to numerical values on the client side
+     */
+    castNumerics?: boolean;
     /**
      * Function that receives `ProgressResult` on each `Continue wait` message.
      */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cubejs-client/core",
-  "version": "0.33.47",
+  "version": "0.33.58",
   "engines": {},
   "repository": {
     "type": "git",
@@ -45,5 +45,5 @@
     "eslint-plugin-node": "^5.2.1",
     "jest": "^26.0.1"
   },
-  "gitHead": "56fdafca61e135266bc19d2c34497f7affcdb4da"
+  "gitHead": "49caef372253236528bcf96b74fbda2447709541"
 }

package/src/ResultSet.js

@@ -169,7 +169,7 @@ class ResultSet {
             range.end
           ];
           
-          if (originalTimeDimension) {
+          if (originalTimeDimension?.dateRange) {
             const [originalStart, originalEnd] = originalTimeDimension.dateRange;
             
             dateRange = [

package/src/index.js

@@ -257,24 +257,51 @@ class CubejsApi {
    * @returns ResultSet
    * @private
    */
-  loadResponseInternal(response) {
+  loadResponseInternal(response, options = {}) {
     if (
-      response.results.length &&
-      response.results[0].query.responseFormat &&
-      response.results[0].query.responseFormat === ResultType.COMPACT
+      response.results.length
     ) {
-      response.results.forEach((result, j) => {
-        const data = [];
-        result.data.dataset.forEach((r) => {
-          const row = {};
-          result.data.members.forEach((m, i) => {
-            row[m] = r[i];
+      if (options.castNumerics) {
+        response.results.forEach((result) => {
+          const numericMembers = Object.entries({
+            ...result.annotation.measures,
+            ...result.annotation.dimensions,
+          }).map(([k, v]) => {
+            if (v.type === 'number') {
+              return k;
+            }
+            
+            return undefined;
+          }).filter(Boolean);
+          
+          result.data = result.data.map((row) => {
+            numericMembers.forEach((key) => {
+              if (row[key] != null) {
+                row[key] = Number(row[key]);
+              }
+            });
+            
+            return row;
           });
-          data.push(row);
         });
-        response.results[j].data = data;
-      });
+      }
+      
+      if (response.results[0].query.responseFormat &&
+        response.results[0].query.responseFormat === ResultType.COMPACT) {
+        response.results.forEach((result, j) => {
+          const data = [];
+          result.data.dataset.forEach((r) => {
+            const row = {};
+            result.data.members.forEach((m, i) => {
+              row[m] = r[i];
+            });
+            data.push(row);
+          });
+          response.results[j].data = data;
+        });
+      }
     }
+    
     return new ResultSet(response, {
       parseDateMeasures: this.parseDateMeasures
     });
@@ -293,7 +320,7 @@ class CubejsApi {
         query,
         queryType: 'multi',
       }),
-      this.loadResponseInternal.bind(this),
+      (response) => this.loadResponseInternal(response, options),
       options,
       callback
     );
@@ -312,7 +339,7 @@ class CubejsApi {
         query,
         queryType: 'multi',
       }),
-      this.loadResponseInternal.bind(this),
+      (response) => this.loadResponseInternal(response, options),
       { ...options, subscribe: true },
       callback
     );

package/src/tests/drill-down.test.js

@@ -241,6 +241,16 @@ describe('drill down query', () => {
       timeDimensions: [],
     })
   );
+  const resultSet5 = new ResultSet(
+    loadResponse({
+      timeDimensions: [
+        {
+          dimension: 'Orders.ts',
+          granularity: 'week',
+        }
+      ]
+    })
+  );
 
   it('handles a query with a time dimension', () => {
     expect(
@@ -366,4 +376,27 @@ describe('drill down query', () => {
       timezone: 'UTC'
     });
   });
+
+  it('snap date range to granularity if the date range is not defined in the time dimension', () => {
+    expect(
+      resultSet5.drillDown({ xValues: ['2020-08-01T00:00:00.000'] })
+    ).toEqual({
+      measures: [],
+      segments: [],
+      dimensions: ['Orders.id', 'Orders.title'],
+      filters: [
+        {
+          member: 'Orders.count',
+          operator: 'measureFilter',
+        },
+      ],
+      timeDimensions: [
+        {
+          dimension: 'Orders.ts',
+          dateRange: ['2020-07-27T00:00:00.000', '2020-08-02T23:59:59.999'],
+        },
+      ],
+      timezone: 'UTC',
+    });
+  });
 });