@contrail/cli 1.0.67 → 1.0.69

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

@@ -1,102 +1,105 @@
-import { Entities } from '@contrail/sdk';
-import fs from 'fs';
-import { getSeparatorByPlatform } from '../common';
-import { authUser } from '../auth/login';
-import chalk from 'chalk';
-const yaml = require('js-yaml');
-export async function MergeOptionSets(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 MERGE'));
-        const fileLocation = args[3];
-        console.log('Using File: ', fileLocation);
-        await mergeOptionSets(fileLocation);
-        console.log('%s Merged', chalk.yellow.bold('OPTION SET MERGE'));
-    }
-    catch (e) {
-        console.log(`%s Merge Failed. ${e}`, chalk.red.bold('FAIL'));
-        return;
-    }
-    console.log('%s Merge Complete.', chalk.green.bold('COMPLETE'));
-}
-function loadOptionSets(fileLocation) {
-    const TARGET_DIR = process.cwd();
-    try {
-        const separator = getSeparatorByPlatform();
-        const fullPath = TARGET_DIR + separator + fileLocation;
-        console.log('Getting file from path: ', fullPath);
-        const doc = yaml.load(fs.readFileSync(TARGET_DIR + separator + fileLocation, 'utf8'));
-        return doc.optionSets;
-    }
-    catch (e) {
-        throw new Error(`ERROR PARSING YAML: ${e}`);
-    }
-}
-async function mergeOptionSets(fileLocation) {
-    const uploadedOptionSets = loadOptionSets(fileLocation);
-    await authUser();
-    const currentOptionSetsFull = await new Entities().get({
-        entityName: 'type-property-option-set',
-    });
-    const currentOptionSets = currentOptionSetsFull.map(os => Object.assign({}, {
-        name: os.name,
-        isArchived: os.isArchived,
-        optionSet: os.optionSet,
-    }));
-    const currentOptionSetsByName = {};
-    for (const currentOptionSet of currentOptionSets) {
-        currentOptionSetsByName[currentOptionSet.name] = currentOptionSet;
-    }
-    const uploadedOptionSetsByName = {};
-    for (const optionSet of uploadedOptionSets) {
-        uploadedOptionSetsByName[optionSet.name] = optionSet;
-    }
-    const mergedOptionSets = [];
-    for (const uploadedOptionSet of uploadedOptionSets) {
-        const existing = currentOptionSetsByName[uploadedOptionSet.name];
-        if (!existing) {
-            if (!uploadedOptionSet.optionSet) {
-                console.log('No OptionSet for: ', uploadedOptionSet.name);
-                continue;
-            }
-            console.log('Adding New: ', uploadedOptionSet.name);
-            mergedOptionSets.push(uploadedOptionSet);
-        }
-        else {
-            console.log('Merging: ', uploadedOptionSet.name);
-            mergedOptionSets.push(mergeOptionSet(existing, uploadedOptionSet));
-        }
-    }
-    for (const currentOptionSet of currentOptionSets) {
-        const found = uploadedOptionSetsByName[currentOptionSet.name];
-        if (!found) {
-            console.log('Adding Existing: ', currentOptionSet.name);
-            mergedOptionSets.push(currentOptionSet);
-        }
-    }
-    saveData({ optionSets: mergedOptionSets });
-}
-function mergeOptionSet(existingOptionSet, uploadedOptionSet) {
-    const merged = {
-        name: uploadedOptionSet.name,
-        optionSet: uploadedOptionSet.optionSet,
-        isArchived: uploadedOptionSet.isArchived,
-    };
-    for (const keyVal of existingOptionSet.optionSet) {
-        const value = keyVal.value;
-        const display = keyVal.display;
-        const found = merged.optionSet.find(keyVal => keyVal.value === value);
-        if (!found) {
-            merged.optionSet.push({ value, display });
-        }
-    }
-    return merged;
-}
-function saveData(data) {
-    const yamlStr = yaml.dump(data);
-    const CURRENT_DIR = process.cwd();
-    const separator = getSeparatorByPlatform();
-    fs.writeFileSync(CURRENT_DIR + separator + 'merged_optionSets.yml', yamlStr, 'utf8');
-}
+import { Entities } from '@contrail/sdk';
+import fs from 'fs';
+import { getSeparatorByPlatform } from '../common';
+import { authUser } from '../auth/login';
+import chalk from 'chalk';
+const yaml = require('js-yaml');
+export async function MergeOptionSets(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 MERGE'));
+        const fileLocation = args[3];
+        console.log('Using File: ', fileLocation);
+        await mergeOptionSets(fileLocation);
+        console.log('%s Merged', chalk.yellow.bold('OPTION SET MERGE'));
+    }
+    catch (e) {
+        console.log(`%s Merge Failed. ${e}`, chalk.red.bold('FAIL'));
+        return;
+    }
+    console.log('%s Merge Complete.', chalk.green.bold('COMPLETE'));
+}
+function loadOptionSets(fileLocation) {
+    const TARGET_DIR = process.cwd();
+    try {
+        const separator = getSeparatorByPlatform();
+        const fullPath = TARGET_DIR + separator + fileLocation;
+        console.log('Getting file from path: ', fullPath);
+        const doc = yaml.load(fs.readFileSync(TARGET_DIR + separator + fileLocation, 'utf8'));
+        return doc;
+    }
+    catch (e) {
+        throw new Error(`ERROR PARSING YAML: ${e}`);
+    }
+}
+async function mergeOptionSets(fileLocation) {
+    const uploadedOptionSets = loadOptionSets(fileLocation);
+    await authUser();
+    const currentOptionSetsFull = await new Entities().get({
+        entityName: 'type-property-option-set',
+    });
+    const currentOptionSets = currentOptionSetsFull.map(os => Object.assign({}, {
+        name: os.name,
+        isArchived: os.isArchived,
+        optionSet: os.optionSet,
+    }));
+    const currentOptionSetsByName = {};
+    for (const currentOptionSet of currentOptionSets) {
+        currentOptionSetsByName[currentOptionSet.name] = currentOptionSet;
+    }
+    const uploadedOptionSetsByName = {};
+    for (const optionSet of uploadedOptionSets) {
+        uploadedOptionSetsByName[optionSet.name] = optionSet;
+    }
+    const mergedOptionSets = [];
+    for (const uploadedOptionSet of uploadedOptionSets) {
+        const existing = currentOptionSetsByName[uploadedOptionSet.name];
+        if (!existing) {
+            if (!uploadedOptionSet.optionSet) {
+                console.log('No OptionSet for: ', uploadedOptionSet.name);
+                continue;
+            }
+            console.log('Adding New: ', uploadedOptionSet.name);
+            mergedOptionSets.push(uploadedOptionSet);
+        }
+        else {
+            console.log('Merging: ', uploadedOptionSet.name);
+            mergedOptionSets.push(mergeOptionSet(existing, uploadedOptionSet));
+        }
+    }
+    for (const currentOptionSet of currentOptionSets) {
+        const found = uploadedOptionSetsByName[currentOptionSet.name];
+        if (!found) {
+            console.log('Adding Existing: ', currentOptionSet.name);
+            mergedOptionSets.push(currentOptionSet);
+        }
+    }
+    saveData(mergedOptionSets);
+}
+function mergeOptionSet(existingOptionSet, uploadedOptionSet) {
+    var _a;
+    const merged = {
+        name: uploadedOptionSet.name,
+        optionSet: uploadedOptionSet.optionSet,
+        isArchived: uploadedOptionSet.isArchived,
+    };
+    if (((_a = existingOptionSet === null || existingOptionSet === void 0 ? void 0 : existingOptionSet.optionSet) === null || _a === void 0 ? void 0 : _a.length) > 0) {
+        for (const keyVal of existingOptionSet.optionSet) {
+            const value = keyVal.value;
+            const display = keyVal.display;
+            const found = merged.optionSet.find(keyVal => keyVal.value === value);
+            if (!found) {
+                merged.optionSet.push({ value, display });
+            }
+        }
+    }
+    return merged;
+}
+function saveData(data) {
+    const yamlStr = yaml.dump(data);
+    const CURRENT_DIR = process.cwd();
+    const separator = getSeparatorByPlatform();
+    fs.writeFileSync(CURRENT_DIR + separator + 'merged_optionSets.yml', yamlStr, 'utf8');
+}

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

