@sisense/sdk-cli 1.13.0 → 1.15.0

package/dist/commands/get-api-token.js

@@ -29,7 +29,7 @@ const handler = async (options) => {
     if (username && !password) {
         ({ maskedPassword: password } = await promptPasswordInteractive(username));
     }
-    const httpClient = getHttpClient(url, username, password);
+    const httpClient = getHttpClient({ url, username, password });
     try {
         await handleHttpClientLogin(httpClient);
         trackExecution(httpClient, command, options);

package/dist/commands/get-data-model.js

@@ -70,7 +70,7 @@ export const getDataModel = async (options, commandName) => {
     if (username && !password) {
         ({ maskedPassword: password } = await promptPasswordInteractive(username));
     }
-    const httpClient = getHttpClient(url, username, password, token, wat);
+    const httpClient = getHttpClient({ url, username, password, token, wat });
     try {
         await handleHttpClientLogin(httpClient);
         trackExecution(httpClient, commandName, options);

package/dist/commands/helpers.d.ts

@@ -2,7 +2,14 @@ import { HttpClient } from '@sisense/sdk-rest-client';
 import { DataModel } from '@sisense/sdk-data';
 import { DataSourceField } from '@sisense/sdk-query-client';
 import { DataSourceSchemaDataset } from '../types.js';
-declare function getHttpClient(url: string, username?: string, password?: string, token?: string, wat?: string): HttpClient;
+declare type HttpClientConfig = {
+    url: string;
+    username?: string;
+    password?: string;
+    token?: string;
+    wat?: string;
+};
+declare function getHttpClient({ url, username, password, token, wat }: HttpClientConfig): HttpClient;
 export declare const handleHttpClientLogin: (httpClient: HttpClient) => Promise<void>;
 /**
  * Create a data model for a Sisense data source

package/dist/commands/helpers.js

@@ -1,11 +1,4 @@
-/* eslint-disable max-params */
-/* eslint-disable @typescript-eslint/restrict-template-expressions */
-/* eslint-disable @typescript-eslint/no-unsafe-member-access */
-/* eslint-disable @typescript-eslint/no-unsafe-assignment */
-/* eslint-disable @typescript-eslint/no-unsafe-call */
-/* eslint-disable @typescript-eslint/no-unsafe-return */
-/* eslint-disable @typescript-eslint/no-unsafe-argument */
-import { HttpClient, getAuthenticator, WatAuthenticator, BearerAuthenticator, } from '@sisense/sdk-rest-client';
+import { HttpClient, getAuthenticator, isBearerAuthenticator, isWatAuthenticator, } from '@sisense/sdk-rest-client';
 import { MetadataTypes } from '@sisense/sdk-data';
 import { writeTypescript, writeJavascript } from '@sisense/sdk-modeling';
 import path from 'path';
@@ -13,8 +6,8 @@ import levenshtein from 'js-levenshtein';
 import { DimensionalQueryClient, } from '@sisense/sdk-query-client';
 import { PKG_VERSION } from '../package-version.js';
 import { trackCliError } from '@sisense/sdk-tracking';
-function getHttpClient(url, username, password, token, wat) {
-    const auth = getAuthenticator(url, username, password, token, wat, false);
+function getHttpClient({ url, username, password, token, wat }) {
+    const auth = getAuthenticator({ url, username, password, token, wat });
     if (!auth) {
         throw new Error('Invalid authentication method');
     }
@@ -25,8 +18,7 @@ export const handleHttpClientLogin = async (httpClient) => {
     try {
         const isLoggedIn = await httpClient.login();
         if (!isLoggedIn) {
-            console.log(`Failed. ${httpClient.auth instanceof WatAuthenticator ||
-                httpClient.auth instanceof BearerAuthenticator
+            console.log(`Failed. ${isWatAuthenticator(httpClient.auth) || isBearerAuthenticator(httpClient.auth)
                 ? 'Double-check your token'
                 : 'Wrong credentials'}.\r\n`);
         }
@@ -34,9 +26,8 @@ export const handleHttpClientLogin = async (httpClient) => {
     }
     catch (err) {
         console.log(`Error connecting to ${httpClient.url}. \r\n${err}\r\n`);
-        return Promise.reject();
+        throw err;
     }
-    return Promise.resolve();
 };
 async function retrieveDataSource(queryClient, dataSourceTitle) {
     console.log('Getting data source... ');
@@ -70,7 +61,9 @@ async function retrieveDataFields(queryClient, dataSourceTitle) {
     try {
         // get the schema of the data source to add descriptions to the fields
         const dataSourceSchema = await queryClient.getDataSourceSchema(dataSourceTitle);
-        return addDescriptionToFields(fields, dataSourceSchema.datasets);
+        return dataSourceSchema?.datasets
+            ? addDescriptionToFields(fields, dataSourceSchema.datasets)
+            : fields;
     }
     catch (error) {
         if (error.status === '403') {

package/dist/package-version.d.ts

@@ -1 +1 @@
-export declare const PKG_VERSION = "1.13.0";
+export declare const PKG_VERSION = "1.15.0";

package/dist/package-version.js

@@ -1 +1 @@
-export const PKG_VERSION = "1.13.0";
+export const PKG_VERSION = "1.15.0";

package/dist/tracking.js

@@ -11,5 +11,5 @@ export const trackExecution = (httpClient, commandName, args) => {
             .join(', '),
     };
     const action = TrackingActions.Execution;
-    void trackProductEvent(action, payload, httpClient).catch((e) => console.log(`An error occurred when sending the ${action} event`, e));
+    trackProductEvent(action, payload, httpClient);
 };

package/package.json

@@ -11,7 +11,7 @@
     "Sisense",
     "Compose SDK"
   ],
-  "version": "1.13.0",
+  "version": "1.15.0",
   "type": "module",
   "exports": "./dist/index.js",
   "main": "./dist/index.js",
@@ -20,12 +20,12 @@
   "license": "SEE LICENSE IN LICENSE.md",
   "bin": "./dist/index.js",
   "dependencies": {
-    "@sisense/sdk-common": "^1.13.0",
-    "@sisense/sdk-data": "^1.13.0",
-    "@sisense/sdk-modeling": "^1.13.0",
-    "@sisense/sdk-query-client": "^1.13.0",
-    "@sisense/sdk-rest-client": "^1.13.0",
-    "@sisense/sdk-tracking": "^1.13.0",
+    "@sisense/sdk-common": "^1.15.0",
+    "@sisense/sdk-data": "^1.15.0",
+    "@sisense/sdk-modeling": "^1.15.0",
+    "@sisense/sdk-query-client": "^1.15.0",
+    "@sisense/sdk-rest-client": "^1.15.0",
+    "@sisense/sdk-tracking": "^1.15.0",
     "cross-fetch": "^4.0.0",
     "inquirer": "^8.1.2",
     "js-levenshtein": "^1.1.6",