@contrail/cli 1.0.11 → 1.0.15

package/src/types/types-uploader.ts

@@ -1,6 +1,5 @@
 import { Entities, Request } from '@contrail/sdk';
-import { ReducedType, ReducedTypeProperties } from './interfaces';
-import { uploadOptionSets } from './option-set-uploader';
+import { ReducedType, ReducedTypeProperty } from './interfaces';
 import chalk from 'chalk';
 import fs from 'fs';
 import { authUser } from '../auth/login';
@@ -14,10 +13,6 @@ export async function uploadTypes(args) {
     const userConfig = await authUser();
     console.log(`%s Getting all types for orgId: ${userConfig.orgId}`, chalk.blue.bold('START'));
 
-    console.log(`%s Uploading`, chalk.yellow.bold('OPTION SETS'));
-    await uploadOptionSets();
-    console.log(`%s Uploaded`, chalk.yellow.bold('OPTION SETS'));
-
     console.log(`%s Uploading`, chalk.yellow.bold('TYPES'));
     await uploadReducedTypes();
     console.log(`%s Uploaded`, chalk.yellow.bold('TYPES'));

package/templates/typescript/package-lock.json

@@ -0,0 +1,14 @@
+{
+  "name": "test-app",
+  "version": "1.0.0",
+  "lockfileVersion": 1,
+  "requires": true,
+  "dependencies": {
+    "typescript": {
+      "version": "4.7.4",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.7.4.tgz",
+      "integrity": "sha512-C0WQT0gezHuw6AdY1M2jxUO83Rjf0HP7Sk1DtXj6j1EwkQNZrHAg2XPWlq62oqEhYvONq5pkC2Y9oPljWToLmQ==",
+      "dev": true
+    }
+  }
+}

package/templates/typescript/package.json

@@ -14,11 +14,13 @@
     "build": "tsc",
     "test": "echo \"Error: no test specified\" && exit 1"
   },
-  "keywords": [
-  ],
+  "keywords": [],
   "author": "",
   "license": "ISC",
   "dependencies": {
     "chalk": "^4.0.0"
+  },
+  "devDependencies": {
+    "typescript": "^4.7.4"
   }
 }

package/lib/types/parse-optionSet.d.ts

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

package/lib/types/parse-optionSet.js

@@ -1,79 +0,0 @@
-import { StringUtil } from '@contrail/util';
-import chalk from 'chalk';
-import fs from 'fs';
-import { getSeparatorByPlatform } from '../common';
-import * as csvToJson from 'csvtojson';
-const yaml = require('js-yaml');
-export async function parseOptionSet(args) {
-    try {
-        if ((args === null || args === void 0 ? void 0 : args.length) < 4) {
-            throw new Error('File name must be included.');
-        }
-        console.log(`%s Parsing`, chalk.yellow.bold('OPTION SETS'));
-        await parseOptionSets(args[3]);
-        console.log(`%s Parsed`, chalk.yellow.bold('OPTION SETS'));
-    }
-    catch (e) {
-        console.log(`%s Parsing Failed. ${e}`, chalk.red.bold('FAIL'));
-        return;
-    }
-    console.log('%s Parsing Complete.', chalk.green.bold('COMPLETE'));
-}
-async function loadDataFromCSV(fileName) {
-    const CURRENT_DIR = process.cwd();
-    try {
-        const separator = getSeparatorByPlatform();
-        const csvData = await csvToJson.default().fromFile(CURRENT_DIR + separator + fileName);
-        return csvData;
-    }
-    catch (e) {
-        throw new Error(`ERROR PARSING CSV: ${e}`);
-    }
-}
-export async function parseOptionSets(fileName) {
-    const csvData = await loadDataFromCSV(fileName);
-    const removedFields = new Set();
-    const valuesByFieldName = {};
-    for (const row of csvData) {
-        for (const [key, value] of Object.entries(row)) {
-            // Dont parse boolean fields - later log removed fields
-            if (value.toLowerCase() === 'false' || value.toLowerCase() === 'true') {
-                removedFields.add(key);
-                continue;
-            }
-            if (!value) {
-                continue;
-            }
-            if (!valuesByFieldName[key]) {
-                valuesByFieldName[key] = new Set();
-            }
-            valuesByFieldName[key].add(value);
-        }
-    }
-    for (const removed of removedFields.values()) {
-        console.log(`Removed Boolean Field: ${removed}`);
-    }
-    const reducedOptionSets = [];
-    for (const [key, value] of Object.entries(valuesByFieldName)) {
-        const optionSet = [];
-        for (const entry of value.values()) {
-            optionSet.push({
-                value: StringUtil.convertToCamelCase(entry),
-                display: isUpperCase(entry) ? entry : StringUtil.convertToTitleCase(entry),
-            });
-        }
-        const reducedOptionSet = {
-            name: StringUtil.convertToTitleCase(key),
-            isArchived: false,
-            optionSet,
-        };
-        reducedOptionSets.push(reducedOptionSet);
-    }
-    const yamlStr = yaml.dump(reducedOptionSets);
-    const CURRENT_DIR = process.cwd();
-    const separator = getSeparatorByPlatform();
-    fs.writeFileSync(CURRENT_DIR + separator + 'parsed_option_sets.yml', yamlStr, 'utf8');
-}
-function isUpperCase(str) {
-    return str === str.toUpperCase();
-}

