@contrail/cli 1.0.55 → 1.0.57

package/lib/cli.js

@@ -22,6 +22,7 @@ import { uploadUsageInfo } from './types/usage-info-uploader';
 import { uploadRuleSets } from './types/rule-set-uploader';
 import { UploadOptionSetHierarchies } from './types/option-set-hierarchy-uploader';
 import { uploadTypePropertyPolicies } from './types/type-property-policy-uploader';
+import { uploadAll } from './types/allUploader';
 const cliUsage = require('command-line-usage');
 /**
  *  Built using documentation here:
@@ -86,6 +87,10 @@ export async function cli(args) {
                     getAll(args);
                     break;
                 }
+                case 'uploadAll': {
+                    uploadAll();
+                    break;
+                }
                 case 'uploadTypes': {
                     uploadTypes();
                     break;
@@ -423,6 +428,10 @@ const helpSections = [
                 name: 'exportOptionSetsHierarchies',
                 summary: 'export OptionSetHierarchies into CSVs.\n'
             },
+            {
+                name: 'uploadAll',
+                summary: 'Upload an extracted archive of types:getAll.'
+            },
             {
                 name: 'uploadOptionSetsHierarchies',
                 summary: 'Upload an extracted option set hierarchies.'

package/lib/types/allUploader.d.ts

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

package/lib/types/allUploader.js

@@ -0,0 +1,24 @@
+import chalk from 'chalk';
+import { authUser } from '../auth/login';
+import { UploadOptionSets } from './option-set-uploader';
+import { UploadOptionSetHierarchies } from './option-set-hierarchy-uploader';
+import { uploadTypes } from './types-uploader';
+import { uploadUsageInfo } from './usage-info-uploader';
+import { uploadRuleSets } from './rule-set-uploader';
+import { uploadTypePropertyPolicies } from './type-property-policy-uploader';
+export async function uploadAll() {
+    try {
+        await authUser();
+        await UploadOptionSets(null);
+        await UploadOptionSetHierarchies(null);
+        await uploadTypes();
+        await uploadUsageInfo(null);
+        await uploadRuleSets(null);
+        await uploadTypePropertyPolicies(null);
+    }
+    catch (e) {
+        console.log(`%s Types Upload Failed. ${e}`, chalk.red.bold('FAIL'));
+        return;
+    }
+    console.log('%s Types Upload Complete.', chalk.green.bold('COMPLETE'));
+}

package/lib/types/interfaces.d.ts

@@ -22,6 +22,7 @@ export interface ReducedTypeProperty {
     inherited: boolean;
     formulaFunction?: string;
     validationFunction?: string;
+    numberFormat?: any;
 }
 export interface ReducedOptionSet {
     name: string;

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

@@ -1,6 +1,6 @@
 import { Entities } from '@contrail/sdk';
 import fs from 'fs';
-import { getSeparatorByPlatform } from '../common';
+import * as path from 'path';
 import { authUser } from '../auth/login';
 import chalk from 'chalk';
 const yaml = require('js-yaml');
@@ -21,9 +21,12 @@ export async function UploadOptionSetHierarchies(args) {
 function loadOptionSetHierarchies() {
     const TARGET_DIR = process.cwd();
     try {
-        const separator = getSeparatorByPlatform();
-        const doc = yaml.load(fs.readFileSync(TARGET_DIR + separator + 'types.yml', 'utf8'));
-        return doc.reducedOptionSetHierarchies;
+        const files = fs.readdirSync(path.join(TARGET_DIR, 'option-set-hierarchies'));
+        const OSHs = [];
+        for (const file of files) {
+            OSHs.push(yaml.load(fs.readFileSync(path.join(TARGET_DIR, 'option-set-hierarchies', file), 'utf8')));
+        }
+        return OSHs;
     }
     catch (e) {
         throw new Error(`ERROR PARSING YAML: ${e}`);

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

@@ -1,6 +1,6 @@
 import { Entities } from '@contrail/sdk';
 import fs from 'fs';
-import { getSeparatorByPlatform } from '../common';
+import * as path from 'path';
 import { authUser } from '../auth/login';
 import chalk from 'chalk';
 const yaml = require('js-yaml');
@@ -21,9 +21,12 @@ export async function UploadOptionSets(args) {
 function loadOptionSets() {
     const TARGET_DIR = process.cwd();
     try {
-        const separator = getSeparatorByPlatform();
-        const doc = yaml.load(fs.readFileSync(TARGET_DIR + separator + 'option_sets.yml', 'utf8'));
-        return doc.reducedOptionSets;
+        const files = fs.readdirSync(path.join(TARGET_DIR, 'option-sets'));
+        const optionSets = [];
+        for (const file of files) {
+            optionSets.push(yaml.load(fs.readFileSync(path.join(TARGET_DIR, 'option-sets', file), 'utf8')));
+        }
+        return optionSets;
     }
     catch (e) {
         throw new Error(`ERROR PARSING YAML: ${e}`);

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

@@ -1,6 +1,6 @@
 import { Entities } from '@contrail/sdk';
 import fs from 'fs';
-import { getSeparatorByPlatform } from '../common';
+import * as path from 'path';
 import { authUser } from '../auth/login';
 import chalk from 'chalk';
 const yaml = require('js-yaml');
@@ -20,11 +20,16 @@ export async function uploadRuleSets(args) {
     console.log('%s Rule set Upload Complete.', chalk.green.bold('COMPLETE'));
 }
 function loadReducedRuleSets() {
+    const ruleSets = [];
+    let ruleSetLinks = [];
     const TARGET_DIR = process.cwd();
     try {
-        const separator = getSeparatorByPlatform();
-        const doc = yaml.load(fs.readFileSync(TARGET_DIR + separator + 'types.yml', 'utf8'));
-        return [doc.reducedRuleSets, doc.reducedRuleSetLinks];
+        const files = fs.readdirSync(path.join(TARGET_DIR, 'rule-sets'));
+        for (const file of files) {
+            ruleSets.push(yaml.load(fs.readFileSync(path.join(TARGET_DIR, 'rule-sets', file), 'utf8')));
+        }
+        ruleSetLinks = yaml.load(fs.readFileSync(path.join(TARGET_DIR, 'rule-set-links.yml'), 'utf8'));
+        return [ruleSets, ruleSetLinks];
     }
     catch (e) {
         throw new Error(`ERROR PARSING YAML: ${e}`);
@@ -127,15 +132,7 @@ async function uploadRuleSetLinkObjects(loadedRuleSetLinks) {
                 if (!transformReducedLink(loadedRuleSetLink, types, currentRuleSets)) {
                     continue;
                 }
-                console.log('Updating: ', loadedRuleSetLink);
-                await new Entities().update({
-                    entityName: 'type-rule-set-link',
-                    id: found.id,
-                    object: {
-                        typeRuleSetId: loadedRuleSetLink.ruleSet,
-                        typeId: loadedRuleSetLink.type,
-                    },
-                });
+                console.log('skipping updating existing rule set link: ', loadedRuleSetLink);
             }
         }
         catch (err) {

package/lib/types/type-property-policy-uploader.js

@@ -1,6 +1,6 @@
 import { Entities } from '@contrail/sdk';
 import fs from 'fs';
-import { getSeparatorByPlatform } from '../common';
+import * as path from 'path';
 import { authUser } from '../auth/login';
 import chalk from 'chalk';
 import { getTypes } from './types-extractor';
@@ -21,11 +21,16 @@ export async function uploadTypePropertyPolicies(args) {
     console.log('%s Type Property Policy Upload Complete.', chalk.green.bold('COMPLETE'));
 }
 function loadTPPolicies() {
+    const tpps = [];
+    let tppLinks = [];
     const TARGET_DIR = process.cwd();
     try {
-        const separator = getSeparatorByPlatform();
-        const doc = yaml.load(fs.readFileSync(TARGET_DIR + separator + 'types.yml', 'utf8'));
-        return [doc.reducedTypePropertyPolicies, doc.reducedTypePropertyPolicyLinks];
+        const files = fs.readdirSync(path.join(TARGET_DIR, 'type-property-policies'));
+        for (const file of files) {
+            tpps.push(yaml.load(fs.readFileSync(path.join(TARGET_DIR, 'type-property-policies', file), 'utf8')));
+        }
+        tppLinks = yaml.load(fs.readFileSync(path.join(TARGET_DIR, 'type-property-policy-links.yml'), 'utf8'));
+        return [tpps, tppLinks];
     }
     catch (e) {
         throw new Error(`ERROR PARSING YAML: ${e}`);

package/lib/types/types-extractor.js

@@ -2,7 +2,7 @@ import { Entities } from '@contrail/sdk';
 import chalk from 'chalk';
 import fs from 'fs';
 import { authUser } from '../auth/login';
-import { getSeparatorByPlatform } from '../common';
+import * as path from 'path';
 import pLimit from 'p-limit';
 const limit = pLimit(30);
 const yaml = require('js-yaml');
@@ -11,7 +11,7 @@ export async function getAll(args) {
         const userConfig = await authUser();
         console.log(`%s Getting all types for orgId: ${userConfig.orgId}`, chalk.blue.bold('START'));
         // make directory to house exports
-        const dir = `./types-${Date.now()}`;
+        const dir = `./contrail-export-${Date.now()}`;
         fs.mkdirSync(dir);
         const data = {
             types: await getTypes(),
@@ -24,7 +24,6 @@ export async function getAll(args) {
             typePropertyPolicyLinks: await getTypePropertyPolicyLinks(),
         };
         const reducedData = reduceData(data);
-        storeOptionSets(data, dir);
         saveData(reducedData, dir);
         console.log('%s Retrieved', chalk.yellow.bold('TYPES'));
     }
@@ -215,6 +214,7 @@ export function reduceTypes(dataHolder) {
                 inherited: typeProperty.inherited,
                 formulaFunction: typeProperty.formulaFunction,
                 validationFunction: typeProperty.validationFunction,
+                numberFormat: typeProperty.numberFormat,
             };
             reducedTypeProperties.push(reducedTypeProperty);
         }
@@ -242,20 +242,36 @@ export function reduceData(data) {
         reducedTypePropertyPolicyLinks: reduceTypePropertyPolicyLinks(data),
     };
 }
-function storeOptionSets(data, dir) {
-    let reducedOptionSets = reduceOptionSets(data);
-    reducedOptionSets = reducedOptionSets.sort((one, two) => (one.name < two.name ? -1 : 1));
-    const optionSetsHolder = {
-        reducedOptionSets,
-    };
-    const CURRENT_DIR = process.cwd();
-    const separator = getSeparatorByPlatform();
-    const yamlStr = yaml.dump(optionSetsHolder);
-    fs.writeFileSync(CURRENT_DIR + separator + dir + separator + 'option_sets.yml', yamlStr, 'utf8');
-}
 function saveData(reducedData, dir) {
-    const yamlStr = yaml.dump(reducedData);
-    const CURRENT_DIR = process.cwd();
-    const separator = getSeparatorByPlatform();
-    fs.writeFileSync(CURRENT_DIR + separator + dir + separator + 'types.yml', yamlStr, 'utf8');
+    const propertyToFolderMap = {
+        reducedTypes: { filename: 'types', split: true, fileLabel: 'slug' },
+        reducedOptionSets: { filename: 'option-sets', split: true, fileLabel: 'name' },
+        reducedOptionSetHierarchies: { filename: 'option-set-hierarchies', split: true, fileLabel: 'name' },
+        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: '' },
+    };
+    for (const [key, folder] of Object.entries(propertyToFolderMap)) {
+        const CURRENT_DIR = process.cwd();
+        if (folder.split) {
+            const subDir = path.join(CURRENT_DIR, dir, folder.filename);
+            if (!fs.existsSync(subDir)) {
+                fs.mkdirSync(subDir);
+            }
+            for (const item of reducedData[key]) {
+                const yamlStr = yaml.dump(item);
+                const fileLabel = item[folder.fileLabel];
+                if (!fileLabel) {
+                    console.warn('skipping bad data:', item);
+                }
+                fs.writeFileSync(path.join(subDir, `${fileLabel}.yml`), yamlStr, 'utf8');
+            }
+        }
+        else {
+            const yamlStr = yaml.dump(reducedData[key]);
+            fs.writeFileSync(path.join(CURRENT_DIR, dir, `${folder.filename}.yml`), yamlStr, 'utf8');
+        }
+    }
 }

package/lib/types/types-uploader.js

@@ -2,7 +2,7 @@ import { Entities, Request } from '@contrail/sdk';
 import chalk from 'chalk';
 import fs from 'fs';
 import { authUser } from '../auth/login';
-import { getSeparatorByPlatform } from '../common';
+import * as path from 'path';
 import * as _ from 'lodash';
 import yaml from 'js-yaml';
 export async function uploadTypes() {
@@ -22,9 +22,12 @@ export async function uploadTypes() {
 function loadReducedTypes() {
     const TARGET_DIR = process.cwd();
     try {
-        const separator = getSeparatorByPlatform();
-        const doc = yaml.load(fs.readFileSync(TARGET_DIR + separator + 'types.yml', 'utf8'));
-        return doc.reducedTypes;
+        const files = fs.readdirSync(path.join(TARGET_DIR, 'types'));
+        const types = [];
+        for (const file of files) {
+            types.push(yaml.load(fs.readFileSync(path.join(TARGET_DIR, 'types', file), 'utf8')));
+        }
+        return types;
     }
     catch (e) {
         throw new Error(`ERROR PARSING YAML: ${e}`);

package/lib/types/usage-info-uploader.js

@@ -1,9 +1,9 @@
 import { Entities } from '@contrail/sdk';
 import fs from 'fs';
-import { getSeparatorByPlatform } from '../common';
 import { authUser } from '../auth/login';
 import chalk from 'chalk';
 import { getTypes } from './types-extractor';
+import * as path from 'path';
 const yaml = require('js-yaml');
 export async function uploadUsageInfo(args) {
     try {
@@ -22,9 +22,8 @@ export async function uploadUsageInfo(args) {
 function loadUsageInfo() {
     const TARGET_DIR = process.cwd();
     try {
-        const separator = getSeparatorByPlatform();
-        const doc = yaml.load(fs.readFileSync(TARGET_DIR + separator + 'types.yml', 'utf8'));
-        return doc.reducedUsageInfo;
+        const doc = yaml.load(fs.readFileSync(path.join(TARGET_DIR, 'usage-info.yml'), 'utf8'));
+        return doc;
     }
     catch (e) {
         throw new Error(`ERROR PARSING YAML: ${e}`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@contrail/cli",
-  "version": "1.0.55",
+  "version": "1.0.57",
   "description": "VibeIQ's Contrail Platform CLI.",
   "main": "lib/index.js",
   "bin": {

package/src/cli.ts

@@ -23,6 +23,7 @@ import { uploadUsageInfo } from './types/usage-info-uploader';
 import { uploadRuleSets } from './types/rule-set-uploader';
 import { UploadOptionSetHierarchies } from './types/option-set-hierarchy-uploader';
 import { uploadTypePropertyPolicies } from './types/type-property-policy-uploader';
+import { uploadAll } from './types/allUploader';
 
 const cliUsage = require('command-line-usage');
 
@@ -96,6 +97,10 @@ export async function cli(args) {
       getAll(args);
       break;
     }
+    case 'uploadAll': {
+      uploadAll();
+      break;
+    }
     case 'uploadTypes': {
       uploadTypes();
       break;
@@ -438,6 +443,10 @@ const helpSections = [
         name: 'exportOptionSetsHierarchies',
         summary: 'export OptionSetHierarchies into CSVs.\n'
       },
+      {
+        name: 'uploadAll',
+        summary: 'Upload an extracted archive of types:getAll.'
+      },
       {
         name: 'uploadOptionSetsHierarchies',
         summary: 'Upload an extracted option set hierarchies.'

package/src/types/allUploader.ts

@@ -0,0 +1,28 @@
+import chalk from 'chalk';
+import { authUser } from '../auth/login';
+
+import { UploadOptionSets } from './option-set-uploader';
+import { UploadOptionSetHierarchies } from './option-set-hierarchy-uploader';
+import { uploadTypes } from './types-uploader';
+import { uploadUsageInfo } from './usage-info-uploader';
+import { uploadRuleSets } from './rule-set-uploader';
+import { uploadTypePropertyPolicies } from './type-property-policy-uploader';
+
+export async function uploadAll() {
+  try {
+    await authUser();
+    await UploadOptionSets(null);
+    await UploadOptionSetHierarchies(null);
+    await uploadTypes();
+    await uploadUsageInfo(null);
+    await uploadRuleSets(null);
+    await uploadTypePropertyPolicies(null);
+
+  }
+  catch (e) {
+    console.log(`%s Types Upload Failed. ${e}`, chalk.red.bold('FAIL'));
+    return;
+  }
+
+  console.log('%s Types Upload Complete.', chalk.green.bold('COMPLETE'));
+}

package/src/types/interfaces.ts

@@ -23,6 +23,7 @@ export interface ReducedTypeProperty {
   inherited: boolean;
   formulaFunction?: string;
   validationFunction?: string;
+  numberFormat?: any;
 }
 
 export interface ReducedOptionSet {

package/src/types/option-set-hierarchy-uploader.ts

@@ -1,6 +1,6 @@
 import { Entities } from '@contrail/sdk';
 import fs from 'fs';
-import { getSeparatorByPlatform } from '../common';
+import * as path from 'path';
 import { authUser } from '../auth/login';
 import chalk from 'chalk';
 
@@ -27,9 +27,12 @@ export async function UploadOptionSetHierarchies(args) {
 function loadOptionSetHierarchies() {
   const TARGET_DIR = process.cwd();
   try {
-    const separator = getSeparatorByPlatform();
-    const doc = yaml.load(fs.readFileSync(TARGET_DIR + separator + 'types.yml', 'utf8'));
-    return doc.reducedOptionSetHierarchies;
+    const files = fs.readdirSync(path.join(TARGET_DIR, 'option-set-hierarchies'));
+    const OSHs = [];
+    for(const file of files) {
+      OSHs.push(yaml.load(fs.readFileSync(path.join(TARGET_DIR, 'option-set-hierarchies', file), 'utf8')));
+    }
+    return OSHs;
   } catch (e) {
     throw new Error(`ERROR PARSING YAML: ${e}`);
   }

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

@@ -1,7 +1,7 @@
 import { Entities } from '@contrail/sdk';
 import { ReducedOptionSet } from './interfaces';
 import fs from 'fs';
-import { getSeparatorByPlatform } from '../common';
+import * as path from 'path';
 import { authUser } from '../auth/login';
 import chalk from 'chalk';
 
@@ -28,9 +28,12 @@ export async function UploadOptionSets(args) {
 function loadOptionSets(){
   const TARGET_DIR = process.cwd();
   try {
-    const separator = getSeparatorByPlatform();
-    const doc = yaml.load(fs.readFileSync(TARGET_DIR + separator + 'option_sets.yml', 'utf8'));
-    return doc.reducedOptionSets;
+    const files = fs.readdirSync(path.join(TARGET_DIR, 'option-sets'));
+    const optionSets = [];
+    for(const file of files) {
+      optionSets.push(yaml.load(fs.readFileSync(path.join(TARGET_DIR, 'option-sets', file), 'utf8')));
+    }
+    return optionSets;
   } catch (e) {
     throw new Error(`ERROR PARSING YAML: ${e}`);
   }

package/src/types/rule-set-uploader.ts

@@ -1,6 +1,6 @@
 import { Entities } from '@contrail/sdk';
 import fs from 'fs';
-import { getSeparatorByPlatform } from '../common';
+import * as path from 'path';
 import { authUser } from '../auth/login';
 import chalk from 'chalk';
 
@@ -26,11 +26,16 @@ export async function uploadRuleSets(args) {
 }
 
 function loadReducedRuleSets() {
+  const ruleSets = [];
+  let ruleSetLinks = [];
   const TARGET_DIR = process.cwd();
   try {
-    const separator = getSeparatorByPlatform();
-    const doc = yaml.load(fs.readFileSync(TARGET_DIR + separator + 'types.yml', 'utf8'));
-    return [doc.reducedRuleSets, doc.reducedRuleSetLinks];
+    const files = fs.readdirSync(path.join(TARGET_DIR, 'rule-sets'));
+    for(const file of files) {
+      ruleSets.push(yaml.load(fs.readFileSync(path.join(TARGET_DIR, 'rule-sets', file), 'utf8')));
+    }
+    ruleSetLinks = yaml.load(fs.readFileSync(path.join(TARGET_DIR, 'rule-set-links.yml'), 'utf8'));
+    return [ruleSets, ruleSetLinks];
   } catch (e) {
     throw new Error(`ERROR PARSING YAML: ${e}`);
   }
@@ -140,15 +145,7 @@ async function uploadRuleSetLinkObjects(loadedRuleSetLinks) {
         });
       } else {
         if (!transformReducedLink(loadedRuleSetLink, types, currentRuleSets)) { continue; }
-        console.log('Updating: ', loadedRuleSetLink);
-        await new Entities().update({
-          entityName: 'type-rule-set-link',
-          id: found.id,
-          object: {
-            typeRuleSetId: loadedRuleSetLink.ruleSet,
-            typeId: loadedRuleSetLink.type,
-          },
-        });
+        console.log('skipping updating existing rule set link: ', loadedRuleSetLink);
       }
     } catch (err) {
       throw new Error(`Error Uploading rule set links: ${err}`);

package/src/types/type-property-policy-uploader.ts

@@ -1,6 +1,6 @@
 import { Entities } from '@contrail/sdk';
 import fs from 'fs';
-import { getSeparatorByPlatform } from '../common';
+import * as path from 'path';
 import { authUser } from '../auth/login';
 import chalk from 'chalk';
 import { getTypes } from './types-extractor';
@@ -27,11 +27,16 @@ export async function uploadTypePropertyPolicies(args) {
 }
 
 function loadTPPolicies() {
+  const tpps = [];
+  let tppLinks = [];
   const TARGET_DIR = process.cwd();
   try {
-    const separator = getSeparatorByPlatform();
-    const doc = yaml.load(fs.readFileSync(TARGET_DIR + separator + 'types.yml', 'utf8'));
-    return [doc.reducedTypePropertyPolicies, doc.reducedTypePropertyPolicyLinks];
+    const files = fs.readdirSync(path.join(TARGET_DIR, 'type-property-policies'));
+    for(const file of files) {
+      tpps.push(yaml.load(fs.readFileSync(path.join(TARGET_DIR, 'type-property-policies', file), 'utf8')));
+    }
+    tppLinks = yaml.load(fs.readFileSync(path.join(TARGET_DIR, 'type-property-policy-links.yml'), 'utf8'));
+    return [tpps, tppLinks];
   } catch (e) {
     throw new Error(`ERROR PARSING YAML: ${e}`);
   }
@@ -102,7 +107,6 @@ async function uploadTypePropertyPolicyLinks(reducedTypePropertyPolicyLinks) {
     .map(t => t.typeProperties)
     .reduce((a, b) => a.concat(b));
 
-
   const currentTPPs = await new Entities().get({
     entityName: 'type-property-policy',
   });

package/src/types/types-extractor.ts

@@ -3,7 +3,7 @@ import { ReducedType, ReducedTypeProperty } from './interfaces';
 import chalk from 'chalk';
 import fs from 'fs';
 import { authUser } from '../auth/login';
-import { getSeparatorByPlatform } from '../common';
+import * as path from 'path';
 import pLimit from 'p-limit';
 const limit = pLimit(30);
 
@@ -26,7 +26,7 @@ export async function getAll(args) {
     console.log(`%s Getting all types for orgId: ${userConfig.orgId}`, chalk.blue.bold('START'));
 
     // make directory to house exports
-    const dir = `./types-${Date.now()}`;
+    const dir = `./contrail-export-${Date.now()}`;
     fs.mkdirSync(dir);
 
     const data: DataHolder = {
@@ -40,7 +40,6 @@ export async function getAll(args) {
       typePropertyPolicyLinks: await getTypePropertyPolicyLinks(),
     };
     const reducedData = reduceData(data);
-    storeOptionSets(data, dir);
     saveData(reducedData, dir);
 
     console.log('%s Retrieved', chalk.yellow.bold('TYPES'));
@@ -243,6 +242,7 @@ export function reduceTypes(dataHolder: DataHolder) {
         inherited: typeProperty.inherited,
         formulaFunction: typeProperty.formulaFunction,
         validationFunction: typeProperty.validationFunction,
+        numberFormat: typeProperty.numberFormat,
       };
 
       reducedTypeProperties.push(reducedTypeProperty);
@@ -276,23 +276,37 @@ export function reduceData(data: DataHolder) {
   };
 }
 
-function storeOptionSets(data: DataHolder, dir: string) {
-  let reducedOptionSets = reduceOptionSets(data);
-  reducedOptionSets = reducedOptionSets.sort((one, two) => (one.name < two.name ? -1 : 1));
-  const optionSetsHolder = {
-    reducedOptionSets,
-  };
-
-  const CURRENT_DIR = process.cwd();
-  const separator = getSeparatorByPlatform();
+function saveData(reducedData, dir: string) {
 
-  const yamlStr = yaml.dump(optionSetsHolder);
-  fs.writeFileSync(CURRENT_DIR + separator + dir + separator + 'option_sets.yml', yamlStr, 'utf8');
-}
+  const propertyToFolderMap = {
+    reducedTypes: { filename: 'types', split: true, fileLabel: 'slug' },
+    reducedOptionSets: { filename: 'option-sets', split: true, fileLabel: 'name' },
+    reducedOptionSetHierarchies: { filename: 'option-set-hierarchies', split: true, fileLabel: 'name' },
+    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: '' },
+  };
+  for(const [key, folder] of Object.entries(propertyToFolderMap)) {
+    const CURRENT_DIR = process.cwd();
+    if(folder.split) {
+      const subDir = path.join(CURRENT_DIR, dir, folder.filename);
+      if(!fs.existsSync(subDir)) {
+        fs.mkdirSync(subDir);
+      }
+      for(const item of reducedData[key]) {
+        const yamlStr = yaml.dump(item);
+        const fileLabel = item[folder.fileLabel];
+        if(!fileLabel) {
+          console.warn('skipping bad data:', item);
+        }
+        fs.writeFileSync(path.join(subDir, `${fileLabel}.yml`), yamlStr, 'utf8');
+      }
+    } else {
+      const yamlStr = yaml.dump(reducedData[key]);
+      fs.writeFileSync(path.join(CURRENT_DIR, dir, `${folder.filename}.yml`), yamlStr, 'utf8');
+    }
 
-function saveData(reducedData, dir: string) {
-  const yamlStr = yaml.dump(reducedData);
-  const CURRENT_DIR = process.cwd();
-  const separator = getSeparatorByPlatform();
-  fs.writeFileSync(CURRENT_DIR + separator + dir + separator + 'types.yml', yamlStr, 'utf8');
+  }
 }

package/src/types/types-uploader.ts

@@ -3,7 +3,7 @@ import { ReducedType } from './interfaces';
 import chalk from 'chalk';
 import fs from 'fs';
 import { authUser } from '../auth/login';
-import { getSeparatorByPlatform } from '../common';
+import * as path from 'path';
 import * as _ from 'lodash';
 
 import yaml from 'js-yaml';
@@ -29,9 +29,12 @@ export async function uploadTypes() {
 function loadReducedTypes(){
   const TARGET_DIR = process.cwd();
   try {
-    const separator = getSeparatorByPlatform();
-    const doc = yaml.load(fs.readFileSync(TARGET_DIR + separator + 'types.yml', 'utf8'));
-    return doc.reducedTypes;
+    const files = fs.readdirSync(path.join(TARGET_DIR, 'types'));
+    const types = [];
+    for(const file of files) {
+      types.push(yaml.load(fs.readFileSync(path.join(TARGET_DIR, 'types', file), 'utf8')));
+    }
+    return types;
   } catch (e) {
     throw new Error(`ERROR PARSING YAML: ${e}`);
   }

package/src/types/usage-info-uploader.ts

@@ -1,9 +1,9 @@
 import { Entities } from '@contrail/sdk';
 import fs from 'fs';
-import { getSeparatorByPlatform } from '../common';
 import { authUser } from '../auth/login';
 import chalk from 'chalk';
 import { getTypes } from './types-extractor';
+import * as path from 'path';
 
 const yaml = require('js-yaml');
 
@@ -28,9 +28,8 @@ export async function uploadUsageInfo(args) {
 function loadUsageInfo() {
   const TARGET_DIR = process.cwd();
   try {
-    const separator = getSeparatorByPlatform();
-    const doc = yaml.load(fs.readFileSync(TARGET_DIR + separator + 'types.yml', 'utf8'));
-    return doc.reducedUsageInfo;
+    const doc = yaml.load(fs.readFileSync(path.join(TARGET_DIR, 'usage-info.yml'), 'utf8'));
+    return doc;
   } catch (e) {
     throw new Error(`ERROR PARSING YAML: ${e}`);
   }