@contrail/cli 2.1.24 → 2.1.26

package/README.md

@@ -17,7 +17,7 @@ $ npm install -g @contrail/cli
 $ contrail COMMAND
 running command...
 $ contrail (--version)
-@contrail/cli/2.1.24 darwin-arm64 node-v18.13.0
+@contrail/cli/2.1.26 darwin-arm64 node-v18.13.0
 $ contrail --help [COMMAND]
 USAGE
   $ contrail COMMAND

package/dist/basecommand.d.ts

@@ -1,6 +1,7 @@
 import { Command } from '@oclif/core';
 export declare abstract class BaseCommand extends Command {
     static description: string;
+    skipConfirmEnv: boolean;
     static baseFlags: {
         logLevel: import("@oclif/core/lib/interfaces").OptionFlag<string, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
         alwaysConfirmEnv: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;

package/dist/basecommand.js

@@ -9,6 +9,10 @@ const config_1 = require("./helpers/config/config");
 const auth_1 = require("@contrail/sdk/lib/auth/auth");
 const lodash_1 = tslib_1.__importDefault(require("lodash"));
 class BaseCommand extends core_1.Command {
+    constructor() {
+        super(...arguments);
+        this.skipConfirmEnv = false;
+    }
     async init() {
         await super.init();
         const { flags } = await this.parse({
@@ -18,7 +22,9 @@ class BaseCommand extends core_1.Command {
             strict: this.ctor.strict,
         });
         await this.setLogLevel(flags.logLevel);
-        await this.confirmEnv(flags.alwaysConfirmEnv);
+        if (!this.skipConfirmEnv) {
+            await this.confirmEnv(flags.alwaysConfirmEnv);
+        }
     }
     async setLogLevel(logLevel) {
         if (logLevel) {

package/dist/commands/config/environments/list.d.ts

@@ -1,5 +1,6 @@
 import { BaseCommand } from '../../../basecommand';
 export default class ListConfigEnvironment extends BaseCommand {
+    skipConfirmEnv: boolean;
     static description: string;
     static examples: string[];
     run(): Promise<void>;

package/dist/commands/config/environments/list.js

@@ -3,6 +3,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const config_1 = require("../../../helpers/config/config");
 const basecommand_1 = require("../../../basecommand");
 class ListConfigEnvironment extends basecommand_1.BaseCommand {
+    constructor() {
+        super(...arguments);
+        this.skipConfirmEnv = true;
+    }
     async run() {
         const { flags } = await this.parse(ListConfigEnvironment);
         await super.setLogLevel(flags.logLevel);

package/dist/commands/config/environments/remove.d.ts

@@ -1,5 +1,6 @@
 import { BaseCommand } from '../../../basecommand';
 export default class RemoveConfigEnvironment extends BaseCommand {
+    skipConfirmEnv: boolean;
     static description: string;
     static examples: string[];
     static strict: boolean;

package/dist/commands/config/environments/remove.js

@@ -6,6 +6,10 @@ const basecommand_1 = require("../../../basecommand");
 const config_1 = require("../../../helpers/config/config");
 const logger_1 = tslib_1.__importDefault(require("../../../logger"));
 class RemoveConfigEnvironment extends basecommand_1.BaseCommand {
+    constructor() {
+        super(...arguments);
+        this.skipConfirmEnv = true;
+    }
     async run() {
         const { flags } = await this.parse(RemoveConfigEnvironment);
         await super.setLogLevel(flags.logLevel);

package/dist/commands/config/environments/set.d.ts

@@ -1,5 +1,6 @@
 import { BaseCommand } from '../../../basecommand';
 export default class SetConfigEnvironment extends BaseCommand {
+    skipConfirmEnv: boolean;
     static description: string;
     static examples: string[];
     static flags: {

package/dist/commands/config/environments/set.js

@@ -6,6 +6,10 @@ const config_1 = require("../../../helpers/config/config");
 const basecommand_1 = require("../../../basecommand");
 const logger_1 = tslib_1.__importDefault(require("../../../logger"));
 class SetConfigEnvironment extends basecommand_1.BaseCommand {
+    constructor() {
+        super(...arguments);
+        this.skipConfirmEnv = true;
+    }
     async run() {
         const { flags } = await this.parse(SetConfigEnvironment);
         await super.setLogLevel(flags.logLevel);

package/dist/commands/config/list.d.ts

@@ -1,6 +1,7 @@
 import { BaseCommand } from '../../basecommand';
 export default class ListConfig extends BaseCommand {
     static description: string;
+    skipConfirmEnv: boolean;
     static examples: string[];
     run(): Promise<void>;
 }

package/dist/commands/config/list.js

@@ -3,6 +3,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const config_1 = require("../../helpers/config/config");
 const basecommand_1 = require("../../basecommand");
 class ListConfig extends basecommand_1.BaseCommand {
+    constructor() {
+        super(...arguments);
+        this.skipConfirmEnv = true;
+    }
     async run() {
         this.log(await (0, config_1.readVibeIQConfig)());
     }

package/dist/commands/config/remove.d.ts

@@ -1,6 +1,7 @@
 import { BaseCommand } from '../../basecommand';
 export default class RemoveConfig extends BaseCommand {
     static description: string;
+    skipConfirmEnv: boolean;
     static examples: string[];
     static strict: boolean;
     static flags: {

package/dist/commands/config/remove.js

@@ -4,6 +4,10 @@ const core_1 = require("@oclif/core");
 const config_1 = require("../../helpers/config/config");
 const basecommand_1 = require("../../basecommand");
 class RemoveConfig extends basecommand_1.BaseCommand {
+    constructor() {
+        super(...arguments);
+        this.skipConfirmEnv = true;
+    }
     async run() {
         const { flags } = await this.parse(RemoveConfig);
         await (0, config_1.deleteConfigs)(Object.keys(flags));

package/dist/commands/config/set.d.ts

@@ -1,5 +1,6 @@
 import { BaseCommand } from '../../basecommand';
 export default class SetConfig extends BaseCommand {
+    skipConfirmEnv: boolean;
     static description: string;
     static examples: string[];
     static flags: {

package/dist/commands/config/set.js

@@ -6,6 +6,10 @@ const config_1 = require("../../helpers/config/config");
 const basecommand_1 = require("../../basecommand");
 const logger_1 = tslib_1.__importDefault(require("../../logger"));
 class SetConfig extends basecommand_1.BaseCommand {
+    constructor() {
+        super(...arguments);
+        this.skipConfirmEnv = true;
+    }
     async run() {
         const { flags } = await this.parse(SetConfig);
         const config = {};

package/dist/commands/projects/load.d.ts

@@ -7,3 +7,15 @@ export default class LoadProject extends BaseCommand {
     };
     run(): Promise<void>;
 }
+interface CheckerFunction {
+    (key: string, value: any): boolean;
+}
+interface ApplyFunction {
+    (key: string, value: any): Promise<void>;
+}
+export interface Transformer {
+    checker: CheckerFunction;
+    recursive: boolean;
+    apply: ApplyFunction;
+}
+export {};

package/dist/commands/projects/load.js

@@ -8,6 +8,7 @@ const helpers_1 = require("../../helpers/projects/helpers");
 const core_1 = require("@oclif/core");
 const basecommand_1 = require("../../basecommand");
 const logger_1 = tslib_1.__importDefault(require("../../logger"));
+const types_1 = require("@contrail/types");
 class LoadProject extends basecommand_1.BaseCommand {
     async run() {
         const { args } = await this.parse(LoadProject);
@@ -42,6 +43,8 @@ LoadProject.args = {
 async function uploadProject(templateFileLocation) {
     const projectConfigurationFromFile = (0, helpers_1.getProjectFile)(templateFileLocation);
     const projectConfiguration = getProjectConfiguration(projectConfigurationFromFile);
+    logger_1.default.info('Checking for object and type references');
+    await transformProject(projectConfiguration);
     logger_1.default.info('Configuring Project.');
     await sdk_1.Request.request('/project-configurator', {
         method: 'POST',
@@ -111,3 +114,85 @@ function parseToProjectConfiguration(projectConfigurationFromFile) {
     }
     return projectConfiguration;
 }
+/**
+ * recursively traverse all the project nodes and transforms any
+ *  entities that need transformation.
+ */
+async function transformProject(projectConfiguration) {
+    const transformers = [
+        {
+            checker: (k, v) => k === 'assortments' && Array.isArray(v),
+            recursive: false,
+            apply: transformAssortmentObjectReferences,
+        },
+    ];
+    for (const transformer of transformers) {
+        // recurse through the project config and check all nodes
+        for (const [k, v] of Object.entries(projectConfiguration)) {
+            if (transformer.checker(k, v)) {
+                await transformer.apply(k, v);
+                if (transformer.recursive) {
+                    await transformProject(projectConfiguration[k]);
+                }
+            }
+            else if (typeof projectConfiguration[k] === 'object') {
+                // recurse for all properties because nested properties
+                // might need to be transformed
+                await transformProject(projectConfiguration[k]);
+            }
+        }
+    }
+}
+/**
+ * Hydrates object reference and type references in the assortment attributes.
+ * @param _ unused parameter for keys
+ * @param assortments The expected node value passed ot this function is a list of assortments
+ */
+async function transformAssortmentObjectReferences(_, assortments) {
+    var _a, _b, _c, _d, _e;
+    const typesClient = new sdk_1.Types();
+    const assortmentType = await typesClient.getType({
+        path: 'assortment',
+        relations: ['typeProperties'],
+    });
+    const assortmentProperties = assortmentType.typeProperties;
+    for (const assortment of assortments !== null && assortments !== void 0 ? assortments : []) {
+        const attributes = JSON.parse(JSON.stringify((_a = assortment === null || assortment === void 0 ? void 0 : assortment.assortmentAtts) !== null && _a !== void 0 ? _a : {}));
+        if (!((_b = Object.keys(attributes)) === null || _b === void 0 ? void 0 : _b.length)) {
+            continue;
+        }
+        for (const [attributeKey, attributeValue] of Object.entries(attributes)) {
+            const property = assortmentProperties.find((x) => x.slug === attributeKey);
+            // if not a reference
+            if (!property || !property.referencedTypePath) {
+                continue;
+            }
+            if (property.propertyType === types_1.PropertyType.TypeReference) {
+                logger_1.default.debug(`found type reference!${attributeKey}${attributeValue}`);
+                // special case: handle type references
+                const type = (_c = (await new sdk_1.Types().getType({ path: attributeValue }))) === null || _c === void 0 ? void 0 : _c.id;
+                logger_1.default.debug(`found type ${type}`);
+                logger_1.default.info(`replacing ${attributeKey}:${attributeValue} with ${attributeKey}Id:${type}`);
+                assortment.assortmentAtts[`${attributeKey}Id`] = type;
+            }
+            else if (property.propertyType === types_1.PropertyType.ObjectReference) {
+                logger_1.default.debug(`found object reference!${attributeKey}${attributeValue}`);
+                let allEntities = [];
+                if (property.referencedTypePath.startsWith('custom-entity')) {
+                    allEntities = await new sdk_1.Entities().get({
+                        entityName: 'custom-entity',
+                        criteria: { typePath: property.referencedTypePath },
+                    });
+                }
+                else {
+                    allEntities = await new sdk_1.Entities().get({ entityName: property.referencedTypePath });
+                }
+                // special case: handle type references
+                const foundAttribute = (_e = (_d = allEntities.find((x) => x.name === attributeValue)) === null || _d === void 0 ? void 0 : _d.id) !== null && _e !== void 0 ? _e : attributeKey;
+                logger_1.default.debug(`found attribute ${foundAttribute}`);
+                logger_1.default.info(`replacing ${attributeKey}:${attributeValue} with ${attributeKey}Id:${foundAttribute}`);
+                assortment.assortmentAtts[`${attributeKey}Id`] = foundAttribute;
+            }
+        }
+    }
+}

package/oclif.manifest.json

@@ -1,5 +1,5 @@
 {
-  "version": "2.1.24",
+  "version": "2.1.26",
   "commands": {
     "app:create": {
       "id": "app:create",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@contrail/cli",
-  "version": "2.1.24",
+  "version": "2.1.26",
   "description": "VibeIQ's Contrail Platform CLI.",
   "bin": {
     "contrail-cli": "./bin/run",