@contrail/cli 1.0.15 → 1.0.17

package/README.md

@@ -0,0 +1,5 @@
+## Installation
+`cd contrail-cli && npm i && npm run build && npm i -g`
+
+## Usage
+`contrail COMMAND`

package/lib/cli.js

@@ -3,9 +3,12 @@ import { deployApp, removeApp } from './apps/deploy-app/deploy';
 import { getTypes } from './types/types-extractor';
 import { uploadTypes } from './types/types-uploader';
 import { UploadOptionSets } from './types/option-set-uploader';
+import { ParseOptionSetsLocalFiles } from './types/option-set-parser';
 import { MergeOptionSets } from './types/option-set-merger';
 import { MergeTypeProperties } from './types/types-properties-merger';
 import { ParseTypesFromFiles, ParseTypesFromLocalFiles } from './types/parse-types';
+import { loadColors } from './colors/color-loader';
+import { listConfig, removeConfig } from './config/configCommands';
 const cliUsage = require('command-line-usage');
 /**
  *  Built using documentation here:
@@ -65,6 +68,10 @@ export async function cli(args) {
                     UploadOptionSets(args);
                     break;
                 }
+                case 'parseOptionSetsLocalFiles': {
+                    ParseOptionSetsLocalFiles(args);
+                    break;
+                }
                 case 'parseTypesFromLocalFiles': {
                     ParseTypesFromLocalFiles(args);
                     break;
@@ -87,6 +94,42 @@ export async function cli(args) {
             }
             break;
         }
+        case 'colors': {
+            switch (command) {
+                case 'load': {
+                    await loadColors();
+                    break;
+                }
+                // case 'delete': {
+                //   await deleteColors();
+                //   break;
+                // }
+                default: {
+                    printIllegalCommand();
+                }
+            }
+            break;
+        }
+        case 'config': {
+            switch (command) {
+                case 'list': {
+                    await listConfig();
+                    break;
+                }
+                case 'remove': {
+                    await removeConfig(args);
+                    break;
+                }
+                // case 'delete': {
+                //   await deleteColors();
+                //   break;
+                // }
+                default: {
+                    printIllegalCommand();
+                }
+            }
+            break;
+        }
         case 'help':
         case '-help':
         case '--help': {
@@ -132,6 +175,13 @@ const helpSections = [
             'remove                       Remove your app.',
         ],
     },
+    {
+        header: 'Colors Commands - Domain: colors',
+        content: [
+            'load                         Load colors from a CSV. Headers (name, hex, red,',
+            '.                            green, blue) are required.',
+        ],
+    },
     {
         header: 'Type Commands - Domain: types',
         content: [
@@ -140,6 +190,7 @@ const helpSections = [
             '.                            Types are uploaded from types.yml\n',
             'uploadOptionSets             Upload OptionSets for your Org.',
             '.                            OptionSets are loaded from option_sets.yml\n',
+            'parseOptionSetsLocalFiles <File Paths>  Parse CSV files into OptionSets',
             'parseTypesFromLocalFiles <File Paths>   Parse CSV files into Types and ',
             '.                                       OptionSets from local files.\n',
             'parseTypesFromFiles <fileIds>           Parse CSV files into Types and ',

package/lib/colors/color-loader.d.ts

@@ -0,0 +1,2 @@
+export declare function deleteColors(): Promise<void>;
+export declare function loadColors(): Promise<void>;

package/lib/colors/color-loader.js

@@ -0,0 +1,94 @@
+import { Entities } from '@contrail/sdk';
+import chalk from 'chalk';
+import { authUser } from '../auth/login';
+import { getSeparatorByPlatform } from '../common';
+const csv = require('csvtojson');
+export async function deleteColors() {
+    try {
+        await authUser();
+        const colors = await getExistingColors();
+        console.log("Deleting %s colors", colors.length);
+        for (const color of colors) {
+            await deleteColor(color);
+        }
+    }
+    catch (e) {
+        console.log(`%s Loading Colors Failed. ${e}`, chalk.red.bold('FAIL'));
+        return;
+    }
+    console.log('%s Deleting Colors Complete.', chalk.green.bold('COMPLETE'));
+}
+export async function loadColors() {
+    try {
+        await authUser();
+        console.log(`%s Getting Existing Colors`, chalk.yellow.bold('COLORS'));
+        console.log(`%s Uploading`, chalk.yellow.bold('COLORS'));
+        await uploadColors();
+        console.log(`%s Uploaded`, chalk.yellow.bold('COLORS'));
+    }
+    catch (e) {
+        console.log(`%s Loading Colors Failed. ${e}`, chalk.red.bold('FAIL'));
+        return;
+    }
+    console.log('%s Loading Colors Complete.', chalk.green.bold('COMPLETE'));
+}
+async function getLocalColors() {
+    console.log("loading colors from local file");
+    const TARGET_DIR = process.cwd();
+    try {
+        const separator = getSeparatorByPlatform();
+        const csvFilePath = TARGET_DIR + separator + 'colors.csv';
+        return await csv().fromFile(csvFilePath);
+    }
+    catch (e) {
+        throw new Error(`ERROR PARSING COLORS CSV: ${e}`);
+    }
+}
+async function getExistingColors() {
+    console.log(`%s Getting Existing Colors`, chalk.yellow.bold('COLORS'));
+    try {
+        return new Entities().get({ entityName: 'color' }); //, useSearch: false }); Not in EntitiesClientGetOptions yet
+    }
+    catch (e) {
+        throw new Error(`ERROR DOWNLOADING COLORS: ${e}`);
+    }
+}
+async function deleteColor(color) {
+    try {
+        await new Entities().delete({ entityName: 'color', id: color.id });
+    }
+    catch (e) {
+        throw new Error(`ERROR DOWNLOADING COLORS: ${e}`);
+    }
+}
+async function uploadColors() {
+    const colors = await getLocalColors();
+    const existingColors = await getExistingColors();
+    const existingNamesValues = existingColors.filter(x => x.name).map(x => x.name);
+    for (const color of colors) {
+        if (existingNamesValues.includes(color.name)) {
+            console.log(`%s SKIPPING %s (%s)`, chalk.yellow.bold('COLORS'), color.hex, color.name);
+            continue;
+        }
+        if (color.hex.length > 1 && color.hex[0] === '#') {
+            color.hex = color.hex.substring(1);
+        }
+        const o = {
+            hex: color.hex,
+            name: color.name
+        };
+        if (color.red) {
+            o.red = color.red;
+        }
+        if (color.green) {
+            o.green = color.green;
+        }
+        if (color.blue) {
+            o.blue = color.blue;
+        }
+        await new Entities().create({
+            entityName: 'color',
+            object: o
+        });
+    }
+}

package/lib/config/config.d.ts

@@ -2,4 +2,5 @@ export declare function initializeVibeIQConfig(): Promise<void>;
 export declare function readVibeIQConfig(): Promise<any>;
 export declare function writeVibeIQConfig(config: Object): Promise<void>;
 export declare function getConfig(): Promise<any>;
-export declare function storeConfig(incomingConfig: Object): Promise<void>;
+export declare function deleteConfigs(configNames: string[]): Promise<void>;
+export declare function storeConfig(incomingConfig: Object, merge?: boolean): Promise<void>;

package/lib/config/config.js

@@ -29,8 +29,7 @@ export async function readVibeIQConfig() {
         console.debug(`failed to open config file (${configFileLocation}) for reading.`);
         console.debug('trying to initialize config file');
         await initializeVibeIQConfig();
-        console.error(`Could not open config file (${configFileLocation}) for reading.`);
-        throw e;
+        fileContent = await fsPromises.readFile(configFileLocation);
     }
     try {
         return JSON.parse(fileContent);
@@ -52,8 +51,20 @@ export async function getConfig() {
     console.debug("getting config from file system");
     return await readVibeIQConfig();
 }
-export async function storeConfig(incomingConfig) {
-    const config = await readVibeIQConfig();
-    const newConfig = Object.assign(Object.assign({}, config), incomingConfig);
-    await writeVibeIQConfig(newConfig);
+export async function deleteConfigs(configNames) {
+    const currentConfig = await readVibeIQConfig();
+    for (const configName of configNames) {
+        delete currentConfig[configName];
+    }
+    await storeConfig(currentConfig, false);
+}
+export async function storeConfig(incomingConfig, merge = true) {
+    let config;
+    if (merge) {
+        config = Object.assign(Object.assign({}, await readVibeIQConfig()), incomingConfig);
+    }
+    else {
+        config = incomingConfig;
+    }
+    await writeVibeIQConfig(config);
 }

package/lib/config/configCommands.d.ts

@@ -0,0 +1,2 @@
+export declare function listConfig(): Promise<void>;
+export declare function removeConfig(args: any): Promise<void>;

package/lib/config/configCommands.js

@@ -0,0 +1,10 @@
+import { deleteConfigs, readVibeIQConfig } from './config';
+export async function listConfig() {
+    console.log(await readVibeIQConfig());
+}
+export async function removeConfig(args) {
+    if ((args === null || args === void 0 ? void 0 : args.length) < 4) {
+        throw new Error('At least one configuration must be included to be removed.');
+    }
+    await deleteConfigs(args.slice(3));
+}

package/lib/types/csv-parser.d.ts

@@ -0,0 +1 @@
+export declare function getCSVFromFile(loadFileId: string): Promise<any[]>;

package/lib/types/csv-parser.js

@@ -0,0 +1,51 @@
+import csvToJson from 'csvtojson';
+import * as client from 'https';
+import { Entities } from '@contrail/sdk';
+export async function getCSVFromFile(loadFileId) {
+    let file;
+    try {
+        file = await new Entities().get({ entityName: 'file', id: loadFileId });
+        console.log('Got file: ', file);
+    }
+    catch (e) {
+        console.log(`Failed to get file: ${loadFileId}`, JSON.stringify(e));
+        throw new Error(`Failed to get file: ${loadFileId} - ` + JSON.stringify(e));
+    }
+    if (!file || !file.downloadUrl) {
+        console.log(`File: ${loadFileId} does not have a downloadUrl`);
+        throw new Error(`File: ${loadFileId} does not have a downloadUrl`);
+    }
+    // get csv
+    let response;
+    try {
+        response = await new Promise((resolve, reject) => {
+            client.get(file.downloadUrl, function (res) {
+                console.log('Status code:', res.statusCode);
+                console.log('Status text:', res.statusMessage);
+                let body = '';
+                res.on('data', (data) => {
+                    body += data.toString();
+                });
+                res.on('end', () => {
+                    console.log('Response body:');
+                    //console.log(body);
+                    resolve(body);
+                });
+            }).on('error', function (e) {
+                console.error(e);
+                reject(e);
+            });
+        });
+    }
+    catch (e) {
+        console.log(`Failed to get data from downloadUrl: ${file.downloadUrl}`, e);
+        throw e;
+    }
+    if (!response) {
+        console.log('Response is empty');
+        throw new Error('Response is empty');
+    }
+    const csvJson = await csvToJson({ flatKeys: true }).fromString(response);
+    // console.log('csvJson', csvJson);
+    return csvJson;
+}

package/lib/types/option-set-parser.d.ts

@@ -0,0 +1 @@
+export declare function ParseOptionSetsLocalFiles(args: any): Promise<void>;

package/lib/types/option-set-parser.js

@@ -0,0 +1,46 @@
+import fs from 'fs';
+import { getSeparatorByPlatform } from '../common';
+import { parseOptionSets } from '@contrail/types';
+import chalk from 'chalk';
+const csv = require('csvtojson');
+const yaml = require('js-yaml');
+export async function ParseOptionSetsLocalFiles(args) {
+    try {
+        if ((args === null || args === void 0 ? void 0 : args.length) < 4) {
+            throw new Error('File name must be included.');
+        }
+        console.log(`%s Importing local file`, chalk.yellow.bold('OPTION SET PARSE'));
+        const fileLocation = args[3];
+        console.log('Using File: ', fileLocation);
+        await parseOptionSetsLocalFiles(fileLocation);
+        console.log(`%s Parsed`, chalk.yellow.bold('OPTION SET PARSE'));
+    }
+    catch (e) {
+        console.log(`%s PARSE Failed. ${e}`, chalk.red.bold('FAIL'));
+        return;
+    }
+    console.log('%s PARSE Complete.', chalk.green.bold('COMPLETE'));
+}
+async function loadOptionSetCSV(fileLocation) {
+    const TARGET_DIR = process.cwd();
+    try {
+        const separator = getSeparatorByPlatform();
+        const fullPath = TARGET_DIR + separator + fileLocation;
+        console.log('Getting file from path: ', fullPath);
+        return await csv().fromFile(fullPath);
+    }
+    catch (e) {
+        throw new Error(`ERROR PARSING CSV: ${e}`);
+    }
+}
+async function parseOptionSetsLocalFiles(fileLocation) {
+    const uploadedOptionData = await loadOptionSetCSV(fileLocation);
+    const parsedOptionSets = parseOptionSets(uploadedOptionData);
+    saveData({ optionSets: parsedOptionSets });
+}
+function saveData(data) {
+    const yamlStr = yaml.dump(data);
+    const CURRENT_DIR = process.cwd();
+    const separator = getSeparatorByPlatform();
+    fs.writeFileSync(CURRENT_DIR + separator + 'parsed_local_optionSets.yml', yamlStr, 'utf8');
+}

package/lib/types/parse-types.js

@@ -1,9 +1,10 @@
-import { TypeProcessor } from '@contrail/sdk';
+import { GetSuggestedTypes } from '@contrail/types';
 import chalk from 'chalk';
 import fs from 'fs';
 import { getSeparatorByPlatform } from '../common';
 import * as csvToJson from 'csvtojson';
 import { authUser } from '../auth/login';
+import { getCSVFromFile } from './csv-parser';
 const yaml = require('js-yaml');
 export async function ParseTypesFromLocalFiles(args) {
     try {
@@ -39,7 +40,7 @@ export async function ParseTypesFromFiles(args) {
     }
     console.log('%s Parsing Complete.', chalk.green.bold('COMPLETE'));
 }
-async function loadDataFromCSV(fileName) {
+async function loadDataFromLocalCSV(fileName) {
     const CURRENT_DIR = process.cwd();
     try {
         const separator = getSeparatorByPlatform();
@@ -57,7 +58,7 @@ async function parseTypesFromLocalFiles(fileLocations) {
     for (const fileLocation of fileLocations) {
         try {
             console.log('Getting data for fileLocation: ', fileLocation);
-            const csvData = await loadDataFromCSV(fileLocation);
+            const csvData = await loadDataFromLocalCSV(fileLocation);
             console.log(`CSV import was successful. ${csvData === null || csvData === void 0 ? void 0 : csvData.length} rows found. Adding to total rows.`);
             csvJSONData.push(...csvData);
         }
@@ -67,13 +68,28 @@ async function parseTypesFromLocalFiles(fileLocations) {
         }
     }
     console.log(`CSV imports were successful. ${csvJSONData === null || csvJSONData === void 0 ? void 0 : csvJSONData.length} total rows found.`);
-    const suggestions = await new TypeProcessor().GetSuggestedTypes(csvJSONData);
+    const suggestions = GetSuggestedTypes(csvJSONData);
     saveData({ optionSets: suggestions.OptionSets }, 'parsed_optionSets.yml');
     saveData({ typeProperties: suggestions.TypeProperties }, 'parsed_typeProperties.yml');
 }
 async function parseTypesFromFiles(fileIds) {
     await authUser();
-    const suggestions = await new TypeProcessor().GetSuggestedTypesFromFiles({ loadFileIds: fileIds });
+    // get csv data
+    const csvJSONData = [];
+    for (const loadFileId of fileIds) {
+        try {
+            console.log('Getting data for fileId: ', loadFileId);
+            const csvJSON = await getCSVFromFile(loadFileId);
+            console.log(`CSV download was successful. ${csvJSON === null || csvJSON === void 0 ? void 0 : csvJSON.length} rows found. Adding to total rows`);
+            csvJSONData.push(...csvJSON);
+        }
+        catch (e) {
+            console.log('Error retrieving csv data', e);
+            throw e;
+        }
+    }
+    console.log(`CSV downloads were successful. ${csvJSONData === null || csvJSONData === void 0 ? void 0 : csvJSONData.length} total rows found.`);
+    const suggestions = GetSuggestedTypes(csvJSONData);
     saveData({ optionSets: suggestions.OptionSets }, 'parsed_optionSets.yml');
     saveData({ typeProperties: suggestions.TypeProperties }, 'parsed_typeProperties.yml');
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@contrail/cli",
-  "version": "1.0.15",
+  "version": "1.0.17",
   "description": "VibeIQ's Contrail Platform CLI.",
   "main": "lib/index.js",
   "bin": {
@@ -23,7 +23,8 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "@contrail/sdk": "^1.0.152",
+    "@contrail/sdk": "^1.0.154",
+    "@contrail/types": "^2.0.61",
     "@contrail/util": "^1.0.17",
     "amazon-cognito-identity-js": "^5.2.3",
     "arg": "^4.0.1",

package/src/cli.ts

@@ -4,9 +4,12 @@ import { deployApp, removeApp } from './apps/deploy-app/deploy';
 import { getTypes } from './types/types-extractor';
 import { uploadTypes } from './types/types-uploader';
 import { UploadOptionSets } from './types/option-set-uploader';
+import { ParseOptionSetsLocalFiles } from './types/option-set-parser';
 import { MergeOptionSets } from './types/option-set-merger';
 import { MergeTypeProperties } from './types/types-properties-merger';
 import { ParseTypesFromFiles, ParseTypesFromLocalFiles } from './types/parse-types';
+import { loadColors, deleteColors } from './colors/color-loader';
+import {listConfig, removeConfig} from './config/configCommands'
 
 const cliUsage = require('command-line-usage');
 
@@ -73,6 +76,10 @@ export async function cli(args) {
           UploadOptionSets(args);
           break;
         }
+        case 'parseOptionSetsLocalFiles': {
+          ParseOptionSetsLocalFiles(args);
+          break;
+        }
         case 'parseTypesFromLocalFiles': {
           ParseTypesFromLocalFiles(args);
           break;
@@ -95,6 +102,43 @@ export async function cli(args) {
       }
       break;
     }
+
+    case 'colors': {
+      switch (command) {
+        case 'load': {
+          await loadColors();
+          break;
+        }
+        // case 'delete': {
+        //   await deleteColors();
+        //   break;
+        // }
+        default: {
+          printIllegalCommand();
+        }
+      }
+      break;
+    }
+    case 'config': {
+      switch (command) {
+        case 'list': {
+          await listConfig();
+          break;
+        }
+        case 'remove': {
+          await removeConfig(args);
+          break;
+        }
+        // case 'delete': {
+        //   await deleteColors();
+        //   break;
+        // }
+        default: {
+          printIllegalCommand();
+        }
+      }
+      break;
+    }
     case 'help':
     case '-help':
     case '--help': {
@@ -145,6 +189,14 @@ const helpSections = [
       'remove                       Remove your app.',
     ],
   },
+  {
+    header: 'Colors Commands - Domain: colors',
+    content: [
+      'load                         Load colors from a CSV. Headers (name, hex, red,',
+      '.                            green, blue) are required.',
+      // 'delete                       Delete all colors.',
+    ],
+  },
   {
     header: 'Type Commands - Domain: types',
     content: [
@@ -153,6 +205,7 @@ const helpSections = [
       '.                            Types are uploaded from types.yml\n',
       'uploadOptionSets             Upload OptionSets for your Org.',
       '.                            OptionSets are loaded from option_sets.yml\n',
+      'parseOptionSetsLocalFiles <File Paths>  Parse CSV files into OptionSets',
       'parseTypesFromLocalFiles <File Paths>   Parse CSV files into Types and ',
       '.                                       OptionSets from local files.\n',
       'parseTypesFromFiles <fileIds>           Parse CSV files into Types and ',