@contrail/cli 3.6.0-alpha-8-alpha.afa500a → 3.6.0-alpha-8-alpha.fb40acc

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.afa500a linux-x64 node-v24.21.0
+@contrail/cli/3.6.0-alpha-8-alpha.fb40acc linux-x64 node-v24.21.0
 $ contrail --help [COMMAND]
 USAGE
   $ contrail COMMAND
@@ -686,7 +686,7 @@ Update an entity
 
 ```
 USAGE
-  $ contrail entities update ENTITYNAME [IDS] [-l error|warn|info|debug] [-e true|false] [-S] [-d] [-i <value>] [-F]
+  $ contrail entities update ENTITYNAME [IDS] [-l error|warn|info|debug] [-e true|false] [-S] [-d] [-i <value>]
     [--suffix <value>] [--apiVersion 1|2]
 
 ARGUMENTS
@@ -694,12 +694,11 @@ ARGUMENTS
   IDS         One or more entity ids to update
 
 FLAGS
-  -F, --force                      Force update without validation. Internal use only
   -S, --skipHydrateRelationships   Skip hydrating relationships when updating the entity
-  -d, --dryRun                     If true, does not create the entity but simulates the creation
+  -d, --dryRun                     If true, does not update the entities but simulates the update
   -e, --alwaysConfirmEnv=<option>  [default: true] The Environment variables
                                    <options: true|false>
-  -i, --inputFile=<value>          File containing properties to update the entity (optional)
+  -i, --inputFile=<value>          A file with a JSON array of {id, ...} objects; each object is one entity to update.
   -l, --logLevel=<option>          The Log Level
                                    <options: error|warn|info|debug>
   --apiVersion=<option>            Api-Version header to send; selects the V1 or V2 variant of the endpoint

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.log('try frefreshing');
+            console.error('access token expired; attempting refresh');
             return;
         }
         throw e;
@@ -176,7 +176,8 @@ async function refreshCurrentUserOrg() {
                 apiGateway: config.apiGateway,
                 orgSlug: config.orgSlug,
             };
-            console.log('fetched new access token from refresh token', newVibeAccessToken);
+            (0, sdk_1.setConfig)(sdk_1.Auth.config);
+            console.error('fetched new access token from refresh token');
         }
         catch (e) {
             throw Error(`Could not get refresh token: ${e}`);
@@ -215,9 +216,11 @@ async function requestRefreshedAccessToken(vibeRefreshToken, apiGateway) {
         },
         body: JSON.stringify({ refreshToken: vibeRefreshToken }),
     });
-    return await response.json().then((data) => {
-        return data.accessToken;
-    });
+    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;
 }
 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);
-            logger_1.default.info(`App API key: (app:${answers.appApiKey})`);
+            this.log(`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;
             }
-            logger_1.default.info(`App API key: (app:${appFound.apiKey.apiKey})`);
+            this.log(`App API key: (app:${appFound.apiKey.apiKey})`);
         }
     }
 }

package/dist/commands/entities/create.js

@@ -290,8 +290,6 @@ class CreateEntity extends basecommand_1.BaseCommand {
     }
 }
 exports.default = CreateEntity;
