@contrail/cli 3.6.0-alpha-8-alpha.fb40acc → 3.6.0-alpha-8-alpha.2c2e640

package/README.md

@@ -17,7 +17,7 @@ $ npm install -g @contrail/cli
 $ contrail COMMAND
 running command...
 $ contrail (--version)
-@contrail/cli/3.6.0-alpha-8-alpha.fb40acc linux-x64 node-v24.21.0
+@contrail/cli/3.6.0-alpha-8-alpha.2c2e640 linux-x64 node-v24.21.0
 $ contrail --help [COMMAND]
 USAGE
   $ contrail COMMAND

package/dist/auth/login.js

@@ -161,7 +161,7 @@ async function refreshCurrentUserOrg() {
     const currentUser = await (0, sdk_1.getCurrentUser)().catch((e) => {
         console.error('error getting current user', e.message);
         if (isExpiredTokenError(e)) {
-            console.error('access token expired; attempting refresh');
+            console.log('try frefreshing');
             return;
         }
         throw e;
@@ -176,8 +176,7 @@ async function refreshCurrentUserOrg() {
                 apiGateway: config.apiGateway,
                 orgSlug: config.orgSlug,
             };
-            (0, sdk_1.setConfig)(sdk_1.Auth.config);
-            console.error('fetched new access token from refresh token');
+            console.log('fetched new access token from refresh token', newVibeAccessToken);
         }
         catch (e) {
             throw Error(`Could not get refresh token: ${e}`);
@@ -216,11 +215,9 @@ async function requestRefreshedAccessToken(vibeRefreshToken, apiGateway) {
         },
         body: JSON.stringify({ refreshToken: vibeRefreshToken }),
     });
-    const data = await response.json();
-    if (!response.ok || !data.accessToken) {
-        throw new Error(`jwt_refresh returned ${response.status} with no access token`);
-    }
-    return data.accessToken;
+    return await response.json().then((data) => {
+        return data.accessToken;
+    });
 }
 function getVersionFromPackageJson() {
     // Get the path to the package.json file

package/dist/commands/app/getApiKey.js

@@ -35,7 +35,7 @@ class GetAPIKeyApp extends basecommand_1.BaseCommand {
                 },
             ];
             const answers = await inquirer_1.default.prompt(questions);
-            this.log(`App API key: (app:${answers.appApiKey})`);
+            logger_1.default.info(`App API key: (app:${answers.appApiKey})`);
         }
         else {
             const appFound = installedApps.find((x) => x.app.identifier === this.flags.appIdentifier);
@@ -43,7 +43,7 @@ class GetAPIKeyApp extends basecommand_1.BaseCommand {
                 logger_1.default.info('You do not have such an app installed');
                 return;
             }
-            this.log(`App API key: (app:${appFound.apiKey.apiKey})`);
+            logger_1.default.info(`App API key: (app:${appFound.apiKey.apiKey})`);
         }
     }
 }

package/dist/commands/entities/delete.js

@@ -91,8 +91,8 @@ class DeleteEntity extends basecommand_1.BaseCommand {
                 console.error('deleted entities:');
             }
             this.log(JSON.stringify(response, null, 2));
-            if (response.failed.length > 0) {
-                console.error(`${response.failed.length} of ${ids.length} deletes failed.`);
+            if (response.idsErrored.length > 0) {
+                console.error(`${response.idsErrored.length} of ${ids.length} deletes failed.`);
                 process.exitCode = 1;
             }
         }
@@ -103,26 +103,32 @@ class DeleteEntity extends basecommand_1.BaseCommand {
 }
 exports.default = DeleteEntity;
 async function deleteEntityByIds(entityName, ids, routing = {}) {
-    const deletedIds = [];
-    const notFoundIds = [];
-    const failed = [];
+    const idsDeleted = new Set();
+    const idsNotFound = new Set();
+    const idsErrored = new Set();
     const limit = (0, p_limit_1.default)(10);
     const deletePromises = ids.map((id) => limit(() => deleteEntityById(entityName, id, routing).then((entity) => {
         if (!entity) {
-            notFoundIds.push(id);
-            return;
+            idsNotFound.add(id);
+            return null;
         }
-        deletedIds.push(id);
+        idsDeleted.add(id);
+        return entity;
     }, (error) => {
         if (error.message.includes('not found')) {
-            notFoundIds.push(id);
+            idsNotFound.add(id);
         }
         else {
-            failed.push({ id, error: (0, common_1.sdkErrorMessage)(error) });
+            idsErrored.add(id);
         }
+        return null;
     })));
     await Promise.all(deletePromises);
-    return { deletedIds, notFoundIds, failed };
+    return {
+        idsDeleted: Array.from(idsDeleted),
+        idsNotFound: Array.from(idsNotFound),
+        idsErrored: Array.from(idsErrored),
+    };
 }
 async function deleteEntityById(entityName, id, routing = {}) {
     const client = new sdk_1.Entities();

package/dist/commands/entities/get.js

@@ -224,9 +224,8 @@ async function find(entityName, options = {}) {
         queryOptions.customParams = { propertySlugs: propertySlugs.join(',') };
     }
     const payload = id ? { id, ...queryOptions } : { criteria, ...queryOptions };
-    // a suffix names a specific sub-route and an id names one entity; both always go
-    // through the plain client (batch-fetch only understands criteria)
-    if ((0, batchFetch_1.canBatchFetchEntity)(entityName) && !suffix && !id) {
+    // a suffix names a specific sub-route, so it always goes through the plain client
+    if ((0, batchFetch_1.canBatchFetchEntity)(entityName) && !suffix) {
         return (0, batchFetch_1.batchFetch)(entityName, payload);
     }
     else {

package/oclif.manifest.json

@@ -1,5 +1,5 @@
 {
-  "version": "3.6.0-alpha-8-alpha.fb40acc",
+  "version": "3.6.0-alpha-8-alpha.2c2e640",
   "commands": {
     "app:create": {
       "id": "app:create",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@contrail/cli",
-  "version": "3.6.0-alpha-8-alpha.fb40acc",
+  "version": "3.6.0-alpha-8-alpha.2c2e640",
   "description": "VibeIQ's Contrail Platform CLI.",
   "bin": {
     "contrail-cli": "./bin/run",