@contrail/cli 3.5.5-alpha.177136f → 3.5.5-alpha.500c168

package/README.md

@@ -17,7 +17,7 @@ $ npm install -g @contrail/cli
 $ contrail COMMAND
 running command...
 $ contrail (--version)
-@contrail/cli/3.5.5-alpha.177136f linux-x64 node-v24.21.0
+@contrail/cli/3.5.5-alpha.500c168 linux-x64 node-v24.21.0
 $ contrail --help [COMMAND]
 USAGE
   $ contrail COMMAND

package/dist/auth/login.js

@@ -9,10 +9,10 @@ const config_1 = require("../helpers/config/config");
 const logger_1 = tslib_1.__importDefault(require("../logger"));
 const path_1 = tslib_1.__importDefault(require("path"));
 const fs_1 = tslib_1.__importDefault(require("fs"));
-const CONFIGURATION = {
-    userPoolId: 'us-east-1_qIaNZdUfm',
-    clientId: process.env.CONTRAIL_COGNITO_CLIENT_ID || '7knkt34gfacbgd0ghnuspefdfg',
-    apiGateway: 'https://api.vibeiq.com/prod/api',
+const DEFAULT_API_GATEWAY = config_1.ENVIRONMENTS.prod;
+const COGNITO_CONFIGS = {
+    dev: { userPoolId: 'us-east-1_e2cA0nJWu', clientId: '209s9c62o165cqab0fu5ihjtu9' },
+    prod: { userPoolId: 'us-east-1_qIaNZdUfm', clientId: '7knkt34gfacbgd0ghnuspefdfg' },
 };
 async function authUser() {
     logger_1.default.debug('authorizing user...');
@@ -66,7 +66,7 @@ async function getOrgSlug(config) {
     return orgSlug;
 }
 async function authenticateWithApiKey(config, apiKey, orgSlug) {
-    const apiGateway = config?.apiGateway ?? CONFIGURATION.apiGateway;
+    const apiGateway = config?.apiGateway ?? DEFAULT_API_GATEWAY;
     sdk_1.Auth.config = {
         apiUserToken: apiKey,
         apiRefreshToken: null,
@@ -78,6 +78,10 @@ async function authenticateWithApiKey(config, apiKey, orgSlug) {
     return returnAndStoreConfig(sdk_1.Auth.config);
 }
 async function authenticateWithUsernamePassword(config) {
+    const apiGateway = config?.apiGateway ?? DEFAULT_API_GATEWAY;
+    const cognitoConfig = getCognitoConfig(apiGateway);
+    const environment = describeEnvironment(apiGateway);
+    logger_1.default.info(`Signing in to ${environment} — use your ${environment} VibeIQ credentials.`);
     const questions = [];
     if (!process.env.CONTRAIL_CLI_EMAIL) {
         questions.push({
@@ -100,14 +104,14 @@ async function authenticateWithUsernamePassword(config) {
         email: process.env.CONTRAIL_CLI_EMAIL || answers.email,
         password: process.env.CONTRAIL_CLI_PASSWORD || answers.password,
         orgSlug: await getOrgSlug(config),
-        ...(config?.apiGateway && { apiGateway: config.apiGateway }),
+        apiGateway,
     };
     if (!params.email || !params.password) {
         throw new Error('Email and Password required');
     }
     const poolData = {
-        UserPoolId: CONFIGURATION.userPoolId,
-        ClientId: CONFIGURATION.clientId,
+        UserPoolId: cognitoConfig.userPoolId,
+        ClientId: cognitoConfig.clientId,
     };
     const userPool = new amazon_cognito_identity_js_1.CognitoUserPool(poolData);
     const authData = {
@@ -123,18 +127,25 @@ async function authenticateWithUsernamePassword(config) {
     return new Promise((resolve, reject) => {
         cognitoUser.authenticateUser(authDetails, {
             onSuccess: async (result) => {
-                const user = result;
-                const config = await setAuthContext(user, params);
-                resolve(config);
+                try {
+                    resolve(await setAuthContext(result, params));
+                }
+                catch (e) {
+                    reject(e);
+                }
             },
             onFailure: (err) => {
+                if (err?.code === 'ResourceNotFoundException') {
+                    reject(new Error(`This version of the CLI signs in to ${environment} with a Cognito client that no longer exists. Update the CLI: npm i -g @contrail/cli`));
+                    return;
+                }
                 reject(err);
             },
         });
     });
 }
 async function setAuthContext(user, params) {
-    const apiGateway = params?.apiGateway ?? CONFIGURATION.apiGateway;
+    const apiGateway = params.apiGateway;
     const { vibeAccessToken, vibeRefreshToken } = await getVibeAccessTokenFromCognitoAccessToken(user.idToken.jwtToken, apiGateway);
     // Set Auth Config
     sdk_1.Auth.config = {
@@ -171,6 +182,19 @@ async function refreshCurrentUserOrg() {
     // await checkTelemetry(current_Version);
     return returnAndStoreConfig(sdk_1.Auth.config);
 }
+function getCognitoConfig(apiGateway) {
+    const environment = findEnvironmentName(apiGateway);
+    if (!environment) {
+        throw new Error(`No Cognito user pool is known for ${new URL(apiGateway).host}. Email and password sign-in works for ${Object.keys(COGNITO_CONFIGS).join(' and ')}; use CONTRAIL_CLI_API_KEY for other environments.`);
+    }
+    return COGNITO_CONFIGS[environment];
+}
+function findEnvironmentName(apiGateway) {
+    return Object.keys(config_1.ENVIRONMENTS).find((name) => config_1.ENVIRONMENTS[name] === apiGateway);
+}
+function describeEnvironment(apiGateway) {
+    return findEnvironmentName(apiGateway) ?? new URL(apiGateway).host;
+}
 async function getVibeAccessTokenFromCognitoAccessToken(cognitoAccessToken, apiGateway) {
     const url = `${apiGateway}/auth/cognito/`;
     const response = await fetch(url, {
@@ -181,9 +205,11 @@ async function getVibeAccessTokenFromCognitoAccessToken(cognitoAccessToken, apiG
         },
         body: JSON.stringify({ accessToken: cognitoAccessToken }),
     });
-    return await response.json().then((data) => {
-        return { vibeAccessToken: data.accessToken, vibeRefreshToken: data.refreshToken };
-    });
+    if (!response.ok) {
+        throw new Error(`${describeEnvironment(apiGateway)} rejected the sign-in (${response.status}).`);
+    }
+    const data = await response.json();
+    return { vibeAccessToken: data.accessToken, vibeRefreshToken: data.refreshToken };
 }
 async function requestRefreshedAccessToken(vibeRefreshToken, apiGateway) {
     const url = `${apiGateway}/auth/jwt_refresh/`;

package/dist/auth/login.spec.js

@@ -1,6 +1,103 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+const amazon_cognito_identity_js_1 = require("amazon-cognito-identity-js");
+const sdk_1 = require("@contrail/sdk");
+const config_1 = require("../helpers/config/config");
 const login_1 = require("./login");
+const mockAuthenticateUser = jest.fn();
+jest.mock('amazon-cognito-identity-js', () => ({
+    CognitoUserPool: jest.fn(),
+    AuthenticationDetails: jest.fn(),
+    CognitoUser: jest.fn().mockImplementation(() => ({
+        authenticateUser: (details, callbacks) => mockAuthenticateUser(details, callbacks),
+    })),
+}));
+jest.mock('@contrail/sdk', () => ({
+    Auth: { config: {} },
+    getCurrentUser: jest.fn(),
+    setConfig: jest.fn(),
+}));
+jest.mock('../helpers/config/config', () => ({
+    ...jest.requireActual('../helpers/config/config'),
+    getConfig: jest.fn(),
+    storeConfig: jest.fn(),
+}));
+jest.mock('../logger', () => ({
+    __esModule: true,
+    default: { debug: jest.fn(), info: jest.fn() },
+}));
+const DEV_GATEWAY = 'https://api.dev.vibeiq.com/dev/api';
+function jsonResponse(status, body = {}) {
+    return new Response(JSON.stringify(body), { status });
+}
+describe('authUser with email and password', () => {
+    const originalFetch = global.fetch;
+    const originalEmail = process.env.CONTRAIL_CLI_EMAIL;
+    const originalPassword = process.env.CONTRAIL_CLI_PASSWORD;
+    let fetchMock;
+    beforeEach(() => {
+        jest.clearAllMocks();
+        process.env.CONTRAIL_CLI_EMAIL = 'dev@vibeiq.com';
+        process.env.CONTRAIL_CLI_PASSWORD = 'secret';
+        config_1.getConfig.mockResolvedValue({ apiGateway: DEV_GATEWAY, orgSlug: 'adam-zone-1' });
+        sdk_1.getCurrentUser.mockResolvedValue({ id: 'user-1' });
+        mockAuthenticateUser.mockImplementation((_details, callbacks) => callbacks.onSuccess({ idToken: { jwtToken: 'cognito-id-token' } }));
+        fetchMock = jest.fn();
+        global.fetch = fetchMock;
+    });
+    afterEach(() => {
+        global.fetch = originalFetch;
+        process.env.CONTRAIL_CLI_EMAIL = originalEmail;
+        process.env.CONTRAIL_CLI_PASSWORD = originalPassword;
+    });
+    it('should sign in through the dev pool when the config points at dev', async () => {
+        fetchMock.mockResolvedValueOnce(jsonResponse(200, { accessToken: 'vibe-access', refreshToken: 'vibe-refresh' }));
+        const context = await (0, login_1.authUser)();
+        expect(amazon_cognito_identity_js_1.CognitoUserPool).toHaveBeenCalledWith({
+            UserPoolId: 'us-east-1_e2cA0nJWu',
+            ClientId: '209s9c62o165cqab0fu5ihjtu9',
+        });
+        expect(context).toEqual({
+            apiUserToken: 'vibe-access',
+            apiRefreshToken: 'vibe-refresh',
+            apiGateway: DEV_GATEWAY,
+            orgSlug: 'adam-zone-1',
+        });
+    });
+    it('should sign in through the prod pool when the config points at prod', async () => {
+        config_1.getConfig.mockResolvedValue({
+            apiGateway: 'https://api.vibeiq.com/prod/api',
+            orgSlug: 'adam-zone-1',
+        });
+        fetchMock.mockResolvedValueOnce(jsonResponse(200, { accessToken: 'vibe-access', refreshToken: 'vibe-refresh' }));
+        await (0, login_1.authUser)();
+        expect(amazon_cognito_identity_js_1.CognitoUserPool).toHaveBeenCalledWith({
+            UserPoolId: 'us-east-1_qIaNZdUfm',
+            ClientId: '7knkt34gfacbgd0ghnuspefdfg',
+        });
+    });
+    it('should fail without saving tokens when no pool is known for the environment', async () => {
+        config_1.getConfig.mockResolvedValue({
+            apiGateway: 'http://localhost:3000/api',
+            orgSlug: 'adam-zone-1',
+        });
+        await expect((0, login_1.authUser)()).rejects.toThrow('No Cognito user pool is known for localhost:3000.');
+        expect(config_1.storeConfig).not.toHaveBeenCalled();
+    });
+    it('should tell the user to update the CLI when its Cognito client no longer exists', async () => {
+        mockAuthenticateUser.mockImplementation((_details, callbacks) => callbacks.onFailure({
+            code: 'ResourceNotFoundException',
+            message: 'User pool client 209s9c62o165cqab0fu5ihjtu9 does not exist.',
+        }));
+        await expect((0, login_1.authUser)()).rejects.toThrow('This version of the CLI signs in to dev with a Cognito client that no longer exists. Update the CLI: npm i -g @contrail/cli');
+        expect(config_1.storeConfig).not.toHaveBeenCalled();
+    });
+    it('should fail without saving tokens when the environment rejects the sign-in', async () => {
+        fetchMock.mockResolvedValueOnce(jsonResponse(401, { message: 'Unauthorized' }));
+        await expect((0, login_1.authUser)()).rejects.toThrow('dev rejected the sign-in (401).');
+        expect(config_1.storeConfig).not.toHaveBeenCalled();
+    });
+});
 describe('getVersionFromPackageJson', () => {
     it('should return the version value from package.json', () => {
         const version = (0, login_1.getVersionFromPackageJson)();

package/dist/helpers/app/app-config-validators.d.ts

@@ -15,12 +15,7 @@ export declare const ERROR_MESSAGES: {
     ignoredAccessGrants: string;
     invalidPermission: (permission: string) => string;
     invalidAccessGrants: (error: string) => string;
-    invalidExtensionIcon: (identifier: string) => string;
-    invalidAppliesTo: (identifier: string, problem: string) => string;
 };
-export declare function isValidExtensionIcon(icon: unknown): boolean;
-/** Icons and appliesTo are checked here, since the apps service stores what it is given. */
-export declare function validateExtensionPlacement(appDeclaration: AppDeclaration): AppConfigValidationError;
 export declare function validateAppConfig(appConfig: AppDeclaration): void;
 export declare function appVersionValidator(appDeclaration: AppDeclaration): AppConfigValidationError;
 export declare function visibilityValidator(appDeclaration: AppDeclaration): AppConfigValidationError;

package/dist/helpers/app/app-config-validators.js

@@ -1,15 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.validateAccessGrants = exports.visibilityValidator = exports.appVersionValidator = exports.validateAppConfig = exports.validateExtensionPlacement = exports.isValidExtensionIcon = exports.ERROR_MESSAGES = void 0;
+exports.validateAccessGrants = exports.visibilityValidator = exports.appVersionValidator = exports.validateAppConfig = exports.ERROR_MESSAGES = void 0;
 const tslib_1 = require("tslib");
 const interfaces_1 = require("../../interfaces");
 const logger_1 = tslib_1.__importDefault(require("../../logger"));
-const VALIDATORS = [
-    appVersionValidator,
-    visibilityValidator,
-    validateAccessGrants,
-    validateExtensionPlacement,
-];
+const VALIDATORS = [appVersionValidator, visibilityValidator, validateAccessGrants];
 exports.ERROR_MESSAGES = {
     missingVersionField: 'Missing "version" field". Semantic App Version looks like "1.0.0". Use "contrail app version [patch|minor|major]" to update the app version.',
     invalidVersionField: '"version" field is not a string. Expecting a version like "1.0.0". Manually update the "version" field to be a string in the app.yml file.',
@@ -22,101 +17,7 @@ exports.ERROR_MESSAGES = {
     ignoredAccessGrants: 'App is set to public. accessGrants will be ignored.',
     invalidPermission: (permission) => `Invalid permission found in one of the accessGrants objects: ${permission}.`,
     invalidAccessGrants: (error) => `Invalid accessGrants. ${error}`,
-    invalidExtensionIcon: (identifier) => `Extension ${identifier}: icon must be a default icon name (like "line-builder"), { material: <icon name> } or { url: <SVG path or http(s) URL> }.`,
-    invalidAppliesTo: (identifier, problem) => `Extension ${identifier}: appliesTo ${problem}.`,
 };
-const STRING_LIST_FIELDS = ['typePaths', 'excludeTypePaths', 'roles'];
-const RULE_FIELDS = [...STRING_LIST_FIELDS, 'minSelected', 'maxSelected', 'label'];
-const APPLIES_TO_FIELDS = [...RULE_FIELDS, 'target', 'inputs'];
-function isValidExtensionIcon(icon) {
-    if (icon === undefined || icon === null) {
-        return true;
-    }
-    if (typeof icon === 'string') {
-        return /^[a-z0-9-]+$/.test(icon);
-    }
-    if (typeof icon !== 'object' || Array.isArray(icon) || Object.keys(icon).length !== 1) {
-        return false;
-    }
-    const { material, url } = icon;
-    if ('material' in icon) {
-        return typeof material === 'string' && /^[a-z0-9_]+$/.test(material);
-    }
-    if ('url' in icon) {
-        return typeof url === 'string' && url.length > 0 && !/^(javascript|data):/i.test(url.trim());
-    }
-    return false;
-}
-exports.isValidExtensionIcon = isValidExtensionIcon;
-function appliesToProblem(appliesTo) {
-    const problem = ruleProblem(appliesTo, APPLIES_TO_FIELDS);
-    if (problem) {
-        return problem;
-    }
-    const { target, inputs } = appliesTo;
-    if (target !== undefined) {
-        const targetProblem = ruleProblem(target, RULE_FIELDS);
-        if (targetProblem) {
-            return `target ${targetProblem}`;
-        }
-    }
-    if (inputs !== undefined) {
-        if (!Array.isArray(inputs)) {
-            return 'inputs must be a list';
-        }
-        for (const [index, input] of inputs.entries()) {
-            const inputProblem = ruleProblem(input, RULE_FIELDS);
-            if (inputProblem) {
-                return `inputs[${index}] ${inputProblem}`;
-            }
-        }
-    }
-    return undefined;
-}
-function ruleProblem(rule, allowedFields) {
-    if (typeof rule !== 'object' || rule === null || Array.isArray(rule)) {
-        return 'must be an object';
-    }
-    const fields = rule;
-    const unknownField = Object.keys(fields).find((field) => !allowedFields.includes(field));
-    if (unknownField) {
-        return `has an unknown field "${unknownField}" (use ${allowedFields.join(', ')})`;
-    }
-    for (const field of STRING_LIST_FIELDS) {
-        const value = fields[field];
-        if (value !== undefined &&
-            (!Array.isArray(value) || value.some((entry) => typeof entry !== 'string'))) {
-            return `${field} must be a list of strings`;
-        }
-    }
-    for (const [field, min] of [
-        ['minSelected', 0],
-        ['maxSelected', 1],
-    ]) {
-        const value = fields[field];
-        if (value !== undefined && (!Number.isInteger(value) || value < min)) {
-            return `${field} must be a whole number of at least ${min}`;
-        }
-    }
-    return undefined;
-}
-/** Icons and appliesTo are checked here, since the apps service stores what it is given. */
-function validateExtensionPlacement(appDeclaration) {
-    const errors = [];
-    for (const extension of appDeclaration?.extensions ?? []) {
-        if (!isValidExtensionIcon(extension.icon)) {
-            errors.push(exports.ERROR_MESSAGES.invalidExtensionIcon(extension.identifier));
-        }
-        if (extension.appliesTo !== undefined) {
-            const problem = appliesToProblem(extension.appliesTo);
-            if (problem) {
-                errors.push(exports.ERROR_MESSAGES.invalidAppliesTo(extension.identifier, problem));
-            }
-        }
-    }
-    return { errors, warnings: [] };
-}
-exports.validateExtensionPlacement = validateExtensionPlacement;
 function validateAppConfig(appConfig) {
     const errors = [];
     const warnings = [];
@@ -129,7 +30,7 @@ function validateAppConfig(appConfig) {
         logger_1.default.warn(warnings);
     }
     if (errors.length) {
-        throw new Error(`Invalid app config: \n ${errors.map((x) => x?.error ?? x).join('\n')}`);
+        throw new Error(`Invalid app config: \n ${errors.map((x) => x.error).join('\n')}`);
     }
 }
 exports.validateAppConfig = validateAppConfig;

package/dist/helpers/app/app-config-validators.spec.js

@@ -308,49 +308,3 @@ describe('validateAccessGrants', () => {
         expect(validationResult).toEqual(expectedError);
     });
 });
-describe('validateExtensionPlacement', () => {
-    const declarationWith = (extension) => ({
-        extensions: [{ identifier: 'line-builder', name: 'Line builder', ...extension }],
-    });
-    it('should accept default, Material and SVG icons, appliesTo, and extensions with neither', () => {
-        for (const icon of [
-            'line-builder',
-            { material: 'grid_on' },
-            { url: 'assets/icons/line-builder.svg' },
-            undefined,
-        ]) {
-            expect((0, app_config_validators_1.validateExtensionPlacement)(declarationWith({ icon }))).toEqual(validResult);
-        }
-        expect((0, app_config_validators_1.validateExtensionPlacement)(declarationWith({
-            appliesTo: {
-                typePaths: ['custom-entity:silhouette', 'item:product'],
-                excludeTypePaths: ['item:material'],
-                roles: ['family'],
-                maxSelected: 20,
-                label: 'Designs or BOMs',
-            },
-        }))).toEqual(validResult);
-    });
-    it('should name the extension whose icon or appliesTo is wrong', () => {
-        expect((0, app_config_validators_1.validateExtensionPlacement)(declarationWith({ icon: { url: 'javascript:alert(1)' } })).errors).toEqual([app_config_validators_1.ERROR_MESSAGES.invalidExtensionIcon('line-builder')]);
-        expect((0, app_config_validators_1.validateExtensionPlacement)(declarationWith({ appliesTo: { typePath: 'item' } })).errors[0]).toContain('unknown field "typePath"');
-        expect((0, app_config_validators_1.validateExtensionPlacement)(declarationWith({ appliesTo: { maxSelected: 0 } })).errors[0]).toContain('maxSelected must be a whole number of at least 1');
-    });
-    it('should check a target and its inputs', () => {
-        expect((0, app_config_validators_1.validateExtensionPlacement)(declarationWith({
-            appliesTo: {
-                target: { typePaths: ['custom-entity:silhouette'], maxSelected: 1, label: 'a Design' },
-                inputs: [{ typePaths: ['color'], maxSelected: 30, label: 'colors' }],
-            },
-        }))).toEqual(validResult);
-        expect((0, app_config_validators_1.validateExtensionPlacement)(declarationWith({ appliesTo: { inputs: [{ typePath: 'color' }] } })).errors[0]).toContain('inputs[0] has an unknown field "typePath"');
-        expect((0, app_config_validators_1.validateExtensionPlacement)(declarationWith({ appliesTo: { target: { inputs: [] } } }))
-            .errors[0]).toContain('target has an unknown field "inputs"');
-    });
-    it('should show the message when validation fails', () => {
-        expect(() => (0, app_config_validators_1.validateAppConfig)({
-            version: '1.0.0',
-            ...declarationWith({ icon: 'Bad Icon' }),
-        })).toThrow(app_config_validators_1.ERROR_MESSAGES.invalidExtensionIcon('line-builder'));
-    });
-});

package/dist/helpers/app/extensions-deployer.d.ts

@@ -1,17 +1,9 @@
 import { AppExtensionDefinition } from '@contrail/entity-types';
-import { App, AppDeclaration, ExtensionAppliesToDeclaration, ExtensionDefinitionDeclaration, ExtensionIconDeclaration } from '../../interfaces';
+import { App, AppDeclaration, ExtensionDefinitionDeclaration } from '../../interfaces';
 export declare function getExtensionDefinitionsForAppVersion(app: App): Promise<AppExtensionDefinition[]>;
-/** Entity-types' definition plus placement, which the apps service stores as declared. */
-export type PlacedExtensionDefinition = AppExtensionDefinition & {
-    icon?: ExtensionIconDeclaration;
-    appliesTo?: ExtensionAppliesToDeclaration;
-    group?: string;
-};
-/** The definition published for an app.yml extension, for a new version or an update alike. */
-export declare function buildExtensionDefinition(extension: ExtensionDefinitionDeclaration, app: App, appName?: string): PlacedExtensionDefinition;
 export declare class ExtensionsDeployer {
     deployExtensions(appDeclaration: AppDeclaration, app: App): Promise<void>;
-    deployExtension(extension: ExtensionDefinitionDeclaration, app: App, existingExtensions: Array<any>, appName?: string): Promise<void>;
+    deployExtension(extension: ExtensionDefinitionDeclaration, app: App, existingExtensions: Array<any>): Promise<void>;
     private createNewExtensionDefinition;
     private updateActionDefinition;
 }

package/dist/helpers/app/extensions-deployer.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ExtensionsDeployer = exports.buildExtensionDefinition = exports.getExtensionDefinitionsForAppVersion = void 0;
+exports.ExtensionsDeployer = exports.getExtensionDefinitionsForAppVersion = void 0;
 const tslib_1 = require("tslib");
 const sdk_1 = require("@contrail/sdk");
 const chalk_1 = tslib_1.__importDefault(require("chalk"));
@@ -13,28 +13,6 @@ async function getExtensionDefinitionsForAppVersion(app) {
     });
 }
 exports.getExtensionDefinitionsForAppVersion = getExtensionDefinitionsForAppVersion;
-/** The definition published for an app.yml extension, for a new version or an update alike. */
-function buildExtensionDefinition(extension, app, appName) {
-    return {
-        identifier: util_1.AppUtil.createExtensionIdentifier({
-            extensionIdentifier: extension?.identifier,
-            appIdentifier: app.identifier,
-        }),
-        name: extension.name,
-        appId: app.id,
-        appVersionId: app.latestAppVersionId,
-        extensionType: extension.extensionType,
-        userApps: extension.userApps,
-        /** @deprecated since entity-types v1.5.1, use display instead */
-        modalDimensions: extension.modalDimensions,
-        display: extension.display,
-        iframeUrl: extension.iframeUrl,
-        icon: extension.icon,
-        appliesTo: extension.appliesTo,
-        group: extension.group ?? appName,
-    };
-}
-exports.buildExtensionDefinition = buildExtensionDefinition;
 class ExtensionsDeployer {
     async deployExtensions(appDeclaration, app) {
         // FETCH ALL EXTENSIONS FROM THE API.
@@ -48,11 +26,11 @@ class ExtensionsDeployer {
         logger_1.default.debug(appDeclaration.extensions);
         if (appDeclaration.extensions) {
             for (const extension of appDeclaration?.extensions ?? []) {
-                await this.deployExtension(extension, app, existingExtensions, appDeclaration.appName);
+                await this.deployExtension(extension, app, existingExtensions);
             }
         }
     }
-    async deployExtension(extension, app, existingExtensions, appName) {
+    async deployExtension(extension, app, existingExtensions) {
         logger_1.default.info(`${chalk_1.default.yellow.bold('EXTENSION')} \tDeploying extension: ${extension?.identifier}`);
         const identifier = util_1.AppUtil.createExtensionIdentifier({
             appIdentifier: app.identifier,
@@ -60,14 +38,28 @@ class ExtensionsDeployer {
         });
         const existingDefinition = existingExtensions.find((ad) => ad.identifier === identifier);
         if (!existingDefinition) {
-            await this.createNewExtensionDefinition(extension, app, appName);
+            await this.createNewExtensionDefinition(extension, app);
         }
         else {
-            await this.updateActionDefinition(existingDefinition, extension, app, appName);
+            await this.updateActionDefinition(existingDefinition, extension, app);
         }
     }
-    async createNewExtensionDefinition(extension, app, appName) {
-        const newObject = buildExtensionDefinition(extension, app, appName);
+    async createNewExtensionDefinition(extension, app) {
+        const newObject = {
+            identifier: util_1.AppUtil.createExtensionIdentifier({
+                extensionIdentifier: extension?.identifier,
+                appIdentifier: app.identifier,
+            }),
+            name: extension.name,
+            appId: app.id,
+            appVersionId: app.latestAppVersionId,
+            extensionType: extension.extensionType,
+            userApps: extension.userApps,
+            /** @deprecated since entity-types v1.5.1, use display instead */
+            modalDimensions: extension.modalDimensions,
+            display: extension.display,
+            iframeUrl: extension.iframeUrl,
+        };
         const actionDefinition = await new sdk_1.Entities().create({
             entityName: 'app-extension-definition',
             object: newObject,
@@ -75,8 +67,22 @@ class ExtensionsDeployer {
         logger_1.default.info(`${chalk_1.default.yellow.bold('EXTENSION')}     Created new extension definition: ${extension?.identifier}`);
         return actionDefinition;
     }
-    async updateActionDefinition(existingActionDefinition, extension, app, appName) {
-        const updates = buildExtensionDefinition(extension, app, appName);
+    async updateActionDefinition(existingActionDefinition, extension, app) {
+        const updates = {
+            identifier: util_1.AppUtil.createExtensionIdentifier({
+                extensionIdentifier: extension?.identifier,
+                appIdentifier: app.identifier,
+            }),
+            name: extension.name,
+            appId: app.id,
+            appVersionId: app.latestAppVersionId,
+            extensionType: extension.extensionType,
+            userApps: extension.userApps,
+            /** @deprecated since entity-types v1.5.1, use display instead */
+            modalDimensions: extension.modalDimensions,
+            display: extension.display,
+            iframeUrl: extension.iframeUrl,
+        };
         const extensionDefinition = await new sdk_1.Entities().update({
             entityName: 'app-extension-definition',
             id: existingActionDefinition.id,

package/dist/interfaces.d.ts

@@ -55,42 +55,6 @@ export interface ExtensionDefinitionDeclaration {
     modalDimensions?: any;
     display?: AppExtensionDisplayConfiguration;
     iframeUrl?: string;
-    /** A default icon's name, `{ material: <icon name> }`, or `{ url: <one-color SVG, absolute or beside iframeUrl> }`.
-     * An extension without an icon shows none. */
-    icon?: ExtensionIconDeclaration;
-    /** What the extension acts on. Apps offer it beside a selection it fits (Boards: the property bar's app row and the
-     * top of the context menu); without it, it is offered as before. */
-    appliesTo?: ExtensionAppliesToDeclaration;
-    /** The name the app's extensions are grouped under; defaults to appName. */
-    group?: string;
-}
-export type ExtensionIconDeclaration = string | {
-    material: string;
-} | {
-    url: string;
-};
-/** Which selected records a rule takes: by type path (with subtypes), exclusions, item role and how many. */
-export interface ExtensionSelectionRuleDeclaration {
-    /** Type paths, each matching itself and its subtypes: item:product matches item:product:footwear. */
-    typePaths?: string[];
-    /** Type paths left out, with their subtypes: item:material. */
-    excludeTypePaths?: string[];
-    /** Item roles a record must have: family, option. */
-    roles?: string[];
-    /** Fewest records: 1 for a target, 0 for an input, unless set. */
-    minSelected?: number;
-    maxSelected?: number;
-    /** What to select, for hints and summaries: "a Design or BOM", "colors". */
-    label?: string;
-}
-/**
- * A selection is a target (what the action acts on) plus optional inputs that come along with it (colors to build
- * in). Every selected record must fit the target or an input. The flat form, the rule's fields with no target, is a
- * target with no inputs.
- */
-export interface ExtensionAppliesToDeclaration extends ExtensionSelectionRuleDeclaration {
-    target?: ExtensionSelectionRuleDeclaration;
-    inputs?: ExtensionSelectionRuleDeclaration[];
 }
 export interface ConfigPropertyElements {
     [key: string]: ConfigPropertyElement;

package/oclif.manifest.json

@@ -1,5 +1,5 @@
 {
-  "version": "3.5.5-alpha.177136f",
+  "version": "3.5.5-alpha.500c168",
   "commands": {
     "app:create": {
       "id": "app:create",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@contrail/cli",
-  "version": "3.5.5-alpha.177136f",
+  "version": "3.5.5-alpha.500c168",
   "description": "VibeIQ's Contrail Platform CLI.",
   "bin": {
     "contrail-cli": "./bin/run",

package/dist/helpers/app/extensions-deployer.spec.d.ts

@@ -1 +0,0 @@
-export {};

package/dist/helpers/app/extensions-deployer.spec.js

@@ -1,29 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const extensions_deployer_1 = require("./extensions-deployer");
-const app = {
-    id: 'app-1',
-    identifier: '@vibeiq.com/gap-design-poc',
-    latestAppVersionId: 'version-1',
-};
-describe('buildExtensionDefinition', () => {
-    it('should publish placement as declared, grouped under the app name', () => {
-        const definition = (0, extensions_deployer_1.buildExtensionDefinition)({
-            identifier: 'line-builder',
-            name: 'Line builder',
-            iframeUrl: 'http://localhost:4395/index.html#/line-builder',
-            icon: 'line-builder',
-            appliesTo: { typePaths: ['custom-entity:silhouette'], maxSelected: 20 },
-        }, app, 'Gap');
-        expect(definition).toMatchObject({
-            identifier: '@vibeiq.com/gap-design-poc:line-builder',
-            appVersionId: 'version-1',
-            icon: 'line-builder',
-            appliesTo: { typePaths: ['custom-entity:silhouette'], maxSelected: 20 },
-            group: 'Gap',
-        });
-    });
-    it("should keep an extension's own group", () => {
-        expect((0, extensions_deployer_1.buildExtensionDefinition)({ identifier: 'x', name: 'X', group: 'Tools' }, app, 'Gap').group).toBe('Tools');
-    });
-});