-// Every row is attempted; a failed row never stops the run. The summary pairs
-// each failed input with its error so the failed rows can be retried as-is.
 function summarizeSettledCreates(inputs, settled) {
     const created = [];
     const failed = [];
@@ -538,9 +536,7 @@ function castValueToPropertyType(value, propertyType) {
             if (Array.isArray(value)) {
                 return value;
             }
-            // Migration hazard: the old comma syntax parses as one string with a
-            // comma in it. Warn with the repeated-key equivalent instead of
-            // guessing at a split.
+            // the old comma syntax parses as one literal value; warn instead of guessing at a split
             if (typeof value === 'string' && value.includes(',')) {
                 console.error(`Value "${value}" for a multi-value property contains a comma and is treated as one literal value. To pass several values, repeat the key: slug=${value
                     .split(',')

package/dist/commands/entities/create.spec.js

@@ -333,8 +333,6 @@ describe('Entity Creation E2E Happy Path', () => {
                 const propertySpecs = (0, propertySpecifications_1.parsePropertySpecificationsIntoMap)([
                     'roles=option',
                 ]);
-                // a single roles value stays scalar at the parse layer and is
-                // normalized to an array where it is consumed
                 const roles = [].concat(propertySpecs.get('roles'));
                 // Test that property level matching works with specified roles
                 expect((0, create_1.doesPropertyLevelMatchRole)(types_1.PropertyLevel.OPTION, roles[0])).toBe(true);

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

package/dist/commands/entities/get.js

@@ -157,6 +157,9 @@ class GetEntity extends basecommand_1.BaseCommand {
                     apiVersion: apiVersion,
                     take,
                 });
+                if (response === null) {
+                    this.error(`Entity not found: ${propertySpecBySlug.get('id')}`, { exit: 1 });
+                }
                 if (outputFile) {
                     fs_1.default.writeFileSync(outputFile, JSON.stringify(response, null, 2));
                     console.error(`Output saved to ${outputFile}`);
@@ -167,6 +170,9 @@ class GetEntity extends basecommand_1.BaseCommand {
             }
         }
         catch (e) {
+            if (e.message?.startsWith('Entity not found:')) {
+                throw e;
+            }
             this.error(`Error fetching entity: ${e.message}`);
         }
     }
@@ -182,6 +188,8 @@ async function getEntityByTypePath(typePath, propertySpec, options = {}) {
     }
     return find(entityName, {
         id,
+        // a missing id returns null (no retries); the command turns it into a clean not-found error
+        ignore404: id !== undefined,
         skipHydrateRelationships,
         relations,
         propertySlugs,
@@ -201,9 +209,10 @@ function convertPropertySpecIntoCriteria(propertySpec) {
 }
 async function find(entityName, options = {}) {
     const client = new sdk_1.Entities();
-    const { criteria, id, propertySlugs, skipHydrateRelationships, relations, skip, suffix, apiVersion, take, } = options;
+    const { criteria, id, ignore404, propertySlugs, skipHydrateRelationships, relations, skip, suffix, apiVersion, take, } = options;
     const queryOptions = {
         entityName,
+        ignore404,
         skipHydrateRelationships,
         relations,
         skip,
@@ -215,8 +224,9 @@ async function find(entityName, options = {}) {
         queryOptions.customParams = { propertySlugs: propertySlugs.join(',') };
     }
     const payload = id ? { id, ...queryOptions } : { criteria, ...queryOptions };
-    // a suffix names a specific sub-route, so it always goes through the plain client
-    if ((0, batchFetch_1.canBatchFetchEntity)(entityName) && !suffix) {
+    // 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) {
         return (0, batchFetch_1.batchFetch)(entityName, payload);
     }
     else {

package/dist/commands/entities/update.d.ts

@@ -6,7 +6,6 @@ export default class UpdateEntity extends BaseCommand {
         skipHydrateRelationships: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
         dryRun: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
         inputFile: import("@oclif/core/lib/interfaces").OptionFlag<string, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
-        force: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
         suffix: import("@oclif/core/lib/interfaces").OptionFlag<string, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
         apiVersion: import("@oclif/core/lib/interfaces").OptionFlag<string, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
         alwaysConfirmEnv: import("@oclif/core/lib/interfaces").OptionFlag<string, import("@oclif/core/lib/interfaces/parser").CustomOptions>;

package/dist/commands/entities/update.js

@@ -27,18 +27,13 @@ class UpdateEntity extends basecommand_1.BaseCommand {
         }),
         dryRun: core_1.Flags.boolean({
             char: 'd',
-            description: 'If true, does not create the entity but simulates the creation',
+            description: 'If true, does not update the entities but simulates the update',
             required: false,
             default: false,
         }),
         inputFile: core_1.Flags.string({
             char: 'i',
-            description: 'File containing properties to update the entity (optional)',
-            required: false,
-        }),
-        force: core_1.Flags.boolean({
-            char: 'F',
-            description: 'Force update without validation. Internal use only',
+            description: 'A file with a JSON array of {id, ...} objects; each object is one entity to update.',
             required: false,
         }),
         suffix: core_1.Flags.string({
@@ -67,7 +62,7 @@ class UpdateEntity extends basecommand_1.BaseCommand {
         await (0, login_1.authUser)();
         const { args, argv } = await this.parse(UpdateEntity);
         const { entityName } = args;
-        const { dryRun: isDryRun, inputFile: inputFilename, skipHydrateRelationships, suffix, apiVersion, force, } = this.flags;
+        const { dryRun: isDryRun, inputFile: inputFilename, skipHydrateRelationships, suffix, apiVersion, } = this.flags;
         const { ids: positionalIds, specs } = (0, propertySpecifications_1.partitionIdsAndSpecs)(argv.slice(1));
         const propertySpec = (0, propertySpecifications_1.parsePropertySpecificationsIntoMap)(specs);
         if (propertySpec.has('id') || propertySpec.has('ids')) {
@@ -101,7 +96,6 @@ class UpdateEntity extends basecommand_1.BaseCommand {
                     skipHydrateRelationships,
                     suffix,
                     apiVersion: apiVersion,
-                    force,
                 });
         }
         try {
@@ -123,8 +117,6 @@ class UpdateEntity extends basecommand_1.BaseCommand {
     }
 }
 exports.default = UpdateEntity;
-// Every row is attempted; a failed row never stops the run. The summary pairs
-// each failed id with its error so the failed rows can be retried.
 function summarizeSettledUpdates(inputs, settled, skipped) {
     const updated = [];
     const failed = [];
@@ -144,7 +136,7 @@ function summarizeSettledUpdates(inputs, settled, skipped) {
 exports.summarizeSettledUpdates = summarizeSettledUpdates;
 async function updateEntityById(entityName, id, changes, options = {}) {
     const client = new sdk_1.Entities();
-    const { skipHydrateRelationships, suffix, apiVersion, force } = options;
+    const { skipHydrateRelationships, suffix, apiVersion } = options;
     return client.update({
         entityName,
         id,

package/dist/helpers/propertySpecifications/propertySpecifications.js

@@ -68,7 +68,8 @@ function parsePropertySpecificationsIntoMap(propertySpecifications) {
             // ids is the one comma-split exception: it is a list of ids by definition
             // and ids never contain commas.
             const idsArray = value.split(',').map((id) => id.trim());
-            propertySpecBySlug.set(slug, idsArray);
+            const existingIds = propertySpecBySlug.get(slug);
+            propertySpecBySlug.set(slug, Array.isArray(existingIds) ? [...existingIds, ...idsArray] : idsArray);
             continue;
         }
         const existing = propertySpecBySlug.get(slug);

package/dist/helpers/propertySpecifications/propertySpecifications.spec.js

@@ -190,6 +190,11 @@ describe('parsePropertySpecificationsIntoMap', () => {
         expect(result.get('ids')).toEqual(['1', '2', '3']);
         expect(result.get('name')).toBe('Test');
     });
+    it('should accumulate repeated ids keys', () => {
+        const specs = ['ids=1,2', 'ids=3'];
+        const result = (0, propertySpecifications_1.parsePropertySpecificationsIntoMap)(specs);
+        expect(result.get('ids')).toEqual(['1', '2', '3']);
+    });
     it('should handle ids as single value', () => {
         const specs = ['ids=123'];
         const result = (0, propertySpecifications_1.parsePropertySpecificationsIntoMap)(specs);

package/oclif.manifest.json

@@ -1,5 +1,5 @@
 {
-  "version": "3.6.0-alpha-8-alpha.afa500a",
+  "version": "3.6.0-alpha-8-alpha.fb40acc",
   "commands": {
     "app:create": {
       "id": "app:create",
@@ -1077,7 +1077,7 @@
           "name": "dryRun",
           "type": "boolean",
           "char": "d",
-          "description": "If true, does not create the entity but simulates the creation",
+          "description": "If true, does not update the entities but simulates the update",
           "required": false,
           "allowNo": false
         },
@@ -1085,18 +1085,10 @@
           "name": "inputFile",
           "type": "option",
           "char": "i",
-          "description": "File containing properties to update the entity (optional)",
+          "description": "A file with a JSON array of {id, ...} objects; each object is one entity to update.",
           "required": false,
           "multiple": false
         },
-        "force": {
-          "name": "force",
-          "type": "boolean",
-          "char": "F",
-          "description": "Force update without validation. Internal use only",
-          "required": false,
-          "allowNo": false
-        },
         "suffix": {
           "name": "suffix",
           "type": "option",

package/package.json

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