package/src/types/parse-optionSet.ts

@@ -1,96 +0,0 @@
-import { StringUtil } from '@contrail/util';
-import { ReducedOptionSet } from './interfaces';
-import chalk from 'chalk';
-import fs from 'fs';
-import { getSeparatorByPlatform } from '../common';
-import * as csvToJson from 'csvtojson';
-
-const yaml = require('js-yaml');
-
-export async function parseOptionSet(args) {
-  try {
-    if (args?.length < 4) {
-      throw new Error('File name must be included.');
-    }
-    console.log(`%s Parsing`, chalk.yellow.bold('OPTION SETS'));
-    await parseOptionSets(args[3]);
-    console.log(`%s Parsed`, chalk.yellow.bold('OPTION SETS'));
-
-  }
-  catch (e) {
-    console.log(`%s Parsing Failed. ${e}`, chalk.red.bold('FAIL'));
-    return;
-  }
-
-  console.log('%s Parsing Complete.', chalk.green.bold('COMPLETE'));
-}
-
-async function loadDataFromCSV(fileName) {
-  const CURRENT_DIR = process.cwd();
-  try {
-    const separator = getSeparatorByPlatform();
-    const csvData = await csvToJson.default().fromFile(CURRENT_DIR + separator + fileName);
-
-    return csvData;
-  } catch (e) {
-    throw new Error(`ERROR PARSING CSV: ${e}`);
-  }
-}
-
-export async function parseOptionSets(fileName) {
-  const csvData = await loadDataFromCSV(fileName);
-
-  const removedFields = new Set<string>();
-  const valuesByFieldName = {};
-  for (const row of csvData) {
-    for (const [key, value] of Object.entries(row)) {
-
-      // Dont parse boolean fields - later log removed fields
-      if ((value as string).toLowerCase() === 'false' || (value as string).toLowerCase() === 'true') {
-        removedFields.add(key);
-        continue;
-      }
-
-      if (!value) {
-        continue;
-      }
-
-      if (!valuesByFieldName[key]) {
-        valuesByFieldName[key] = new Set<string>();
-      }
-      (valuesByFieldName[key] as Set<string>).add(value as string);
-    }
-  }
-
-  for (const removed of removedFields.values()) {
-    console.log(`Removed Boolean Field: ${removed}`);
-  }
-
-  const reducedOptionSets = [];
-  for (const [key, value] of Object.entries(valuesByFieldName)) {
-    const optionSet = [];
-    for (const entry of (value as Set<string>).values()) {
-      optionSet.push({
-        value: StringUtil.convertToCamelCase(entry),
-        display: isUpperCase(entry) ? entry : StringUtil.convertToTitleCase(entry), // if all uppercase dont convert
-      });
-    }
-
-    const reducedOptionSet: ReducedOptionSet = {
-      name: StringUtil.convertToTitleCase(key),
-      isArchived: false,
-      optionSet,
-    };
-
-    reducedOptionSets.push(reducedOptionSet);
-  }
-
-  const yamlStr = yaml.dump(reducedOptionSets);
-  const CURRENT_DIR = process.cwd();
-  const separator = getSeparatorByPlatform();
-  fs.writeFileSync(CURRENT_DIR + separator + 'parsed_option_sets.yml', yamlStr, 'utf8');
-}
-
-function isUpperCase(str) {
-  return str === str.toUpperCase();
-}