@vizzly/api-client 0.0.45 → 0.0.46

package/dist/models/Authentication.d.ts

@@ -4,11 +4,13 @@ export declare class Authentication {
     constructor(authParams: AuthParams);
     updateAuthParams(authParams: Partial<AuthParams>): void;
     clearAuthParams(): void;
+    getQueryEngineApiKey(): string;
     getQueryEngineAccessToken(): string;
     getProjectAdminOverrideToken(): string | undefined;
     getDashboardAccessToken(): string;
     getAppSessionToken(): string | undefined;
-    getDataAccessToken(): string;
+    hasDataAccessToken(): boolean;
+    getDataAccessToken(): string | undefined;
     getProjectApiKey(): string;
     getProjectAccessToken(): string;
     buildAuthHeaders(acceptedAuthParams: Request<{}>['acceptedAuthParams']): {

package/dist/models/Authentication.js

@@ -13,6 +13,11 @@ class Authentication {
     clearAuthParams() {
         this.authParams = {};
     }
+    getQueryEngineApiKey() {
+        if (!this.authParams.queryEngineApiKey)
+            throw new MissingAuthParameter_1.MissingAuthParameter('queryEngineApiKey');
+        return this.authParams.queryEngineApiKey;
+    }
     getQueryEngineAccessToken() {
         if (!this.authParams.queryEngineAccessToken)
             throw new MissingAuthParameter_1.MissingAuthParameter('queryEngineAccessToken');
@@ -29,8 +34,11 @@ class Authentication {
     getAppSessionToken() {
         return this.authParams.appSessionToken;
     }
+    hasDataAccessToken() {
+        return !!this.authParams.dataAccessToken;
+    }
     getDataAccessToken() {
-        if (!this.authParams.dataAccessToken)
+        if (!this.hasDataAccessToken())
             throw new MissingAuthParameter_1.MissingAuthParameter('dataAccessToken');
         return this.authParams.dataAccessToken;
     }
@@ -51,6 +59,11 @@ class Authentication {
                 auth: `Bearer ${usableAuthParams.dashboardAccessToken}`,
             };
         }
+        if (usableAuthParams.queryEngineApiKey) {
+            return {
+                'Config-Api-Key': usableAuthParams.queryEngineApiKey,
+            };
+        }
         // If a project access token has been set on the config, use that instead
         // of fetching one. This is most likely used on the managed query-engine where we
         // pass the project access token through in a request header.

package/dist/models/VizzlyQueryEngineApi.d.ts

@@ -1,6 +1,8 @@
 import { Api } from './Api';
 import { Authentication } from './Authentication';
 import { nVizzlyQueryEngine, Request, extraHeaders, CreateDashboardParams, UpdateDashboardParams, UpdateGlobalLibraryParams, GlobalLibrary, CreateGlobalLibraryParams, GlobalLibraryPermissionFromAPI, RequestParams } from '../types';
+import { nSemanticLayer } from '@vizzly/semantic-layer-public';
+import { SQLSchema } from '@vizzly/sqlbuilder-public';
 export declare class VizzlyQueryEngineApi extends Api {
     constructor(auth: Authentication, host: string, extraHeaders?: extraHeaders);
     buildCreateDashboardRequest(params: RequestParams<CreateDashboardParams>): Request<CreateDashboardParams & {
@@ -23,8 +25,19 @@ export declare class VizzlyQueryEngineApi extends Api {
     }>): Request<{}>;
     createConfigFromUpload(createConfigFromUploadParams: RequestParams<nVizzlyQueryEngine.CreateConfigFromUploadParams>): Promise<import("../types").Response<unknown>>;
     private buildCreateConfigFromUploadRequest;
-    createResults(params: RequestParams<nVizzlyQueryEngine.CreateResultsParams>): Promise<import("../types").Response<unknown>>;
+    createResults(params: RequestParams<nVizzlyQueryEngine.CreateResultsParams>, versionOverride?: 'v1' | 'v2'): Promise<import("../types").Response<{
+        results: Array<nSemanticLayer.Result>;
+    }>>;
     private buildCreateResultsRequest;
+    collectSchema(params: RequestParams<nVizzlyQueryEngine.CollectSchemaParams>): Promise<import("../types").Response<{
+        schemaByConnection: {
+            [connectionId: string]: {
+                /** ID of the connection */
+                id: string;
+            } & SQLSchema;
+        };
+    }>>;
+    private buildCollectSchemaRequest;
     createSqlPreview(params: RequestParams<nVizzlyQueryEngine.CreateSqlPreviewParams>): Promise<import("../types").Response<{
         message: string;
     }>>;

package/dist/models/VizzlyQueryEngineApi.js

@@ -88,21 +88,41 @@ class VizzlyQueryEngineApi extends Api_1.Api {
             },
         };
     }
-    createResults(params) {
-        return __awaiter(this, void 0, void 0, function* () {
-            return yield this.execute(this.buildCreateResultsRequest(params));
+    createResults(params_1) {
+        return __awaiter(this, arguments, void 0, function* (params, versionOverride = 'v2') {
+            return yield this.execute(this.buildCreateResultsRequest(params, versionOverride));
         });
     }
-    buildCreateResultsRequest(params) {
+    buildCreateResultsRequest(params, versionOverride) {
         return {
-            path: `/api/v1/create-results`,
+            path: `/api/${versionOverride}/create-results`,
             method: 'post',
             abortSignal: params.abortSignal,
             body: {
                 queries: params.queries,
+                dynamicConfig: params.dynamicConfig,
+                identityConfigIntegritySignature: this.auth.hasDataAccessToken() ? this.auth.getDataAccessToken() : undefined,
+                secureFilters: params.secureFilters,
                 virtualFields: {},
-                identityConfigIntegritySignature: this.auth.getDataAccessToken(),
             },
+            acceptedAuthParams: ['queryEngineApiKey', 'dashboardAccessToken'],
+        };
+    }
+    collectSchema(params) {
+        return __awaiter(this, void 0, void 0, function* () {
+            return yield this.execute(this.buildCollectSchemaRequest(params));
+        });
+    }
+    buildCollectSchemaRequest(params) {
+        return {
+            path: `/api/v1/schema`,
+            method: 'post',
+            abortSignal: params.abortSignal,
+            body: {
+                allowedConfigOrigins: params.allowedConfigOrigins,
+                dynamicConfig: params.dynamicConfig,
+            },
+            acceptedAuthParams: ['queryEngineApiKey'],
         };
     }
     createSqlPreview(params) {

package/dist/types.d.ts

@@ -7,6 +7,8 @@ export * from './types/dashboard';
 export * from './types/project';
 export * from './types/team';
 export * from './types/user';
+import { DataAccessConfig } from '@vizzly/auth';
+import { nSemanticLayer, OriginId } from '@vizzly/semantic-layer-public';
 export type PartialBy<T, K extends keyof T> = Omit<T, K> & Partial<Pick<T, K>>;
 export type UpdateDashboardResponseBody = {
     dashboard: DashboardFromAPI;
@@ -86,6 +88,7 @@ export type AuthParams = {
     dataAccessToken?: string;
     projectApiKey?: string;
     appSessionToken?: string;
+    queryEngineApiKey?: string;
 };
 export declare namespace nVizzlyQueryEngine {
     type CreateConfigFromUploadParams = {
@@ -94,6 +97,12 @@ export declare namespace nVizzlyQueryEngine {
     };
     type CreateResultsParams = {
         queries: any;
+        dynamicConfig?: nSemanticLayer.Config;
+        secureFilters?: DataAccessConfig['secureFilters'];
+    };
+    type CollectSchemaParams = {
+        allowedConfigOrigins: OriginId[];
+        dynamicConfig?: nSemanticLayer.Config;
     };
     type CreateSqlPreviewParams = {
         sql: string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vizzly/api-client",
-  "version": "0.0.45",
+  "version": "0.0.46",
   "private": false,
   "license": "NONE",
   "source": "src/index.ts",
@@ -14,7 +14,7 @@
     "@types/jest": "^29.5.12",
     "@types/lodash": "^4.17.0",
     "@types/uuid": "^9.0.8",
-    "@vizzly/auth": "^0.2.8",
+    "@vizzly/auth": "^0.2.16",
     "jest": "^29.6.0",
     "lodash": "^4.17.21",
     "nock": "^13.5.4",
@@ -33,6 +33,8 @@
     "prepublish": "yarn build"
   },
   "dependencies": {
+    "@vizzly/semantic-layer-public": "^0.0.228",
+    "@vizzly/sqlbuilder-public": "^0.1.33",
     "cross-fetch": "^4.0.0"
   }
 }