@contrail/cli 2.1.20 → 2.1.22

package/dist/commands/types/getAll.js

@@ -11,10 +11,14 @@ const type_extractor_1 = require("../../helpers/types/type-extractor");
 const types_1 = require("../../api/types");
 const file_helpers_1 = require("../../helpers/file-helpers");
 const users_1 = require("../../api/users");
-const yaml = require('js-yaml');
-class GetAllTypes extends core_1.Command {
+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");
+class GetAllTypes extends basecommand_1.BaseCommand {
     async run() {
         const { flags } = await this.parse(GetAllTypes);
+        await super.setLogLevel(flags.logLevel);
         await getAll(flags.outDir, flags.overwrite);
     }
 }
@@ -25,13 +29,23 @@ GetAllTypes.examples = [
 `,
 ];
 GetAllTypes.flags = {
-    outDir: core_1.Flags.string({ char: 'd', description: 'The directory to which to export the type 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 })
+    outDir: core_1.Flags.string({
+        char: 'd',
+        description: 'The directory to which to export the type 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 function getAll(outDir, overwrite) {
     try {
         const userConfig = await (0, login_1.authUser)();
-        console.log(`%s Getting all types for orgId: ${userConfig.orgId}`, chalk_1.default.blue.bold('START'));
+        logger_1.default.info(`%s Getting all types 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));
@@ -51,13 +65,13 @@ async function getAll(outDir, overwrite) {
         };
         const reducedData = await reduceData(data);
         await saveData(reducedData, outDir, overwrite);
-        console.log('%s Retrieved', chalk_1.default.yellow.bold('TYPES'));
+        logger_1.default.info('%s Retrieved', chalk_1.default.yellow.bold('TYPES'));
     }
     catch (e) {
-        console.log(`%s Types Retrieval Failed. ${e}`, chalk_1.default.red.bold('FAIL'));
+        logger_1.default.info(`%s Types Retrieval Failed. ${e}`, chalk_1.default.red.bold('FAIL'));
         return;
     }
-    console.log('%s Types Retrieval Complete.', chalk_1.default.green.bold('COMPLETE'));
+    logger_1.default.info('%s Types Retrieval Complete.', chalk_1.default.green.bold('COMPLETE'));
 }
 exports.getAll = getAll;
 async function reduceTypePropertyPolicies(data) {
@@ -74,36 +88,36 @@ async function reduceTypePropertyPolicies(data) {
             return statement;
         }
         if (type === 'group') {
-            const groupName = (_a = groups.find(x => x.id === id)) === null || _a === void 0 ? void 0 : _a.name;
+            const groupName = (_a = groups.find((x) => x.id === id)) === null || _a === void 0 ? void 0 : _a.name;
             if (!groupName) {
-                console.log(`Could not find group for statement. skipping invalid policy conversion ${id}`);
+                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 = (_b = orgUsers.find(x => x.user.id === id)) === null || _b === void 0 ? void 0 : _b.email;
+            const userEmail = (_b = orgUsers.find((x) => x.user.id === id)) === null || _b === void 0 ? void 0 : _b.email;
             if (!userEmail) {
-                console.log(`Could not find group for statement. skipping invalid policy conversion ${id}`);
+                logger_1.default.info(`Could not find group for statement. skipping invalid policy conversion ${id}`);
                 return statement;
             }
             statement.principal = `user:${userEmail}`;
         }
         return statement;
     }
-    return (_a = data === null || data === void 0 ? void 0 : data.typePropertyPolicies) === null || _a === void 0 ? void 0 : _a.map(x => {
+    return (_a = data === null || data === void 0 ? void 0 : data.typePropertyPolicies) === null || _a === void 0 ? void 0 : _a.map((x) => {
         return {
             label: x.label,
             policy: {
                 version: x.policy.version,
-                statements: x.policy.statements.map(x => reducePrincipal(x)),
-            }
+                statements: x.policy.statements.map((x) => reducePrincipal(x)),
+            },
         };
     }).sort((one, two) => (one.label < two.label ? -1 : 1));
 }
 function reduceTypePropertyPolicyLinks(data) {
     var _a, _b;
-    const typeProperties = (_a = data === null || data === void 0 ? void 0 : data.types) === null || _a === void 0 ? void 0 : _a.map(x => x.typeProperties).reduce((x, y) => x.concat(y));
+    const typeProperties = (_a = data === null || data === void 0 ? void 0 : data.types) === null || _a === void 0 ? void 0 : _a.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) {
@@ -111,15 +125,13 @@ function reduceTypePropertyPolicyLinks(data) {
         }
         return map;
     }, {});
