@cubejs-client/core 0.34.37 → 0.35.0

package/index.d.ts

@@ -66,7 +66,7 @@ declare module '@cubejs-client/core' {
     public request(method: string, params: any): ITransportResponse<ResultSet>;
   }
 
-  export type CubeJSApiOptions = {
+  export type CubeApiOptions = {
     /**
      * URL of your Cube.js Backend. By default, in the development environment it is `http://localhost:4000/cubejs-api/v1`
      */
@@ -98,7 +98,7 @@ declare module '@cubejs-client/core' {
     /**
      * A Cube API instance. If not provided will be taken from `CubeProvider`
      */
-    cubejsApi?: CubejsApi;
+    cubeApi?: CubeApi;
     /**
      * If enabled, all members of the 'number' type will be automatically converted to numerical values on the client side
      */
@@ -324,7 +324,7 @@ declare module '@cubejs-client/core' {
      * ```js
      * import { ResultSet } from '@cubejs-client/core';
      *
-     * const resultSet = await cubejsApi.load(query);
+     * const resultSet = await cubeApi.load(query);
      * // You can store the result somewhere
      * const tmp = resultSet.serialize();
      *
@@ -1072,11 +1072,11 @@ declare module '@cubejs-client/core' {
   }
 
   /**
-   * Main class for accessing Cube.js API
+   * Main class for accessing Cube API
    *
    * @order 2
    */
-  export class CubejsApi {
+  export class CubeApi {
     load<QueryType extends DeeplyReadonly<Query | Query[]>>(
       query: QueryType,
       options?: LoadMethodOptions,
@@ -1085,13 +1085,13 @@ declare module '@cubejs-client/core' {
      * Fetch data for the passed `query`.
      *
      * ```js
-     * import cubejs from '@cubejs-client/core';
+     * import cube from '@cubejs-client/core';
      * import Chart from 'chart.js';
      * import chartjsConfig from './toChartjsData';
      *
-     * const cubejsApi = cubejs('CUBEJS_TOKEN');
+     * const cubeApi = cube('CUBEJS_TOKEN');
      *
-     * const resultSet = await cubejsApi.load({
+     * const resultSet = await cubeApi.load({
      *  measures: ['Stories.count'],
      *  timeDimensions: [{
      *    dimension: 'Stories.time',
@@ -1123,7 +1123,7 @@ declare module '@cubejs-client/core' {
      *
      * ```js
      * // Subscribe to a query's updates
-     * const subscription = await cubejsApi.subscribe(
+     * const subscription = await cubeApi.subscribe(
      *   {
      *     measures: ['Logs.count'],
      *     timeDimensions: [
@@ -1173,12 +1173,12 @@ declare module '@cubejs-client/core' {
   }
 
   /**
-   * Creates an instance of the `CubejsApi`. The API entry point.
+   * Creates an instance of the `CubeApi`. The API entry point.
    *
    * ```js
-   * import cubejs from '@cubejs-client/core';
-   * const cubejsApi = cubejs(
-   *   'CUBEJS-API-TOKEN',
+   * import cube from '@cubejs-client/core';
+   * const cubeApi = cube(
+   *   'CUBE-API-TOKEN',
    *   { apiUrl: 'http://localhost:4000/cubejs-api/v1' }
    * );
    * ```
@@ -1186,8 +1186,8 @@ declare module '@cubejs-client/core' {
    * You can also pass an async function or a promise that will resolve to the API token
    *
    * ```js
-   * import cubejs from '@cubejs-client/core';
-   * const cubejsApi = cubejs(
+   * import cube from '@cubejs-client/core';
+   * const cubeApi = cube(
    *   async () => await Auth.getJwtToken(),
    *   { apiUrl: 'http://localhost:4000/cubejs-api/v1' }
    * );
@@ -1196,8 +1196,8 @@ declare module '@cubejs-client/core' {
    * @param apiToken - [API token](/product/auth) is used to authorize requests and determine SQL database you're accessing. In the development mode, Cube.js Backend will print the API token to the console on startup. In case of async function `authorization` is updated for `options.transport` on each request.
    * @order 1
    */
-  export default function cubejs(apiToken: string | (() => Promise<string>), options: CubeJSApiOptions): CubejsApi;
-  export default function cubejs(options: CubeJSApiOptions): CubejsApi;
+  export default function cube(apiToken: string | (() => Promise<string>), options: CubeApiOptions): CubeApi;
+  export default function cube(options: CubeApiOptions): CubeApi;
 
   /**
    * @hidden

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cubejs-client/core",
-  "version": "0.34.37",
+  "version": "0.35.0",
   "engines": {},
   "repository": {
     "type": "git",
@@ -45,5 +45,5 @@
     "eslint-plugin-node": "^5.2.1",
     "jest": "^27"
   },
-  "gitHead": "595c23dc095825180036b2c3950671d6a75065eb"
+  "gitHead": "75bc6c3d96392b7823e714d17ac85ab435e55b05"
 }

package/src/index.js

@@ -30,7 +30,7 @@ function mutexPromise(promise) {
   });
 }
 
-class CubejsApi {
+class CubeApi {
   constructor(apiToken, options) {
     if (apiToken !== null && !Array.isArray(apiToken) && typeof apiToken === 'object') {
       options = apiToken;
@@ -373,7 +373,7 @@ class CubejsApi {
   }
 }
 
-export default (apiToken, options) => new CubejsApi(apiToken, options);
+export default (apiToken, options) => new CubeApi(apiToken, options);
 
-export { CubejsApi, CubejsApi as CubeApi, HttpTransport, ResultSet, RequestError, Meta };
+export { CubeApi, HttpTransport, ResultSet, RequestError, Meta };
 export * from './utils';

package/src/index.test.js

@@ -1,13 +1,13 @@
 /**
  * @license Apache-2.0
  * @copyright Cube Dev, Inc.
- * @fileoverview CubejsApi class unit tests.
+ * @fileoverview CubeApi class unit tests.
  */
 
 /* globals describe,test,expect,beforeEach,jest */
 
 import ResultSet from './ResultSet';
-import { CubejsApi } from './index';
+import { CubeApi } from './index';
 
 jest.mock('./ResultSet');
 beforeEach(() => {
@@ -203,9 +203,9 @@ const mockData = {
   }],
 };
 
-describe('CubejsApi', () => {
-  test('CubejsApi#loadResponseInternal should work with the "default" resType for regular query', () => {
-    const api = new CubejsApi(undefined, {
+describe('CubeApi', () => {
+  test('CubeApi#loadResponseInternal should work with the "default" resType for regular query', () => {
+    const api = new CubeApi(undefined, {
       apiUrl: 'http://localhost:4000/cubejs-api/v1',
     });
     const income = {
@@ -236,8 +236,8 @@ describe('CubejsApi', () => {
     });
   });
 
-  test('CubejsApi#loadResponseInternal should work with the "default" resType for compare date range query', () => {
-    const api = new CubejsApi(undefined, {
+  test('CubeApi#loadResponseInternal should work with the "default" resType for compare date range query', () => {
+    const api = new CubeApi(undefined, {
       apiUrl: 'http://localhost:4000/cubejs-api/v1',
     });
     const income = {
@@ -282,8 +282,8 @@ describe('CubejsApi', () => {
     });
   });
 
-  test('CubejsApi#loadResponseInternal should work with the "default" resType for blending query', () => {
-    const api = new CubejsApi(undefined, {
+  test('CubeApi#loadResponseInternal should work with the "default" resType for blending query', () => {
+    const api = new CubeApi(undefined, {
       apiUrl: 'http://localhost:4000/cubejs-api/v1',
     });
     const income = {
@@ -328,8 +328,8 @@ describe('CubejsApi', () => {
     });
   });
 
-  test('CubejsApi#loadResponseInternal should work with the "compact" resType for regular query', () => {
-    const api = new CubejsApi(undefined, {
+  test('CubeApi#loadResponseInternal should work with the "compact" resType for regular query', () => {
+    const api = new CubeApi(undefined, {
       apiUrl: 'http://localhost:4000/cubejs-api/v1',
     });
     const income = {
@@ -360,8 +360,8 @@ describe('CubejsApi', () => {
     });
   });
 
-  test('CubejsApi#loadResponseInternal should work with the "compact" resType for compare date range query', () => {
-    const api = new CubejsApi(undefined, {
+  test('CubeApi#loadResponseInternal should work with the "compact" resType for compare date range query', () => {
+    const api = new CubeApi(undefined, {
       apiUrl: 'http://localhost:4000/cubejs-api/v1',
     });
     const income = {
@@ -406,8 +406,8 @@ describe('CubejsApi', () => {
     });
   });
 
-  test('CubejsApi#loadResponseInternal should work with the "compact" resType for blending query', () => {
-    const api = new CubejsApi(undefined, {
+  test('CubeApi#loadResponseInternal should work with the "compact" resType for blending query', () => {
+    const api = new CubeApi(undefined, {
       apiUrl: 'http://localhost:4000/cubejs-api/v1',
     });
     const income = {

package/src/index.umd.js

@@ -1,8 +1,8 @@
-import cubejs from './index';
+import cube from './index';
 import * as clientCoreExports from './index';
 
 Object.keys(clientCoreExports).forEach((key) => {
-  cubejs[key] = clientCoreExports[key];
+  cube[key] = clientCoreExports[key];
 });
 
-export default cubejs;
+export default cube;

package/src/utils.js

@@ -288,10 +288,17 @@ export function movePivotItem(
   if (id === 'measures') {
     destinationIndex = lastIndex + 1;
   } else if (
+    sourceAxis === destinationAxis &&
     destinationIndex >= lastIndex &&
     nextPivotConfig[destinationAxis][lastIndex] === 'measures'
   ) {
     destinationIndex = lastIndex - 1;
+  } else if (
+    sourceAxis !== destinationAxis &&
+    destinationIndex > lastIndex &&
+    nextPivotConfig[destinationAxis][lastIndex] === 'measures'
+  ) {
+    destinationIndex = lastIndex;
   }
 
   nextPivotConfig[sourceAxis].splice(sourceIndex, 1);