@contrail/cli 2.4.0 → 3.0.1

package/dist/commands/types/getAll.d.ts

@@ -1,29 +1,11 @@
 import { BaseCommand } from '../../basecommand';
-export interface DataHolder {
-    types: any[];
-    optionSets: any[];
-    optionSetHierarchies: any[];
-    optionSetHierarchyLinks: any[];
-    ruleSets: any[];
-    ruleSetLinks: any[];
-    usageInfo: any[];
-    typePropertyPolicies: any[];
-    typePropertyPolicyLinks: any[];
-    typePolicies: any[];
-    typePolicyLinks: any[];
-}
-export interface ReducedDataHolder {
-    reducedTypes: any[];
-    reducedOptionSets: any[];
-    reducedOptionSetHierarchies: any[];
-    reducedOptionSetHierarchyLinks: any[];
-    reducedRuleSets: any[];
-    reducedRuleSetLinks: any[];
-    reducedUsageInfo: any[];
-    reducedTypePropertyPolicies: any[];
-    reducedTypePropertyPolicyLinks: any[];
-    reducedTypePolicies: any[];
-    reducedTypePolicyLinks: any[];
+export interface FolderMap {
+    [key: string]: {
+        filename: string;
+        split: boolean;
+        fileLabel: string;
+        saveFunction?: (data: any, dir: string, overwrite: boolean) => Promise<void>;
+    };
 }
 export default class GetAllTypes extends BaseCommand {
     static description: string;
@@ -31,9 +13,9 @@ export default class GetAllTypes extends BaseCommand {
     static flags: {
         outDir: import("@oclif/core/lib/interfaces").OptionFlag<string, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
         overwrite: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
+        alwaysConfirmEnv: import("@oclif/core/lib/interfaces").OptionFlag<string, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
+        logLevel: import("@oclif/core/lib/interfaces").OptionFlag<string, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
     };
     run(): Promise<void>;
 }
 export declare function getAll(outDir: string, overwrite: boolean): Promise<void>;
-export declare function reduceTypes(dataHolder: DataHolder): any[];
-export declare function reduceData(data: DataHolder): Promise<ReducedDataHolder>;

package/dist/commands/types/getAll.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.reduceData = exports.reduceTypes = exports.getAll = void 0;
+exports.getAll = void 0;
 const tslib_1 = require("tslib");
 const core_1 = require("@oclif/core");
 const chalk_1 = tslib_1.__importDefault(require("chalk"));
@@ -9,8 +9,8 @@ const login_1 = require("../../auth/login");
 const path = tslib_1.__importStar(require("path"));
 const type_extractor_1 = require("../../helpers/types/type-extractor");
 const types_1 = require("../../api/types");
+const types_2 = require("@contrail/org-config-migration/lib/types");
 const file_helpers_1 = require("../../helpers/file-helpers");
-const users_1 = require("../../api/users");
 const basecommand_1 = require("../../basecommand");
 const logger_1 = tslib_1.__importDefault(require("../../logger"));
 const js_yaml_1 = tslib_1.__importDefault(require("js-yaml"));
@@ -22,6 +22,7 @@ class GetAllTypes extends basecommand_1.BaseCommand {
 `,
     ];
     static flags = {
+        ...basecommand_1.BaseCommand.baseFlags,
         outDir: core_1.Flags.string({
             char: 'd',
             description: 'The directory to which to export the type data. Defaults to the current directory',
@@ -36,15 +37,14 @@ class GetAllTypes extends basecommand_1.BaseCommand {
         }),
     };
     async run() {
-        const { flags } = await this.parse(GetAllTypes);
-        await getAll(flags.outDir, flags.overwrite);
+        await getAll(this.flags.outDir, this.flags.overwrite);
     }
 }
 exports.default = GetAllTypes;
 async function getAll(outDir, overwrite) {
     try {
         const userConfig = await (0, login_1.authUser)();
-        logger_1.default.info(`${chalk_1.default.blue.bold('START')} Getting all types for orgId: ${userConfig.orgId}`);
+        logger_1.default.info(`${chalk_1.default.blue.bold('START')} Getting all types for org ${userConfig.orgSlug}`);
         // make directory to house exports
         if (!fs_1.default.existsSync(path.resolve(outDir))) {
             fs_1.default.mkdirSync(path.resolve(outDir));
@@ -62,7 +62,7 @@ async function getAll(outDir, overwrite) {
             typePolicies: await (0, types_1.getTypePolicies)(),
             typePolicyLinks: await (0, types_1.getTypePolicyLinks)(),
         };
-        const reducedData = await reduceData(data);
+        const reducedData = await (0, types_2.getAllReducedTypes)(data);
         await saveData(reducedData, outDir, overwrite);
         logger_1.default.info(`${chalk_1.default.yellow.bold('TYPES')} Retrieved`);
     }
@@ -73,313 +73,6 @@ async function getAll(outDir, overwrite) {
     logger_1.default.info(`${chalk_1.default.green.bold('COMPLETE')} Types Retrieval Complete.`);
 }
 exports.getAll = getAll;
-async function reduceTypePropertyPolicies(data) {
-    const orgUsers = await (0, users_1.getUserOrgs)();
-    const groups = await (0, users_1.getGroups)();
-    function reducePrincipal(statement) {
-        if (!statement?.principal) {
-            return statement;
-        }
-        const [type, id] = statement.principal.split(':');
-        if (!type || !id) {
-            return statement;
-        }
-        if (type === 'group') {
-            const groupName = groups.find((x) => x.id === id)?.name;
-            if (!groupName) {
-                logger_1.default.info(`Could not find group for statement. skipping invalid policy conversion ${id}`);
-                return statement;
-            }
-            statement.principal = `group:${groupName}`;
-        }
-        else if (type === 'user') {
-            const userEmail = orgUsers.find((x) => x.user.id === id)?.email;
-            if (!userEmail) {
-                logger_1.default.info(`Could not find group for statement. skipping invalid policy conversion ${id}`);
-                return statement;
-            }
-            statement.principal = `user:${userEmail}`;
-        }
-        return statement;
-    }
-    return data?.typePropertyPolicies
-        ?.map((x) => {
-        return {
-            label: x.label,
-            identifier: x.identifier,
-            policy: {
-                version: x.policy.version,
-                statements: x.policy.statements.map((x) => reducePrincipal(x)),
-            },
-        };
-    })
-        .sort((one, two) => (one.label < two.label ? -1 : 1));
-}
-function reduceTypePropertyPolicyLinks(data) {
-    const typeProperties = data?.types?.map((x) => x.typeProperties).reduce((x, y) => x.concat(y));
-    // make a map of all type properties to their type ids
-    const typePropertyIdToTypeSlugMap = data.types.reduce((map, obj) => {
-        for (const tp of obj.typeProperties) {
-            map[tp.id] = obj.slug;
-        }
-        return map;
-    }, {});
-    return data?.typePropertyPolicyLinks
-        ?.map((x) => {
-        const typeSlug = typePropertyIdToTypeSlugMap[x.typePropertyId];
-        const typePropertySlug = typeProperties.find((y) => y.id === x.typePropertyId)?.slug;
-        const typePropertyPolicyIdentifier = data.typePropertyPolicies.find((y) => y.id === x.typePropertyPolicyId)?.identifier;
-        if (!typeSlug || !typePropertySlug || !typePropertyPolicyIdentifier) {
-            logger_1.default.debug(`typeSlug: ${typeSlug} typePropertySlug: ${typePropertySlug}, typePropertyPolicyIdentifier: ${typePropertyPolicyIdentifier} `);
-            logger_1.default.warn(`Could not reduce bad type property policy link... skipping ${JSON.stringify(x, null, 2)}`);
-            return null;
-        }
-        return {
-            typeSlug,
-            typePropertySlug,
-            typePropertyPolicyIdentifier,
-        };
-    })
-        .filter((x) => !!x);
-}
-async function reduceTypePolicies(data) {
-    const orgUsers = await (0, users_1.getUserOrgs)();
-    const groups = await (0, users_1.getGroups)();
-    function reducePrincipal(statement) {
-        if (!statement?.principal) {
-            return statement;
-        }
-        const [type, id] = statement.principal.split(':');
-        if (!type || !id) {
-            return statement;
-        }
-        if (type === 'group') {
-            const groupName = groups.find((x) => x.id === id)?.name;
-            if (!groupName) {
-                logger_1.default.info(`Could not find group for statement. skipping invalid policy conversion ${id}`);
-                return statement;
-            }
-            statement.principal = `group:${groupName}`;
-        }
-        else if (type === 'user') {
-            const userEmail = orgUsers.find((x) => x.user.id === id)?.email;
-            if (!userEmail) {
-                logger_1.default.info(`Could not find group for statement. skipping invalid policy conversion ${id}`);
-                return statement;
-            }
-            statement.principal = `user:${userEmail}`;
-        }
-        return statement;
-    }
-    return data?.typePolicies
-        ?.map((x) => {
-        return {
-            label: x.label,
-            identifier: x.identifier,
-            policy: {
-                version: x.policy.version,
-                statements: x.policy.statements.map((x) => reducePrincipal(x)),
-            },
-        };
-    })
-        .sort((one, two) => (one.label < two.label ? -1 : 1));
-}
-function reduceTypePolicyLinks(data) {
-    const types = data?.types;
-    return data?.typePolicyLinks?.map((x) => {
-        return {
-            typeSlug: types.find((y) => y.id === x.typeId)?.slug,
-            typePolicyIdentifier: data.typePolicies.find((y) => y.id === x.typePolicyId)?.identifier,
-        };
-    });
-}
-function reduceUsageInfo(data) {
-    const typeProperties = data?.types?.map((x) => x.typeProperties).reduce((x, y) => x.concat(y));
-    return data?.usageInfo
-        ?.map((x) => {
-        return {
-            used: x.used,
-            editable: x.editable,
-            formulaFunction: x.formulaFunction,
-            validationFunction: x.validationFunction,
-            numberFormat: x.numberFormat,
-            defaultValue: x.defaultValue,
-            label: x.label,
-            typeSlug: data.types.find((y) => y.id === x.typeId)?.slug,
-            typePropertySlug: typeProperties.find((y) => y.id === x.typePropertyId)?.slug,
-        };
-    })
-        .sort((one, two) => (one.label < two.label ? -1 : 1));
-}
-function reduceRuleSetLinks(data) {
-    const reducedRuleSetLinks = [];
-    if (!data?.ruleSetLinks.length) {
-        return [];
-    }
-    for (const ruleSetLink of data.ruleSetLinks) {
-        const ruleSet = data?.ruleSets?.find((x) => x.id === ruleSetLink.typeRuleSetId);
-        const type = data?.types?.find((x) => x.id === ruleSetLink.typeId);
-        if (!ruleSet || !type) {
-            logger_1.default.info(`${chalk_1.default.red.bold('TYPES')} Skipping bad rule set link ${ruleSetLink.id}`);
-        }
-        reducedRuleSetLinks.push({
-            ruleSet: ruleSet.identifier,
-            type: type.slug,
-        });
-    }
-    return reducedRuleSetLinks.sort((one, two) => {
-        if (one.type === two.type) {
-            return one.ruleSet > two.ruleSet ? -1 : 1;
-        }
-        return one.type > two.type ? -1 : 1;
-    });
-}
-function reduceRuleSets(data) {
-    return data?.ruleSets
-        ?.map((x) => {
-        return {
-            ruleSet: x.ruleSet,
-            name: x.name,
-            identifier: x.identifier,
-        };
-    })
-        .sort((one, two) => (one.name < two.name ? -1 : 1));
-}
-function reduceOptionSets(data) {
-    return data.optionSets
-        ?.map((optionSet) => {
-        return {
-            name: optionSet.name,
-            slug: optionSet.slug,
-            isArchived: optionSet.isArchived,
-            optionSet: optionSet.optionSet,
-        };
-    })
-        .sort((one, two) => (one.name < two.name ? -1 : 1));
-}
-function reduceOptionSetHierarchies(data) {
-    return data.optionSetHierarchies
-        ?.map((x) => {
-        const hierarchyBySlug = x.hierarchy.map((optionSetId) => data.optionSets?.find((x) => x.id === optionSetId)?.slug);
-        return {
-            hierarchy: hierarchyBySlug,
-            options: x.options,
-            name: x.name,
-            identifier: x.identifier,
-        };
-    })
-        .sort((one, two) => (one.name < two.name ? -1 : 1));
-}
-function reduceOptionSetHierarchyLinks(data) {
-    return data.optionSetHierarchyLinks
-        ?.map((x) => {
-        const osh = data.optionSetHierarchies.find((y) => y.id === x.optionSetHierarchyId);
-        if (!osh) {
-            logger_1.default.info(`OSH Link: could not find option set hierarchy ${x.optionSetHierarchyId} skipping...`);
-            return null;
-        }
-        const type = data.types.find((y) => y.id === x.typeId);
-        if (!type) {
-            logger_1.default.info(`OSH Link: could not find type ${x.typeId} skipping...`);
-            return null;
-        }
-        const typePropertySlugs = [];
-        for (const tpId of x.hierarchyTypePropertyIds) {
-            const typePropertySlug = type.typeProperties.find((y) => y.id === tpId)?.slug;
-            if (!typePropertySlug) {
-                logger_1.default.info(`OSH Link: could not find type property ${tpId} skipping...`);
-                return null;
-            }
-            typePropertySlugs.push(typePropertySlug);
-        }
-        return {
-            optionSetHierarchyIdentifier: osh.identifier,
-            typeSlug: type.slug,
-            typePropertySlugs,
-        };
-    })
-        .filter((x) => !!x)
-        .sort((one, two) => (one.typeSlug < two.typeSlug ? -1 : 1));
-}
-function reduceTypes(dataHolder) {
-    logger_1.default.info(`Found types: ${dataHolder.types.length}`);
-    let reducedTypes = [];
-    const optionSetSlugById = {};
-    for (const optionSet of dataHolder.optionSets) {
-        optionSetSlugById[optionSet.id] = optionSet.slug;
-    }
-    logger_1.default.debug(`option set and their ids: ${JSON.stringify(optionSetSlugById, null, 2)}`);
-    for (const type of dataHolder.types) {
-        const reducedTypeProperties = [];
-        for (const typeProperty of type.typeProperties) {
-            if (typeProperty.inherited) {
-                continue;
-            }
-            const reducedTypeProperty = {
-                slug: typeProperty.slug,
-                id: typeProperty.id,
-                isArchived: typeProperty.isArchived,
-                propertyType: typeProperty.propertyType,
-                label: typeProperty.label,
-                editable: typeProperty.editable,
-                searchable: typeProperty.searchable,
-                core: typeProperty.core,
-                typePropertyOptionSetSlug: optionSetSlugById[typeProperty.typePropertyOptionSetId],
-                formula: typeProperty.formula,
-                referencedTypePath: typeProperty.referencedTypePath,
-                referencedTypeRootSlug: typeProperty.referencedTypeRootSlug,
-                typePropertyUserListId: typeProperty.typePropertyUserListId,
-                referencedTypeRole: typeProperty.referencedTypeRole,
-                defaultValue: typeProperty.defaultValue,
-                propertyLevel: typeProperty.propertyLevel,
-                carryOverBehavior: typeProperty.carryOverBehavior,
-                carryOverDefault: typeProperty.carryOverDefault,
-                isUniqueProperty: typeProperty.isUniqueProperty,
-                isUniquePropertyInFamily: typeProperty.isUniquePropertyInFamily,
-                inherited: typeProperty.inherited,
-                formulaFunction: typeProperty.formulaFunction,
-                validationFunction: typeProperty.validationFunction,
-                numberFormat: typeProperty.numberFormat,
-                sequenceSeedValue: typeProperty.sequenceSeedValue,
-            };
-            reducedTypeProperties.push(reducedTypeProperty);
-        }
-        const reducedType = {
-            typePath: type.typePath,
-            slug: type.slug,
-            label: type.label,
-            isArchived: type.isArchived,
-            typeProperties: reducedTypeProperties
-                .map((x) => {
-                delete x['id'];
-                return {
-                    ...x,
-                };
-            })
-                .sort((one, two) => (one.slug < two.slug ? -1 : 1)),
-        };
-        reducedTypes.push(reducedType);
-    }
-    reducedTypes = reducedTypes.sort((one, two) => (one.typePath < two.typePath ? -1 : 1));
-    return reducedTypes;
-}
-exports.reduceTypes = reduceTypes;
-async function reduceData(data) {
-    return {
-        reducedTypes: reduceTypes(data),
-        reducedOptionSets: reduceOptionSets(data),
-        reducedOptionSetHierarchies: reduceOptionSetHierarchies(data),
-        reducedOptionSetHierarchyLinks: reduceOptionSetHierarchyLinks(data),
-        reducedRuleSets: reduceRuleSets(data),
-        reducedRuleSetLinks: reduceRuleSetLinks(data),
-        reducedUsageInfo: reduceUsageInfo(data),
-        reducedTypePropertyPolicies: await reduceTypePropertyPolicies(data),
-        reducedTypePropertyPolicyLinks: reduceTypePropertyPolicyLinks(data),
-        reducedTypePolicies: await reduceTypePolicies(data),
-        reducedTypePolicyLinks: reduceTypePolicyLinks(data),
-    };
-}
-exports.reduceData = reduceData;
 const saveTypesFunction = async (data, dir, overwrite) => {
     const roots = {};
     for (const type of data.reducedTypes) {

package/dist/commands/types/getOptionSets.d.ts

@@ -0,0 +1,16 @@
+import { BaseCommand } from '../../basecommand';
+import { DataHolder, ReducedDataHolder } from '@contrail/org-config-migration/lib/interfaces';
+export default class GetOptionSets extends BaseCommand {
+    static description: string;
+    static examples: string[];
+    static flags: {
+        format: import("@oclif/core/lib/interfaces").OptionFlag<string, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
+        outDir: import("@oclif/core/lib/interfaces").OptionFlag<string, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
+        overwrite: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
+        alwaysConfirmEnv: import("@oclif/core/lib/interfaces").OptionFlag<string, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
+        logLevel: import("@oclif/core/lib/interfaces").OptionFlag<string, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
+    };
+    run(): Promise<void>;
+}
+export declare function getAllOptionSets(outDir: string, overwrite: boolean, format: string): Promise<void>;
+export declare function reduceData(data: DataHolder): Promise<ReducedDataHolder>;

package/dist/commands/types/getOptionSets.js

@@ -0,0 +1,171 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.reduceData = exports.getAllOptionSets = void 0;
+const tslib_1 = require("tslib");
+const core_1 = require("@oclif/core");
+const chalk_1 = tslib_1.__importDefault(require("chalk"));
+const fs_1 = tslib_1.__importDefault(require("fs"));
+const login_1 = require("../../auth/login");
+const path = tslib_1.__importStar(require("path"));
+const types_1 = require("../../api/types");
+const file_helpers_1 = require("../../helpers/file-helpers");
+const basecommand_1 = require("../../basecommand");
+const logger_1 = tslib_1.__importDefault(require("../../logger"));
+const js_yaml_1 = tslib_1.__importDefault(require("js-yaml"));
+const common_1 = require("../../common");
+const types_2 = require("@contrail/org-config-migration/lib/types");
+class GetOptionSets extends basecommand_1.BaseCommand {
+    static description = 'Get all option sets and associated data for your Org';
+    static examples = [
+        `$ contrail types getOptionSets --format <YAML or CSV>
+`,
+    ];
+    static flags = {
+        ...basecommand_1.BaseCommand.baseFlags,
+        format: core_1.Flags.string({ options: ['YAML', 'CSV'] }),
+        outDir: core_1.Flags.string({
+            char: 'd',
+            description: 'The directory to which to export the option sets data. Defaults to the current directory',
+            required: false,
+            default: '.',
+        }),
+        overwrite: core_1.Flags.boolean({
+            char: 'f',
+            description: 'Replaces any existing export files in outDir',
+            required: false,
+            default: false,
+        }),
+    };
+    async run() {
+        await getAllOptionSets(this.flags.outDir, this.flags.overwrite, this.flags.format);
+    }
+}
+exports.default = GetOptionSets;
+async function getAllOptionSets(outDir, overwrite, format) {
+    try {
+        const userConfig = await (0, login_1.authUser)();
+        logger_1.default.info(`%s Getting all Option Sets for orgId: ${userConfig.orgId}`, chalk_1.default.blue.bold('START'));
+        // make directory to house exports
+        if (!fs_1.default.existsSync(path.resolve(outDir))) {
+            fs_1.default.mkdirSync(path.resolve(outDir));
+        }
+        const data = {
+            optionSets: await (0, types_1.getOptionSets)(),
+        };
+        const reducedData = await reduceData(data);
+        await saveData(reducedData, outDir, overwrite, format);
+        logger_1.default.info('%s Retrieved', chalk_1.default.yellow.bold('OPTION SETS'));
+    }
+    catch (e) {
+        logger_1.default.info(`%s Option Sets Retrieval Failed. ${e}`, chalk_1.default.red.bold('FAIL'));
+        return;
+    }
+    logger_1.default.info('%s Option Sets Retrieval Complete.', chalk_1.default.green.bold('COMPLETE'));
+}
+exports.getAllOptionSets = getAllOptionSets;
+async function reduceData(data) {
+    return {
+        reducedOptionSets: (0, types_2.getReducedOptionSets)(data),
+    };
+}
+exports.reduceData = reduceData;
+// eslint-disable-next-line @typescript-eslint/explicit-function-return-type
+function sortOptionSetsByName(optionSets) {
+    return optionSets.sort((a, b) => {
+        const nameA = a.name.toLowerCase();
+        const nameB = b.name.toLowerCase();
+        if (nameA < nameB)
+            return -1;
+        if (nameA > nameB)
+            return 1;
+        return 0;
+    });
+}
+async function saveData(reducedData, dir, overwrite, format) {
+    const propertyToFolderMap = {
+        reducedOptionSets: { filename: 'option-sets', split: true, fileLabel: 'name' },
+    };
+    for (const [key, folder] of Object.entries(propertyToFolderMap)) {
+        const CURRENT_DIR = process.cwd();
+        if (folder['saveFunction']) {
+            await folder['saveFunction'](reducedData, dir, overwrite);
+        }
+        else if (folder.split) {
+            const subDir = path.join(CURRENT_DIR, dir, folder.filename);
+            if (!fs_1.default.existsSync(subDir)) {
+                fs_1.default.mkdirSync(subDir);
+            }
+            if (format === 'CSV') {
+                await saveOptionSetsToCSV(reducedData[key], subDir, folder.fileLabel, overwrite, false);
+            }
+            else {
+                await saveOptionSetsToYAML(reducedData[key], subDir, folder.fileLabel, overwrite);
+            }
+        }
+        else {
+            if (format === 'CSV') {
+                const combinedCSVPath = path.join(CURRENT_DIR, dir, 'option-sets.csv');
+                const combineCSV = true;
+                await saveOptionSetsToCSV(reducedData[key], combinedCSVPath, folder.fileLabel, overwrite, combineCSV);
+            }
+            else {
+                const yamlStr = js_yaml_1.default.dump(reducedData[key]);
+                const pathToWrite = path.join(CURRENT_DIR, dir, `${folder.filename}.yml`);
+                if (fs_1.default.existsSync(pathToWrite)) {
+                    await (0, file_helpers_1.safeFileOverwrite)(pathToWrite, overwrite);
+                }
+                fs_1.default.writeFileSync(pathToWrite, yamlStr, 'utf8');
+            }
+        }
+    }
+}
+async function saveOptionSetsToCSV(optionSets, dir, fileLabel, overwrite, combineCSV) {
+    const sortedOptionSets = sortOptionSetsByName(optionSets);
+    let dataToAdd = [];
+    for (const item of sortedOptionSets) {
+        const fileLabelValue = item[fileLabel];
+        if (!fileLabelValue) {
+            logger_1.default.warn('skipping bad data:', item);
+            continue;
+        }
+        let pathToWrite;
+        if (combineCSV) {
+            const csvHeaders = 'Option Set name,Value Key,label\n'; // CSV headers
+            fs_1.default.writeFileSync(dir, csvHeaders, 'utf8');
+            pathToWrite = dir;
+        }
+        else {
+            dataToAdd = [];
+            pathToWrite = path.join(dir, `${(0, common_1.removeSlash)(fileLabelValue)}.csv`);
+            const csvHeaders = 'Option Set Name,Value Key,Label\n'; // CSV headers
+            if (!fs_1.default.existsSync(pathToWrite)) {
+                fs_1.default.writeFileSync(pathToWrite, csvHeaders, 'utf8');
+            }
+        }
+        const existingData = fs_1.default.readFileSync(pathToWrite, 'utf8');
+        for (const option of item.optionSet) {
+            const csvData = `${item.name},${option.value},${option.display}\n`;
+            if (!existingData.includes(csvData)) {
+                dataToAdd.push(csvData);
+            }
+        }
+        if (dataToAdd.length > 0) {
+            fs_1.default.writeFileSync(pathToWrite, dataToAdd.join(''), { encoding: 'utf8', flag: 'a' });
+        }
+    }
+}
+async function saveOptionSetsToYAML(optionSets, dir, fileLabel, overwrite) {
+    for (const item of optionSets) {
+        const yamlStr = js_yaml_1.default.dump(item);
+        const fileLabelValue = item[fileLabel];
+        if (!fileLabelValue) {
+            logger_1.default.warn('skipping bad data:', item);
+            continue;
+        }
+        const pathToWrite = path.join(dir, `${(0, common_1.removeSlash)(fileLabelValue)}.yml`);
+        if (fs_1.default.existsSync(pathToWrite)) {
+            await (0, file_helpers_1.safeFileOverwrite)(pathToWrite, overwrite);
+        }
+        fs_1.default.writeFileSync(pathToWrite, yamlStr, 'utf8');
+    }
+}

package/dist/commands/types/loadAll.d.ts

@@ -4,6 +4,8 @@ export default class LoadAllTypes extends BaseCommand {
     static examples: string[];
     static flags: {
         dir: import("@oclif/core/lib/interfaces").OptionFlag<string, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
+        alwaysConfirmEnv: import("@oclif/core/lib/interfaces").OptionFlag<string, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
+        logLevel: import("@oclif/core/lib/interfaces").OptionFlag<string, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
     };
     run(): Promise<void>;
 }

package/dist/commands/types/loadAll.js

@@ -21,6 +21,7 @@ class LoadAllTypes extends basecommand_1.BaseCommand {
 `,
     ];
     static flags = {
+        ...basecommand_1.BaseCommand.baseFlags,
         dir: core_1.Flags.string({
             char: 'd',
             description: 'The directory from which to load the types data. Defaults to the current directory.',
@@ -29,8 +30,7 @@ class LoadAllTypes extends basecommand_1.BaseCommand {
         }),
     };
     async run() {
-        const { flags } = await this.parse(LoadAllTypes);
-        await loadAll(flags.dir);
+        await loadAll(this.flags.dir);
     }
 }
 exports.default = LoadAllTypes;

package/dist/commands/types/mergeOptionSets.d.ts

@@ -2,6 +2,10 @@ import { BaseCommand } from '../../basecommand';
 export default class MergeOptionSets extends BaseCommand {
     static description: string;
     static examples: string[];
+    static flags: {
+        alwaysConfirmEnv: import("@oclif/core/lib/interfaces").OptionFlag<string, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
+        logLevel: import("@oclif/core/lib/interfaces").OptionFlag<string, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
+    };
     static args: {
         file: import("@oclif/core/lib/interfaces/parser").Arg<string, Record<string, unknown>>;
     };

package/dist/commands/types/mergeOptionSets.js

@@ -16,15 +16,17 @@ class MergeOptionSets extends basecommand_1.BaseCommand {
         `$ contrail types mergeOptionSets <File Path>
 `,
     ];
+    static flags = {
+        ...basecommand_1.BaseCommand.baseFlags,
+    };
     static args = {
         file: core_1.Args.string({ description: 'File to merge with the cloud option sets', required: true }),
     };
     async run() {
-        const { args } = await this.parse(MergeOptionSets);
         try {
             this.log('%s Importing local file', chalk_1.default.yellow.bold('OPTION SET MERGE'));
-            this.log('Using File: ', args.file);
-            await mergeOptionSets(args.file);
+            this.log('Using File: ', this.args.file);
+            await mergeOptionSets(this.args.file);
             this.log('%s Merged', chalk_1.default.yellow.bold('OPTION SET MERGE'));
         }
         catch (e) {

package/dist/commands/types/mergeTypeProperties.d.ts

@@ -3,6 +3,10 @@ export default class MergeTypeProperties extends BaseCommand {
     static description: string;
     static examples: string[];
     static strict: boolean;
+    static flags: {
+        alwaysConfirmEnv: import("@oclif/core/lib/interfaces").OptionFlag<string, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
+        logLevel: import("@oclif/core/lib/interfaces").OptionFlag<string, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
+    };
     static args: {
         file: import("@oclif/core/lib/interfaces/parser").Arg<string, Record<string, unknown>>;
         typePaths: import("@oclif/core/lib/interfaces/parser").Arg<string, Record<string, unknown>>;