@contrail/cli 2.1.28 → 2.2.1

package/dist/commands/types/getAll.js

@@ -44,7 +44,7 @@ GetAllTypes.flags = {
 async function getAll(outDir, overwrite) {
     try {
         const userConfig = await (0, login_1.authUser)();
-        logger_1.default.info(`%s Getting all types for orgId: ${userConfig.orgId}`, chalk_1.default.blue.bold('START'));
+        logger_1.default.info(`${chalk_1.default.blue.bold('START')} Getting all types for orgId: ${userConfig.orgId}`);
         // make directory to house exports
         if (!fs_1.default.existsSync(path.resolve(outDir))) {
             fs_1.default.mkdirSync(path.resolve(outDir));
@@ -64,13 +64,13 @@ async function getAll(outDir, overwrite) {
         };
         const reducedData = await reduceData(data);
         await saveData(reducedData, outDir, overwrite);
-        logger_1.default.info('%s Retrieved', chalk_1.default.yellow.bold('TYPES'));
+        logger_1.default.info(`${chalk_1.default.yellow.bold('TYPES')} Retrieved`);
     }
     catch (e) {
-        logger_1.default.info(`%s Types Retrieval Failed. ${e}`, chalk_1.default.red.bold('FAIL'));
+        logger_1.default.info(`${chalk_1.default.red.bold('FAIL')} Types Retrieval Failed. ${e}`);
         return;
     }
-    logger_1.default.info('%s Types Retrieval Complete.', chalk_1.default.green.bold('COMPLETE'));
+    logger_1.default.info(`${chalk_1.default.green.bold('COMPLETE')} Types Retrieval Complete.`);
 }
 exports.getAll = getAll;
 async function reduceTypePropertyPolicies(data) {
@@ -107,6 +107,7 @@ async function reduceTypePropertyPolicies(data) {
     return (_a = data === null || data === void 0 ? void 0 : data.typePropertyPolicies) === null || _a === void 0 ? void 0 : _a.map((x) => {
         return {
             label: x.label,
+            identifier: x.identifier,
             policy: {
                 version: x.policy.version,
                 statements: x.policy.statements.map((x) => reducePrincipal(x)),
@@ -128,15 +129,15 @@ function reduceTypePropertyPolicyLinks(data) {
         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) {
-            logger_1.default.warn('Could not reduce bad type property policy link... skipping', x);
+        const typePropertyPolicyIdentifier = (_b = data.typePropertyPolicies.find((y) => y.id === x.typePropertyPolicyId)) === null || _b === void 0 ? void 0 : _b.identifier;
+        if (!typeSlug || !typePropertySlug || !typePropertyPolicyIdentifier) {
+            logger_1.default.warn(`Could not reduce bad type property policy link... skipping ${x}`);
             return null;
         }
         return {
             typeSlug,
             typePropertySlug,
-            typePropertyPolicyLabel,
+            typePropertyPolicyIdentifier,
         };
     }).filter((x) => !!x);
 }
@@ -174,6 +175,7 @@ async function reduceTypePolicies(data) {
     return (_a = data === null || data === void 0 ? void 0 : data.typePolicies) === null || _a === void 0 ? void 0 : _a.map((x) => {
         return {
             label: x.label,
+            identifier: x.identifier,
             policy: {
                 version: x.policy.version,
                 statements: x.policy.statements.map((x) => reducePrincipal(x)),
@@ -188,7 +190,7 @@ function reduceTypePolicyLinks(data) {
         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,
+            typePolicyIdentifier: (_b = data.typePolicies.find((y) => y.id === x.typePolicyId)) === null || _b === void 0 ? void 0 : _b.identifier,
         };
     });
 }
@@ -220,10 +222,10 @@ function reduceRuleSetLinks(data) {
         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) {
-            logger_1.default.info('%s Skipping bad rule set link', ruleSetLink.id, chalk_1.default.red.bold('TYPES'));
+            logger_1.default.info(`${chalk_1.default.red.bold('TYPES')} Skipping bad rule set link ${ruleSetLink.id}`);
         }
         reducedRuleSetLinks.push({
-            ruleSet: ruleSet.name,
+            ruleSet: ruleSet.identifier,
             type: type.slug,
         });
     }
@@ -240,6 +242,7 @@ function reduceRuleSets(data) {
         return {
             ruleSet: x.ruleSet,
             name: x.name,
+            identifier: x.identifier,
         };
     }).sort((one, two) => (one.name < two.name ? -1 : 1));
 }
@@ -248,6 +251,7 @@ function reduceOptionSets(data) {
     return (_a = data.optionSets) === null || _a === void 0 ? void 0 : _a.map((optionSet) => {
         return {
             name: optionSet.name,
+            slug: optionSet.slug,
             isArchived: optionSet.isArchived,
             optionSet: optionSet.optionSet,
         };
@@ -256,11 +260,12 @@ 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; });
+        const hierarchyBySlug = 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.slug; });
         return {
-            hierarchy: hierarchyByName,
+            hierarchy: hierarchyBySlug,
             options: x.options,
             name: x.name,
+            identifier: x.identifier,
         };
     }).sort((one, two) => (one.name < two.name ? -1 : 1));
 }
@@ -270,37 +275,38 @@ function reduceOptionSetHierarchyLinks(data) {
         var _a;
         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...');
+            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...');
+            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;
             if (!typePropertySlug) {
-                logger_1.default.info('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);
         }
         return {
-            optionSetHierarchyName: osh.name,
+            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);
+    logger_1.default.info(`Found types: ${dataHolder.types.length}`);
     let reducedTypes = [];
-    const optionSetNameById = {};
+    const optionSetSlugById = {};
     for (const optionSet of dataHolder.optionSets) {
-        optionSetNameById[optionSet.id] = optionSet.name;
+        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) {
@@ -313,7 +319,7 @@ function reduceTypes(dataHolder) {
                 editable: typeProperty.editable,
                 searchable: typeProperty.searchable,
                 core: typeProperty.core,
-                typePropertyOptionSetName: optionSetNameById[typeProperty.typePropertyOptionSetId],
+                typePropertyOptionSetSlug: optionSetSlugById[typeProperty.typePropertyOptionSetId],
                 formula: typeProperty.formula,
                 referencedTypePath: typeProperty.referencedTypePath,
                 referencedTypeRootSlug: typeProperty.referencedTypeRootSlug,
@@ -368,7 +374,7 @@ const saveTypesFunction = async (data, dir, overwrite) => {
     for (const type of data.reducedTypes) {
         const typePathParts = type.typePath.split(':');
         if (!typePathParts) {
-            logger_1.default.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]) {
@@ -387,7 +393,7 @@ const saveTypesFunction = async (data, dir, overwrite) => {
         const yamlStr = js_yaml_1.default.dump(types);
         const fileLabel = root;
         if (!fileLabel) {
-            logger_1.default.warn('skipping bad type root:', root);
+            logger_1.default.warn(`skipping bad type root: ${root}`);
         }
         const pathToWrite = path.join(subDir, `${(0, common_1.removeSlash)(fileLabel)}.yml`);
         if (fs_1.default.existsSync(pathToWrite)) {
@@ -408,7 +414,7 @@ async function saveData(reducedData, dir, overwrite) {
         reducedOptionSetHierarchies: {
             filename: 'option-set-hierarchies',
             split: true,
-            fileLabel: 'name',
+            fileLabel: 'identifier',
         },
         reducedOptionSetHierarchyLinks: {
             filename: 'type-option-set-hierarchy-links',
@@ -445,7 +451,7 @@ async function saveData(reducedData, dir, overwrite) {
                 const yamlStr = js_yaml_1.default.dump(item);
                 const fileLabel = item[folder.fileLabel];
                 if (!fileLabel) {
-                    logger_1.default.warn('skipping bad data:', item);
+                    logger_1.default.warn(`skipping bad data: ${item}`);
                     continue;
                 }
                 const pathToWrite = path.join(subDir, `${(0, common_1.removeSlash)(fileLabel)}.yml`);

package/dist/commands/types/loadAll.js

@@ -48,9 +48,9 @@ async function loadAll(dir, skipPolicies = false) {
         }
     }
     catch (e) {
-        logger_1.default.info(`%s Types Upload Failed. ${e}`, chalk_1.default.red.bold('FAIL'));
+        logger_1.default.info(`${chalk_1.default.red.bold('FAIL')} Types Upload Failed. ${e}`);
         return;
     }
-    logger_1.default.info('%s Types Upload Complete.', chalk_1.default.green.bold('COMPLETE'));
+    logger_1.default.info(`${chalk_1.default.green.bold('COMPLETE')} Types Upload Complete.`);
 }
 exports.loadAll = loadAll;

package/dist/commands/types/mergeOptionSets.js

@@ -70,21 +70,21 @@ async function mergeOptionSets(fileLocation) {
         const existing = currentOptionSetsByName[uploadedOptionSet.name];
         if (!existing) {
             if (!uploadedOptionSet.optionSet) {
-                logger_1.default.info('No OptionSet for: ', uploadedOptionSet.name);
+                logger_1.default.info(`No OptionSet for: ${uploadedOptionSet.name}`);
                 continue;
             }
-            logger_1.default.info('Adding New: ', uploadedOptionSet.name);
+            logger_1.default.info(`Adding New: ${uploadedOptionSet.name}`);
             mergedOptionSets.push(uploadedOptionSet);
         }
         else {
-            logger_1.default.info('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) {
-            logger_1.default.info('Adding Existing: ', currentOptionSet.name);
+            logger_1.default.info(`Adding Existing: ${currentOptionSet.name}`);
             mergedOptionSets.push(currentOptionSet);
         }
     }
@@ -94,6 +94,7 @@ function mergeOptionSet(existingOptionSet, uploadedOptionSet) {
     var _a;
     const merged = {
         name: uploadedOptionSet.name,
+        identifier: uploadedOptionSet.identifier,
         optionSet: uploadedOptionSet.optionSet,
         isArchived: uploadedOptionSet.isArchived,
     };

package/dist/commands/types/mergeTypeProperties.js

@@ -18,7 +18,7 @@ class MergeTypeProperties extends basecommand_1.BaseCommand {
         try {
             this.log('%s Importing local file', chalk_1.default.yellow.bold('TYPE PROPERTIES MERGE'));
             this.log('Using File: ', args.file);
-            logger_1.default.info('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);
@@ -73,7 +73,7 @@ async function mergeTypeProperties(fileLocation, typePaths) {
     for (const typePath of typePaths) {
         const foundType = reducedData.reducedTypes.find((reducedTypes) => reducedTypes.typePath === typePath);
         if (!foundType) {
-            logger_1.default.warn(`%s No Type found for: ${typePath}`, chalk_1.default.red.bold('WARNING'));
+            logger_1.default.warn(`${chalk_1.default.red.bold('WARNING')} No Type found for: ${typePath}`);
         }
         mergeType(foundType, uploadedTypeProperties);
     }

package/dist/commands/types/parseOptionSetsHierarchyLocalFile.js

@@ -31,16 +31,16 @@ ParseOptionSetsHierarchyLocalFile.args = {
 async function parseOptionSetsHierarchyLocalFile(fileLocation) {
     try {
         await (0, login_1.authUser)();
-        logger_1.default.info('%s Importing local file', chalk_1.default.yellow.bold('OPTION SET HIERARCHY PARSE'));
+        logger_1.default.info(`${chalk_1.default.yellow.bold('OPTION SET HIERARCHY PARSE')} Importing local file`);
         logger_1.default.info('Using File: ', fileLocation);
         await parseAndSaveOptionSetHierarchiesLocalFile(fileLocation);
-        logger_1.default.info('%s Parsed', chalk_1.default.yellow.bold('OPTION SET HIERARCHY PARSE'));
+        logger_1.default.info(`${chalk_1.default.yellow.bold('OPTION SET HIERARCHY PARSE')} Parsed`);
     }
     catch (e) {
-        logger_1.default.info(`%s PARSE Failed. ${e}`, chalk_1.default.red.bold('FAIL'));
+        logger_1.default.info(`${chalk_1.default.red.bold('FAIL')} PARSE Failed. ${e}`);
         return;
     }
-    logger_1.default.info('%s PARSE Complete.', chalk_1.default.green.bold('COMPLETE'));
+    logger_1.default.info(`${chalk_1.default.green.bold('COMPLETE')} PARSE Complete.`);
 }
 exports.parseOptionSetsHierarchyLocalFile = parseOptionSetsHierarchyLocalFile;
 async function loadOptionSetHierarchyCSV(fileLocation) {

package/dist/commands/types/parseOptionSetsHierarchyValuesToKeysLocalFile.js

@@ -40,10 +40,10 @@ async function parseOptionSetsHierarchyValuesToKeysLocalFile(fileLocation) {
         logger_1.default.info('%s Parsed', chalk_1.default.yellow.bold('OPTION SET HIERARCHY PARSE'));
     }
     catch (e) {
-        logger_1.default.info(`%s PARSE Failed. ${e}`, chalk_1.default.red.bold('FAIL'));
+        logger_1.default.info(`${chalk_1.default.red.bold('FAIL')} PARSE Failed . ${e}`);
         return;
     }
-    logger_1.default.info('%s PARSE Complete.', chalk_1.default.green.bold('COMPLETE'));
+    logger_1.default.info(`${chalk_1.default.green.bold('COMPLETE')} PARSE Complete.`);
 }
 exports.parseOptionSetsHierarchyValuesToKeysLocalFile = parseOptionSetsHierarchyValuesToKeysLocalFile;
 async function loadOptionSetHierarchyCSV(fileLocation) {

package/dist/commands/types/parseOptionSetsLocalFiles.js

@@ -53,10 +53,10 @@ async function ParseOptionSetsToFolderStructure(args) {
         logger_1.default.info('%s Parsed', chalk_1.default.yellow.bold('OPTION SET PARSE'));
     }
     catch (e) {
-        logger_1.default.info(`%s PARSE Failed. ${e}`, chalk_1.default.red.bold('FAIL'));
+        logger_1.default.info(`${chalk_1.default.red.bold('FAIL')} PARSE Failed . ${e}`);
         return;
     }
-    logger_1.default.info('%s PARSE Complete.', chalk_1.default.green.bold('COMPLETE'));
+    logger_1.default.info(`${chalk_1.default.green.bold('COMPLETE')} PARSE Complete.`);
 }
 exports.ParseOptionSetsToFolderStructure = ParseOptionSetsToFolderStructure;
 async function loadOptionSetCSV(fileLocation) {

package/dist/commands/types/parseOptionSetsToFolderStructure.js

@@ -21,10 +21,10 @@ class ParseOptionSetsToFolderStructure extends basecommand_1.BaseCommand {
             logger_1.default.info('%s Parsed', chalk_1.default.yellow.bold('OPTION SET PARSE'));
         }
         catch (e) {
-            logger_1.default.info(`%s PARSE Failed. ${e}`, chalk_1.default.red.bold('FAIL'));
+            logger_1.default.info(`${chalk_1.default.red.bold('FAIL')} PARSE Failed . ${e}`);
             return;
         }
-        logger_1.default.info('%s PARSE Complete.', chalk_1.default.green.bold('COMPLETE'));
+        logger_1.default.info(`${chalk_1.default.green.bold('COMPLETE')} PARSE Complete.`);
     }
 }
 exports.default = ParseOptionSetsToFolderStructure;

package/dist/commands/types/parseTypesFromFiles.js

@@ -17,10 +17,10 @@ class ParseTypesFromFiles extends basecommand_1.BaseCommand {
             logger_1.default.info('%s Parsed', chalk_1.default.yellow.bold('TYPES AND OPTION SETS'));
         }
         catch (e) {
-            logger_1.default.info(`%s Parsing Failed. ${e}`, chalk_1.default.red.bold('FAIL'));
+            logger_1.default.info(`${chalk_1.default.red.bold('FAIL')} Parsing Failed . ${e}`);
             return;
         }
-        logger_1.default.info('%s Parsing Complete.', chalk_1.default.green.bold('COMPLETE'));
+        logger_1.default.info(`${chalk_1.default.green.bold('COMPLETE')} Parsing Complete.`);
     }
 }
 exports.default = ParseTypesFromFiles;

package/dist/commands/types/parseTypesFromLocalFiles.js

@@ -17,10 +17,10 @@ class ParseTypesFromLocalFiles extends basecommand_1.BaseCommand {
             logger_1.default.info('%s Parsed', chalk_1.default.yellow.bold('TYPES AND OPTION SETS'));
         }
         catch (e) {
-            logger_1.default.info(`%s Parsing Failed. ${e}`, chalk_1.default.red.bold('FAIL'));
+            logger_1.default.info(`${chalk_1.default.red.bold('FAIL')} Parsing Failed . ${e}`);
             return;
         }
-        logger_1.default.info('%s Parsing Complete.', chalk_1.default.green.bold('COMPLETE'));
+        logger_1.default.info(`${chalk_1.default.green.bold('COMPLETE')} Parsing Complete.`);
     }
 }
 exports.default = ParseTypesFromLocalFiles;

package/dist/commands/types/parseTypesFromTemplateAndDataFromLocalFiles.js

@@ -19,10 +19,10 @@ class ParseTypesFromTemplateAndDataFromLocalFiles extends basecommand_1.BaseComm
             logger_1.default.info('%s Parsed', chalk_1.default.yellow.bold('TYPES AND OPTION SETS'));
         }
         catch (e) {
-            logger_1.default.info(`%s Parsing Failed. ${e}`, chalk_1.default.red.bold('FAIL'));
+            logger_1.default.info(`${chalk_1.default.red.bold('FAIL')} Parsing Failed . ${e}`);
             return;
         }
-        logger_1.default.info('%s Parsing Complete.', chalk_1.default.green.bold('COMPLETE'));
+        logger_1.default.info(`${chalk_1.default.green.bold('COMPLETE')} Parsing Complete.`);
     }
 }
 exports.default = ParseTypesFromTemplateAndDataFromLocalFiles;

package/dist/commands/types/parseTypesFromTemplateFromLocalFiles.js

@@ -19,10 +19,10 @@ class ParseTypesFromTemplateFromLocalFiles extends basecommand_1.BaseCommand {
             logger_1.default.info('%s Parsed', chalk_1.default.yellow.bold('TYPES AND OPTION SETS'));
         }
         catch (e) {
-            logger_1.default.info(`%s Parsing Failed. ${e}`, chalk_1.default.red.bold('FAIL'));
+            logger_1.default.info(`${chalk_1.default.red.bold('FAIL')} Parsing Failed . ${e}`);
             return;
         }
-        logger_1.default.info('%s Parsing Complete.', chalk_1.default.green.bold('COMPLETE'));
+        logger_1.default.info(`${chalk_1.default.green.bold('COMPLETE')} Parsing Complete.`);
     }
 }
 exports.default = ParseTypesFromTemplateFromLocalFiles;

package/dist/commands/types/uploadOptionSetHierarchies.js

@@ -35,18 +35,18 @@ UploadOptionSetHierarchies.flags = {
 async function uploadOptionSetHierarchies(dir) {
     try {
         await (0, login_1.authUser)();
-        logger_1.default.info('%s Uploading', chalk_1.default.yellow.bold('OPTION SET HIERARCHIES'));
+        logger_1.default.info(`${chalk_1.default.yellow.bold('OPTION SET HIERARCHIES')} Uploading`);
         const optionSetHierarchies = await loadOptionSetHierarchies(dir);
         await uploadOSH(optionSetHierarchies);
         const optionSetHierarchyLinks = await loadOptionSetHierarchyLinks(dir);
         await uploadOSHLinks(optionSetHierarchyLinks);
-        logger_1.default.info('%s Uploaded', chalk_1.default.yellow.bold('OPTION SET HIERARCHIES'));
+        logger_1.default.info(`${chalk_1.default.yellow.bold('OPTION SET HIERARCHIES')} Uploaded`);
     }
     catch (e) {
-        logger_1.default.info(`%s Option set hierarchy Upload Failed. ${e}`, chalk_1.default.red.bold('FAIL'));
+        logger_1.default.info(`${chalk_1.default.red.bold('FAIL')} Option set hierarchy Upload Failed. ${e}`);
         return;
     }
-    logger_1.default.info('%s Option set hierarchy Upload Complete.', chalk_1.default.green.bold('COMPLETE'));
+    logger_1.default.info(`${chalk_1.default.green.bold('COMPLETE')} Option set hierarchy Upload Complete.`);
 }
 exports.uploadOptionSetHierarchies = uploadOptionSetHierarchies;
 function loadOptionSetHierarchies(fromDir) {
@@ -90,8 +90,8 @@ async function uploadOSH(loadedOSHs) {
     for (const loadedOSH of loadedOSHs) {
         loadedOSHByName[loadedOSH.name] = loadedOSH;
     }
-    logger_1.default.debug('current OSH:', currentOSHs);
-    logger_1.default.debug('loaded OSH:', loadedOSHs);
+    logger_1.default.debug(`current OSH: ${currentOSHs}`);
+    logger_1.default.debug(`loaded OSH: ${loadedOSHs}`);
     for (const osh of loadedOSHs) {
         try {
             const found = currentOSHByName[osh.name];
@@ -99,7 +99,7 @@ async function uploadOSH(loadedOSHs) {
                 if (!transformOSHNameToID(osh.hierarchy, optionSets)) {
                     continue;
                 }
-                logger_1.default.info('Creating: ', osh);
+                logger_1.default.debug(`Creating: ': ${JSON.stringify(osh)}`);
                 await new sdk_1.Entities().create({
                     entityName: 'option-set-hierarchy',
                     object: osh,
@@ -109,7 +109,7 @@ async function uploadOSH(loadedOSHs) {
                 if (!transformOSHNameToID(osh.hierarchy, optionSets)) {
                     continue;
                 }
-                logger_1.default.info('Updating: ', osh);
+                logger_1.default.debug(`Updating: ${JSON.stringify(osh)}`);
                 await new sdk_1.Entities().update({
                     entityName: 'option-set-hierarchy',
                     id: found.id,
@@ -125,7 +125,7 @@ async function uploadOSH(loadedOSHs) {
         try {
             const found = loadedOSHByName[currentOSH.name];
             if (!found) {
-                logger_1.default.info('Deleting: ', currentOSH.name);
+                logger_1.default.info(`Deleting: ${currentOSH.name}`);
                 await new sdk_1.Entities().delete({
                     entityName: 'option-set-hierarchy',
                     id: currentOSH.id,
@@ -139,11 +139,11 @@ async function uploadOSH(loadedOSHs) {
 }
 // transforms the passed hierarchy from names to ids, and returns true if operation succeeded.
 function transformOSHNameToID(hierarchy, optionSets) {
-    logger_1.default.info('passed hierarchy:', hierarchy);
+    logger_1.default.info(`passed hierarchy: ${hierarchy}`);
     for (let i = 0; i < hierarchy.length; i++) {
         const os = optionSets.find((os) => os.name === hierarchy[i]);
         if (!os) {
-            logger_1.default.error('could not find option set with name', hierarchy[i], ' at position', i, 'skipping...');
+            logger_1.default.error(`could not find option set with name ${hierarchy[i]} at position ${i}. skipping...`);
             return false;
         }
         hierarchy[i] = os.id;
@@ -178,23 +178,30 @@ async function uploadOSHLinks(reducedOSHLinks) {
         if (!foundType ||
             !foundOSH ||
             foundTPSlugs.length !== currentLink.hierarchyTypePropertyIds.length) {
-            logger_1.default.info('skipping unhashable, invalid type option set hierarchy link:', currentLink);
+            logger_1.default.info(`skipping unhashable, invalid type option set hierarchy link: ${currentLink}`);
         }
-        const hash = `${foundType.slug}|${foundOSH.name}|${foundTPSlugs.sort().join('|')}`;
+        // don't mutate original array
+        const sortedFoundTPSlugs = [...foundTPSlugs].sort();
+        const hash = `${foundType.slug}|${foundOSH.name}|${sortedFoundTPSlugs.join('|')}`;
         currentOSHLinkHashes[hash] = currentLink;
     }
     const reducedLinksByHashes = {};
     for (const loadedLink of reducedOSHLinks) {
-        const hash = `${loadedLink.typeSlug}|${loadedLink.optionSetHierarchyName}|${loadedLink.typePropertySlugs.sort().join('|')}}`;
+        // don't mutate original array
+        const sortedTPSlugs = [...loadedLink.typePropertySlugs].sort();
+        const hash = `${loadedLink.typeSlug}|${loadedLink.optionSetHierarchyIdentifier}|${sortedTPSlugs.join('|')}}`;
         reducedLinksByHashes[hash] = loadedLink;
     }
     for (const loadedLink of reducedOSHLinks) {
         try {
-            const found = currentOSHLinkHashes[`${loadedLink.typeSlug}|${loadedLink.optionSetHierarchyName}|${loadedLink.typePropertySlugs.sort().join('|')}`];
+            // don't mutate original array
+            const sortedTPSlugs = [...loadedLink.typePropertySlugs].sort();
+            const found = currentOSHLinkHashes[`${loadedLink.typeSlug}|${loadedLink.optionSetHierarchyIdentifier}|${sortedTPSlugs.join('|')}`];
             if (!found) {
                 if (!transformReducedLink(loadedLink, typesWithProperties, currentOSHs)) {
                     continue;
                 }
+                logger_1.default.debug(`Creating: ': ${JSON.stringify(loadedLink)}`);
                 await new sdk_1.Entities().create({
                     entityName: 'type-option-set-hierarchy-link',
                     object: {
@@ -213,7 +220,7 @@ async function uploadOSHLinks(reducedOSHLinks) {
         try {
             const found = reducedLinksByHashes[currentLinkHash];
             if (!found) {
-                logger_1.default.info('Deleting: ', currentLinkHash);
+                logger_1.default.debug(`Deleting: ${JSON.stringify(currentLinkHash)}`);
                 await new sdk_1.Entities().delete({
                     entityName: 'type-option-set-hierarchy-link',
                     id: currentLink['id'],
@@ -227,23 +234,26 @@ 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) {
-        logger_1.default.error('OSH Links: Could not find type with slug', OSHLink.typeSlug);
+        logger_1.default.error(`OSH Links: Could not find type with slug ${OSHLink.typeSlug}`);
         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 : [];
     if (foundTPs.length !== OSHLink.typePropertySlugs.length) {
-        logger_1.default.error('OSH Links: Could not find all type properties with slugs', OSHLink.typePropertySlugs);
+        logger_1.default.error(`OSH Links: Could not find all type properties with slugs ${OSHLink.typePropertySlugs}`);
         return false;
     }
+    logger_1.default.debug(`foundTPs: ${JSON.stringify(foundTPs)}`);
     OSHLink.hierarchyTypePropertyIds = foundTPs.map((x) => x.id);
-    const foundOSH = OSHs.find((x) => x.name === OSHLink.optionSetHierarchyName);
+    const foundOSH = OSHs.find((x) => x.identifier === OSHLink.optionSetHierarchyIdentifier);
     if (!foundOSH) {
-        logger_1.default.error('OSH Links: Could not find option set hierarchy with name', OSHLink.optionSetHierarchyName);
+        logger_1.default.error(`OSH Links: Could not find option set hierarchy with identifier ${OSHLink.optionSetHierarchyIdentifier}`);
         return false;
     }
     OSHLink.optionSetHierarchyId = foundOSH.id;
+    logger_1.default.debug(`OSHLink after transform: ${JSON.stringify(OSHLink, null, 2)}`);
     return true;
 }

package/dist/commands/types/uploadOptionSets.js

@@ -34,16 +34,16 @@ UploadOptionSets.flags = {
 async function uploadOptionSets(dir) {
     try {
         const userConfig = await (0, login_1.authUser)();
-        logger_1.default.info(`%s Getting all types for orgId: ${userConfig.orgId}`, chalk_1.default.blue.bold('START'));
-        logger_1.default.info('%s Uploading', chalk_1.default.yellow.bold('OPTION SETS'));
+        logger_1.default.info(`${chalk_1.default.blue.bold('START')} Getting all types for orgId: ${userConfig.orgId}`);
+        logger_1.default.info(`${chalk_1.default.yellow.bold('OPTION SETS')} Uploading`);
         await uploadOS(dir);
-        logger_1.default.info('%s Uploaded', chalk_1.default.yellow.bold('OPTION SETS'));
+        logger_1.default.info(`${chalk_1.default.yellow.bold('OPTION SETS')} Uploaded`);
     }
     catch (e) {
-        logger_1.default.info(`%s Types Upload Failed. ${e}`, chalk_1.default.red.bold('FAIL'));
+        logger_1.default.info(`${chalk_1.default.red.bold('FAIL')} Types Upload Failed. ${e}`);
         return;
     }
-    logger_1.default.info('%s Types Upload Complete.', chalk_1.default.green.bold('COMPLETE'));
+    logger_1.default.info(`${chalk_1.default.green.bold('COMPLETE')} Types Upload Complete.`);
 }
 exports.uploadOptionSets = uploadOptionSets;
 function loadOptionSets(fromDir) {
@@ -65,34 +65,35 @@ async function uploadOS(dir) {
     const currentOptionSets = await new sdk_1.Entities().get({
         entityName: 'type-property-option-set',
     });
-    const currentOptionSetsByName = {};
+    const currentOptionSetsByIdentifier = {};
     for (const currentOptionSet of currentOptionSets) {
-        currentOptionSetsByName[currentOptionSet.name] = currentOptionSet;
+        currentOptionSetsByIdentifier[currentOptionSet.identifier] = currentOptionSet;
     }
-    const newOptionSetsByName = {};
+    const newOptionSetsByIdentifier = {};
     for (const optionSet of optionSets) {
-        newOptionSetsByName[optionSet.name] = optionSet;
+        newOptionSetsByIdentifier[optionSet.identifier] = optionSet;
     }
     for (const optionSet of optionSets) {
         try {
-            const found = currentOptionSetsByName[optionSet.name];
+            const found = currentOptionSetsByIdentifier[optionSet.identifier];
             if (!found) {
                 if (!optionSet.optionSet) {
-                    logger_1.default.info('No OptionSet for: ', optionSet.name);
+                    logger_1.default.info(`No OptionSet for: ${optionSet.identifier}`);
                     continue;
                 }
-                logger_1.default.info('Creating: ', optionSet.name);
+                logger_1.default.info(`Creating: ${optionSet.identifier}`);
                 await new sdk_1.Entities().create({
                     entityName: 'type-property-option-set',
                     object: {
                         name: optionSet.name,
+                        identifier: optionSet.identifier,
                         optionSet: optionSet.optionSet,
                         isArchived: optionSet.isArchived,
                     },
                 });
             }
             else {
-                logger_1.default.info('Updating: ', optionSet.name);
+                logger_1.default.info(`Updating: ${optionSet.identifier}`);
                 await new sdk_1.Entities().update({
                     entityName: 'type-property-option-set',
                     id: found.id,
@@ -110,9 +111,9 @@ async function uploadOS(dir) {
     }
     for (const currentOptionSet of currentOptionSets) {
         try {
-            const found = newOptionSetsByName[currentOptionSet.name];
+            const found = newOptionSetsByIdentifier[currentOptionSet.identifier];
             if (!found) {
-                logger_1.default.info('Deleting: ', currentOptionSet.name);
+                logger_1.default.info(`Deleting: ${currentOptionSet.identifier}`);
                 await new sdk_1.Entities().delete({
                     entityName: 'type-property-option-set',
                     id: currentOptionSet.id,