@sisense/sdk-cli 2.21.0 → 2.23.0

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

@@ -1,5 +1,5 @@
 import { trackExecution } from '../tracking.js';
-import { getHttpClient, handleHttpClientLogin } from './helpers.js';
+import { getHttpClient } from './helpers.js';
 import { promptPasswordInteractive } from './prompts.js';
 const command = 'get-api-token';
 const describe = 'Get an API token from the given Sisense URL using the provided credentials.';
@@ -29,9 +29,8 @@ const handler = async (options) => {
     if (username && !password) {
         ({ maskedPassword: password } = await promptPasswordInteractive(username));
     }
-    const httpClient = getHttpClient({ url, username, password });
     try {
-        await handleHttpClientLogin(httpClient);
+        const httpClient = await getHttpClient({ url, username, password });
         trackExecution(httpClient, command, options);
         const response = await httpClient.get('/api/v1/authentication/tokens/api');
         console.log(response);

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

@@ -1,5 +1,5 @@
 import { trackExecution } from '../tracking.js';
-import { createDataModel, getFilePathInfo, getHttpClient, handleHttpClientLogin, isSupportedOutputFile, writeFile, } from './helpers.js';
+import { createDataModel, getFilePathInfo, getHttpClient, isSupportedOutputFile, writeFile, } from './helpers.js';
 import { promptPasswordInteractive } from './prompts.js';
 const command = 'get-data-model';
 const describe = 'Write the TypeScript or JavaScript representation of a data model from the given Sisense URL and data source';
@@ -70,9 +70,8 @@ export const getDataModel = async (options, commandName) => {
     if (username && !password) {
         ({ maskedPassword: password } = await promptPasswordInteractive(username));
     }
-    const httpClient = getHttpClient({ url, username, password, token, wat });
     try {
-        await handleHttpClientLogin(httpClient);
+        const httpClient = await getHttpClient({ url, username, password, token, wat });
         trackExecution(httpClient, commandName, options);
         await createDataModel(httpClient, dataSource).then((model) => {
             return writeFile(model, outputInfo);

package/dist/commands/helpers.d.ts

@@ -8,7 +8,7 @@ declare type HttpClientConfig = {
     token?: string;
     wat?: string;
 };
-declare function getHttpClient({ url, username, password, token, wat }: HttpClientConfig): HttpClient;
+declare function getHttpClient({ url, username, password, token, wat }: HttpClientConfig): Promise<HttpClient>;
 export declare const handleHttpClientLogin: (httpClient: HttpClient) => Promise<void>;
 /**
  * Create a data model for a Sisense data source

package/dist/commands/helpers.js

@@ -1,17 +1,28 @@
+import { levenshtein } from '@sisense/sdk-common';
 import { MetadataTypes } from '@sisense/sdk-data';
 import { writeJavascript, writeTypescript } from '@sisense/sdk-modeling';
 import { DimensionalQueryClient } from '@sisense/sdk-query-client';
 import { getAuthenticator, HttpClient, isBearerAuthenticator, isWatAuthenticator, } from '@sisense/sdk-rest-client';
 import { trackCliError } from '@sisense/sdk-tracking';
-import levenshtein from 'js-levenshtein';
 import path from 'path';
 import { PKG_VERSION } from '../package-version.js';
-function getHttpClient({ url, username, password, token, wat }) {
+async function getHttpClient({ url, username, password, token, wat }) {
     const auth = getAuthenticator({ url, username, password, token, wat });
     if (!auth) {
         throw new Error('Invalid authentication method');
     }
-    return new HttpClient(url, auth, 'sdk-cli' + (PKG_VERSION ? `-${PKG_VERSION}` : ''));
+    const env = 'sdk-cli' + (PKG_VERSION ? `-${PKG_VERSION}` : '');
+    let httpClient = new HttpClient(url, auth, env);
+    await handleHttpClientLogin(httpClient);
+    const systemSettings = await httpClient.get('api/v1/settings/system');
+    if (systemSettings?.tracking?.apiTelemetry) {
+        httpClient = new HttpClient(url, auth, env, {
+            'x-sisense-origin': 'sdk-cli',
+            'x-sisense-sdk': 'csdk-sdk-cli',
+        });
+        await handleHttpClientLogin(httpClient);
+    }
+    return httpClient;
 }
 export const handleHttpClientLogin = async (httpClient) => {
     console.log('Logging in... ');

package/dist/package-version.d.ts

@@ -1 +1 @@
-export declare const PKG_VERSION = "2.21.0";
+export declare const PKG_VERSION = "2.23.0";

package/dist/package-version.js

@@ -1 +1 @@
-export const PKG_VERSION = "2.21.0";
+export const PKG_VERSION = "2.23.0";

package/package.json

@@ -11,7 +11,7 @@
     "Sisense",
     "Compose SDK"
   ],
-  "version": "2.21.0",
+  "version": "2.23.0",
   "type": "module",
   "exports": "./dist/index.js",
   "main": "./dist/index.js",
@@ -20,15 +20,14 @@
   "license": "SEE LICENSE IN LICENSE.md",
   "bin": "./dist/index.js",
   "dependencies": {
-    "@sisense/sdk-common": "2.21.0",
-    "@sisense/sdk-data": "2.21.0",
-    "@sisense/sdk-modeling": "2.21.0",
-    "@sisense/sdk-query-client": "2.21.0",
-    "@sisense/sdk-rest-client": "2.21.0",
-    "@sisense/sdk-tracking": "2.21.0",
+    "@sisense/sdk-common": "2.23.0",
+    "@sisense/sdk-data": "2.23.0",
+    "@sisense/sdk-modeling": "2.23.0",
+    "@sisense/sdk-query-client": "2.23.0",
+    "@sisense/sdk-rest-client": "2.23.0",
+    "@sisense/sdk-tracking": "2.23.0",
     "cross-fetch": "^4.0.0",
     "inquirer": "^8.1.2",
-    "js-levenshtein": "^1.1.6",
     "node-window-polyfill": "^1.0.2",
     "yargs": "17.7.1"
   },
@@ -56,7 +55,6 @@
   "devDependencies": {
     "@babel/preset-env": "^7.20.2",
     "@types/inquirer": "8.2.6",
-    "@types/js-levenshtein": "^1.1.3",
     "@types/yargs": "^17.0.22",
     "@vitest/coverage-istanbul": "3.2.4",
     "eslint": "^8.40.0",