@contrail/cli 2.2.8 → 2.3.1

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

@@ -10,7 +10,7 @@ function loadAppConfig(config = { skipValidation: false }) {
     const TARGET_DIR = process.cwd();
     try {
         const doc = js_yaml_1.default.load(fs_1.default.readFileSync(path.resolve(path.join(TARGET_DIR, 'app.yml')), 'utf8'));
-        if (!(config === null || config === void 0 ? void 0 : config.skipValidation)) {
+        if (!config?.skipValidation) {
             (0, app_config_validators_1.validateAppConfig)(doc);
         }
         return doc;

package/dist/helpers/loader-process/helpers.js

@@ -91,9 +91,9 @@ async function loadLocalFile(configFileName) {
 exports.loadLocalFile = loadLocalFile;
 function getFileExtension(fileName) {
     let ext = '';
-    const parts = fileName === null || fileName === void 0 ? void 0 : fileName.split('.');
-    if ((parts === null || parts === void 0 ? void 0 : parts.length) > 1) {
-        ext = `.${parts[(parts === null || parts === void 0 ? void 0 : parts.length) - 1]}`;
+    const parts = fileName?.split('.');
+    if (parts?.length > 1) {
+        ext = `.${parts[parts?.length - 1]}`;
     }
     return ext;
 }

package/dist/helpers/projects/helpers.js

@@ -53,7 +53,7 @@ async function getAssortmentsAndSubFolders(parentId, assortments, subFolders, al
         },
     });
     const integrationAssortments = workspaceAssortments; //?.filter(a => a.assortmentType === 'INTEGRATION');
-    if ((integrationAssortments === null || integrationAssortments === void 0 ? void 0 : integrationAssortments.length) > 0) {
+    if (integrationAssortments?.length > 0) {
         allAssortments.push(...integrationAssortments);
         for (const a of integrationAssortments) {
             const integrationAssortmentsCopy = util_1.ObjectUtil.cloneDeep(a);
@@ -81,8 +81,8 @@ async function getAssortmentsAndSubFolders(parentId, assortments, subFolders, al
         },
         relations: ['entity'],
     });
-    const workspaceFolders = workspaceFolderLinks === null || workspaceFolderLinks === void 0 ? void 0 : workspaceFolderLinks.map((wfl) => wfl.entity);
-    if ((workspaceFolders === null || workspaceFolders === void 0 ? void 0 : workspaceFolders.length) > 0) {
+    const workspaceFolders = workspaceFolderLinks?.map((wfl) => wfl.entity);
+    if (workspaceFolders?.length > 0) {
         for (const folder of workspaceFolders) {
             const converted = {
                 identifier: folder.identifier,
@@ -112,11 +112,11 @@ function convertRelationshipsToIdentifiers(assortments, allAssortments) {
     }
     for (const assortment of assortments) {
         if (assortment.sourceAssortmentIds) {
-            assortment.sourceAssortmentIdentifier = assortment.sourceAssortmentIds.map((id) => { var _a; return (_a = allAssortments.find((a) => a.id === id)) === null || _a === void 0 ? void 0 : _a.identifier; });
+            assortment.sourceAssortmentIdentifier = assortment.sourceAssortmentIds.map((id) => allAssortments.find((a) => a.id === id)?.identifier);
         }
         delete assortment.sourceAssortmentIds;
         if (assortment.composedFromAssortmentIds) {
-            assortment.composedFromAssortmentIdentifiers = assortment.composedFromAssortmentIds.map((id) => { var _a; return (_a = allAssortments.find((a) => a.id === id)) === null || _a === void 0 ? void 0 : _a.identifier; });
+            assortment.composedFromAssortmentIdentifiers = assortment.composedFromAssortmentIds.map((id) => allAssortments.find((a) => a.id === id)?.identifier);
         }
         delete assortment.composedFromAssortmentIds;
     }

package/dist/helpers/types/type-parser.js

@@ -27,7 +27,7 @@ async function parseTypesFromLocalFiles(fileLocations) {
         try {
             logger_1.default.info(`Getting data for fileLocation:  ${fileLocation}`);
             const csvData = await loadDataFromLocalCSV(fileLocation);
-            logger_1.default.info(`CSV import was successful. ${csvData === null || csvData === void 0 ? void 0 : csvData.length} rows found. Adding to total rows.`);
+            logger_1.default.info(`CSV import was successful. ${csvData?.length} rows found. Adding to total rows.`);
             csvJSONData.push(...csvData);
         }
         catch (e) {
@@ -35,7 +35,7 @@ async function parseTypesFromLocalFiles(fileLocations) {
             throw e;
         }
     }
-    logger_1.default.info(`CSV imports were successful. ${csvJSONData === null || csvJSONData === void 0 ? void 0 : csvJSONData.length} total rows found.`);
+    logger_1.default.info(`CSV imports were successful. ${csvJSONData?.length} total rows found.`);
     const suggestions = (0, types_1.GetSuggestedTypes)(csvJSONData);
     saveData(suggestions.OptionSets, 'parsed_optionSets.yml');
     saveData({ typeProperties: suggestions.TypeProperties }, 'parsed_typeProperties.yml');
@@ -47,10 +47,10 @@ async function parseTypesFromTemplateFromLocalFiles(templateFileLocation, dataFi
     try {
         logger_1.default.info(`Getting template from fileLocation:  ${templateFileLocation}`);
         templateCSVData = await loadDataFromLocalCSV(templateFileLocation);
-        logger_1.default.info(`CSV import was successful. ${templateCSVData === null || templateCSVData === void 0 ? void 0 : templateCSVData.length} rows found.`);
+        logger_1.default.info(`CSV import was successful. ${templateCSVData?.length} rows found.`);
         logger_1.default.info(`Getting data from fileLocation:  ${dataFileLocation}`);
         dataCSVData = await loadDataFromLocalCSV(dataFileLocation);
-        logger_1.default.info(`CSV import was successful. ${dataCSVData === null || dataCSVData === void 0 ? void 0 : dataCSVData.length} rows found.`);
+        logger_1.default.info(`CSV import was successful. ${dataCSVData?.length} rows found.`);
     }
     catch (e) {
         logger_1.default.info(`Error importing csv data. ${e}`);
@@ -66,7 +66,7 @@ async function parseTypesFromTemplateAndDataFromLocalFiles(templateFileLocation,
     try {
         logger_1.default.info(`Getting template from fileLocation:  ${templateFileLocation}`);
         templateCSVData = await loadDataFromLocalCSV(templateFileLocation);
-        logger_1.default.info(`CSV import was successful. ${templateCSVData === null || templateCSVData === void 0 ? void 0 : templateCSVData.length} rows found.`);
+        logger_1.default.info(`CSV import was successful. ${templateCSVData?.length} rows found.`);
     }
     catch (e) {
         logger_1.default.info(`Error importing csv data. ${e}`);
@@ -77,7 +77,7 @@ async function parseTypesFromTemplateAndDataFromLocalFiles(templateFileLocation,
         try {
             logger_1.default.info(`Getting data for dataFileLocation:  ${dataFileLocation}`);
             const csvData = await loadDataFromLocalCSV(dataFileLocation);
-            logger_1.default.info(`CSV import was successful. ${csvData === null || csvData === void 0 ? void 0 : csvData.length} rows found. Adding to total rows.`);
+            logger_1.default.info(`CSV import was successful. ${csvData?.length} rows found. Adding to total rows.`);
             dataCSVData.push(...csvData);
         }
         catch (e) {
@@ -98,7 +98,7 @@ async function parseTypesFromFiles(fileIds) {
         try {
             logger_1.default.info(`Getting data for fileId:  ${loadFileId}`);
             const csvJSON = await (0, csv_parser_1.getCSVFromFile)(loadFileId);
-            logger_1.default.info(`CSV download was successful. ${csvJSON === null || csvJSON === void 0 ? void 0 : csvJSON.length} rows found. Adding to total rows`);
+            logger_1.default.info(`CSV download was successful. ${csvJSON?.length} rows found. Adding to total rows`);
             csvJSONData.push(...csvJSON);
         }
         catch (e) {
@@ -106,7 +106,7 @@ async function parseTypesFromFiles(fileIds) {
             throw e;
         }
     }
-    logger_1.default.info(`CSV downloads were successful. ${csvJSONData === null || csvJSONData === void 0 ? void 0 : csvJSONData.length} total rows found.`);
+    logger_1.default.info(`CSV downloads were successful. ${csvJSONData?.length} total rows found.`);
     const suggestions = (0, types_1.GetSuggestedTypes)(csvJSONData);
     saveData(suggestions.OptionSets, 'parsed_optionSets.yml');
     saveData({ typeProperties: suggestions.TypeProperties }, 'parsed_typeProperties.yml');

package/dist/helpers/types/type-uploader.js

@@ -137,7 +137,6 @@ async function uploadReducedTypes(dir) {
     }
 }
 async function uploadReducedTypeProperties(type, currentPropertyTypes, newPropertyTypes, optionSets) {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u;
     const currentPropertyTypeBySlug = {};
     for (const currentPropertyType of currentPropertyTypes) {
         currentPropertyTypeBySlug[currentPropertyType.slug] = currentPropertyType;
@@ -189,25 +188,25 @@ async function uploadReducedTypeProperties(type, currentPropertyTypes, newProper
             // !typePropertiesEqual(found, newPropertyType, optionSetIdBySlug)
             ) {
                 const proposedTP = {
-                    isArchived: (_a = newPropertyType.isArchived) !== null && _a !== void 0 ? _a : null,
-                    propertyType: (_b = newPropertyType.propertyType) !== null && _b !== void 0 ? _b : null,
-                    slug: (_c = newPropertyType.slug) !== null && _c !== void 0 ? _c : null,
-                    label: (_d = newPropertyType.label) !== null && _d !== void 0 ? _d : null,
-                    editable: (_e = newPropertyType.editable) !== null && _e !== void 0 ? _e : null,
-                    searchable: (_f = newPropertyType.searchable) !== null && _f !== void 0 ? _f : null,
-                    core: (_g = newPropertyType.core) !== null && _g !== void 0 ? _g : null,
-                    typePropertyOptionSetId: (_h = optionSetIdBySlug[newPropertyType.typePropertyOptionSetSlug]) !== null && _h !== void 0 ? _h : null,
-                    formula: (_j = newPropertyType.formula) !== null && _j !== void 0 ? _j : null,
-                    referencedTypePath: (_k = newPropertyType.referencedTypePath) !== null && _k !== void 0 ? _k : null,
-                    carryOverBehavior: (_l = newPropertyType.carryOverBehavior) !== null && _l !== void 0 ? _l : null,
-                    carryOverDefault: (_m = newPropertyType.carryOverDefault) !== null && _m !== void 0 ? _m : null,
-                    referencedTypeRootSlug: (_o = newPropertyType.referencedTypeRootSlug) !== null && _o !== void 0 ? _o : null,
-                    defaultValue: (_p = newPropertyType.defaultValue) !== null && _p !== void 0 ? _p : null,
-                    propertyLevel: (_q = newPropertyType.propertyLevel) !== null && _q !== void 0 ? _q : null,
-                    formulaFunction: (_r = newPropertyType.formulaFunction) !== null && _r !== void 0 ? _r : null,
-                    validationFunction: (_s = newPropertyType.validationFunction) !== null && _s !== void 0 ? _s : null,
-                    numberFormat: (_t = newPropertyType.numberFormat) !== null && _t !== void 0 ? _t : null,
-                    sequenceSeedValue: (_u = newPropertyType.sequenceSeedValue) !== null && _u !== void 0 ? _u : null,
+                    isArchived: newPropertyType.isArchived ?? null,
+                    propertyType: newPropertyType.propertyType ?? null,
+                    slug: newPropertyType.slug ?? null,
+                    label: newPropertyType.label ?? null,
+                    editable: newPropertyType.editable ?? null,
+                    searchable: newPropertyType.searchable ?? null,
+                    core: newPropertyType.core ?? null,
+                    typePropertyOptionSetId: optionSetIdBySlug[newPropertyType.typePropertyOptionSetSlug] ?? null,
+                    formula: newPropertyType.formula ?? null,
+                    referencedTypePath: newPropertyType.referencedTypePath ?? null,
+                    carryOverBehavior: newPropertyType.carryOverBehavior ?? null,
+                    carryOverDefault: newPropertyType.carryOverDefault ?? null,
+                    referencedTypeRootSlug: newPropertyType.referencedTypeRootSlug ?? null,
+                    defaultValue: newPropertyType.defaultValue ?? null,
+                    propertyLevel: newPropertyType.propertyLevel ?? null,
+                    formulaFunction: newPropertyType.formulaFunction ?? null,
+                    validationFunction: newPropertyType.validationFunction ?? null,
+                    numberFormat: newPropertyType.numberFormat ?? null,
+                    sequenceSeedValue: newPropertyType.sequenceSeedValue ?? null,
                 };
                 // logger.debug(
                 //   `found type property option set: ${newPropertyType.typePropertyOptionSetSlug}, ${proposedTP.typePropertyOptionSetId}, `,

package/dist/helpers/workflow-template-definitions/workflow-template-definition-deployer.js

@@ -95,7 +95,7 @@ class WorkflowTemplateDefinitionDeployer {
         logger_1.default.info('WORKFLOW DEFINITION \tDeploying workflow definitions.');
         if (appDeclaration.workflows) {
             const localWorkflows = Object.keys(appDeclaration.workflows);
-            if ((localWorkflows === null || localWorkflows === void 0 ? void 0 : localWorkflows.length) > 0) {
+            if (localWorkflows?.length > 0) {
                 for (const workflowKey of localWorkflows) {
                     await this.deployWorkflow(workflowKey, appDeclaration.workflows[workflowKey], app, existingWorkflows);
                 }
@@ -131,13 +131,12 @@ class WorkflowTemplateDefinitionDeployer {
         return workflowTemplate;
     }
     async populateActionIds(workflowDefinition, app) {
-        var _a;
         const availableAppActions = await (0, actions_deployer_1.getActionsForAppVersion)(app);
-        if (!((_a = workflowDefinition.workflowDefinition) === null || _a === void 0 ? void 0 : _a.paths)) {
+        if (!workflowDefinition.workflowDefinition?.paths) {
             return;
         }
         for (const path of workflowDefinition.workflowDefinition.paths) {
-            if (!(path === null || path === void 0 ? void 0 : path.actionDefinitionConfigs)) {
+            if (!path?.actionDefinitionConfigs) {
                 continue;
             }
             for (const actionConfiguration of path.actionDefinitionConfigs) {

package/dist/helpers/workflow-templates/helper.js

@@ -56,15 +56,14 @@ class LocalWorkflowTemplateDeployer {
         return newWorkflowTemplate;
     }
     async populateActionIds(workflowTemplate, workflowKey, appIdentifier) {
-        var _a;
         const installedApps = await (0, apps_1.getInstalledApps)();
         const appOrg = installedApps.find((x) => x.app.identifier === appIdentifier);
         logger_1.default.info('workflow template:', JSON.stringify(workflowTemplate, null, 2));
-        if (!((_a = workflowTemplate === null || workflowTemplate === void 0 ? void 0 : workflowTemplate.workflowDefinition) === null || _a === void 0 ? void 0 : _a.paths)) {
+        if (!workflowTemplate?.workflowDefinition?.paths) {
             return;
         }
         for (const path of workflowTemplate.workflowDefinition.paths) {
-            if (!(path === null || path === void 0 ? void 0 : path.actionDefinitionConfigs)) {
+            if (!path?.actionDefinitionConfigs) {
                 continue;
             }
             for (const actionConfiguration of path.actionDefinitionConfigs) {
@@ -89,8 +88,7 @@ class LocalWorkflowTemplateDeployer {
         }
     }
     async createWorkflowSchedule(workflowTemplate, workflowId) {
-        var _a;
-        if (!((_a = workflowTemplate === null || workflowTemplate === void 0 ? void 0 : workflowTemplate.crons) === null || _a === void 0 ? void 0 : _a.length) || !workflowTemplate.id) {
+        if (!workflowTemplate?.crons?.length || !workflowTemplate.id) {
             return;
         }
         const crons = [];
@@ -111,11 +109,10 @@ class LocalWorkflowTemplateDeployer {
         return crons;
     }
     async updateWorkflowSchedule(workflowTemplate, workflowId) {
-        var _a, _b, _c, _d;
-        const existingSchedules = (_a = (await (0, schedules_1.getExistingSchedules)()).filter((x) => (x === null || x === void 0 ? void 0 : x.ownerReference) === `event-workflow-template:${workflowId}`)) !== null && _a !== void 0 ? _a : [];
-        const newSchedules = (_b = workflowTemplate === null || workflowTemplate === void 0 ? void 0 : workflowTemplate.crons) !== null && _b !== void 0 ? _b : [];
-        const existingCronNames = (_c = existingSchedules.map((x) => x.name)) !== null && _c !== void 0 ? _c : [];
-        const newCronNames = (_d = newSchedules.map((x) => x.name)) !== null && _d !== void 0 ? _d : [];
+        const existingSchedules = (await (0, schedules_1.getExistingSchedules)()).filter((x) => x?.ownerReference === `event-workflow-template:${workflowId}`) ?? [];
+        const newSchedules = workflowTemplate?.crons ?? [];
+        const existingCronNames = existingSchedules.map((x) => x.name) ?? [];
+        const newCronNames = newSchedules.map((x) => x.name) ?? [];
         const cronsToAdd = newSchedules.filter((x) => !existingCronNames.includes(x.name));
         const cronsToRemove = existingSchedules.filter((x) => !newCronNames.includes(x.name));
         const cronsToEdit = existingSchedules.filter((x) => newCronNames.includes(x.name));
@@ -157,15 +154,14 @@ class LocalWorkflowTemplateDeployer {
         }
     }
     async updateWorkflowTemplate(workflowKey, existingWorkflowTemplate, workflowTemplate, appIdentifier) {
-        var _a, _b;
         await this.populateActionIds(workflowTemplate, workflowKey, appIdentifier);
         const updates = Object.assign(new Object(), {
             name: workflowTemplate.name,
             triggerKey: workflowTemplate.triggerKey,
             builtIn: workflowTemplate.builtIn,
             workflowDefinition: workflowTemplate.workflowDefinition,
-            messageGroupId: (_a = workflowTemplate.messageGroupId) !== null && _a !== void 0 ? _a : existingWorkflowTemplate.messageGroupId,
-            parallelWorkerCount: (_b = workflowTemplate.parallelWorkerCount) !== null && _b !== void 0 ? _b : existingWorkflowTemplate.parallelWorkerCount,
+            messageGroupId: workflowTemplate.messageGroupId ?? existingWorkflowTemplate.messageGroupId,
+            parallelWorkerCount: workflowTemplate.parallelWorkerCount ?? existingWorkflowTemplate.parallelWorkerCount,
         });
         const updatedWorkflowTemplate = await (0, event_workflow_templates_1.updateWorkflowTemplate)({
             id: existingWorkflowTemplate.id,
@@ -265,12 +261,11 @@ function loadTemplateConfig(saveFile) {
     }
 }
 async function populateActionIdentifiers(workflowTemplate) {
-    var _a;
-    if (!((_a = workflowTemplate === null || workflowTemplate === void 0 ? void 0 : workflowTemplate.workflowDefinition) === null || _a === void 0 ? void 0 : _a.paths)) {
+    if (!workflowTemplate?.workflowDefinition?.paths) {
         return;
     }
     for (const path of workflowTemplate.workflowDefinition.paths) {
-        if (!(path === null || path === void 0 ? void 0 : path.actionDefinitionConfigs)) {
+        if (!path?.actionDefinitionConfigs) {
             continue;
         }
         for (const actionConfiguration of path.actionDefinitionConfigs) {

package/dist/interface-converters.js

@@ -4,8 +4,7 @@ exports.convertWorkflow = exports.DEFAULT_WORKFLOW_PARALLELISM = void 0;
 exports.DEFAULT_WORKFLOW_PARALLELISM = 1;
 // parses the user-facing interface of the workflow and converts it to the cloud-facing format in-place.
 function convertWorkflow(workflow) {
-    var _a;
-    workflow.parallelWorkerCount = (_a = workflow.parallelism) !== null && _a !== void 0 ? _a : exports.DEFAULT_WORKFLOW_PARALLELISM;
+    workflow.parallelWorkerCount = workflow.parallelism ?? exports.DEFAULT_WORKFLOW_PARALLELISM;
     workflow.messageGroupId = workflow.groupId;
 }
 exports.convertWorkflow = convertWorkflow;

package/dist/interfaces.js

@@ -24,15 +24,52 @@ var AppRuntime;
     AppRuntime["NODE"] = "NODE";
 })(AppRuntime = exports.AppRuntime || (exports.AppRuntime = {}));
 class AppVersion {
+    id;
+    createdOn;
+    updatedOn;
+    createdById;
+    updatedById;
+    createdBy;
+    updatedBy;
+    orgId;
+    appId;
+    app;
+    appOrgs;
+    versionNumber;
+    status;
+    eventWorkflowTriggerKeyMapping;
+    configProperties;
+    triggerKeyDefinitions;
+    dockerImageRef;
+    appRuntime;
 }
 exports.AppVersion = AppVersion;
 class AppApiKey {
+    id;
+    createdOn;
+    updatedOn;
+    createdById;
+    updatedById;
+    createdBy;
+    updatedBy;
+    orgId;
+    appOrgId;
+    appOrg;
+    apiKey;
 }
 exports.AppApiKey = AppApiKey;
 class ConfigProperty {
+    slug;
+    propertyType;
+    options;
+    label;
 }
 exports.ConfigProperty = ConfigProperty;
 class TriggerKeyDefinition {
+    name;
+    description;
+    triggerKey;
+    external;
 }
 exports.TriggerKeyDefinition = TriggerKeyDefinition;
 class CommonConfiguration {
@@ -46,23 +83,65 @@ var AssortmentType;
     AssortmentType["SHOWCASE"] = "SHOWCASE";
 })(AssortmentType = exports.AssortmentType || (exports.AssortmentType = {}));
 class AssortmentConfiguration {
+    identifier;
+    name;
+    type;
+    sourceAssortmentIdentifier;
+    composedFromAssortmentIdentifiers;
+    ownerAtts;
+    assortmentAtts;
 }
 exports.AssortmentConfiguration = AssortmentConfiguration;
 class Folder {
+    identifier;
+    name;
+    principals;
+    assortments;
+    subFolders;
 }
 exports.Folder = Folder;
 class ProjectConfiguration {
+    projectName;
+    identifier;
+    commonConfig;
+    principals;
+    assortments;
+    subFolders;
 }
 exports.ProjectConfiguration = ProjectConfiguration;
 class ProjectConfigurationTemplate {
+    projectName;
+    identifier;
+    commonConfig;
+    principals;
+    allFolders;
+    allAssortments;
+    allAssortmentRelationships;
 }
 exports.ProjectConfigurationTemplate = ProjectConfigurationTemplate;
 class FolderSlim {
+    identifier;
+    name;
+    principals;
+    folderIdentifier;
 }
 exports.FolderSlim = FolderSlim;
 class AssortmentConfigurationSlim {
+    identifier;
+    name;
+    type;
+    folderIdentifier;
+    sourceAssortmentIdentifier;
+    composedFromAssortmentIdentifiers;
+    ownerAtts;
+    assortmentAtts;
 }
 exports.AssortmentConfigurationSlim = AssortmentConfigurationSlim;
 class AssortmentConfigurationRelationships {
+    identifier;
+    sourceAssortmentIdentifier;
+    composedFromAssortmentIdentifiers;
+    ownerAtts;
+    assortmentAtts;
 }
 exports.AssortmentConfigurationRelationships = AssortmentConfigurationRelationships;

package/dist/logger.js

@@ -4,13 +4,14 @@ const tslib_1 = require("tslib");
 const winston_1 = tslib_1.__importStar(require("winston"));
 const lodash_1 = tslib_1.__importDefault(require("lodash"));
 class Logger {
+    logger;
+    colors = {
+        error: 'red',
+        warn: 'yellow',
+        info: 'green',
+        debug: 'blue',
+    };
     constructor() {
-        this.colors = {
-            error: 'red',
-            warn: 'yellow',
-            info: 'green',
-            debug: 'blue',
-        };
         const transport = new winston_1.transports.Console();
         winston_1.default.addColors(this.colors);
         this.logger = (0, winston_1.createLogger)({