@cubejs-client/react 0.28.33 → 0.28.38

package/index.d.ts

@@ -318,6 +318,7 @@ declare module '@cubejs-client/react' {
     timeDimensions: AvailableCube<TCubeDimension>[];
   };
 
+  // todo: CubeMember
   export type AvailableCube<T = any> = {
     cubeName: string;
     cubeTitle: string;
@@ -459,6 +460,8 @@ declare module '@cubejs-client/react' {
    */
   type CubeFetchOptions = {
     skip?: boolean;
+    cubejsApi?: CubejsApi;
+    query?: Query;
   };
 
   /**
@@ -502,6 +505,8 @@ declare module '@cubejs-client/react' {
     sql: string;
   };
 
+  export function useCubeMeta(options?: Omit<CubeFetchOptions, 'query'>): CubeFetchResult<Meta>;
+
   /**
    * @hidden
    */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cubejs-client/react",
-  "version": "0.28.33",
+  "version": "0.28.38",
   "author": "Cube Dev, Inc.",
   "license": "MIT",
   "engines": {},
@@ -24,7 +24,7 @@
   ],
   "dependencies": {
     "@babel/runtime": "^7.1.2",
-    "@cubejs-client/core": "^0.28.25",
+    "@cubejs-client/core": "^0.28.38",
     "anser": "^2.0.1",
     "core-js": "^3.6.5",
     "html-entities": "^2.3.2",
@@ -44,5 +44,5 @@
   "peerDependencies": {
     "react": ">=16.10.2"
   },
-  "gitHead": "1ff7d93b9f5029136cccdf9ae747ba6bb493babf"
+  "gitHead": "b6ac84b0ec679a40886a19e85d24619e0ca6a2ec"
 }

package/src/hooks/cube-fetch.js

@@ -22,22 +22,23 @@ export function useCubeFetch(method, options = {}) {
     const cubejsApi = options.cubejsApi || context?.cubejsApi;
     const query = loadOptions.query || options.query;
 
-    if (!cubejsApi) {
-      throw new Error('Cube.js API client is not provided');
-    }
+    const queryCondition = method === 'meta' ? true : query && isQueryPresent(query);
 
-    if ((ignoreSkip || !skip) && query && isQueryPresent(query)) {
+    if (cubejsApi && (ignoreSkip || !skip) && queryCondition) {
       setError(null);
       setResponse({
         isLoading: true,
         response: null,
       });
 
+      const coreOptions = {
+        mutexObj: mutexRef.current,
+        mutexKey: method,
+      };
+      const args = method === 'meta' ? [coreOptions] : [query, coreOptions];
+
       try {
-        const response = await cubejsApi[method](query, {
-          mutexObj: mutexRef.current,
-          mutexKey: method,
-        });
+        const response = await cubejsApi[method](...args);
 
         if (isMounted()) {
           setResponse({
@@ -45,9 +46,9 @@ export function useCubeFetch(method, options = {}) {
             isLoading: false,
           });
         }
-      } catch (err) {
+      } catch (error) {
         if (isMounted()) {
-          setError(err);
+          setError(error);
           setResponse({
             isLoading: false,
             response: null,

package/src/hooks/cube-meta.js

@@ -0,0 +1,5 @@
+import { useCubeFetch } from './cube-fetch';
+
+export function useCubeMeta(options = {}) {
+  return useCubeFetch('meta', options);
+}

package/src/hooks/dry-run.js

@@ -3,6 +3,6 @@ import { useCubeFetch } from './cube-fetch';
 export function useDryRun(query, options = {}) {
   return useCubeFetch('dryRun', {
     ...options,
-    query
-  })
+    query,
+  });
 }

package/src/index.js

@@ -8,6 +8,7 @@ export * from './hooks/cube-sql';
 export * from './hooks/dry-run';
 export * from './hooks/lazy-dry-run';
 export * from './hooks/cube-query';
+export * from './hooks/cube-meta';
 export {
   QueryRenderer,
   QueryRendererWithTotals,

package/src/utils.js

@@ -77,9 +77,19 @@ export function generateAnsiHTML(txt) {
 }
 
 export function removeEmpty(obj) {
+  if (typeof obj !== 'object') {
+    return obj;
+  }
+
   return Object.fromEntries(
     Object.entries(obj)
       .filter(([, v]) => v != null)
-      .map(([k, v]) => [k, typeof v === 'object' && !Array.isArray(v) ? removeEmpty(v) : v])
+      .map(([k, v]) => {
+        if (Array.isArray(v)) {
+          return [k, v.map(removeEmpty)];
+        }
+
+        return [k, typeof v === 'object' ? removeEmpty(v) : v];
+      })
   );
 }