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

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.2c2e640 linux-x64 node-v24.21.0
+@contrail/cli/3.6.0-alpha-8-alpha.2ab4f80 linux-x64 node-v24.21.0
 $ contrail --help [COMMAND]
 USAGE
   $ contrail COMMAND

package/dist/auth/login.js

@@ -3,7 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getVersionFromPackageJson = exports.authUser = void 0;
 const tslib_1 = require("tslib");
 const amazon_cognito_identity_js_1 = require("amazon-cognito-identity-js");
-const inquirer_1 = tslib_1.__importDefault(require("inquirer"));
 const sdk_1 = require("@contrail/sdk");
 const config_1 = require("../helpers/config/config");
 const logger_1 = tslib_1.__importDefault(require("../logger"));
@@ -63,7 +62,7 @@ exports.authUser = authUser;
 async function getOrgSlug(config) {
     const orgSlug = config?.orgSlug || process.env.CONTRAIL_CLI_ORG_SLUG;
     if (!orgSlug) {
-        const answers = await inquirer_1.default.prompt([
+        const answers = await (0, common_1.promptOnStderr)([
             {
                 type: 'input',
                 name: 'orgSlug',
@@ -106,7 +105,7 @@ async function authenticateWithUsernamePassword(config) {
             message: 'Password',
         });
     }
-    const answers = await inquirer_1.default.prompt(questions);
+    const answers = await (0, common_1.promptOnStderr)(questions);
     const params = {
         email: process.env.CONTRAIL_CLI_EMAIL || answers.email,
         password: process.env.CONTRAIL_CLI_PASSWORD || answers.password,
@@ -161,7 +160,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 +175,7 @@ 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);
         }
         catch (e) {
             throw Error(`Could not get refresh token: ${e}`);
@@ -215,9 +214,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/basecommand.js

@@ -3,8 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.BaseCommand = void 0;
 const tslib_1 = require("tslib");
 const core_1 = require("@oclif/core");
+const common_1 = require("./common");
 const logger_1 = tslib_1.__importDefault(require("./logger"));
-const inquirer_1 = tslib_1.__importDefault(require("inquirer"));
 const config_1 = require("./helpers/config/config");
 const lodash_1 = require("lodash");
 const login_1 = require("./auth/login");
@@ -73,7 +73,7 @@ class BaseCommand extends core_1.Command {
             choices: ['yes', 'no'],
             default: 'no',
         });
-        const { confirm } = await inquirer_1.default.prompt(questions);
+        const { confirm } = await (0, common_1.promptOnStderr)(questions);
         if (confirm === 'no') {
             logger_1.default.info('Please use `contrail config use` command to choose the configuration or `contrail config set --environment=prod` to set different environment.');
             this.exit(1);

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.d.ts

@@ -23,6 +23,7 @@ export default class CreateEntity extends BaseCommand {
         path: import("@oclif/core/lib/interfaces/parser").Arg<string, Record<string, unknown>>;
     };
     static strict: boolean;
+    init(): Promise<void>;
     run(): Promise<void>;
 }
 export type CreateSummary = {

package/dist/commands/entities/create.js

@@ -218,8 +218,11 @@ class CreateEntity extends basecommand_1.BaseCommand {
         }),
     };
     static strict = false;
-    async run() {
+    async init() {
         (0, common_1.routeConsoleLogToStderr)();
+        await super.init();
+    }
+    async run() {
         await (0, login_1.authUser)();
         const { flags, argv, args } = await this.parse(CreateEntity);
         const { count, dryRun: isDryRun, inputFile: inputFilename, outputFile: outputFilename, generateValues: shouldGenerateMissingValues, readableIds: shouldUseReadableIds, skipHydrateRelationships, suffix, apiVersion, } = flags;
@@ -371,8 +374,8 @@ function createEntityWithPopulatedValues(type, typeReferencesCache, objectRefere
     // Handle property specifications
     for (const [propertySlug, specifiedValue] of propertySpecificationBySlug.entries()) {
         const correspondingProperty = type.typeProperties.find((prop) => getPropertySlug(prop) === propertySlug);
-        if (!specifiedValue) {
-            throw new Error(`Value for property ${propertySlug} is required`);
+        if (specifiedValue === undefined) {
+            continue;
         }
         entity[propertySlug] = castValueToPropertyType(specifiedValue, correspondingProperty?.propertyType || types_1.PropertyType.String);
     }
@@ -521,6 +524,9 @@ function generateRandomDateString() {
     return new Date().toISOString();
 }
 function castValueToPropertyType(value, propertyType) {
+    if (Array.isArray(value) && propertyType !== types_1.PropertyType.MultiSelect) {
+        return value.map((element) => castValueToPropertyType(element, propertyType));
+    }
     switch (propertyType) {
         case types_1.PropertyType.Boolean:
             return value.toString().toLowerCase() === 'true';
@@ -553,7 +559,7 @@ async function createEntity(entityName, entity, routing = {}) {
     const skipHydrateRelationships = SHOULD_SKIP_HYDRATE_RELATIONSHIPS;
     const { suffix, apiVersion } = routing;
     if (entityName === 'assortment-item' && !suffix)
-        return (0, entities_1.createAssortmentItem)(entity, { skipHydrateRelationships }); // special case
+        return (0, entities_1.createAssortmentItem)(entity, { skipHydrateRelationships, apiVersion }); // special case
     const response = await client.create({
         entityName,
         object: entity,

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

@@ -532,6 +532,10 @@ describe('castValueToPropertyType array coercion', () => {
         expect(consoleError).toHaveBeenCalledWith(expect.stringContaining('slug=option slug=family'));
         consoleError.mockRestore();
     });
+    it('should cast each element of a repeated-key array on scalar property types', () => {
+        expect((0, create_1.castValueToPropertyType)(['1', '2'], types_1.PropertyType.Number)).toEqual([1, 2]);
+        expect((0, create_1.castValueToPropertyType)(['true', 'false'], types_1.PropertyType.Boolean)).toEqual([true, false]);
+    });
     it('should keep commas literal on string properties without warning', () => {
         const consoleError = jest.spyOn(console, 'error').mockImplementation(() => undefined);
         expect((0, create_1.castValueToPropertyType)('my,name', types_1.PropertyType.String)).toBe('my,name');

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

@@ -15,5 +15,6 @@ export default class DeleteEntity extends BaseCommand {
         ids: import("@oclif/core/lib/interfaces/parser").Arg<string, Record<string, unknown>>;
     };
     static strict: boolean;
+    init(): Promise<void>;
     run(): Promise<void>;
 }

package/dist/commands/entities/delete.js

@@ -51,8 +51,11 @@ class DeleteEntity extends basecommand_1.BaseCommand {
         }),
     };
     static strict = false;
-    async run() {
+    async init() {
         (0, common_1.routeConsoleLogToStderr)();
+        await super.init();
+    }
+    async run() {
         await (0, login_1.authUser)();
         const { args, flags, argv } = await this.parse(DeleteEntity);
         const { entityName } = args;
@@ -91,8 +94,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,54 +106,32 @@ 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);
+        if (error.message?.includes('not found')) {
+            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();
     if (IS_DRY_RUN) {
-        return client.get({ entityName, id, ignore404: true }).catch(throwIfNot404);
+        return client.get({ entityName, id, ignore404: true });
     }
     const { suffix, apiVersion } = routing;
-    return client
-        .delete({ entityName, id, ignore404: true, suffix, apiVersion })
-        .catch(throwIfNot404);
-}
-function throwIfNot404(e) {
-    const { statusCode } = parseSDKErrorMessage(e);
-    if (statusCode === 404) {
-        return null;
-    }
-    throw e;
-}
-function parseSDKErrorMessage(e) {
-    const parsed = JSON.parse(e.details);
-    return {
-        statusCode: parsed.statusCode,
-        message: parsed.message,
-    };
+    return client.delete({ entityName, id, ignore404: true, suffix, apiVersion });
 }

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

@@ -20,5 +20,6 @@ export default class GetEntity extends BaseCommand {
         ids: import("@oclif/core/lib/interfaces/parser").Arg<string, Record<string, unknown>>;
     };
     static strict: boolean;
+    init(): Promise<void>;
     run(): Promise<void>;
 }

package/dist/commands/entities/get.js

@@ -83,8 +83,11 @@ class GetEntity extends basecommand_1.BaseCommand {
         }),
     };
     static strict = false;
-    async run() {
+    async init() {
         (0, common_1.routeConsoleLogToStderr)();
+        await super.init();
+    }
+    async run() {
         await (0, login_1.authUser)();
         const { args, flags, argv } = await this.parse(GetEntity);
         const { typePath } = args;
@@ -224,8 +227,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

@@ -16,6 +16,7 @@ export default class UpdateEntity extends BaseCommand {
         ids: import("@oclif/core/lib/interfaces/parser").Arg<string, Record<string, unknown>>;
     };
     static strict: boolean;
+    init(): Promise<void>;
     run(): Promise<void>;
 }
 export type UpdateSummary = {

package/dist/commands/entities/update.js

@@ -57,8 +57,11 @@ class UpdateEntity extends basecommand_1.BaseCommand {
         }),
     };
     static strict = false;
-    async run() {
+    async init() {
         (0, common_1.routeConsoleLogToStderr)();
+        await super.init();
+    }
+    async run() {
         await (0, login_1.authUser)();
         const { args, argv } = await this.parse(UpdateEntity);
         const { entityName } = args;

package/dist/common.d.ts

@@ -4,3 +4,4 @@ export declare function delay(ms: number): Promise<NodeJS.Timeout>;
 export declare function removeSlash(string: string): string;
 export declare function routeConsoleLogToStderr(): void;
 export declare function sdkErrorMessage(reason: any): string;
+export declare const promptOnStderr: any;

package/dist/common.js

@@ -1,6 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.sdkErrorMessage = exports.routeConsoleLogToStderr = exports.removeSlash = exports.delay = exports.getSeparatorByPlatform = void 0;
+exports.promptOnStderr = exports.sdkErrorMessage = exports.routeConsoleLogToStderr = exports.removeSlash = exports.delay = exports.getSeparatorByPlatform = void 0;
+const tslib_1 = require("tslib");
+const inquirer_1 = tslib_1.__importDefault(require("inquirer"));
 function getSeparatorByPlatform() {
     const isWin = process.platform === 'win32';
     const separator = isWin ? '\\' : '/';
@@ -28,3 +30,6 @@ function sdkErrorMessage(reason) {
     return reason?.message || reason?.details || String(reason);
 }
 exports.sdkErrorMessage = sdkErrorMessage;
+// inquirer renders prompt UI to its output stream directly, bypassing the
+// console.log redirect; stdout must stay data-only
+exports.promptOnStderr = inquirer_1.default.createPromptModule({ output: process.stderr });

package/dist/helpers/entities/assortment-items.d.ts

@@ -1,10 +1,12 @@
 import { Item } from '@contrail/entity-types';
+import { API_VERSION } from '@contrail/sdk';
 export declare function throwIfInvalidAssortmentId(assortmentId: string): Promise<void>;
 export declare function createAssortmentItem(assortmentItem: {
     assortmentId: string;
     itemId: string;
     [key: string]: any;
-}, { skipHydrateRelationships }?: {
-    skipHydrateRelationships: boolean;
+}, options?: {
+    skipHydrateRelationships?: boolean;
+    apiVersion?: API_VERSION;
 }): Promise<any>;
 export declare function findItemsNotInAssortment(assortmentId: string, count?: number): Promise<Item[]>;

package/dist/helpers/entities/assortment-items.js

@@ -15,15 +15,17 @@ async function doesAssortmentExistById(id) {
     const assortment = await client.get({ entityName: 'assortment', id });
     return !!assortment;
 }
-async function createAssortmentItem(assortmentItem, { skipHydrateRelationships } = { skipHydrateRelationships: false }) {
+async function createAssortmentItem(assortmentItem, options = {}) {
     const client = new sdk_1.Entities();
     const { assortmentId, itemId } = assortmentItem;
+    const { skipHydrateRelationships = false, apiVersion } = options;
     // add item to assortment
     await client.create({
         entityName: 'assortment',
         id: assortmentId,
         relation: 'items',
         object: { itemIds: [itemId] },
+        apiVersion,
     });
     // Update assortment item with properties
     const updated = await client.update({
@@ -31,6 +33,7 @@ async function createAssortmentItem(assortmentItem, { skipHydrateRelationships }
         id: `${assortmentId}:${itemId}`,
         object: assortmentItem,
         skipHydrateRelationships,
+        apiVersion,
     });
     return updated;
 }

package/dist/helpers/file-helpers.js

@@ -3,8 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.loadData = exports.saveData = exports.parseFileAsJsonArray = exports.parseCSVData = exports.safeFileOverwrite = void 0;
 const tslib_1 = require("tslib");
 const path = tslib_1.__importStar(require("path"));
+const common_1 = require("../common");
 const fs_1 = tslib_1.__importDefault(require("fs"));
-const inquirer_1 = tslib_1.__importDefault(require("inquirer"));
 const js_yaml_1 = tslib_1.__importDefault(require("js-yaml"));
 const logger_1 = tslib_1.__importDefault(require("../logger"));
 const sync_1 = require("csv-parse/sync");
@@ -15,7 +15,7 @@ async function safeFileOverwrite(fileLocation, overwrite) {
         logger_1.default.info(`overwriting ${fileLocation}`);
         return true;
     }
-    const answers = await inquirer_1.default.prompt([
+    const answers = await (0, common_1.promptOnStderr)([
         {
             type: 'confirm',
             name: 'shouldOverwrite',

package/oclif.manifest.json

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

package/package.json

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