@@ -1 +1,3 @@
-export declare function ParseOptionSetsLocalFiles(args: any): Promise<void>;
+export declare function ParseOptionSetsLocalFiles(args: any): Promise<void>;
+export declare function ParseOptionSetsToFolderStructure(args: any): Promise<void>;
+export declare function parseLabelsInColumn(uploadedOptionData: any): any[];

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

@@ -1,50 +1,140 @@
-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 newData = [];
-    // for (const row of uploadedOptionData) {
-    //   newData.push({[row.optionSetName]: row.displayName});
-    // }
-    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');
-}
+import fs from 'fs';
+import { getSeparatorByPlatform } from '../common';
+import { parseOptionSets } from '@contrail/types';
+import { StringUtil } from '@contrail/util';
+import chalk from 'chalk';
+const csv = require('csvtojson');
+const yaml = require('js-yaml');
+import * as path from 'path';
+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];
+        const csvStyle = args[4];
+        console.log('Using File: ', fileLocation);
+        await parseOptionSetsLocalFiles(fileLocation, csvStyle);
+        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'));
+}
+export async function ParseOptionSetsToFolderStructure(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 parseOptionSetsToFolderStructure(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}`);
+    }
+}
+function loadOptionSets(fileLocation) {
+    const TARGET_DIR = process.cwd();
+    try {
+        const separator = getSeparatorByPlatform();
+        const fullPath = TARGET_DIR + separator + fileLocation;
+        console.log('Getting file from path: ', fullPath);
+        const doc = yaml.load(fs.readFileSync(TARGET_DIR + separator + fileLocation, 'utf8'));
+        return doc;
+    }
+    catch (e) {
+        throw new Error(`ERROR PARSING YAML: ${e}`);
+    }
+}
+async function parseOptionSetsLocalFiles(fileLocation, csvStyle) {
+    const uploadedOptionData = await loadOptionSetCSV(fileLocation);
+    if (csvStyle === 'NameAndLabel') {
+        const parsedOptionSets = parseOptionSets(uploadedOptionData);
+        saveData(parsedOptionSets);
+    }
+    if (csvStyle === 'LabelsInColumn') {
+        const parsedOptionSets = parseLabelsInColumn(uploadedOptionData);
+        saveData(parsedOptionSets);
+    }
+}
+async function parseOptionSetsToFolderStructure(fileLocation) {
+    const uploadedOptionData = await loadOptionSets(fileLocation);
+    saveDataInFolders(uploadedOptionData);
+}
+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');
+}
+function saveDataInFolders(data) {
+    const folder = { filename: 'option-sets', split: true, fileLabel: 'name' };
+    const dir = 'merged_option_sets';
+    const CURRENT_DIR = process.cwd();
+    const subDir = path.join(CURRENT_DIR, dir, folder.filename);
+    if (!fs.existsSync(subDir)) {
+        fs.mkdirSync(subDir, { recursive: true });
+    }
+    for (const item of data) {
+        const yamlStr = yaml.dump(item);
+        const fileLabel = item[folder.fileLabel];
+        if (!fileLabel) {
+            console.warn('skipping bad data:', item);
+        }
+        fs.writeFileSync(path.join(subDir, `${removeSlash(fileLabel)}.yml`), yamlStr, 'utf8');
+    }
+}
+function removeSlash(string) {
+    const re = /\//gi;
+    return string.replace(re, '-');
+}
+export function parseLabelsInColumn(uploadedOptionData) {
+    const optionSets = [];
+    const optionSetNames = Object.keys(uploadedOptionData[0]);
+    for (const optionSetName of optionSetNames) {
+        const uniqueOptionSetValues = new Set();
+        for (const data of uploadedOptionData) {
+            const label = data[optionSetName];
+            uniqueOptionSetValues.add(label);
+        }
+        const optionSet = [];
+        if (uniqueOptionSetValues) {
+            for (const entry of uniqueOptionSetValues.values()) {
+                if (entry === '') {
+                    continue;
+                }
+                optionSet.push({
+                    value: StringUtil.convertToCamelCase(entry),
+                    display: entry,
+                });
+            }
+        }
+        const reducedOptionSet = {
+            name: optionSetName,
+            isArchived: false,
+            optionSet,
+        };
+        optionSets.push(reducedOptionSet);
+    }
+    return optionSets;
+}

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

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

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

@@ -1,98 +1,98 @@
-import { Entities } from '@contrail/sdk';
-import fs from 'fs';
-import * as path from 'path';
-import { authUser } from '../auth/login';
-import chalk from 'chalk';
-const yaml = require('js-yaml');
-export async function UploadOptionSets(args) {
-    try {
-        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'));
-    }
-    catch (e) {
-        console.log(`%s Types Upload Failed. ${e}`, chalk.red.bold('FAIL'));
-        return;
-    }
-    console.log('%s Types Upload Complete.', chalk.green.bold('COMPLETE'));
-}
-function loadOptionSets() {
-    const TARGET_DIR = process.cwd();
-    try {
-        const files = fs.readdirSync(path.join(TARGET_DIR, 'option-sets'));
-        const optionSets = [];
-        for (const file of files) {
-            optionSets.push(yaml.load(fs.readFileSync(path.join(TARGET_DIR, 'option-sets', file), 'utf8')));
-        }
-        return optionSets;
-    }
-    catch (e) {
-        throw new Error(`ERROR PARSING YAML: ${e}`);
-    }
-}
-async function uploadOptionSets() {
-    const optionSets = loadOptionSets();
-    const currentOptionSets = await new Entities().get({
-        entityName: 'type-property-option-set',
-    });
-    const currentOptionSetsByName = {};
-    for (const currentOptionSet of currentOptionSets) {
-        currentOptionSetsByName[currentOptionSet.name] = currentOptionSet;
-    }
-    const newOptionSetsByName = {};
-    for (const optionSet of optionSets) {
-        newOptionSetsByName[optionSet.name] = optionSet;
-    }
-    for (const optionSet of optionSets) {
-        try {
-            const found = currentOptionSetsByName[optionSet.name];
-            if (!found) {
-                if (!optionSet.optionSet) {
-                    console.log('No OptionSet for: ', optionSet.name);
-                    continue;
-                }
-                console.log('Creating: ', optionSet.name);
-                await new Entities().create({
-                    entityName: 'type-property-option-set',
-                    object: {
-                        name: optionSet.name,
-                        optionSet: optionSet.optionSet,
-                        isArchived: optionSet.isArchived,
-                    },
-                });
-            }
-            else {
-                console.log('Updating: ', optionSet.name);
-                await new Entities().update({
-                    entityName: 'type-property-option-set',
-                    id: found.id,
-                    object: {
-                        name: optionSet.name,
-                        optionSet: optionSet.optionSet,
-                        isArchived: optionSet.isArchived,
-                    },
-                });
-            }
-        }
-        catch (err) {
-            throw new Error(`Error Uploading OptionSets: ${err}`);
-        }
-    }
-    for (const currentOptionSet of currentOptionSets) {
-        try {
-            const found = newOptionSetsByName[currentOptionSet.name];
-            if (!found) {
-                console.log('Deleting: ', currentOptionSet.name);
-                await new Entities().delete({
-                    entityName: 'type-property-option-set',
-                    id: currentOptionSet.id,
-                });
-            }
-        }
-        catch (err) {
-            throw new Error(`Error Deleting OptionSets: ${err}`);
-        }
-    }
-}
+import { Entities } from '@contrail/sdk';
+import fs from 'fs';
+import * as path from 'path';
+import { authUser } from '../auth/login';
+import chalk from 'chalk';
+const yaml = require('js-yaml');
+export async function UploadOptionSets(args) {
+    try {
+        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'));
+    }
+    catch (e) {
+        console.log(`%s Types Upload Failed. ${e}`, chalk.red.bold('FAIL'));
+        return;
+    }
+    console.log('%s Types Upload Complete.', chalk.green.bold('COMPLETE'));
+}
+function loadOptionSets() {
+    const TARGET_DIR = process.cwd();
+    try {
+        const files = fs.readdirSync(path.join(TARGET_DIR, 'option-sets'));
+        const optionSets = [];
+        for (const file of files) {
+            optionSets.push(yaml.load(fs.readFileSync(path.join(TARGET_DIR, 'option-sets', file), 'utf8')));
+        }
+        return optionSets;
+    }
+    catch (e) {
+        throw new Error(`ERROR PARSING YAML: ${e}`);
+    }
+}
+async function uploadOptionSets() {
+    const optionSets = loadOptionSets();
+    const currentOptionSets = await new Entities().get({
+        entityName: 'type-property-option-set',
+    });
+    const currentOptionSetsByName = {};
+    for (const currentOptionSet of currentOptionSets) {
+        currentOptionSetsByName[currentOptionSet.name] = currentOptionSet;
+    }
+    const newOptionSetsByName = {};
+    for (const optionSet of optionSets) {
+        newOptionSetsByName[optionSet.name] = optionSet;
+    }
+    for (const optionSet of optionSets) {
+        try {
+            const found = currentOptionSetsByName[optionSet.name];
+            if (!found) {
+                if (!optionSet.optionSet) {
+                    console.log('No OptionSet for: ', optionSet.name);
+                    continue;
+                }
+                console.log('Creating: ', optionSet.name);
+                await new Entities().create({
+                    entityName: 'type-property-option-set',
+                    object: {
+                        name: optionSet.name,
+                        optionSet: optionSet.optionSet,
+                        isArchived: optionSet.isArchived,
+                    },
+                });
+            }
+            else {
+                console.log('Updating: ', optionSet.name);
+                await new Entities().update({
+                    entityName: 'type-property-option-set',
+                    id: found.id,
+                    object: {
+                        name: optionSet.name,
+                        optionSet: optionSet.optionSet,
+                        isArchived: optionSet.isArchived,
+                    },
+                });
+            }
+        }
+        catch (err) {
+            throw new Error(`Error Uploading OptionSets: ${err}`);
+        }
+    }
+    for (const currentOptionSet of currentOptionSets) {
+        try {
+            const found = newOptionSetsByName[currentOptionSet.name];
+            if (!found) {
+                console.log('Deleting: ', currentOptionSet.name);
+                await new Entities().delete({
+                    entityName: 'type-property-option-set',
+                    id: currentOptionSet.id,
+                });
+            }
+        }
+        catch (err) {
+            throw new Error(`Error Deleting OptionSets: ${err}`);
+        }
+    }
+}

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

@@ -1,4 +1,4 @@
-export declare function ParseTypesFromLocalFiles(args: any): Promise<void>;
-export declare function ParseTypesFromFiles(args: any): Promise<void>;
-export declare function ParseTypesFromTemplateFromLocalFiles(args: any): Promise<void>;
-export declare function ParseTypesFromTemplateAndDataFromLocalFiles(args: any): Promise<void>;
+export declare function ParseTypesFromLocalFiles(args: any): Promise<void>;
+export declare function ParseTypesFromFiles(args: any): Promise<void>;
+export declare function ParseTypesFromTemplateFromLocalFiles(args: any): Promise<void>;
+export declare function ParseTypesFromTemplateAndDataFromLocalFiles(args: any): Promise<void>;