@contrail/cli 2.2.8 → 2.3.0

package/dist/commands/types/parseOptionSetsLocalFiles.js

@@ -1,10 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.parseLabelsInColumn = exports.ParseOptionSetsToFolderStructure = void 0;
+exports.parseNameAndLabelAndKey = exports.parseLabelsInColumn = exports.ParseOptionSetsToFolderStructure = void 0;
 const tslib_1 = require("tslib");
 const path = tslib_1.__importStar(require("path"));
 const fs_1 = tslib_1.__importDefault(require("fs"));
-const types_1 = require("@contrail/types");
 const util_1 = require("@contrail/util");
 const chalk_1 = tslib_1.__importDefault(require("chalk"));
 const csvtojson_1 = tslib_1.__importDefault(require("csvtojson"));
@@ -14,6 +13,40 @@ const basecommand_1 = require("../../basecommand");
 const logger_1 = tslib_1.__importDefault(require("../../logger"));
 const common_1 = require("../../common");
 class ParseOptionSetsLocalFiles extends basecommand_1.BaseCommand {
+    static description = 'Parse CSV files into OptionSets. Style denotes the format the csv is in. If the csv file has a column for option set' +
+        'name, option key, and option label, use "NameAndLabelAndKey". If the file has one column for each option set with ' +
+        `the rows being the label value use "LabelsInColumn". In the case of LabelsInColumn, the keys are autogenerated.
+
+Example file for LabelsInColumn would be
+
+Gender, Countries, Brands
+men, spain, prada
+women, france, converse
+unisex, australia
+, usa
+, egypt
+
+Example file for NameAndLabelAndKey would be
+
+Gender, g_men, Men
+Bender, g_women, Women
+Gender g_uni, Unisex
+Countries, co_spain, Spain
+Countries, co_france, France
+Countries, co_aus, Australia
+Countries, co_usa, United States of America,
+Countries, co_egypt, Egypt
+`;
+    static examples = [
+        `$ contrail types parseOptionSetsLocalFiles <File Paths> <style>
+`,
+    ];
+    static flags = {
+        csvStyle: core_1.Flags.string({ options: ['NameAndLabelAndKey', 'LabelsInColumn'], required: true }),
+    };
+    static args = {
+        file: core_1.Args.string({ description: 'File to parse', required: true }),
+    };
     async run() {
         const { args, flags } = await this.parse(ParseOptionSetsLocalFiles);
         try {
@@ -24,26 +57,16 @@ class ParseOptionSetsLocalFiles extends basecommand_1.BaseCommand {
         }
         catch (e) {
             this.log(`%s PARSE Failed. ${e}`, chalk_1.default.red.bold('FAIL'));
+            console.error(e);
             return;
         }
         this.log('%s PARSE Complete.', chalk_1.default.green.bold('COMPLETE'));
     }
 }
 exports.default = ParseOptionSetsLocalFiles;
-ParseOptionSetsLocalFiles.description = 'Parse CSV files into OptionSets. Style denotes the format the csv is in. If the csv file has a column for name and label, use "NameAndLabel". If the file has one column for each option set with the rows being the label value use "LabelsInColumn"';
-ParseOptionSetsLocalFiles.examples = [
-    `$ contrail types parseOptionSetsLocalFiles <File Paths> <style>
-`,
-];
-ParseOptionSetsLocalFiles.flags = {
-    csvStyle: core_1.Flags.string({ options: ['NameAndLabel', 'LabelsInColumn'], required: true }),
-};
-ParseOptionSetsLocalFiles.args = {
-    file: core_1.Args.string({ description: 'File to parse', required: true }),
-};
 async function ParseOptionSetsToFolderStructure(args) {
     try {
-        if ((args === null || args === void 0 ? void 0 : args.length) < 4) {
+        if (args?.length < 4) {
             throw new Error('File name must be included.');
         }
         logger_1.default.info('%s Importing local file', chalk_1.default.yellow.bold('OPTION SET PARSE'));
@@ -84,8 +107,8 @@ function loadOptionSets(fileLocation) {
 }
 async function parseOptionSetsLocalFiles(fileLocation, csvStyle) {
     const uploadedOptionData = await loadOptionSetCSV(fileLocation);
-    if (csvStyle === 'NameAndLabel') {
-        const parsedOptionSets = (0, types_1.parseOptionSets)(uploadedOptionData);
+    if (csvStyle === 'NameAndLabelAndKey') {
+        const parsedOptionSets = parseNameAndLabelAndKey(uploadedOptionData);
         saveData(parsedOptionSets);
     }
     if (csvStyle === 'LabelsInColumn') {
@@ -119,6 +142,11 @@ function saveDataInFolders(data) {
         fs_1.default.writeFileSync(path.join(subDir, `${(0, common_1.removeSlash)(fileLabel)}.yml`), yamlStr, 'utf8');
     }
 }
+/**
+ * Expects
+ * @param uploadedOptionData
+ * @returns
+ */
 function parseLabelsInColumn(uploadedOptionData) {
     const optionSets = [];
     const optionSetNames = Object.keys(uploadedOptionData[0]);
@@ -131,7 +159,7 @@ function parseLabelsInColumn(uploadedOptionData) {
         const optionSet = [];
         if (uniqueOptionSetValues) {
             for (const entry of uniqueOptionSetValues.values()) {
-                if (entry === '') {
+                if (!entry) {
                     continue;
                 }
                 optionSet.push({
@@ -150,3 +178,53 @@ function parseLabelsInColumn(uploadedOptionData) {
     return optionSets;
 }
 exports.parseLabelsInColumn = parseLabelsInColumn;
+/**
+ * Expects a CSV file with an ignored header file and 3 columns:
+ *  The first column contains the option set name (e.g. Gender)
+ *  The second column contains the option keys (e.g. ge_men)
+ *  The second column contains the option display label (e.g. Men)
+ *
+ * Sample file
+ * ignored header 1, ignored header 2, ignored header 3
+ * Gender, ge_men, Men
+ * Gender, ge_women, Women
+ * Brand, b_prada, Prada
+ * Brand, b_coach, Coach
+ * @param uploadedOptionData
+ * @returns
+ */
+function parseNameAndLabelAndKey(uploadedOptionData) {
+    const optionSets = {};
+    for (const csvRow of uploadedOptionData) {
+        const row = Object.values(csvRow);
+        if (row.length !== 3 || row.some((x) => !x)) {
+            console.log('skipping bad row', JSON.stringify(row, null, 2));
+            continue;
+        }
+        const optionSetName = row[0];
+        if (!optionSets[optionSetName]) {
+            optionSets[optionSetName] = {};
+        }
+        const key = row[1];
+        const label = row[2];
+        optionSets[optionSetName][key] = label;
+    }
+    const result = [];
+    for (const optionSetName of Object.keys(optionSets)) {
+        const optionSet = [];
+        for (const [key, value] of Object.entries(optionSets[optionSetName])) {
+            optionSet.push({
+                value: key,
+                display: value,
+            });
+        }
+        const reducedOptionSet = {
+            name: optionSetName,
+            isArchived: false,
+            optionSet,
+        };
+        result.push(reducedOptionSet);
+    }
+    return result;
+}
+exports.parseNameAndLabelAndKey = parseNameAndLabelAndKey;

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

@@ -7,4 +7,3 @@ export default class ParseOptionSetsToFolderStructure extends BaseCommand {
     };
     run(): Promise<void>;
 }
-export declare function parseLabelsInColumn(uploadedOptionData: any): any[];

package/dist/commands/types/parseOptionSetsToFolderStructure.js

@@ -1,10 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.parseLabelsInColumn = void 0;
 const tslib_1 = require("tslib");
 const path = tslib_1.__importStar(require("path"));
 const fs_1 = tslib_1.__importDefault(require("fs"));
-const util_1 = require("@contrail/util");
 const chalk_1 = tslib_1.__importDefault(require("chalk"));
 const js_yaml_1 = tslib_1.__importDefault(require("js-yaml"));
 const core_1 = require("@oclif/core");
@@ -12,6 +10,11 @@ const basecommand_1 = require("../../basecommand");
 const logger_1 = tslib_1.__importDefault(require("../../logger"));
 const common_1 = require("../../common");
 class ParseOptionSetsToFolderStructure extends basecommand_1.BaseCommand {
+    static description = 'Parses a YAML file containing multiple option sets (like the output of `parseOptionSetLocalFiles`) and separates them into multiple files in a directory. The resulting files can be uploaded using `uploadOptionSets`';
+    static examples = ['$ contrail types parseOptionSetsLocalFiles <File Paths> <style>'];
+    static args = {
+        file: core_1.Args.string({ description: 'File to parse', required: true }),
+    };
     async run() {
         const { args } = await this.parse(ParseOptionSetsToFolderStructure);
         try {
@@ -28,14 +31,6 @@ class ParseOptionSetsToFolderStructure extends basecommand_1.BaseCommand {
     }
 }
 exports.default = ParseOptionSetsToFolderStructure;
-ParseOptionSetsToFolderStructure.description = 'Parse CSV files into OptionSets. Style denotes the format the csv is in. If the csv file has a column for name and label, use "NameAndLabel". If the file has one column for each option set with the rows being the label value use "LabelsInColumn"';
-ParseOptionSetsToFolderStructure.examples = [
-    `$ contrail types parseOptionSetsLocalFiles <File Paths> <style>
-`,
-];
-ParseOptionSetsToFolderStructure.args = {
-    file: core_1.Args.string({ description: 'File to parse', required: true }),
-};
 function loadOptionSets(fileLocation) {
     const TARGET_DIR = process.cwd();
     try {
@@ -69,34 +64,3 @@ function saveDataInFolders(data) {
         fs_1.default.writeFileSync(path.join(subDir, `${(0, common_1.removeSlash)(fileLabel)}.yml`), yamlStr, 'utf8');
     }
 }
-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: util_1.StringUtil.convertToCamelCase(entry),
-                    display: entry,
-                });
-            }
-        }
-        const reducedOptionSet = {
-            name: optionSetName,
-            isArchived: false,
-            optionSet,
-        };
-        optionSets.push(reducedOptionSet);
-    }
-    return optionSets;
-}
-exports.parseLabelsInColumn = parseLabelsInColumn;

package/dist/commands/types/parseTypesFromFiles.js

@@ -7,6 +7,19 @@ const type_parser_1 = require("../../helpers/types/type-parser");
 const basecommand_1 = require("../../basecommand");
 const logger_1 = tslib_1.__importDefault(require("../../logger"));
 class ParseTypesFromFiles extends basecommand_1.BaseCommand {
+    static description = 'Parse CSV files into Types and OptionSets from VibeIQ Files.\n File must be .yml.';
+    static examples = [
+        `$ contrail types parseTypesFromFiles <fileIds>
+    `,
+    ];
+    // variable argument length
+    static strict = false;
+    static args = {
+        typePaths: core_1.Args.string({
+            description: 'A list of the VibeIQ file IDs to parse',
+            required: true,
+        }),
+    };
     async run() {
         const { argv } = await this.parse(ParseTypesFromFiles);
         try {
@@ -24,16 +37,3 @@ class ParseTypesFromFiles extends basecommand_1.BaseCommand {
     }
 }
 exports.default = ParseTypesFromFiles;
-ParseTypesFromFiles.description = 'Parse CSV files into Types and OptionSets from VibeIQ Files.\n File must be .yml.';
-ParseTypesFromFiles.examples = [
-    `$ contrail types parseTypesFromFiles <fileIds>
-    `,
-];
-// variable argument length
-ParseTypesFromFiles.strict = false;
-ParseTypesFromFiles.args = {
-    typePaths: core_1.Args.string({
-        description: 'A list of the VibeIQ file IDs to parse',
-        required: true,
-    }),
-};

package/dist/commands/types/parseTypesFromLocalFiles.js

@@ -7,6 +7,16 @@ const type_parser_1 = require("../../helpers/types/type-parser");
 const basecommand_1 = require("../../basecommand");
 const logger_1 = tslib_1.__importDefault(require("../../logger"));
 class ParseTypesFromLocalFiles extends basecommand_1.BaseCommand {
+    static description = 'Parse CSV files into Types and OptionSets from local files.';
+    static examples = [
+        `$ contrail types parseTypesFromLocalFiles <File Paths>
+    `,
+    ];
+    // variable argument length
+    static strict = false;
+    static args = {
+        typePaths: core_1.Args.string({ description: 'A list of the files to parse', required: true }),
+    };
     async run() {
         const { argv } = await this.parse(ParseTypesFromLocalFiles);
         try {
@@ -24,13 +34,3 @@ class ParseTypesFromLocalFiles extends basecommand_1.BaseCommand {
     }
 }
 exports.default = ParseTypesFromLocalFiles;
-ParseTypesFromLocalFiles.description = 'Parse CSV files into Types and OptionSets from local files.';
-ParseTypesFromLocalFiles.examples = [
-    `$ contrail types parseTypesFromLocalFiles <File Paths>
-    `,
-];
-// variable argument length
-ParseTypesFromLocalFiles.strict = false;
-ParseTypesFromLocalFiles.args = {
-    typePaths: core_1.Args.string({ description: 'A list of the files to parse', required: true }),
-};

package/dist/commands/types/parseTypesFromTemplateAndDataFromLocalFiles.js

@@ -7,6 +7,16 @@ const type_parser_1 = require("../../helpers/types/type-parser");
 const basecommand_1 = require("../../basecommand");
 const logger_1 = tslib_1.__importDefault(require("../../logger"));
 class ParseTypesFromTemplateAndDataFromLocalFiles extends basecommand_1.BaseCommand {
+    static description = 'Parse CSV files into Types and OptionSets from local type template files.';
+    static examples = [
+        `$ contrail types parseTypesFromTemplateAndDataFromLocalFiles <Template Path> <File Paths>
+    `,
+    ];
+    static strict = false;
+    static args = {
+        templateFile: core_1.Args.string({ description: 'The template file to use', required: true }),
+        filePaths: core_1.Args.string({ description: 'A list of data file to use', required: true }),
+    };
     async run() {
         const { args, argv } = await this.parse(ParseTypesFromTemplateAndDataFromLocalFiles);
         try {
@@ -26,13 +36,3 @@ class ParseTypesFromTemplateAndDataFromLocalFiles extends basecommand_1.BaseComm
     }
 }
 exports.default = ParseTypesFromTemplateAndDataFromLocalFiles;
-ParseTypesFromTemplateAndDataFromLocalFiles.description = 'Parse CSV files into Types and OptionSets from local type template files.';
-ParseTypesFromTemplateAndDataFromLocalFiles.examples = [
-    `$ contrail types parseTypesFromTemplateAndDataFromLocalFiles <Template Path> <File Paths>
-    `,
-];
-ParseTypesFromTemplateAndDataFromLocalFiles.strict = false;
-ParseTypesFromTemplateAndDataFromLocalFiles.args = {
-    templateFile: core_1.Args.string({ description: 'The template file to use', required: true }),
-    filePaths: core_1.Args.string({ description: 'A list of data file to use', required: true }),
-};

package/dist/commands/types/parseTypesFromTemplateFromLocalFiles.js

@@ -7,6 +7,15 @@ const type_parser_1 = require("../../helpers/types/type-parser");
 const basecommand_1 = require("../../basecommand");
 const logger_1 = tslib_1.__importDefault(require("../../logger"));
 class ParseTypesFromTemplateFromLocalFiles extends basecommand_1.BaseCommand {
+    static description = 'Parse CSV files into Types and OptionSets from local type template files.';
+    static examples = [
+        `$ contrail types parseTypesFromTemplateFromLocalFiles <Template File> <Data File>
+    `,
+    ];
+    static args = {
+        templateFile: core_1.Args.string({ description: 'The template file to use', required: true }),
+        filePath: core_1.Args.string({ description: 'The data file to use', required: true }),
+    };
     async run() {
         const { args } = await this.parse(ParseTypesFromTemplateFromLocalFiles);
         try {
@@ -26,12 +35,3 @@ class ParseTypesFromTemplateFromLocalFiles extends basecommand_1.BaseCommand {
     }
 }
 exports.default = ParseTypesFromTemplateFromLocalFiles;
-ParseTypesFromTemplateFromLocalFiles.description = 'Parse CSV files into Types and OptionSets from local type template files.';
-ParseTypesFromTemplateFromLocalFiles.examples = [
-    `$ contrail types parseTypesFromTemplateFromLocalFiles <Template File> <Data File>
-    `,
-];
-ParseTypesFromTemplateFromLocalFiles.args = {
-    templateFile: core_1.Args.string({ description: 'The template file to use', required: true }),
-    filePath: core_1.Args.string({ description: 'The data file to use', required: true }),
-};

package/dist/commands/types/uploadOptionSetHierarchies.js

@@ -13,25 +13,25 @@ const basecommand_1 = require("../../basecommand");
 const logger_1 = tslib_1.__importDefault(require("../../logger"));
 const js_yaml_1 = tslib_1.__importDefault(require("js-yaml"));
 class UploadOptionSetHierarchies extends basecommand_1.BaseCommand {
+    static description = 'Upload Option Set Hierarchies for your Org. Option set hierarchies are loaded from .yml files in the option-set-hierarchies directory.';
+    static examples = [
+        `$ contrail types uploadOptionSetHierarchies
+`,
+    ];
+    static flags = {
+        dir: core_1.Flags.string({
+            char: 'd',
+            description: 'The directory from which to export the option set hierarchies data. Defaults to the current directory. The option set data will be loaded from $dir/option-set-hierarchies',
+            required: false,
+            default: '.',
+        }),
+    };
     async run() {
         const { flags } = await this.parse(UploadOptionSetHierarchies);
         return await uploadOptionSetHierarchies(flags.dir);
     }
 }
 exports.default = UploadOptionSetHierarchies;
-UploadOptionSetHierarchies.description = 'Upload Option Set Hierarchies for your Org. Option set hierarchies are loaded from .yml files in the option-set-hierarchies directory.';
-UploadOptionSetHierarchies.examples = [
-    `$ contrail types uploadOptionSetHierarchies
-`,
-];
-UploadOptionSetHierarchies.flags = {
-    dir: core_1.Flags.string({
-        char: 'd',
-        description: 'The directory from which to export the option set hierarchies data. Defaults to the current directory. The option set data will be loaded from $dir/option-set-hierarchies',
-        required: false,
-        default: '.',
-    }),
-};
 async function uploadOptionSetHierarchies(dir) {
     try {
         await (0, login_1.authUser)();
@@ -173,7 +173,7 @@ async function uploadOSHLinks(reducedOSHLinks) {
         const foundType = typesWithProperties.find((x) => x.id === currentLink.typeId);
         const foundOSH = currentOSHs.find((osh) => osh.id === currentLink.optionSetHierarchyId);
         const foundTPSlugs = typeProperties
-            .filter((x) => { var _a; return (_a = currentLink === null || currentLink === void 0 ? void 0 : currentLink.hierarchyTypePropertyIds) === null || _a === void 0 ? void 0 : _a.includes(x.id); })
+            .filter((x) => currentLink?.hierarchyTypePropertyIds?.includes(x.id))
             .map((x) => x.slug);
         if (!foundType ||
             !foundOSH ||
@@ -233,7 +233,6 @@ async function uploadOSHLinks(reducedOSHLinks) {
     }
 }
 function transformReducedLink(OSHLink, typesWithProperties, OSHs) {
-    var _a, _b;
     logger_1.default.debug(`OSHLink before transform: ${JSON.stringify(OSHLink, null, 2)}`);
     const foundType = typesWithProperties.find((x) => x.slug === OSHLink.typeSlug);
     if (!foundType) {
@@ -241,7 +240,7 @@ function transformReducedLink(OSHLink, typesWithProperties, OSHs) {
         return false;
     }
     OSHLink.typeId = foundType.id;
-    const foundTPs = (_b = (_a = foundType === null || foundType === void 0 ? void 0 : foundType.typeProperties) === null || _a === void 0 ? void 0 : _a.filter((x) => OSHLink.typePropertySlugs.includes(x.slug))) !== null && _b !== void 0 ? _b : [];
+    const foundTPs = foundType?.typeProperties?.filter((x) => OSHLink.typePropertySlugs.includes(x.slug)) ?? [];
     if (foundTPs.length !== OSHLink.typePropertySlugs.length) {
         logger_1.default.error(`OSH Links: Could not find all type properties with slugs ${OSHLink.typePropertySlugs}`);
         return false;

package/dist/commands/types/uploadOptionSets.js

@@ -12,25 +12,25 @@ const basecommand_1 = require("../../basecommand");
 const logger_1 = tslib_1.__importDefault(require("../../logger"));
 const js_yaml_1 = tslib_1.__importDefault(require("js-yaml"));
 class UploadOptionSets extends basecommand_1.BaseCommand {
+    static description = 'Upload OptionSets for your Org. OptionSets are loaded from .yml files in the option-sets directory.';
+    static examples = [
+        `$ contrail types uploadOptionSets
+`,
+    ];
+    static flags = {
+        dir: core_1.Flags.string({
+            char: 'd',
+            description: 'The directory from which to export the option set data. Defaults to the current directory. The option set data will be loaded from $dir/option-sets',
+            required: false,
+            default: '.',
+        }),
+    };
     async run() {
         const { flags } = await this.parse(UploadOptionSets);
         return await uploadOptionSets(flags.dir);
     }
 }
 exports.default = UploadOptionSets;
-UploadOptionSets.description = 'Upload OptionSets for your Org. OptionSets are loaded from .yml files in the option-sets directory.';
-UploadOptionSets.examples = [
-    `$ contrail types uploadOptionSets
-`,
-];
-UploadOptionSets.flags = {
-    dir: core_1.Flags.string({
-        char: 'd',
-        description: 'The directory from which to export the option set data. Defaults to the current directory. The option set data will be loaded from $dir/option-sets',
-        required: false,
-        default: '.',
-    }),
-};
 async function uploadOptionSets(dir) {
     try {
         const userConfig = await (0, login_1.authUser)();
@@ -73,6 +73,8 @@ async function uploadOS(dir) {
     for (const optionSet of optionSets) {
         newOptionSetsBySlug[optionSet.slug] = optionSet;
     }
+    logger_1.default.debug(`Current OptionSets: ${JSON.stringify(currentOptionSetsBySlug, null, 2)}`);
+    logger_1.default.debug(`New OptionSets: ${JSON.stringify(newOptionSetsBySlug, null, 2)}`);
     for (const optionSet of optionSets) {
         try {
             const found = currentOptionSetsBySlug[optionSet.slug];

package/dist/commands/types/uploadOptionSetsHierarchyLocalFile.js

@@ -12,24 +12,24 @@ const core_1 = require("@oclif/core");
 const basecommand_1 = require("../../basecommand");
 const logger_1 = tslib_1.__importDefault(require("../../logger"));
 class UploadOptionSetsHierarchyLocalFile extends basecommand_1.BaseCommand {
+    static description = 'upload CSV file into OptionSetHierarchy';
+    static examples = [
+        `$ contrail types uploadOptionSetsHierarchyLocalFile <File Path> <name>
+`,
+    ];
+    static args = {
+        file: core_1.Args.string({ description: 'File to parse', required: true }),
+        name: core_1.Args.string({
+            description: 'The name to be give to the option set hierarchy',
+            required: true,
+        }),
+    };
     async run() {
         const { args } = await this.parse(UploadOptionSetsHierarchyLocalFile);
         await uploadOptionSetsHierarchyLocalFile(args.file, args.name);
     }
 }
 exports.default = UploadOptionSetsHierarchyLocalFile;
-UploadOptionSetsHierarchyLocalFile.description = 'upload CSV file into OptionSetHierarchy';
-UploadOptionSetsHierarchyLocalFile.examples = [
-    `$ contrail types uploadOptionSetsHierarchyLocalFile <File Path> <name>
-`,
-];
-UploadOptionSetsHierarchyLocalFile.args = {
-    file: core_1.Args.string({ description: 'File to parse', required: true }),
-    name: core_1.Args.string({
-        description: 'The name to be give to the option set hierarchy',
-        required: true,
-    }),
-};
 async function uploadOptionSetsHierarchyLocalFile(fileLocation, name) {
     try {
         await (0, login_1.authUser)();
@@ -65,7 +65,7 @@ async function parseOptionSetHierarchiesLocalFile(fileLocation) {
         name: 'No Name',
         options: [],
     };
-    if (!((uploadedOptionHierarchyData === null || uploadedOptionHierarchyData === void 0 ? void 0 : uploadedOptionHierarchyData.length) > 0)) {
+    if (!(uploadedOptionHierarchyData?.length > 0)) {
         return optionSetHierarchy;
     }
     const keysInOrder = Object.keys(uploadedOptionHierarchyData[0]);

package/dist/commands/types/uploadRuleSets.js

@@ -12,25 +12,25 @@ const basecommand_1 = require("../../basecommand");
 const logger_1 = tslib_1.__importDefault(require("../../logger"));
 const js_yaml_1 = tslib_1.__importDefault(require("js-yaml"));
 class UploadRuleSets extends basecommand_1.BaseCommand {
+    static description = 'Upload an extracted rule set';
+    static examples = [
+        `$ contrail types uploadRuleSets
+`,
+    ];
+    static flags = {
+        dir: core_1.Flags.string({
+            char: 'd',
+            description: 'The directory from which to export the rule set data. Defaults to the current directory. The rule set data will be loaded from $dir/rule-sets/*.yml',
+            required: false,
+            default: '.',
+        }),
+    };
     async run() {
         const { flags } = await this.parse(UploadRuleSets);
         await uploadRuleSets(flags.dir);
     }
 }
 exports.default = UploadRuleSets;
-UploadRuleSets.description = 'Upload an extracted rule set';
-UploadRuleSets.examples = [
-    `$ contrail types uploadRuleSets
-`,
-];
-UploadRuleSets.flags = {
-    dir: core_1.Flags.string({
-        char: 'd',
-        description: 'The directory from which to export the rule set data. Defaults to the current directory. The rule set data will be loaded from $dir/rule-sets/*.yml',
-        required: false,
-        default: '.',
-    }),
-};
 async function uploadRuleSets(dir) {
     try {
         await (0, login_1.authUser)();

package/dist/commands/types/uploadTypePolicies.js

@@ -14,25 +14,25 @@ const basecommand_1 = require("../../basecommand");
 const logger_1 = tslib_1.__importDefault(require("../../logger"));
 const js_yaml_1 = tslib_1.__importDefault(require("js-yaml"));
 class UploadTypePolicies extends basecommand_1.BaseCommand {
+    static description = 'Upload type policies';
+    static examples = [
+        `$ contrail types UploadTypePolicies
+`,
+    ];
+    static flags = {
+        dir: core_1.Flags.string({
+            char: 'd',
+            description: 'The directory from which to export the type policy data. Defaults to the current directory. The type policy data will be loaded from $dir/type-policies/*.yml',
+            required: false,
+            default: '.',
+        }),
+    };
     async run() {
         const { flags } = await this.parse(UploadTypePolicies);
         return await uploadTypePolicies(flags.dir);
     }
 }
 exports.default = UploadTypePolicies;
-UploadTypePolicies.description = 'Upload type policies';
-UploadTypePolicies.examples = [
-    `$ contrail types UploadTypePolicies
-`,
-];
-UploadTypePolicies.flags = {
-    dir: core_1.Flags.string({
-        char: 'd',
-        description: 'The directory from which to export the type policy data. Defaults to the current directory. The type policy data will be loaded from $dir/type-policies/*.yml',
-        required: false,
-        default: '.',
-    }),
-};
 async function uploadTypePolicies(dir) {
     try {
         await (0, login_1.authUser)();
@@ -69,14 +69,14 @@ async function uploadTypePolicyObjects(reducedTypePolicies) {
     const orgUsers = await (0, users_1.getUserOrgs)();
     const groups = await (0, users_1.getGroups)();
     function fillPrincipal(statement) {
-        const principal = statement === null || statement === void 0 ? void 0 : statement.principal;
+        const principal = statement?.principal;
         if (!principal) {
-            logger_1.default.warn(`skipping bad statement principal ${statement === null || statement === void 0 ? void 0 : statement.principal}`);
+            logger_1.default.warn(`skipping bad statement principal ${statement?.principal}`);
             return statement;
         }
         const [type, identifier] = principal.split(':');
         if (!type || !identifier) {
-            logger_1.default.warn(`skipping bad statement principal ${statement === null || statement === void 0 ? void 0 : statement.principal}`);
+            logger_1.default.warn(`skipping bad statement principal ${statement?.principal}`);
             return statement;
         }
         if (type === 'group') {