@contrail/cli 2.1.27 → 2.2.1

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

@@ -24,11 +24,11 @@ class AppDeployer {
     async deploy(appDeclaration) {
         let app = await this.getExistingApp(appDeclaration);
         if (!app) {
-            logger_1.default.info('%s      Creating new app.', chalk_1.default.yellow.bold('APP'));
+            logger_1.default.info(`${chalk_1.default.yellow.bold('APP')}      Creating new app.`);
             app = await this.createNewApp(appDeclaration);
         }
         else {
-            logger_1.default.info('%s      Updating existing app.', chalk_1.default.yellow.bold('APP'));
+            logger_1.default.info(`${chalk_1.default.yellow.bold('APP')}      Updating existing app.`);
             app = await this.updateExistingApp(appDeclaration, app);
         }
         if (this.dryRun) {
@@ -79,14 +79,14 @@ class AppDeployer {
             return {};
         }
         let app = await new sdk_1.Entities().create({ entityName: 'app', object: newApp });
-        logger_1.default.info(`%s      Created new app: ${app.name}`, chalk_1.default.yellow.bold('APP'));
+        logger_1.default.info(`${chalk_1.default.yellow.bold('APP')}      Created new app: ${app.name}`);
         const isDocker = Object.hasOwnProperty.call(appDeclaration, 'dockerImageRef');
         if (!isDocker) {
             // this is the expected default behavior
             const appCodePackage = await createNodePackage(appDeclaration.appIdentifier, this.debug, this.dryRun);
             app.appCodePackageId = appCodePackage.id;
             app = await new sdk_1.Entities().update({ entityName: 'app', id: app.id, object: app });
-            logger_1.default.info(`%s      Updated app with code package: ${app.name}`, chalk_1.default.yellow.bold('APP'));
+            logger_1.default.info(`${chalk_1.default.yellow.bold('APP')}      Updated app with code package: ${app.name}`);
         }
         return app;
     }
@@ -136,7 +136,7 @@ class AppDeployer {
             id: existingApp.id,
             object: updates,
         });
-        logger_1.default.info(`%s      Updated app: ${app.name}`, chalk_1.default.yellow.bold('APP'));
+        logger_1.default.info(`${chalk_1.default.yellow.bold('APP')}      Updated app: ${app.name}`);
         return app;
     }
     async remove(appDeclaration) {
@@ -144,11 +144,11 @@ class AppDeployer {
         if (app) {
             const actions = await (0, actions_deployer_1.getActionsForAppVersion)(app);
             for (const action of actions) {
-                logger_1.default.info(`%s      Deleting action: ${action.identifier}`, chalk_1.default.yellow.bold('APP'));
+                logger_1.default.info(`${chalk_1.default.yellow.bold('APP')}      Deleting action: ${action.identifier}`);
                 await (0, actions_deployer_1.deleteAction)(action.id);
             }
             app = await new sdk_1.Entities().delete({ entityName: 'app', id: app.id });
-            logger_1.default.info(`%s      Deleted app: ${app.name}`, chalk_1.default.yellow.bold('APP'));
+            logger_1.default.info(`${chalk_1.default.green.bold('APP')}      Deleted app: ${app.name}`);
         }
         else {
             throw new Error('App not found.');
@@ -177,7 +177,7 @@ async function createNodePackage(appIdentifier, debug, dryRun) {
             child_process_1.default.execSync('npx tsc --outDir tmp/dist');
         }
         catch (e) {
-            logger_1.default.error('%s      Failed to build package.', chalk_1.default.red.bold('APP'));
+            logger_1.default.error(`${chalk_1.default.red.bold('APP')}      Failed to build package.`);
             const stdOut = e.stdout.toString();
             const stdErr = e.stderr.toString();
             logger_1.default.error('Build Error(stdout):', stdOut);
@@ -224,7 +224,7 @@ async function createNodePackage(appIdentifier, debug, dryRun) {
         return appCodePackage;
     }
     catch (e) {
-        logger_1.default.error('%s      Failed to create app package.', chalk_1.default.red.bold('APP'));
+        logger_1.default.error(`${chalk_1.default.red.bold('APP')}      Failed to create app package.`);
         throw e;
     }
     finally {

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

@@ -18,7 +18,7 @@ class ExtensionsDeployer {
         var _a;
         // FETCH ALL EXTENSIONS FROM THE API.
         if (!appDeclaration.extensions) {
-            logger_1.default.info('%s \tNo extensions found...skipping.', chalk_1.default.yellow.bold('EXTENSION'));
+            logger_1.default.info(`${chalk_1.default.yellow.bold('EXTENSION')} \tNo extensions found...skipping.`);
             return;
         }
         // UPSERT / DELETE BASED ON EXTENSION IDENTIFIER
@@ -32,7 +32,7 @@ class ExtensionsDeployer {
         }
     }
     async deployExtension(extension, app, existingExtensions) {
-        logger_1.default.info(`%s \tDeploying extension: ${extension === null || extension === void 0 ? void 0 : extension.identifier}`, chalk_1.default.yellow.bold('EXTENSION'));
+        logger_1.default.info(`${chalk_1.default.yellow.bold('EXTENSION')} \tDeploying extension: ${extension === null || extension === void 0 ? void 0 : extension.identifier}`);
         const identifier = util_1.AppUtil.createExtensionIdentifier({
             appIdentifier: app.identifier,
             extensionIdentifier: extension.identifier,
@@ -63,7 +63,7 @@ class ExtensionsDeployer {
             entityName: 'app-extension-definition',
             object: newObject,
         });
-        logger_1.default.info(`%s      Created new extension definition: ${extension === null || extension === void 0 ? void 0 : extension.identifier}`, chalk_1.default.yellow.bold('APP'));
+        logger_1.default.info(`${chalk_1.default.yellow.bold('EXTENSION')}     Created new extension definition: ${extension === null || extension === void 0 ? void 0 : extension.identifier}`);
         return actionDefinition;
     }
     async updateActionDefinition(existingActionDefinition, extension, app) {
@@ -85,7 +85,7 @@ class ExtensionsDeployer {
             id: existingActionDefinition.id,
             object: updates,
         });
-        logger_1.default.info(`%s      Updated existing extension definition: ${extensionDefinition.identifier}`, chalk_1.default.yellow.bold('APP'));
+        logger_1.default.info(`${chalk_1.default.yellow.bold('EXTENSION')}      Updated existing extension definition: ${extensionDefinition.identifier}`);
         return extensionDefinition;
     }
 }

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

@@ -0,0 +1,2 @@
+import { AppDeclaration } from '../../interfaces';
+export declare function updateAppConfig(newAppYml: AppDeclaration): void;

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

@@ -0,0 +1,20 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.updateAppConfig = void 0;
+const tslib_1 = require("tslib");
+const path = tslib_1.__importStar(require("path"));
+const fs_1 = tslib_1.__importDefault(require("fs"));
+const js_yaml_1 = tslib_1.__importDefault(require("js-yaml"));
+function updateAppConfig(newAppYml) {
+    const TARGET_DIR = process.cwd();
+    try {
+        // Convert the updated data back to YAML format
+        const updatedYamlData = js_yaml_1.default.dump(newAppYml);
+        // Write the updated YAML back to the file
+        fs_1.default.writeFileSync(path.resolve(path.join(TARGET_DIR, 'app.yml')), updatedYamlData, 'utf8');
+    }
+    catch (e) {
+        throw new Error(`ERROR PARSING YAML: ${e}`);
+    }
+}
+exports.updateAppConfig = updateAppConfig;

package/dist/helpers/app/upgrade-version.d.ts

@@ -0,0 +1,16 @@
+import semver from 'semver';
+/**
+ * Upgrades a semantic version based on a specified release type.
+ *
+ * @param {string} currentVersion - The current semantic version string.
+ * @param {semver.ReleaseType} type - The type of release ('major', 'minor', 'patch').
+ * @returns {string} The upgraded semantic version.
+ * @throws {Error} If the provided currentVersion is not a valid semantic version.
+ *
+ * @example
+ * const currentVersion = '1.2.3';
+ * const releaseType = 'minor';
+ * const upgradedVersion = upgradeVersion(currentVersion, releaseType);
+ * console.log(upgradedVersion); // Outputs: '1.3.0'
+ */
+export declare function upgradeVersion(currentVersion: string, type: semver.ReleaseType): string;

package/dist/helpers/app/upgrade-version.js

@@ -0,0 +1,37 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.upgradeVersion = void 0;
+const tslib_1 = require("tslib");
+const semver_1 = tslib_1.__importDefault(require("semver"));
+/**
+ * Upgrades a semantic version based on a specified release type.
+ *
+ * @param {string} currentVersion - The current semantic version string.
+ * @param {semver.ReleaseType} type - The type of release ('major', 'minor', 'patch').
+ * @returns {string} The upgraded semantic version.
+ * @throws {Error} If the provided currentVersion is not a valid semantic version.
+ *
+ * @example
+ * const currentVersion = '1.2.3';
+ * const releaseType = 'minor';
+ * const upgradedVersion = upgradeVersion(currentVersion, releaseType);
+ * console.log(upgradedVersion); // Outputs: '1.3.0'
+ */
+function upgradeVersion(currentVersion, type) {
+    try {
+        const paddedVersion = currentVersion
+            .toString()
+            .split('.')
+            .concat(new Array(3).fill(0).map(String))
+            .slice(0, 3)
+            .join('.');
+        if (!semver_1.default.valid(paddedVersion)) {
+            throw new Error('Invalid version string');
+        }
+        return semver_1.default.inc(paddedVersion, type);
+    }
+    catch (e) {
+        throw new Error(`ERROR PARSING YAML: ${e}`);
+    }
+}
+exports.upgradeVersion = upgradeVersion;

package/dist/helpers/app/upgrade-version.spec.d.ts

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

package/dist/helpers/app/upgrade-version.spec.js

@@ -0,0 +1,33 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const tslib_1 = require("tslib");
+const semver_1 = tslib_1.__importDefault(require("semver"));
+const upgrade_version_1 = require("./upgrade-version");
+describe('upgradeVersion', () => {
+    it('should upgrade the major semantic version correctly for a valid input', () => {
+        const currentVersion = '1.1.1';
+        const releaseType = 'major';
+        const upgradedVersion = (0, upgrade_version_1.upgradeVersion)(currentVersion, releaseType);
+        const expectedVersion = semver_1.default.inc(currentVersion, releaseType);
+        expect(upgradedVersion).toBe(expectedVersion);
+    });
+    it('should upgrade the minor semantic version correctly for a valid input', () => {
+        const currentVersion = '1.2.3';
+        const releaseType = 'minor';
+        const upgradedVersion = (0, upgrade_version_1.upgradeVersion)(currentVersion, releaseType);
+        const expectedVersion = semver_1.default.inc(currentVersion, releaseType);
+        expect(upgradedVersion).toBe(expectedVersion);
+    });
+    it('should upgrade the patch semantic version correctly for a valid input', () => {
+        const currentVersion = '1.1.0';
+        const releaseType = 'patch';
+        const upgradedVersion = (0, upgrade_version_1.upgradeVersion)(currentVersion, releaseType);
+        const expectedVersion = semver_1.default.inc(currentVersion, releaseType);
+        expect(upgradedVersion).toBe(expectedVersion);
+    });
+    it('should throw an error for an invalid semantic version input', () => {
+        const currentVersion = 'invalidVersion';
+        const releaseType = 'patch';
+        expect(() => (0, upgrade_version_1.upgradeVersion)(currentVersion, releaseType)).toThrowError('Invalid version string');
+    });
+});

package/dist/helpers/colors/helpers.js

@@ -21,7 +21,7 @@ async function getLocalColors() {
 }
 exports.getLocalColors = getLocalColors;
 async function getExistingColors() {
-    logger_1.default.info('%s Getting Existing Colors', chalk_1.default.yellow.bold('COLORS'));
+    logger_1.default.info(`${chalk_1.default.yellow.bold('COLORS')} Getting Existing Colors`);
     const colors = [];
     try {
         let nextPageKey = null;
@@ -56,7 +56,7 @@ async function uploadColors() {
     const existingNamesValues = existingColors.filter((x) => x.name).map((x) => x.name);
     for (const color of colors) {
         if (existingNamesValues.includes(color.name)) {
-            logger_1.default.info('%s SKIPPING %s (%s)', chalk_1.default.yellow.bold('COLORS'), color.hex, color.name);
+            logger_1.default.info(`${chalk_1.default.yellow.bold('COLORS')} SKIPPING ${color.hex} (${color.name})`);
             continue;
         }
         if (color.hex.length > 1 && color.hex[0] === '#') {

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

@@ -27,7 +27,7 @@ function getLocalUploadConfig(configFileName) {
     }
     const CURRENT_DIR = process.cwd();
     const fullPath = path.join(CURRENT_DIR, configFileName);
-    logger_1.default.info('Getting config from path: ', fullPath);
+    logger_1.default.info(`Getting config from path: ${fullPath}`);
     if (ext === '.yml') {
         try {
             const doc = js_yaml_1.default.load(fs.readFileSync(fullPath, 'utf8'));
@@ -53,7 +53,7 @@ async function uploadFile(incomingFileName) {
         entityName: 'file',
         object: { contentType: 'text/csv', fileName: fileName, ttl: 24 * 60 * 60 * 1000 },
     });
-    logger_1.default.info('VibeIQ file ID:', file.id);
+    logger_1.default.info(`VibeIQ file ID: ${file.id}`);
     // Upload the CSV data to the newly created VibeIQ file
     const fileDetails = {
         contentType: 'text/csv',
@@ -65,14 +65,14 @@ async function uploadFile(incomingFileName) {
 async function loadFile(config) {
     const entities = new sdk_1.Entities();
     // start a load job referencing the newly created file
-    logger_1.default.info('Loading with config: ', config);
+    logger_1.default.info(`Loading with config: ${config}`);
     const loadJob = await entities.create({
         entityName: 'loader-process',
         object: {
             ...config,
         },
     });
-    logger_1.default.info('Load has been kicked off. loader-process ID: ', loadJob.id);
+    logger_1.default.info(`Load has been kicked off. loader-process ID: ${loadJob.id}`);
 }
 async function uploadAndLoadLocalFile(incomingFileName, configFileName) {
     const file = await uploadFile(incomingFileName);

package/dist/helpers/projects/helpers.js

@@ -12,7 +12,7 @@ function getProjectFile(fileName) {
     const CURRENT_DIR = process.cwd();
     try {
         const fullPath = path.join(CURRENT_DIR, fileName);
-        logger_1.default.info('Getting file from path: ', fullPath);
+        logger_1.default.info(`Getting file from path: ${fullPath}`);
         const doc = js_yaml_1.default.load(fs_1.default.readFileSync(fullPath, 'utf8'));
         return doc.projectConfiguration;
     }

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

@@ -10,7 +10,7 @@ async function getCSVFromFile(loadFileId) {
     let file;
     try {
         file = await new sdk_1.Entities().get({ entityName: 'file', id: loadFileId });
-        logger_1.default.info('Got file: ', file);
+        logger_1.default.info(`Got file: ${file}`);
     }
     catch (e) {
         logger_1.default.info(`Failed to get file: ${loadFileId}`, JSON.stringify(e));
@@ -26,15 +26,15 @@ async function getCSVFromFile(loadFileId) {
         response = await new Promise((resolve, reject) => {
             client
                 .get(file.downloadUrl, function (res) {
-                logger_1.default.info('Status code:', res.statusCode);
-                logger_1.default.info('Status text:', res.statusMessage);
+                logger_1.default.info(`Status code: ${res.statusCode}`);
+                logger_1.default.info(`Status text: ${res.statusMessage}`);
                 let body = '';
                 res.on('data', (data) => {
                     body += data.toString();
                 });
                 res.on('end', () => {
-                    logger_1.default.info('Response body:');
-                    //logger.info(body);
+                    logger_1.default.debug('Response body:');
+                    logger_1.default.debug(body);
                     resolve(body);
                 });
             })
@@ -45,7 +45,7 @@ async function getCSVFromFile(loadFileId) {
         });
     }
     catch (e) {
-        logger_1.default.info(`Failed to get data from downloadUrl: ${file.downloadUrl}`, e);
+        logger_1.default.info(`Failed to get data from downloadUrl: ${file.downloadUrl} ${JSON.stringify(e)}`);
         throw e;
     }
     if (!response) {

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

@@ -8,7 +8,7 @@ const p_limit_1 = tslib_1.__importDefault(require("p-limit"));
 const logger_1 = tslib_1.__importDefault(require("../../logger"));
 const limit = (0, p_limit_1.default)(30);
 async function getTypes(withTypeProperties = true) {
-    logger_1.default.info('%s Retrieving', chalk_1.default.yellow.bold('TYPES'));
+    logger_1.default.info(`${chalk_1.default.yellow.bold('TYPES')} Retrieving`);
     const entitiesClient = new sdk_1.Entities();
     const types = await entitiesClient.get({
         entityName: 'type',

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

@@ -25,13 +25,13 @@ async function parseTypesFromLocalFiles(fileLocations) {
     const csvJSONData = [];
     for (const fileLocation of fileLocations) {
         try {
-            logger_1.default.info('Getting data for fileLocation: ', fileLocation);
+            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.`);
             csvJSONData.push(...csvData);
         }
         catch (e) {
-            logger_1.default.info('Error importing csv data.', e);
+            logger_1.default.info(`Error importing csv data. ${e}`);
             throw e;
         }
     }
@@ -45,15 +45,15 @@ async function parseTypesFromTemplateFromLocalFiles(templateFileLocation, dataFi
     let templateCSVData = [];
     let dataCSVData = [];
     try {
-        logger_1.default.info('Getting template from fileLocation: ', templateFileLocation);
+        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('Getting data from fileLocation: ', dataFileLocation);
+        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.`);
     }
     catch (e) {
-        logger_1.default.info('Error importing csv data.', e);
+        logger_1.default.info(`Error importing csv data. ${e}`);
         throw e;
     }
     const types = (0, types_1.GetTypesFromTemplate)(templateCSVData, dataCSVData);
@@ -64,24 +64,24 @@ exports.parseTypesFromTemplateFromLocalFiles = parseTypesFromTemplateFromLocalFi
 async function parseTypesFromTemplateAndDataFromLocalFiles(templateFileLocation, dataFileLocations) {
     let templateCSVData = [];
     try {
-        logger_1.default.info('Getting template from fileLocation: ', templateFileLocation);
+        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.`);
     }
     catch (e) {
-        logger_1.default.info('Error importing csv data.', e);
+        logger_1.default.info(`Error importing csv data. ${e}`);
         throw e;
     }
     const dataCSVData = [];
     for (const dataFileLocation of dataFileLocations) {
         try {
-            logger_1.default.info('Getting data for dataFileLocation: ', dataFileLocation);
+            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.`);
             dataCSVData.push(...csvData);
         }
         catch (e) {
-            logger_1.default.info('Error importing csv data.', e);
+            logger_1.default.info(`Error importing csv data. ${e}`);
             throw e;
         }
     }
@@ -96,13 +96,13 @@ async function parseTypesFromFiles(fileIds) {
     const csvJSONData = [];
     for (const loadFileId of fileIds) {
         try {
-            logger_1.default.info('Getting data for fileId: ', loadFileId);
+            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`);
             csvJSONData.push(...csvJSON);
         }
         catch (e) {
-            logger_1.default.info('Error retrieving csv data', e);
+            logger_1.default.info(`Error retrieving csv data ${e}`);
             throw e;
         }
     }

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

@@ -13,16 +13,16 @@ const logger_1 = tslib_1.__importDefault(require("../../logger"));
 async function uploadTypes(dir) {
     try {
         const userConfig = await (0, login_1.authUser)();
-        logger_1.default.info(`%s Getting all types for orgId: ${userConfig.orgId}`, chalk_1.default.blue.bold('START'));
-        logger_1.default.info('%s Uploading', chalk_1.default.yellow.bold('TYPES'));
+        logger_1.default.info(`START Getting all types for orgId: ${userConfig.orgId}`);
+        logger_1.default.info('TYPES Uploading ');
         await uploadReducedTypes(dir);
-        logger_1.default.info('%s Uploaded', chalk_1.default.yellow.bold('TYPES'));
+        logger_1.default.info(`${chalk_1.default.yellow.bold('TYPES')} Uploaded`);
     }
     catch (e) {
-        logger_1.default.info(`%s Types Upload Failed. ${e}`, chalk_1.default.red.bold('FAIL'));
+        logger_1.default.info(`${chalk_1.default.red.bold('FAIL')} Types Upload Failed . ${e}`);
         return;
     }
-    logger_1.default.info('%s Types Upload Complete.', chalk_1.default.green.bold('COMPLETE'));
+    logger_1.default.info(`${chalk_1.default.green.bold('COMPLETE')} Types Upload Complete.`);
 }
 exports.uploadTypes = uploadTypes;
 function loadReducedTypes(fromDir) {
@@ -66,10 +66,10 @@ async function uploadReducedTypes(dir) {
             const found = currentTypesBySlug[type.slug];
             if (!found) {
                 if (!type.typePath.includes(':')) {
-                    logger_1.default.info('Cannot create a base type. Skipping: ', type.slug);
+                    logger_1.default.info(`Cannot create a base type. Skipping: ${type.slug}`);
                     continue;
                 }
-                logger_1.default.info('Creating Type: ', type.slug);
+                logger_1.default.info(`Creating Type: ': ${type.slug}`);
                 const createdType = await new sdk_1.Entities().create({
                     entityName: 'type',
                     object: {
@@ -84,7 +84,7 @@ async function uploadReducedTypes(dir) {
                 await uploadReducedTypeProperties(createdType, newTypeProperties, type.typeProperties);
             }
             else {
-                logger_1.default.info('Updating Type: ', type.slug);
+                logger_1.default.info(`Updating Type: ': ${type.slug}`);
                 const updatedType = await new sdk_1.Entities().update({
                     entityName: 'type',
                     id: found.id,
@@ -99,7 +99,7 @@ async function uploadReducedTypes(dir) {
             }
         }
         catch (err) {
-            logger_1.default.info('Error Uploading Types: ', err);
+            logger_1.default.info(`Error Uploading Types: ${err}`);
         }
     }
 }
@@ -116,15 +116,15 @@ async function uploadReducedTypeProperties(type, currentPropertyTypes, newProper
     const optionSets = await new sdk_1.Entities().get({
         entityName: 'type-property-option-set',
     });
-    const optionSetIdByName = {};
+    const optionSetIdByIdentifier = {};
     for (const optionSet of optionSets) {
-        optionSetIdByName[optionSet.name] = optionSet.id;
+        optionSetIdByIdentifier[optionSet.identifier] = optionSet.id;
     }
     for (const newPropertyType of newPropertyTypes) {
         try {
             const found = currentPropertyTypeBySlug[newPropertyType.slug];
             if (!found && !newPropertyType.inherited) {
-                logger_1.default.info('Creating Type-Property: ', newPropertyType.slug);
+                logger_1.default.info(`Creating Type-Property: ': ${newPropertyType.slug}`);
                 await sdk_1.Request.request(`/types/${type.id}/type-properties`, {
                     method: 'POST',
                     body: JSON.stringify({
@@ -135,7 +135,7 @@ async function uploadReducedTypeProperties(type, currentPropertyTypes, newProper
                         editable: newPropertyType.editable,
                         searchable: newPropertyType.searchable,
                         core: newPropertyType.core,
-                        typePropertyOptionSetId: optionSetIdByName[newPropertyType.typePropertyOptionSetName],
+                        typePropertyOptionSetId: optionSetIdByIdentifier[newPropertyType.typePropertyOptionSetSlug],
                         formula: newPropertyType.formula,
                         referencedTypePath: newPropertyType.referencedTypePath,
                         referencedTypeRootSlug: newPropertyType.referencedTypeRootSlug,
@@ -154,8 +154,8 @@ async function uploadReducedTypeProperties(type, currentPropertyTypes, newProper
             }
             else if (found &&
                 !newPropertyType.inherited &&
-                !typePropertiesEqual(found, newPropertyType, optionSetIdByName)) {
-                logger_1.default.info('Updating Type-Property: ', newPropertyType.slug);
+                !typePropertiesEqual(found, newPropertyType, optionSetIdByIdentifier)) {
+                logger_1.default.info(`Updating Type-Property: ': ${newPropertyType.slug}`);
                 await new sdk_1.Entities().update({
                     entityName: 'type-property',
                     id: found.id,
@@ -167,7 +167,7 @@ async function uploadReducedTypeProperties(type, currentPropertyTypes, newProper
                         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 = optionSetIdByName[newPropertyType.typePropertyOptionSetName]) !== null && _h !== void 0 ? _h : null,
+                        typePropertyOptionSetId: (_h = optionSetIdByIdentifier[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,
                         referencedTypeRootSlug: (_l = newPropertyType.referencedTypeRootSlug) !== null && _l !== void 0 ? _l : null,
@@ -182,14 +182,14 @@ async function uploadReducedTypeProperties(type, currentPropertyTypes, newProper
             }
         }
         catch (err) {
-            logger_1.default.info('Error Creating Properties: ', err);
+            logger_1.default.info(`Error Creating Properties: ${err}`);
         }
     }
     for (const currentPropertyType of currentPropertyTypes) {
         try {
             const found = newPropertyTypesBySlug[currentPropertyType.slug];
             if (!found && !currentPropertyType.inherited) {
-                logger_1.default.info('Deleting Type-Property: ', currentPropertyType.slug);
+                logger_1.default.info(`Deleting Type-Property: ': ${currentPropertyType.slug}`);
                 await sdk_1.Request.request(`/types/${type.id}/type-properties/${currentPropertyType.id}`, {
                     method: 'DELETE',
                     headers: {
@@ -204,7 +204,7 @@ async function uploadReducedTypeProperties(type, currentPropertyTypes, newProper
         }
     }
 }
-function typePropertiesEqual(typeProperty1, typeProperty2, optionSetIdByName) {
+function typePropertiesEqual(typeProperty1, typeProperty2, optionSetIdByIdentifier) {
     const reducedProperty1 = {
         isArchived: typeProperty1.isArchived,
         propertyType: typeProperty1.propertyType,
@@ -213,7 +213,7 @@ function typePropertiesEqual(typeProperty1, typeProperty2, optionSetIdByName) {
         editable: typeProperty1.editable,
         searchable: typeProperty1.searchable,
         core: typeProperty1.core,
-        typePropertyOptionSetId: optionSetIdByName[typeProperty1.typePropertyOptionSetName],
+        typePropertyOptionSetId: optionSetIdByIdentifier[typeProperty1.typePropertyOptionSetSlug],
         formula: typeProperty1.formula,
         referencedTypePath: typeProperty1.referencedTypePath,
         referencedTypeRootSlug: typeProperty1.referencedTypeRootSlug,
@@ -232,7 +232,7 @@ function typePropertiesEqual(typeProperty1, typeProperty2, optionSetIdByName) {
         editable: typeProperty2.editable,
         searchable: typeProperty2.searchable,
         core: typeProperty2.core,
-        typePropertyOptionSetId: optionSetIdByName[typeProperty2.typePropertyOptionSetName],
+        typePropertyOptionSetId: optionSetIdByIdentifier[typeProperty2.typePropertyOptionSetSlug],
         formula: typeProperty2.formula,
         referencedTypePath: typeProperty2.referencedTypePath,
         referencedTypeRootSlug: typeProperty2.referencedTypeRootSlug,

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

@@ -14,7 +14,7 @@ class WorkflowTemplateDefinitionDeployer {
     async cliInstallWorkflowTemplateDefinitions() {
         const installedAppOrgs = await (0, apps_1.getInstalledApps)();
         if (!installedAppOrgs.length) {
-            logger_1.default.info('%s \nNo apps are currently installed. You must install an app before installing its associated workflow template definitions.', chalk_1.default.red.bold('WORKFLOW DEFINITION'));
+            logger_1.default.warn('WORKFLOW DEFINITION \nNo apps are currently installed. You must install an app before installing its associated workflow template definitions.');
             return;
         }
         const answers = await inquirer_1.default.prompt([
@@ -69,7 +69,7 @@ class WorkflowTemplateDefinitionDeployer {
             };
             await (0, event_workflow_templates_1.createWorkflowTemplate)(newObject);
         }
-        logger_1.default.info(`%s \n ${workflowTemplateDefinitionsToInstall.length} workflows installed`, chalk_1.default.green.bold('WORKFLOW DEFINITION'));
+        logger_1.default.info(`WORKFLOW DEFINITION \n ${workflowTemplateDefinitionsToInstall.length} workflows installed`);
     }
     async listWorkflowTemplateDefinitions() {
         const installedAppOrgs = await (0, apps_1.getInstalledApps)();
@@ -92,7 +92,7 @@ class WorkflowTemplateDefinitionDeployer {
             appVersionId: app.latestAppVersionId,
         });
         // UPSERT / DELETE BASED ON WORKFLOW IDENTIFIER
-        logger_1.default.info('%s \tDeploying workflow definitions.', chalk_1.default.yellow.bold('WORKFLOW DEFINITION'));
+        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) {
@@ -103,7 +103,7 @@ class WorkflowTemplateDefinitionDeployer {
         }
     }
     async deployWorkflow(workflowKey, workflow, app, existingWorkflows) {
-        logger_1.default.info(`%s \tDeploying workflow definitions: ${workflowKey}`, chalk_1.default.yellow.bold('WORKFLOW DEFINITION'));
+        logger_1.default.info(`WORKFLOW DEFINITION \tDeploying workflow definitions: ${workflowKey}`);
         const identifier = this.getWorkflowDeclarationIdentifier(workflowKey, app);
         const existingDefinition = existingWorkflows.find((ad) => ad.identifier === identifier);
         (0, interface_converters_1.convertWorkflow)(workflow);
@@ -127,7 +127,7 @@ class WorkflowTemplateDefinitionDeployer {
             parallelWorkerCount: workflowDeclaration.parallelWorkerCount,
         };
         const workflowTemplate = await (0, event_workflow_template_definition_1.createWorkflowTemplateDefinition)(newObject);
-        logger_1.default.info(`%s      Created new workflow definition definitions: ${workflowKey}`, chalk_1.default.yellow.bold('WORKFLOW DEFINITION'));
+        logger_1.default.info(`WORKFLOW DEFINITION \t Created new workflow definition definitions: ${workflowKey}`);
         return workflowTemplate;
     }
     async populateActionIds(workflowDefinition, app) {
@@ -169,7 +169,7 @@ class WorkflowTemplateDefinitionDeployer {
             id: existingWorkflowDefinition.id,
             updates,
         });
-        logger_1.default.info(`%s      Updated existing workflow definition: ${updatedWorkflowDefinition.identifier}`, chalk_1.default.yellow.bold('WORKFLOW DEFINITION'));
+        logger_1.default.info(`WORKFLOW DEFINITION \t Updated existing workflow definition: ${updatedWorkflowDefinition.identifier}`);
         return updatedWorkflowDefinition;
     }
     getActionDeclarationIdentifier(actionKey, app) {

package/dist/helpers/workflow-templates/helper.d.ts

@@ -1,13 +1,15 @@
 import { EventWorkflowActionDefinition, WorkflowTemplate, WorkflowTemplateDeclaration } from '../../interfaces';
 export declare class LocalWorkflowTemplateDeployer {
     deployWorkflows(wtDeclaration: WorkflowTemplateDeclaration): Promise<void>;
-    deployWorkflowTemplate(workflow: WorkflowTemplate, existingWorkflows: WorkflowTemplate[]): Promise<WorkflowTemplate>;
+    deployWorkflowTemplate(workflow: WorkflowTemplate, existingWorkflows: WorkflowTemplate[], appIdentifier: string): Promise<WorkflowTemplate>;
     private createNewWorkflowTemplate;
     private populateActionIds;
+    createWorkflowSchedule(workflowTemplate: WorkflowTemplate, workflowId: string): Promise<any>;
+    updateWorkflowSchedule(workflowTemplate: WorkflowTemplate, workflowId: string): Promise<any>;
     private updateWorkflowTemplate;
     deleteWorkflowTemplates(wtDeclaration: WorkflowTemplateDeclaration): Promise<void>;
 }
-export declare function getWorkflowTemplateIdentifier(workflowKey: string): string;
+export declare function getWorkflowTemplateIdentifier(workflowTemplate: WorkflowTemplate): string;
 export declare function getActionByIdentifier(identifier: string): Promise<EventWorkflowActionDefinition>;
 export declare class WorkflowTemplateDeployer {
     deleteWorkflowTemplates(): Promise<void>;