@contrail/cli 1.0.14 → 1.0.15

package/lib/cli.js

@@ -2,7 +2,10 @@ import { create } from './apps/create-app/create';
 import { deployApp, removeApp } from './apps/deploy-app/deploy';
 import { getTypes } from './types/types-extractor';
 import { uploadTypes } from './types/types-uploader';
-import { parseOptionSet } from './types/parse-optionSet';
+import { UploadOptionSets } from './types/option-set-uploader';
+import { MergeOptionSets } from './types/option-set-merger';
+import { MergeTypeProperties } from './types/types-properties-merger';
+import { ParseTypesFromFiles, ParseTypesFromLocalFiles } from './types/parse-types';
 const cliUsage = require('command-line-usage');
 /**
  *  Built using documentation here:
@@ -54,12 +57,28 @@ export async function cli(args) {
                     getTypes(args);
                     break;
                 }
-                case 'upload': {
+                case 'uploadTypes': {
                     uploadTypes(args);
                     break;
                 }
-                case 'parseOptionSet': {
-                    parseOptionSet(args);
+                case 'uploadOptionSets': {
+                    UploadOptionSets(args);
+                    break;
+                }
+                case 'parseTypesFromLocalFiles': {
+                    ParseTypesFromLocalFiles(args);
+                    break;
+                }
+                case 'parseTypesFromFiles': {
+                    ParseTypesFromFiles(args);
+                    break;
+                }
+                case 'mergeOptionSets': {
+                    MergeOptionSets(args);
+                    break;
+                }
+                case 'mergeTypeProperties': {
+                    MergeTypeProperties(args);
                     break;
                 }
                 default: {
@@ -117,8 +136,22 @@ const helpSections = [
         header: 'Type Commands - Domain: types',
         content: [
             'getAll                       Get all OptionSets and Types for your Org.',
-            'upload                       Upload OptionSets and Types for your Org.',
-            'parseOptionSet <File Path>   Parse a CSV file into OptionSets.',
+            'uploadTypes                  Upload Types for your Org.',
+            '.                            Types are uploaded from types.yml\n',
+            'uploadOptionSets             Upload OptionSets for your Org.',
+            '.                            OptionSets are loaded from option_sets.yml\n',
+            'parseTypesFromLocalFiles <File Paths>   Parse CSV files into Types and ',
+            '.                                       OptionSets from local files.\n',
+            'parseTypesFromFiles <fileIds>           Parse CSV files into Types and ',
+            '.                                       OptionSets from VibeIQ Files.\n',
+            'mergeOptionSets <File Path>             Merge the OptionSets from an existing',
+            '.                                       org and the OptionSets passed in.',
+            '.                                       File must be .yml\n',
+            'mergeTypeProperties <File Path> <TypePaths> ',
+            '.                                       Merge the TypeProperties from an existing',
+            '.                                       org and the TypeProperties passed in.',
+            '.                                       Add to Types via TypePath',
+            '.                                       File must be .yml\n',
         ],
     },
 ];

package/lib/types/interfaces.d.ts

@@ -3,9 +3,9 @@ export interface ReducedType {
     label: string;
     typePath: string;
     isArchived: boolean;
-    typeProperties: ReducedType[];
+    typeProperties: ReducedTypeProperty[];
 }
-export interface ReducedTypeProperties {
+export interface ReducedTypeProperty {
     id: string;
     isArchived: boolean;
     propertyType: PropertyType;

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

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

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

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

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

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

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

@@ -1,7 +1,23 @@
 import { Entities } from '@contrail/sdk';
 import fs from 'fs';
 import { getSeparatorByPlatform } from '../common';
+import { authUser } from '../auth/login';
+import chalk from 'chalk';
 const yaml = require('js-yaml');
+export async function UploadOptionSets(args) {
+    try {
+        const userConfig = await authUser();
+        console.log(`%s Getting all types for orgId: ${userConfig.orgId}`, chalk.blue.bold('START'));
+        console.log(`%s Uploading`, chalk.yellow.bold('OPTION SETS'));
+        await uploadOptionSets();
+        console.log(`%s Uploaded`, chalk.yellow.bold('OPTION SETS'));
+    }
+    catch (e) {
+        console.log(`%s Types Upload Failed. ${e}`, chalk.red.bold('FAIL'));
+        return;
+    }
+    console.log('%s Types Upload Complete.', chalk.green.bold('COMPLETE'));
+}
 function loadOptionSets() {
     const TARGET_DIR = process.cwd();
     try {
@@ -13,7 +29,7 @@ function loadOptionSets() {
         throw new Error(`ERROR PARSING YAML: ${e}`);
     }
 }
-export async function uploadOptionSets() {
+async function uploadOptionSets() {
     const optionSets = loadOptionSets();
     const currentOptionSets = await new Entities().get({
         entityName: 'type-property-option-set',

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

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

package/lib/types/parse-types.js

@@ -0,0 +1,85 @@
+import { TypeProcessor } from '@contrail/sdk';
+import chalk from 'chalk';
+import fs from 'fs';
+import { getSeparatorByPlatform } from '../common';
+import * as csvToJson from 'csvtojson';
+import { authUser } from '../auth/login';
+const yaml = require('js-yaml');
+export async function ParseTypesFromLocalFiles(args) {
+    try {
+        if ((args === null || args === void 0 ? void 0 : args.length) < 4) {
+            throw new Error('File names must be included.');
+        }
+        console.log(`%s Parsing`, chalk.yellow.bold('TYPES AND OPTION SETS'));
+        const fileLocations = args.slice(3);
+        console.log('Using File Location(s): ', fileLocations);
+        await parseTypesFromLocalFiles(fileLocations);
+        console.log(`%s Parsed`, chalk.yellow.bold('TYPES AND OPTION SETS'));
+    }
+    catch (e) {
+        console.log(`%s Parsing Failed. ${e}`, chalk.red.bold('FAIL'));
+        return;
+    }
+    console.log('%s Parsing Complete.', chalk.green.bold('COMPLETE'));
+}
+export async function ParseTypesFromFiles(args) {
+    try {
+        if ((args === null || args === void 0 ? void 0 : args.length) < 4) {
+            throw new Error('File ids must be included.');
+        }
+        console.log(`%s Parsing`, chalk.yellow.bold('TYPES AND OPTION SETS'));
+        const fileIds = args.slice(3);
+        console.log('Using FileId(s): ', fileIds);
+        await parseTypesFromFiles(fileIds);
+        console.log(`%s Parsed`, chalk.yellow.bold('TYPES AND OPTION SETS'));
+    }
+    catch (e) {
+        console.log(`%s Parsing Failed. ${e}`, chalk.red.bold('FAIL'));
+        return;
+    }
+    console.log('%s Parsing Complete.', chalk.green.bold('COMPLETE'));
+}
+async function loadDataFromCSV(fileName) {
+    const CURRENT_DIR = process.cwd();
+    try {
+        const separator = getSeparatorByPlatform();
+        const fullPath = CURRENT_DIR + separator + fileName;
+        console.log('Getting file from path: ', fullPath);
+        const csvData = await csvToJson.default().fromFile(fullPath);
+        return csvData;
+    }
+    catch (e) {
+        throw new Error(`ERROR PARSING CSV: ${e}`);
+    }
+}
+async function parseTypesFromLocalFiles(fileLocations) {
+    const csvJSONData = [];
+    for (const fileLocation of fileLocations) {
+        try {
+            console.log('Getting data for fileLocation: ', fileLocation);
+            const csvData = await loadDataFromCSV(fileLocation);
+            console.log(`CSV import was successful. ${csvData === null || csvData === void 0 ? void 0 : csvData.length} rows found. Adding to total rows.`);
+            csvJSONData.push(...csvData);
+        }
+        catch (e) {
+            console.log('Error importing csv data.', e);
+            throw e;
+        }
+    }
+    console.log(`CSV imports were successful. ${csvJSONData === null || csvJSONData === void 0 ? void 0 : csvJSONData.length} total rows found.`);
+    const suggestions = await new TypeProcessor().GetSuggestedTypes(csvJSONData);
+    saveData({ optionSets: suggestions.OptionSets }, 'parsed_optionSets.yml');
+    saveData({ typeProperties: suggestions.TypeProperties }, 'parsed_typeProperties.yml');
+}
+async function parseTypesFromFiles(fileIds) {
+    await authUser();
+    const suggestions = await new TypeProcessor().GetSuggestedTypesFromFiles({ loadFileIds: fileIds });
+    saveData({ optionSets: suggestions.OptionSets }, 'parsed_optionSets.yml');
+    saveData({ typeProperties: suggestions.TypeProperties }, 'parsed_typeProperties.yml');
+}
+function saveData(data, name) {
+    const yamlStr = yaml.dump(data);
+    const CURRENT_DIR = process.cwd();
+    const separator = getSeparatorByPlatform();
+    fs.writeFileSync(CURRENT_DIR + separator + name, yamlStr, 'utf8');
+}

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

@@ -1 +1,2 @@
 export declare function getTypes(args: any): Promise<void>;
+export declare function getReducedTypes(optionSets: any): Promise<any[]>;

package/lib/types/types-extractor.js

@@ -15,7 +15,11 @@ export async function getTypes(args) {
         await getOptionSets(optionSets);
         console.log(`%s Retrieved`, chalk.yellow.bold('OPTION SETS'));
         console.log(`%s Retrieving`, chalk.yellow.bold('TYPES'));
-        await getReducedTypes(optionSets);
+        const reducedTypes = await getReducedTypes(optionSets);
+        const typesHolder = {
+            types: reducedTypes,
+        };
+        saveData(typesHolder);
         console.log(`%s Retrieved`, chalk.yellow.bold('TYPES'));
     }
     catch (e) {
@@ -43,7 +47,7 @@ async function getOptionSets(optionSets) {
     const yamlStr = yaml.dump(optionSetsHolder);
     fs.writeFileSync(CURRENT_DIR + separator + 'option_sets.yml', yamlStr, 'utf8');
 }
-async function getReducedTypes(optionSets) {
+export async function getReducedTypes(optionSets) {
     const types = await new Entities().get({
         entityName: 'type',
     });
@@ -90,11 +94,11 @@ async function getReducedTypes(optionSets) {
         reducedTypes.push(reducedType);
     }
     reducedTypes = reducedTypes.sort((one, two) => (one.typePath < two.typePath ? -1 : 1));
-    const typesHolder = {
-        types: reducedTypes,
-    };
+    return reducedTypes;
+}
+function saveData(data) {
+    const yamlStr = yaml.dump(data);
     const CURRENT_DIR = process.cwd();
     const separator = getSeparatorByPlatform();
-    const yamlStr = yaml.dump(typesHolder);
     fs.writeFileSync(CURRENT_DIR + separator + 'types.yml', yamlStr, 'utf8');
 }

package/lib/types/types-properties-merger.d.ts

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

package/lib/types/types-properties-merger.js

@@ -0,0 +1,69 @@
+import { Entities } from '@contrail/sdk';
+import { getReducedTypes } from './types-extractor';
+import fs from 'fs';
+import { getSeparatorByPlatform } from '../common';
+import { authUser } from '../auth/login';
+import chalk from 'chalk';
+const yaml = require('js-yaml');
+export async function MergeTypeProperties(args) {
+    try {
+        if ((args === null || args === void 0 ? void 0 : args.length) < 5) {
+            throw new Error('File name must be included along with a type path.');
+        }
+        console.log(`%s Importing local file`, chalk.yellow.bold('TYPE PROPERTIES MERGE'));
+        const fileLocation = args[3];
+        console.log('Using File: ', fileLocation);
+        const typePaths = args.slice(4);
+        console.log('Using TypePaths: ', typePaths);
+        await mergeTypeProperties(fileLocation, typePaths);
+        console.log(`%s Merged`, chalk.yellow.bold('TYPE PROPERTIES MERGE'));
+    }
+    catch (e) {
+        console.log(`%s Merge Failed. ${e}`, chalk.red.bold('FAIL'));
+        return;
+    }
+    console.log('%s Merge Complete.', chalk.green.bold('COMPLETE'));
+}
+function loadTypeProperties(fileLocation) {
+    const TARGET_DIR = process.cwd();
+    try {
+        const separator = getSeparatorByPlatform();
+        const fullPath = TARGET_DIR + separator + fileLocation;
+        console.log('Getting file from path: ', fullPath);
+        const doc = yaml.load(fs.readFileSync(TARGET_DIR + separator + fileLocation, 'utf8'));
+        return doc.typeProperties;
+    }
+    catch (e) {
+        throw new Error(`ERROR PARSING YAML: ${e}`);
+    }
+}
+async function mergeTypeProperties(fileLocation, typePaths) {
+    const uploadedTypeProperties = loadTypeProperties(fileLocation);
+    await authUser();
+    const optionSets = await new Entities().get({
+        entityName: 'type-property-option-set',
+    });
+    const reducedTypes = await getReducedTypes(optionSets);
+    for (const typePath of typePaths) {
+        const foundType = reducedTypes.find(reducedTypes => reducedTypes.typePath === typePath);
+        if (!foundType) {
+            console.log(`%s No Type found for: ${typePath}`, chalk.red.bold('WARNING'));
+        }
+        mergeType(foundType, uploadedTypeProperties);
+    }
+    saveData({ types: reducedTypes });
+}
+function mergeType(reducedType, typePropertiesToAdd) {
+    for (const typeProperty of typePropertiesToAdd) {
+        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 CURRENT_DIR = process.cwd();
+    const separator = getSeparatorByPlatform();
+    fs.writeFileSync(CURRENT_DIR + separator + 'merged_types.yml', yamlStr, 'utf8');
+}

package/lib/types/types-uploader.js

@@ -1,5 +1,4 @@
 import { Entities, Request } from '@contrail/sdk';
-import { uploadOptionSets } from './option-set-uploader';
 import chalk from 'chalk';
 import fs from 'fs';
 import { authUser } from '../auth/login';
@@ -10,9 +9,6 @@ export async function uploadTypes(args) {
     try {
         const userConfig = await authUser();
         console.log(`%s Getting all types for orgId: ${userConfig.orgId}`, chalk.blue.bold('START'));
-        console.log(`%s Uploading`, chalk.yellow.bold('OPTION SETS'));
-        await uploadOptionSets();
-        console.log(`%s Uploaded`, chalk.yellow.bold('OPTION SETS'));
         console.log(`%s Uploading`, chalk.yellow.bold('TYPES'));
         await uploadReducedTypes();
         console.log(`%s Uploaded`, chalk.yellow.bold('TYPES'));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@contrail/cli",
-  "version": "1.0.14",
+  "version": "1.0.15",
   "description": "VibeIQ's Contrail Platform CLI.",
   "main": "lib/index.js",
   "bin": {
@@ -23,7 +23,7 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "@contrail/sdk": "^1.0.91",
+    "@contrail/sdk": "^1.0.152",
     "@contrail/util": "^1.0.17",
     "amazon-cognito-identity-js": "^5.2.3",
     "arg": "^4.0.1",

package/src/cli.ts

@@ -3,7 +3,11 @@ import { create } from './apps/create-app/create';
 import { deployApp, removeApp } from './apps/deploy-app/deploy';
 import { getTypes } from './types/types-extractor';
 import { uploadTypes } from './types/types-uploader';
-import { parseOptionSet } from './types/parse-optionSet';
+import { UploadOptionSets } from './types/option-set-uploader';
+import { MergeOptionSets } from './types/option-set-merger';
+import { MergeTypeProperties } from './types/types-properties-merger';
+import { ParseTypesFromFiles, ParseTypesFromLocalFiles } from './types/parse-types';
+
 const cliUsage = require('command-line-usage');
 
 /**
@@ -61,12 +65,28 @@ export async function cli(args) {
           getTypes(args);
           break;
         }
-        case 'upload': {
+        case 'uploadTypes': {
           uploadTypes(args);
           break;
         }
-        case 'parseOptionSet': {
-          parseOptionSet(args);
+        case 'uploadOptionSets': {
+          UploadOptionSets(args);
+          break;
+        }
+        case 'parseTypesFromLocalFiles': {
+          ParseTypesFromLocalFiles(args);
+          break;
+        }
+        case 'parseTypesFromFiles': {
+          ParseTypesFromFiles(args);
+          break;
+        }
+        case 'mergeOptionSets': {
+          MergeOptionSets(args);
+          break;
+        }
+        case 'mergeTypeProperties': {
+          MergeTypeProperties(args);
           break;
         }
         default: {
@@ -129,8 +149,22 @@ const helpSections = [
     header: 'Type Commands - Domain: types',
     content: [
       'getAll                       Get all OptionSets and Types for your Org.',
-      'upload                       Upload OptionSets and Types for your Org.',
-      'parseOptionSet <File Path>   Parse a CSV file into OptionSets.',
+      'uploadTypes                  Upload Types for your Org.',
+      '.                            Types are uploaded from types.yml\n',
+      'uploadOptionSets             Upload OptionSets for your Org.',
+      '.                            OptionSets are loaded from option_sets.yml\n',
+      'parseTypesFromLocalFiles <File Paths>   Parse CSV files into Types and ',
+      '.                                       OptionSets from local files.\n',
+      'parseTypesFromFiles <fileIds>           Parse CSV files into Types and ',
+      '.                                       OptionSets from VibeIQ Files.\n',
+      'mergeOptionSets <File Path>             Merge the OptionSets from an existing',
+      '.                                       org and the OptionSets passed in.', 
+      '.                                       File must be .yml\n',
+      'mergeTypeProperties <File Path> <TypePaths> ', 
+      '.                                       Merge the TypeProperties from an existing',
+      '.                                       org and the TypeProperties passed in.',
+      '.                                       Add to Types via TypePath', 
+      '.                                       File must be .yml\n',
     ],
   },
 ];

package/src/types/interfaces.ts

@@ -3,10 +3,10 @@ export interface ReducedType {
   label: string;
   typePath: string;
   isArchived: boolean;
-  typeProperties: ReducedType[];
+  typeProperties: ReducedTypeProperty[];
 }
 
-export interface ReducedTypeProperties {
+export interface ReducedTypeProperty {
   id: string;
   isArchived: boolean;
   propertyType: PropertyType;

package/src/types/option-set-merger.ts

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