-    return (_b = data === null || data === void 0 ? void 0 : data.typePropertyPolicyLinks) === null || _b === void 0 ? void 0 : _b.map(x => {
+    return (_b = data === null || data === void 0 ? void 0 : data.typePropertyPolicyLinks) === null || _b === void 0 ? void 0 : _b.map((x) => {
         var _a, _b;
         const typeSlug = typePropertyIdToTypeSlugMap[x.typePropertyId];
-        const typePropertySlug = (_a = typeProperties.find(y => y.id === x.typePropertyId)) === null || _a === void 0 ? void 0 : _a.slug;
-        const typePropertyPolicyLabel = (_b = data.typePropertyPolicies.find(y => y.id === x.typePropertyPolicyId)) === null || _b === void 0 ? void 0 : _b.label;
-        if (!typeSlug ||
-            !typePropertySlug ||
-            !typePropertyPolicyLabel) {
-            console.warn('Could not reduce bad type property policy link... skipping', x);
+        const typePropertySlug = (_a = typeProperties.find((y) => y.id === x.typePropertyId)) === null || _a === void 0 ? void 0 : _a.slug;
+        const typePropertyPolicyLabel = (_b = data.typePropertyPolicies.find((y) => y.id === x.typePropertyPolicyId)) === null || _b === void 0 ? void 0 : _b.label;
+        if (!typeSlug || !typePropertySlug || !typePropertyPolicyLabel) {
+            logger_1.default.warn('Could not reduce bad type property policy link... skipping', x);
             return null;
         }
         return {
@@ -127,7 +139,7 @@ function reduceTypePropertyPolicyLinks(data) {
             typePropertySlug,
             typePropertyPolicyLabel,
         };
-    }).filter(x => !!x);
+    }).filter((x) => !!x);
 }
 async function reduceTypePolicies(data) {
     var _a;
@@ -143,48 +155,48 @@ async function reduceTypePolicies(data) {
             return statement;
         }
         if (type === 'group') {
-            const groupName = (_a = groups.find(x => x.id === id)) === null || _a === void 0 ? void 0 : _a.name;
+            const groupName = (_a = groups.find((x) => x.id === id)) === null || _a === void 0 ? void 0 : _a.name;
             if (!groupName) {
-                console.log(`Could not find group for statement. skipping invalid policy conversion ${id}`);
+                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 = (_b = orgUsers.find(x => x.user.id === id)) === null || _b === void 0 ? void 0 : _b.email;
+            const userEmail = (_b = orgUsers.find((x) => x.user.id === id)) === null || _b === void 0 ? void 0 : _b.email;
             if (!userEmail) {
-                console.log(`Could not find group for statement. skipping invalid policy conversion ${id}`);
+                logger_1.default.info(`Could not find group for statement. skipping invalid policy conversion ${id}`);
                 return statement;
             }
             statement.principal = `user:${userEmail}`;
         }
         return statement;
     }
-    return (_a = data === null || data === void 0 ? void 0 : data.typePolicies) === null || _a === void 0 ? void 0 : _a.map(x => {
+    return (_a = data === null || data === void 0 ? void 0 : data.typePolicies) === null || _a === void 0 ? void 0 : _a.map((x) => {
         return {
             label: x.label,
             policy: {
                 version: x.policy.version,
-                statements: x.policy.statements.map(x => reducePrincipal(x)),
-            }
+                statements: x.policy.statements.map((x) => reducePrincipal(x)),
+            },
         };
     }).sort((one, two) => (one.label < two.label ? -1 : 1));
 }
 function reduceTypePolicyLinks(data) {
     var _a;
     const types = data === null || data === void 0 ? void 0 : data.types;
-    return (_a = data === null || data === void 0 ? void 0 : data.typePolicyLinks) === null || _a === void 0 ? void 0 : _a.map(x => {
+    return (_a = data === null || data === void 0 ? void 0 : data.typePolicyLinks) === null || _a === void 0 ? void 0 : _a.map((x) => {
         var _a, _b;
         return {
-            typeSlug: (_a = types.find(y => y.id === x.typeId)) === null || _a === void 0 ? void 0 : _a.slug,
-            typePolicyLabel: (_b = data.typePolicies.find(y => y.id === x.typePolicyId)) === null || _b === void 0 ? void 0 : _b.label,
+            typeSlug: (_a = types.find((y) => y.id === x.typeId)) === null || _a === void 0 ? void 0 : _a.slug,
+            typePolicyLabel: (_b = data.typePolicies.find((y) => y.id === x.typePolicyId)) === null || _b === void 0 ? void 0 : _b.label,
         };
     });
 }
 function reduceUsageInfo(data) {
     var _a, _b;
-    const typeProperties = (_a = data === null || data === void 0 ? void 0 : data.types) === null || _a === void 0 ? void 0 : _a.map(x => x.typeProperties).reduce((x, y) => x.concat(y));
-    return (_b = data === null || data === void 0 ? void 0 : data.usageInfo) === null || _b === void 0 ? void 0 : _b.map(x => {
+    const typeProperties = (_a = data === null || data === void 0 ? void 0 : data.types) === null || _a === void 0 ? void 0 : _a.map((x) => x.typeProperties).reduce((x, y) => x.concat(y));
+    return (_b = data === null || data === void 0 ? void 0 : data.usageInfo) === null || _b === void 0 ? void 0 : _b.map((x) => {
         var _a, _b;
         return {
             used: x.used,
@@ -194,8 +206,8 @@ function reduceUsageInfo(data) {
             numberFormat: x.numberFormat,
             defaultValue: x.defaultValue,
             label: x.label,
-            typeSlug: (_a = data.types.find(y => y.id === x.typeId)) === null || _a === void 0 ? void 0 : _a.slug,
-            typePropertySlug: (_b = typeProperties.find(y => y.id === x.typePropertyId)) === null || _b === void 0 ? void 0 : _b.slug,
+            typeSlug: (_a = data.types.find((y) => y.id === x.typeId)) === null || _a === void 0 ? void 0 : _a.slug,
+            typePropertySlug: (_b = typeProperties.find((y) => y.id === x.typePropertyId)) === null || _b === void 0 ? void 0 : _b.slug,
         };
     }).sort((one, two) => (one.label < two.label ? -1 : 1));
 }
@@ -206,14 +218,14 @@ function reduceRuleSetLinks(data) {
         return [];
     }
     for (const ruleSetLink of data.ruleSetLinks) {
-        const ruleSet = (_a = data === null || data === void 0 ? void 0 : data.ruleSets) === null || _a === void 0 ? void 0 : _a.find(x => x.id === ruleSetLink.typeRuleSetId);
-        const type = (_b = data === null || data === void 0 ? void 0 : data.types) === null || _b === void 0 ? void 0 : _b.find(x => x.id === ruleSetLink.typeId);
+        const ruleSet = (_a = data === null || data === void 0 ? void 0 : data.ruleSets) === null || _a === void 0 ? void 0 : _a.find((x) => x.id === ruleSetLink.typeRuleSetId);
+        const type = (_b = data === null || data === void 0 ? void 0 : data.types) === null || _b === void 0 ? void 0 : _b.find((x) => x.id === ruleSetLink.typeId);
         if (!ruleSet || !type) {
-            console.log('%s Skipping bad rule set link', ruleSetLink.id, chalk_1.default.red.bold('TYPES'));
+            logger_1.default.info('%s Skipping bad rule set link', ruleSetLink.id, chalk_1.default.red.bold('TYPES'));
         }
         reducedRuleSetLinks.push({
             ruleSet: ruleSet.name,
-            type: type.slug
+            type: type.slug,
         });
     }
     return reducedRuleSetLinks.sort((one, two) => {
@@ -225,7 +237,7 @@ function reduceRuleSetLinks(data) {
 }
 function reduceRuleSets(data) {
     var _a;
-    return (_a = data === null || data === void 0 ? void 0 : data.ruleSets) === null || _a === void 0 ? void 0 : _a.map(x => {
+    return (_a = data === null || data === void 0 ? void 0 : data.ruleSets) === null || _a === void 0 ? void 0 : _a.map((x) => {
         return {
             ruleSet: x.ruleSet,
             name: x.name,
@@ -234,7 +246,7 @@ function reduceRuleSets(data) {
 }
 function reduceOptionSets(data) {
     var _a;
-    return (_a = data.optionSets) === null || _a === void 0 ? void 0 : _a.map(optionSet => {
+    return (_a = data.optionSets) === null || _a === void 0 ? void 0 : _a.map((optionSet) => {
         return {
             name: optionSet.name,
             isArchived: optionSet.isArchived,
@@ -244,34 +256,34 @@ function reduceOptionSets(data) {
 }
 function reduceOptionSetHierarchies(data) {
     var _a;
-    return (_a = data.optionSetHierarchies) === null || _a === void 0 ? void 0 : _a.map(x => {
-        const hierarchyByName = x.hierarchy.map(optionSetId => { var _a, _b; return (_b = (_a = data.optionSets) === null || _a === void 0 ? void 0 : _a.find(x => x.id === optionSetId)) === null || _b === void 0 ? void 0 : _b.name; });
+    return (_a = data.optionSetHierarchies) === null || _a === void 0 ? void 0 : _a.map((x) => {
+        const hierarchyByName = x.hierarchy.map((optionSetId) => { var _a, _b; return (_b = (_a = data.optionSets) === null || _a === void 0 ? void 0 : _a.find((x) => x.id === optionSetId)) === null || _b === void 0 ? void 0 : _b.name; });
         return {
             hierarchy: hierarchyByName,
             options: x.options,
-            name: x.name
+            name: x.name,
         };
     }).sort((one, two) => (one.name < two.name ? -1 : 1));
 }
 function reduceOptionSetHierarchyLinks(data) {
     var _a;
-    return (_a = data.optionSetHierarchyLinks) === null || _a === void 0 ? void 0 : _a.map(x => {
+    return (_a = data.optionSetHierarchyLinks) === null || _a === void 0 ? void 0 : _a.map((x) => {
         var _a;
-        const osh = data.optionSetHierarchies.find(y => y.id === x.optionSetHierarchyId);
+        const osh = data.optionSetHierarchies.find((y) => y.id === x.optionSetHierarchyId);
         if (!osh) {
-            console.log('OSH Link: could not find option set hierarchy', x.optionSetHierarchyId, 'skipping...');
+            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);
+        const type = data.types.find((y) => y.id === x.typeId);
         if (!type) {
-            console.log('OSH Link: could not find type', x.typeId, 'skipping...');
+            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 = (_a = type.typeProperties.find(y => y.id === tpId)) === null || _a === void 0 ? void 0 : _a.slug;
+            const typePropertySlug = (_a = type.typeProperties.find((y) => y.id === tpId)) === null || _a === void 0 ? void 0 : _a.slug;
             if (!typePropertySlug) {
-                console.log('OSH Link: could not find type property', tpId, 'skipping...');
+                logger_1.default.info('OSH Link: could not find type property', tpId, 'skipping...');
                 return null;
             }
             typePropertySlugs.push(typePropertySlug);
@@ -281,10 +293,10 @@ function reduceOptionSetHierarchyLinks(data) {
             typeSlug: type.slug,
             typePropertySlugs,
         };
-    }).filter(x => !!x).sort((one, two) => (one.typeSlug < two.typeSlug ? -1 : 1));
+    }).filter((x) => !!x).sort((one, two) => (one.typeSlug < two.typeSlug ? -1 : 1));
 }
 function reduceTypes(dataHolder) {
-    console.log('Found types: ', dataHolder.types.length);
+    logger_1.default.info('Found types: ', dataHolder.types.length);
     let reducedTypes = [];
     const optionSetNameById = {};
     for (const optionSet of dataHolder.optionSets) {
@@ -321,12 +333,14 @@ function reduceTypes(dataHolder) {
             slug: type.slug,
             label: type.label,
             isArchived: type.isArchived,
-            typeProperties: reducedTypeProperties.map(x => {
+            typeProperties: reducedTypeProperties
+                .map((x) => {
                 delete x['id'];
                 return {
-                    ...x
+                    ...x,
                 };
-            }).sort((one, two) => (one.slug < two.slug ? -1 : 1)),
+            })
+                .sort((one, two) => (one.slug < two.slug ? -1 : 1)),
         };
         reducedTypes.push(reducedType);
     }
@@ -355,7 +369,7 @@ const saveTypesFunction = async (data, dir, overwrite) => {
     for (const type of data.reducedTypes) {
         const typePathParts = type.typePath.split(':');
         if (!typePathParts) {
-            console.warn('skipping bad type with no path', type);
+            logger_1.default.warn('skipping bad type with no path', type);
         }
         const root = typePathParts[0];
         if (roots[root]) {
@@ -371,12 +385,12 @@ const saveTypesFunction = async (data, dir, overwrite) => {
         if (!fs_1.default.existsSync(subDir)) {
             fs_1.default.mkdirSync(subDir);
         }
-        const yamlStr = yaml.dump(types);
+        const yamlStr = js_yaml_1.default.dump(types);
         const fileLabel = root;
         if (!fileLabel) {
-            console.warn('skipping bad type root:', root);
+            logger_1.default.warn('skipping bad type root:', root);
         }
-        const pathToWrite = path.join(subDir, `${removeSlash(fileLabel)}.yml`);
+        const pathToWrite = path.join(subDir, `${(0, common_1.removeSlash)(fileLabel)}.yml`);
         if (fs_1.default.existsSync(pathToWrite)) {
             await (0, file_helpers_1.safeFileOverwrite)(pathToWrite, overwrite);
         }
@@ -385,15 +399,36 @@ const saveTypesFunction = async (data, dir, overwrite) => {
 };
 async function saveData(reducedData, dir, overwrite) {
     const propertyToFolderMap = {
-        reducedTypes: { filename: 'types', split: false, fileLabel: 'slug', saveFunction: saveTypesFunction },
+        reducedTypes: {
+            filename: 'types',
+            split: false,
+            fileLabel: 'slug',
+            saveFunction: saveTypesFunction,
+        },
         reducedOptionSets: { filename: 'option-sets', split: true, fileLabel: 'name' },
-        reducedOptionSetHierarchies: { filename: 'option-set-hierarchies', split: true, fileLabel: 'name' },
-        reducedOptionSetHierarchyLinks: { filename: 'type-option-set-hierarchy-links', split: false, fileLabel: '' },
+        reducedOptionSetHierarchies: {
+            filename: 'option-set-hierarchies',
+            split: true,
+            fileLabel: 'name',
+        },
+        reducedOptionSetHierarchyLinks: {
+            filename: 'type-option-set-hierarchy-links',
+            split: false,
+            fileLabel: '',
+        },
         reducedRuleSets: { filename: 'rule-sets', split: true, fileLabel: 'name' },
         reducedRuleSetLinks: { filename: 'rule-set-links', split: false, fileLabel: '' },
         reducedUsageInfo: { filename: 'usage-info', split: false, fileLabel: '' },
-        reducedTypePropertyPolicies: { filename: 'type-property-policies', split: true, fileLabel: 'label' },
-        reducedTypePropertyPolicyLinks: { filename: 'type-property-policy-links', split: false, fileLabel: '' },
+        reducedTypePropertyPolicies: {
+            filename: 'type-property-policies',
+            split: true,
+            fileLabel: 'label',
+        },
+        reducedTypePropertyPolicyLinks: {
+            filename: 'type-property-policy-links',
+            split: false,
+            fileLabel: '',
+        },
         reducedTypePolicies: { filename: 'type-policies', split: true, fileLabel: 'label' },
         reducedTypePolicyLinks: { filename: 'type-policy-links', split: false, fileLabel: '' },
     };
@@ -408,13 +443,13 @@ async function saveData(reducedData, dir, overwrite) {
                 fs_1.default.mkdirSync(subDir);
             }
             for (const item of reducedData[key]) {
-                const yamlStr = yaml.dump(item);
+                const yamlStr = js_yaml_1.default.dump(item);
                 const fileLabel = item[folder.fileLabel];
                 if (!fileLabel) {
-                    console.warn('skipping bad data:', item);
+                    logger_1.default.warn('skipping bad data:', item);
                     continue;
                 }
-                const pathToWrite = path.join(subDir, `${removeSlash(fileLabel)}.yml`);
+                const pathToWrite = path.join(subDir, `${(0, common_1.removeSlash)(fileLabel)}.yml`);
                 if (fs_1.default.existsSync(pathToWrite)) {
                     await (0, file_helpers_1.safeFileOverwrite)(pathToWrite, overwrite);
                 }
@@ -422,7 +457,7 @@ async function saveData(reducedData, dir, overwrite) {
             }
         }
         else {
-            const yamlStr = yaml.dump(reducedData[key]);
+            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);
@@ -431,7 +466,3 @@ async function saveData(reducedData, dir, overwrite) {
         }
     }
 }
-function removeSlash(string) {
-    const re = /\//gi;
-    return string.replace(re, '-');
-}

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

@@ -1,5 +1,5 @@
-import { Command } from '@oclif/core';
-export default class LoadAllTypes extends Command {
+import { BaseCommand } from '../basecommand';
+export default class LoadAllTypes extends BaseCommand {
     static description: string;
     static examples: string[];
     static flags: {

package/dist/commands/types/loadAll.js

@@ -12,9 +12,12 @@ const uploadRuleSets_1 = require("./uploadRuleSets");
 const uploadTypePropertyPolicies_1 = require("./uploadTypePropertyPolicies");
 const type_uploader_1 = require("../../helpers/types/type-uploader");
 const uploadTypePolicies_1 = require("./uploadTypePolicies");
-class LoadAllTypes extends core_1.Command {
+const basecommand_1 = require("../basecommand");
+const logger_1 = tslib_1.__importDefault(require("../../logger"));
+class LoadAllTypes extends basecommand_1.BaseCommand {
     async run() {
         const { flags } = await this.parse(LoadAllTypes);
+        await super.setLogLevel(flags.logLevel);
         await loadAll(flags.dir);
     }
 }
@@ -25,7 +28,12 @@ LoadAllTypes.examples = [
 `,
 ];
 LoadAllTypes.flags = {
-    dir: core_1.Flags.string({ char: 'd', description: 'The directory from which to load the types data. Defaults to the current directory.', required: false, default: '.' }),
+    dir: core_1.Flags.string({
+        char: 'd',
+        description: 'The directory from which to load the types data. Defaults to the current directory.',
+        required: false,
+        default: '.',
+    }),
 };
 async function loadAll(dir, skipPolicies = false) {
     try {
@@ -41,9 +49,9 @@ async function loadAll(dir, skipPolicies = false) {
         }
     }
     catch (e) {
-        console.log(`%s Types Upload Failed. ${e}`, chalk_1.default.red.bold('FAIL'));
+        logger_1.default.info(`%s Types Upload Failed. ${e}`, chalk_1.default.red.bold('FAIL'));
         return;
     }
-    console.log('%s Types Upload Complete.', chalk_1.default.green.bold('COMPLETE'));
+    logger_1.default.info('%s Types Upload Complete.', chalk_1.default.green.bold('COMPLETE'));
 }
 exports.loadAll = loadAll;

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

@@ -1,5 +1,5 @@
-import { Command } from '@oclif/core';
-export default class MergeOptionSets extends Command {
+import { BaseCommand } from '../basecommand';
+export default class MergeOptionSets extends BaseCommand {
     static description: string;
     static examples: string[];
     static args: {

package/dist/commands/types/mergeOptionSets.js

@@ -7,10 +7,13 @@ const fs_1 = tslib_1.__importDefault(require("fs"));
 const login_1 = require("../../auth/login");
 const chalk_1 = tslib_1.__importDefault(require("chalk"));
 const core_1 = require("@oclif/core");
-const yaml = require('js-yaml');
-class MergeOptionSets extends core_1.Command {
+const basecommand_1 = require("../basecommand");
+const logger_1 = tslib_1.__importDefault(require("../../logger"));
+const js_yaml_1 = tslib_1.__importDefault(require("js-yaml"));
+class MergeOptionSets extends basecommand_1.BaseCommand {
     async run() {
         const { args, flags } = await this.parse(MergeOptionSets);
+        await super.setLogLevel(flags.logLevel);
         try {
             this.log('%s Importing local file', chalk_1.default.yellow.bold('OPTION SET MERGE'));
             this.log('Using File: ', args.file);
@@ -37,7 +40,7 @@ function loadOptionSets(fileLocation) {
     const TARGET_DIR = process.cwd();
     try {
         const fullPath = path.resolve(path.join(TARGET_DIR, fileLocation));
-        const doc = yaml.load(fs_1.default.readFileSync(fullPath, 'utf8'));
+        const doc = js_yaml_1.default.load(fs_1.default.readFileSync(fullPath, 'utf8'));
         return doc;
     }
     catch (e) {
@@ -50,7 +53,7 @@ async function mergeOptionSets(fileLocation) {
     const currentOptionSetsFull = await new sdk_1.Entities().get({
         entityName: 'type-property-option-set',
     });
-    const currentOptionSets = currentOptionSetsFull.map(os => Object.assign({}, {
+    const currentOptionSets = currentOptionSetsFull.map((os) => Object.assign({}, {
         name: os.name,
         isArchived: os.isArchived,
         optionSet: os.optionSet,
@@ -68,21 +71,21 @@ async function mergeOptionSets(fileLocation) {
         const existing = currentOptionSetsByName[uploadedOptionSet.name];
         if (!existing) {
             if (!uploadedOptionSet.optionSet) {
-                console.log('No OptionSet for: ', uploadedOptionSet.name);
+                logger_1.default.info('No OptionSet for: ', uploadedOptionSet.name);
                 continue;
             }
-            console.log('Adding New: ', uploadedOptionSet.name);
+            logger_1.default.info('Adding New: ', uploadedOptionSet.name);
             mergedOptionSets.push(uploadedOptionSet);
         }
         else {
-            console.log('Merging: ', uploadedOptionSet.name);
+            logger_1.default.info('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);
+            logger_1.default.info('Adding Existing: ', currentOptionSet.name);
             mergedOptionSets.push(currentOptionSet);
         }
     }
@@ -99,7 +102,7 @@ function mergeOptionSet(existingOptionSet, uploadedOptionSet) {
         for (const keyVal of existingOptionSet.optionSet) {
             const value = keyVal.value;
             const display = keyVal.display;
-            const found = merged.optionSet.find(keyVal => keyVal.value === value);
+            const found = merged.optionSet.find((keyVal) => keyVal.value === value);
             if (!found) {
                 merged.optionSet.push({ value, display });
             }
@@ -108,7 +111,7 @@ function mergeOptionSet(existingOptionSet, uploadedOptionSet) {
     return merged;
 }
 function saveData(data) {
-    const yamlStr = yaml.dump(data);
+    const yamlStr = js_yaml_1.default.dump(data);
     const CURRENT_DIR = process.cwd();
     fs_1.default.writeFileSync(path.resolve(path.join(CURRENT_DIR, 'merged_optionSets.yml')), yamlStr, 'utf8');
 }

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

@@ -1,5 +1,5 @@
-import { Command } from '@oclif/core';
-export default class MergeTypeProperties extends Command {
+import { BaseCommand } from '../basecommand';
+export default class MergeTypeProperties extends BaseCommand {
     static description: string;
     static examples: string[];
     static strict: boolean;

package/dist/commands/types/mergeTypeProperties.js

@@ -9,14 +9,17 @@ const core_1 = require("@oclif/core");
 const type_extractor_1 = require("../../helpers/types/type-extractor");
 const getAll_1 = require("./getAll");
 const types_1 = require("../../api/types");
-const yaml = require('js-yaml');
-class MergeTypeProperties extends core_1.Command {
+const basecommand_1 = require("../basecommand");
+const logger_1 = tslib_1.__importDefault(require("../../logger"));
+const js_yaml_1 = tslib_1.__importDefault(require("js-yaml"));
+class MergeTypeProperties extends basecommand_1.BaseCommand {
     async run() {
-        const { args, argv } = await this.parse(MergeTypeProperties);
+        const { args, argv, flags } = await this.parse(MergeTypeProperties);
+        await super.setLogLevel(flags.logLevel);
         try {
             this.log('%s Importing local file', chalk_1.default.yellow.bold('TYPE PROPERTIES MERGE'));
             this.log('Using File: ', args.file);
-            console.log('argv:', JSON.stringify(argv));
+            logger_1.default.info('argv:', JSON.stringify(argv));
             const typePaths = argv.slice(1);
             this.log('Using TypePaths: ', typePaths);
             await mergeTypeProperties(args.file, typePaths);
@@ -45,7 +48,7 @@ function loadTypeProperties(fileLocation) {
     const TARGET_DIR = process.cwd();
     try {
         const fullPath = path.join(TARGET_DIR, fileLocation);
-        return yaml.load(fs_1.default.readFileSync(fullPath, 'utf8'));
+        return js_yaml_1.default.load(fs_1.default.readFileSync(fullPath, 'utf8'));
     }
     catch (e) {
         throw new Error(`ERROR PARSING YAML: ${e}`);
@@ -69,9 +72,9 @@ async function mergeTypeProperties(fileLocation, typePaths) {
     };
     const reducedData = await (0, getAll_1.reduceData)(data);
     for (const typePath of typePaths) {
-        const foundType = reducedData.reducedTypes.find(reducedTypes => reducedTypes.typePath === typePath);
+        const foundType = reducedData.reducedTypes.find((reducedTypes) => reducedTypes.typePath === typePath);
         if (!foundType) {
-            console.warn(`%s No Type found for: ${typePath}`, chalk_1.default.red.bold('WARNING'));
+            logger_1.default.warn(`%s No Type found for: ${typePath}`, chalk_1.default.red.bold('WARNING'));
         }
         mergeType(foundType, uploadedTypeProperties);
     }
@@ -79,14 +82,14 @@ async function mergeTypeProperties(fileLocation, typePaths) {
 }
 function mergeType(reducedType, typePropertiesToAdd) {
     for (const typeProperty of typePropertiesToAdd) {
-        const found = reducedType.typeProperties.find(tp => tp.slug === typeProperty.slug);
+        const found = reducedType.typeProperties.find((tp) => tp.slug === typeProperty.slug);
         if (!found) {
             reducedType.typeProperties.push(typeProperty);
         }
     }
 }
 function saveData(data) {
-    const yamlStr = yaml.dump(data);
+    const yamlStr = js_yaml_1.default.dump(data);
     const CURRENT_DIR = process.cwd();
     fs_1.default.writeFileSync(path.resolve(path.join(CURRENT_DIR, 'merged_types.yml')), yamlStr, 'utf8');
 }

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

@@ -1,5 +1,5 @@
-import { Command } from '@oclif/core';
-export default class ParseOptionSetsHierarchyLocalFile extends Command {
+import { BaseCommand } from '../basecommand';
+export default class ParseOptionSetsHierarchyLocalFile extends BaseCommand {
     static description: string;
     static examples: string[];
     static args: {