@contrail/cli 1.0.3 → 1.0.4

package/lib/{create-app → apps/create-app}/create.js

@@ -37,11 +37,7 @@ async function promptForMissingOptions(options) {
         });
     }
     const answers = await inquirer.prompt(questions);
-    return {
-        ...options,
-        appName: options.appName || answers.appName,
-        template: options.template || answers.template,
-    };
+    return Object.assign(Object.assign({}, options), { appName: options.appName || answers.appName, template: options.template || answers.template });
 }
 export async function create(args) {
     let options = parseArgumentsIntoOptions(args);

package/lib/{create-app → apps/create-app}/setup-template.js

@@ -12,7 +12,7 @@ function copyTemplate(templateDir) {
     });
 }
 export async function setUpTemplate(options) {
-    const templateDir = path.resolve(new URL(currentFileUrl).pathname, `../../../templates/${options.template.toLocaleLowerCase()}`).replace(/\\/g, '\\').replace(/(.):\\(.):/g, '').replace(/%20/g, ' ');
+    const templateDir = path.resolve(new URL(currentFileUrl).pathname, `../../../../templates/${options.template.toLocaleLowerCase()}`).replace(/\\/g, '\\').replace(/(.):\\(.):/g, '').replace(/%20/g, ' ');
     try {
         const tasks = new Listr([
             {

package/lib/{deploy-app → apps/deploy-app}/actions-deployer.js

@@ -1,6 +1,7 @@
 import { Entities } from '@contrail/sdk';
 import chalk from 'chalk';
 import { ConfigPropertiesParser } from './app-template-parsers';
+import { getSeparatorByPlatform } from '../../common';
 import fs from 'fs';
 export class ActionsDeployer {
     async deployActions(appDeclaration, app) {
@@ -77,10 +78,9 @@ export class ActionsDeployer {
             throw new Error('Action handler must be a .js file.');
         }
         const CURRENT_DIR = process.cwd();
-        const isWin = process.platform === 'win32';
-        const separator = isWin ? '\\' : '/';
-        const functionLocaiton = CURRENT_DIR + separator + actionDeclaration.handler;
-        const content = fs.readFileSync(functionLocaiton);
+        const separator = getSeparatorByPlatform();
+        const functionLocation = CURRENT_DIR + separator + actionDeclaration.handler;
+        const content = fs.readFileSync(functionLocation);
         return content.toString();
     }
 }

package/lib/{deploy-app → apps/deploy-app}/app-deployer.js

@@ -1,6 +1,6 @@
 import { Entities } from '@contrail/sdk';
 import chalk from 'chalk';
-import { Auth } from '../auth/auth';
+import { Auth } from '../../auth/auth';
 import { ActionsDeployer } from './actions-deployer';
 import { TriggerKeyDefinitionParser, ConfigPropertiesParser } from './app-template-parsers';
 export class AppDeployer {

package/lib/{deploy-app → apps/deploy-app}/deploy.js

@@ -1,12 +1,14 @@
 import chalk from 'chalk';
 import fs from 'fs';
-import { authUser } from '../auth/login';
+import { authUser } from '../../auth/login';
 import { AppDeployer } from './app-deployer';
+import { getSeparatorByPlatform } from '../../common';
 const yaml = require('js-yaml');
 function loadAppConfig() {
     const TARGET_DIR = process.cwd();
     try {
-        const doc = yaml.load(fs.readFileSync(TARGET_DIR + '/app.yml', 'utf8'));
+        const separator = getSeparatorByPlatform();
+        const doc = yaml.load(fs.readFileSync(TARGET_DIR + separator + 'app.yml', 'utf8'));
         console.log(doc);
         return doc;
     }

package/lib/auth/login.d.ts

@@ -1 +1,2 @@
-export declare function authUser(): Promise<unknown>;
+import { AuthContext } from './auth';
+export declare function authUser(): Promise<AuthContext>;

package/lib/auth/login.js

@@ -60,8 +60,8 @@ export async function authUser() {
         cognitoUser.authenticateUser(authDetails, {
             onSuccess: async (result) => {
                 const user = result;
-                await setAuthContext(user, params);
-                resolve({ success: true, data: result });
+                const config = await setAuthContext(user, params);
+                resolve(config);
             },
             onFailure: (err) => {
                 reject(err);
@@ -109,4 +109,5 @@ async function setAuthContext(user, params) {
     if (org) {
         Auth.config.orgId = org.orgId || org.id;
     }
+    return Object.assign({}, Auth.config);
 }

package/lib/cli.js

@@ -1,5 +1,7 @@
-import { create } from './create-app/create';
-import { deployApp, removeApp } from './deploy-app/deploy';
+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';
 /**
  *  Built using documentation here:
  *  https://www.twilio.com/blog/how-to-build-a-cli-with-node-js
@@ -20,7 +22,11 @@ export async function cli(args) {
             break;
         }
         case 'extract-types': {
-            // TODO
+            getTypes(args);
+            break;
+        }
+        case 'upload-types': {
+            uploadTypes(args);
             break;
         }
         default: {

package/lib/common.d.ts

@@ -0,0 +1 @@
+export declare function getSeparatorByPlatform(): "\\" | "/";

package/lib/common.js

@@ -0,0 +1,5 @@
+export function getSeparatorByPlatform() {
+    const isWin = process.platform === 'win32';
+    const separator = isWin ? '\\' : '/';
+    return separator;
+}

package/lib/types/interfaces.d.ts

@@ -0,0 +1,51 @@
+export interface ReducedType {
+    slug: string;
+    label: string;
+    typePath: string;
+    isArchived: boolean;
+    typeProperties: ReducedType[];
+}
+export interface ReducedTypeProperties {
+    id: string;
+    isArchived: boolean;
+    propertyType: PropertyType;
+    slug: string;
+    label: string;
+    editable: boolean;
+    core: boolean;
+    typePropertyOptionSetId: string;
+    formula: string;
+    referencedTypeRootSlug: string;
+    defaultValue: string;
+    propertyLevel: string;
+    inherited: boolean;
+}
+export interface ReducedOptionSet {
+    id: string;
+    name: string;
+    isArchived: boolean;
+    optionSet: any[];
+}
+export declare enum PropertyType {
+    Text = "text",
+    String = "string",
+    Number = "number",
+    Date = "date",
+    Boolean = "boolean",
+    MultiSelect = "multi_select",
+    SingleSelect = "choice",
+    Url = "url",
+    Currency = "currency",
+    Percent = "percent",
+    Rating = "rating",
+    Formula = "formula",
+    ObjectReference = "object_reference",
+    ObjectReferenceList = "object_ref_list",
+    DataGrid = "data_grid",
+    CascadingSelect = "cascading_select",
+    Sequence = "sequence",
+    Constant = "constant",
+    Composite = "composite",
+    UserList = "userList",
+    Image = "image"
+}

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

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

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

@@ -0,0 +1,75 @@
+import { Entities } from '@contrail/sdk';
+import fs from 'fs';
+import { getSeparatorByPlatform } from '../common';
+const yaml = require('js-yaml');
+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.optionSets;
+    }
+    catch (e) {
+        throw new Error(`ERROR PARSING YAML: ${e}`);
+    }
+}
+export async function uploadOptionSets() {
+    const optionSets = loadOptionSets();
+    const currentOptionSets = await new Entities().get({
+        entityName: 'type-property-option-set',
+    });
+    const currentOptionSetsByName = {};
+    for (const currentOptionSet of currentOptionSets) {
+        currentOptionSetsByName[currentOptionSet.name] = currentOptionSet;
+    }
+    const newOptionSetsByName = {};
+    for (const optionSet of optionSets) {
+        newOptionSetsByName[optionSet.name] = optionSet;
+    }
+    for (const optionSet of optionSets) {
+        try {
+            const found = currentOptionSetsByName[optionSet.name];
+            if (!found) {
+                console.log('Creating: ', optionSet.name);
+                await new Entities().create({
+                    entityName: 'type-property-option-set',
+                    object: {
+                        name: optionSet.name,
+                        optionSet: optionSet.optionSet,
+                        isArchived: optionSet.isArchived,
+                    },
+                });
+            }
+            else {
+                console.log('Updating: ', optionSet.name);
+                await new Entities().update({
+                    entityName: 'type-property-option-set',
+                    id: found.id,
+                    object: {
+                        name: optionSet.name,
+                        optionSet: optionSet.optionSet,
+                        isArchived: optionSet.isArchived,
+                    },
+                });
+            }
+        }
+        catch (err) {
+            throw new Error(`Error Uploading OptionSets: ${err}`);
+        }
+    }
+    for (const currentOptionSet of currentOptionSets) {
+        try {
+            const found = newOptionSetsByName[currentOptionSet.name];
+            if (!found) {
+                console.log('Deleting: ', currentOptionSet.name);
+                await new Entities().delete({
+                    entityName: 'type-property-option-set',
+                    id: currentOptionSet.id,
+                });
+            }
+        }
+        catch (err) {
+            throw new Error(`Error Deleting OptionSets: ${err}`);
+        }
+    }
+}

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

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

package/lib/types/types-extractor.js

@@ -0,0 +1,93 @@
+import { Entities } from '@contrail/sdk';
+import chalk from 'chalk';
+import fs from 'fs';
+import { authUser } from '../auth/login';
+import { getSeparatorByPlatform } from '../common';
+const yaml = require('js-yaml');
+export async function getTypes(args) {
+    try {
+        const userConfig = await authUser();
+        console.log(`%s Getting all types for orgId: ${userConfig.orgId}`, chalk.blue.bold('START'));
+        console.log(`%s Retrieving`, chalk.yellow.bold('OPTION SETS'));
+        await getOptionSets();
+        console.log(`%s Retrieved`, chalk.yellow.bold('OPTION SETS'));
+        console.log(`%s Retrieving`, chalk.yellow.bold('TYPES'));
+        await getReducedTypes();
+        console.log(`%s Retrieved`, chalk.yellow.bold('TYPES'));
+    }
+    catch (e) {
+        console.log(`%s Types Retrieval Failed. ${e}`, chalk.red.bold('FAIL'));
+        return;
+    }
+    console.log('%s Types Retrieval Complete.', chalk.green.bold('COMPLETE'));
+}
+async function getOptionSets() {
+    const optionSets = await new Entities().get({
+        entityName: 'type-property-option-set',
+    });
+    const reducedOptionSets = [];
+    for (const optionSet of optionSets) {
+        const reducedOptionSet = {
+            id: optionSet.id,
+            name: optionSet.name,
+            isArchived: optionSet.isArchived,
+            optionSet: optionSet.optionSet,
+        };
+        reducedOptionSets.push(reducedOptionSet);
+    }
+    const optionSetsHolder = {
+        optionSets: reducedOptionSets,
+    };
+    const CURRENT_DIR = process.cwd();
+    const separator = getSeparatorByPlatform();
+    const yamlStr = yaml.dump(optionSetsHolder);
+    fs.writeFileSync(CURRENT_DIR + separator + 'option_sets.yml', yamlStr, 'utf8');
+}
+async function getReducedTypes() {
+    const types = await new Entities().get({
+        entityName: 'type',
+    });
+    console.log('Found types: ', types.length);
+    const reducedTypes = [];
+    for (const type of types) {
+        const typeWithProperties = await new Entities().get({
+            entityName: 'type',
+            id: type.id,
+            relations: ['typeProperties'],
+        });
+        const reducedTypeProperties = [];
+        for (const typeProperty of typeWithProperties.typeProperties) {
+            const reducedTypeProperty = {
+                id: typeProperty.id,
+                isArchived: typeProperty.isArchived,
+                propertyType: typeProperty.propertyType,
+                slug: typeProperty.slug,
+                label: typeProperty.label,
+                editable: typeProperty.editable,
+                core: typeProperty.core,
+                typePropertyOptionSetId: typeProperty.typePropertyOptionSetId,
+                formula: typeProperty.formula,
+                referencedTypeRootSlug: typeProperty.referencedTypeRootSlug,
+                defaultValue: typeProperty.defaultValue,
+                propertyLevel: typeProperty.propertyLevel,
+                inherited: typeProperty.inherited,
+            };
+            reducedTypeProperties.push(reducedTypeProperty);
+        }
+        const reducedType = {
+            slug: typeWithProperties.slug,
+            label: typeWithProperties.label,
+            typePath: typeWithProperties.typePath,
+            isArchived: typeWithProperties.isArchived,
+            typeProperties: reducedTypeProperties,
+        };
+        reducedTypes.push(reducedType);
+    }
+    const typesHolder = {
+        types: reducedTypes,
+    };
+    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-uploader.d.ts

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

package/lib/types/types-uploader.js

@@ -0,0 +1,171 @@
+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';
+import { getSeparatorByPlatform } from '../common';
+const yaml = require('js-yaml');
+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'));
+    }
+    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 loadReducedTypes() {
+    const TARGET_DIR = process.cwd();
+    try {
+        const separator = getSeparatorByPlatform();
+        const doc = yaml.load(fs.readFileSync(TARGET_DIR + separator + 'types.yml', 'utf8'));
+        return doc.types;
+    }
+    catch (e) {
+        throw new Error(`ERROR PARSING YAML: ${e}`);
+    }
+}
+async function uploadReducedTypes() {
+    const types = loadReducedTypes();
+    const currentTypesWithoutProperties = await new Entities().get({
+        entityName: 'type',
+    });
+    const currentTypes = [];
+    for (const currentTypeWithoutProperties of currentTypesWithoutProperties) {
+        const typeWithProperties = await new Entities().get({
+            entityName: 'type',
+            id: currentTypeWithoutProperties.id,
+            relations: ['typeProperties'],
+        });
+        currentTypes.push(typeWithProperties);
+    }
+    const currentTypesBySlug = {};
+    for (const currentType of currentTypes) {
+        currentTypesBySlug[currentType.slug] = currentType;
+    }
+    const newTypesBySlug = {};
+    for (const type of types) {
+        newTypesBySlug[type.slug] = type;
+    }
+    for (const type of types) {
+        try {
+            const found = currentTypesBySlug[type.slug];
+            if (!found) {
+                if (!type.typePath.includes(':')) {
+                    console.log('Cannot create a base type. Skipping: ', type.slug);
+                    continue;
+                }
+                console.log('Creating Type: ', type.slug);
+                const createdType = await new Entities().create({
+                    entityName: 'type',
+                    object: {
+                        slug: type.slug,
+                        label: type.label,
+                        typePath: type.typePath,
+                        isArchived: type.isArchived,
+                    },
+                });
+                await uploadReducedTypeProperties(createdType, [], type.typeProperties);
+            }
+            else {
+                console.log('Updating Type: ', type.slug);
+                const updatedType = await new Entities().update({
+                    entityName: 'type',
+                    id: found.id,
+                    object: {
+                        slug: type.slug,
+                        label: type.label,
+                        typePath: type.typePath,
+                        isArchived: type.isArchived,
+                    },
+                });
+                await uploadReducedTypeProperties(updatedType, found.typeProperties, type.typeProperties);
+            }
+        }
+        catch (err) {
+            console.log('Error Uploading Types: ', err);
+        }
+    }
+    for (const currentType of currentTypes) {
+        try {
+            const found = newTypesBySlug[currentType.slug];
+            if (!found) {
+                console.log('Deleting Type: ', currentType.slug);
+                await new Entities().delete({
+                    entityName: 'type',
+                    id: currentType.id,
+                });
+            }
+        }
+        catch (err) {
+            throw new Error(`Error Deleting Types: ${err}`);
+        }
+    }
+}
+async function uploadReducedTypeProperties(type, currentPropertyTypes, newPropertyTypes) {
+    const currentPropertyTypeBySlug = {};
+    for (const currentPropertyType of currentPropertyTypes) {
+        currentPropertyTypeBySlug[currentPropertyType.slug] = currentPropertyType;
+    }
+    const newPropertyTypesBySlug = {};
+    for (const newPropertyType of newPropertyTypes) {
+        newPropertyTypesBySlug[newPropertyType.slug] = newPropertyType;
+    }
+    for (const newPropertyType of newPropertyTypes) {
+        try {
+            const found = currentPropertyTypeBySlug[newPropertyType.slug];
+            if (!found && !newPropertyType.inherited) {
+                console.log('Creating Type-Property: ', newPropertyType.slug);
+                await Request.request(`/types/${type.id}/type-properties`, {
+                    method: 'POST',
+                    body: JSON.stringify({
+                        isArchived: newPropertyType.isArchived,
+                        propertyType: newPropertyType.propertyType,
+                        slug: newPropertyType.slug,
+                        label: newPropertyType.label,
+                        editable: newPropertyType.editable,
+                        core: newPropertyType.core,
+                        typePropertyOptionSetId: newPropertyType.typePropertyOptionSetId,
+                        formula: newPropertyType.formula,
+                        referencedTypeRootSlug: newPropertyType.referencedTypeRootSlug,
+                        defaultValue: newPropertyType.defaultValue,
+                        propertyLevel: newPropertyType.propertyLevel,
+                    }),
+                    headers: {
+                        'Accept': 'application/json',
+                        'Content-Type': 'application/json',
+                    },
+                });
+            }
+        }
+        catch (err) {
+            console.log('Error Creating Properties: ', err);
+        }
+    }
+    for (const currentPropertyType of currentPropertyTypes) {
+        try {
+            const found = newPropertyTypesBySlug[currentPropertyType.slug];
+            if (!found && !currentPropertyType.inherited) {
+                console.log('Deleting Type-Property: ', currentPropertyType.slug);
+                await Request.request(`/types/${type.id}/type-properties/${currentPropertyType.id}`, {
+                    method: 'DELETE',
+                    headers: {
+                        'Accept': 'application/json',
+                        'Content-Type': 'application/json',
+                    },
+                });
+            }
+        }
+        catch (err) {
+            throw new Error(`Error Deleting Properties: ${err}`);
+        }
+    }
+}

package/package.json

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

package/src/{create-app → apps/create-app}/setup-template.ts

@@ -16,7 +16,7 @@ function copyTemplate(templateDir){
 }
 
 export async function setUpTemplate(options) {
-  const templateDir = path.resolve(new URL(currentFileUrl).pathname, `../../../templates/${options.template.toLocaleLowerCase()}`).replace(/\\/g, '\\').replace(/(.):\\(.):/g, '').replace(/%20/g, ' ');
+  const templateDir = path.resolve(new URL(currentFileUrl).pathname, `../../../../templates/${options.template.toLocaleLowerCase()}`).replace(/\\/g, '\\').replace(/(.):\\(.):/g, '').replace(/%20/g, ' ');
   try {
     const tasks = new Listr([
       {

package/src/{deploy-app → apps/deploy-app}/actions-deployer.ts

@@ -2,6 +2,8 @@ import { Entities } from '@contrail/sdk';
 import chalk from 'chalk';
 import { App, AppDeclaration, AppActionDeclaration, EventWorkflowActionDefinition } from './interfaces';
 import { ConfigPropertiesParser } from './app-template-parsers';
+import { getSeparatorByPlatform } from '../../common';
+
 import fs from 'fs';
 
 export class ActionsDeployer {
@@ -99,11 +101,10 @@ export class ActionsDeployer {
       throw new Error('Action handler must be a .js file.');
     }
     const CURRENT_DIR = process.cwd();
-    const isWin = process.platform === 'win32';
-    const separator = isWin ? '\\' : '/';
+    const separator = getSeparatorByPlatform();
 
-    const functionLocaiton = CURRENT_DIR + separator + actionDeclaration.handler;
-    const content = fs.readFileSync(functionLocaiton);
+    const functionLocation = CURRENT_DIR + separator + actionDeclaration.handler;
+    const content = fs.readFileSync(functionLocation);
     return content.toString();
   }
 }

package/src/{deploy-app → apps/deploy-app}/app-deployer.ts

@@ -1,6 +1,6 @@
 import { Entities } from '@contrail/sdk';
 import chalk from 'chalk';
-import { Auth } from '../auth/auth';
+import { Auth } from '../../auth/auth';
 import { ActionsDeployer } from './actions-deployer';
 import { App, AppDeclaration } from './interfaces';
 import { TriggerKeyDefinitionParser, ConfigPropertiesParser } from './app-template-parsers';

package/src/{deploy-app → apps/deploy-app}/deploy.ts

@@ -1,14 +1,16 @@
 import chalk from 'chalk';
 import fs from 'fs';
-import { authUser } from '../auth/login';
+import { authUser } from '../../auth/login';
 import { AppDeployer } from './app-deployer';
 import { AppDeclaration } from './interfaces';
+import { getSeparatorByPlatform } from '../../common';
 const yaml = require('js-yaml');
 
 function loadAppConfig(){
   const TARGET_DIR = process.cwd();
   try {
-    const doc = yaml.load(fs.readFileSync(TARGET_DIR + '/app.yml', 'utf8'));
+    const separator = getSeparatorByPlatform();
+    const doc = yaml.load(fs.readFileSync(TARGET_DIR + separator + 'app.yml', 'utf8'));
     console.log(doc);
     return doc;
   } catch (e) {

package/src/auth/login.ts

@@ -1,14 +1,14 @@
 const AmazonCognitoIdentity = require('amazon-cognito-identity-js');
 import inquirer from 'inquirer';
 import { Request, setConfig } from '@contrail/sdk';
-import { Auth } from './auth';
+import { Auth, AuthContext } from './auth';
 
 const CONFIGURATION = {
     userPoolId: 'us-east-1_x8hXZUsL6',
     clientId: process.env.CONTRAIL_COGNITO_CLIENT_ID || '2oubek96sue5rsncovtqhs3scm',
 };
 
-export async function authUser(){
+export async function authUser(): Promise<AuthContext>{
     const questions = [];
     if (!process.env.CONTRAIL_CLI_EMAIL) {
         questions.push({
@@ -68,9 +68,9 @@ export async function authUser(){
         cognitoUser.authenticateUser(authDetails, {
             onSuccess: async (result) => {
                 const user = result;
-                await setAuthContext(user, params);
+                const config = await setAuthContext(user, params);
 
-                resolve({success: true, data: result});
+                resolve(config);
             },
             onFailure: (err) => {
                 reject(err);
@@ -79,7 +79,7 @@ export async function authUser(){
     });
 }
 
-async function setAuthContext(user, params){
+async function setAuthContext(user, params): Promise<AuthContext> {
 
     // TODO Dont allow user to set this - they could set dev
     const questions = [];
@@ -122,4 +122,6 @@ async function setAuthContext(user, params){
     if (org) {
         Auth.config.orgId = org.orgId || org.id;
     }
+
+    return Object.assign({}, Auth.config);
 }

package/src/cli.ts

@@ -1,6 +1,8 @@
 
-import { create } from './create-app/create';
-import { deployApp, removeApp } from './deploy-app/deploy';
+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';
 /**
  *  Built using documentation here:
  *  https://www.twilio.com/blog/how-to-build-a-cli-with-node-js
@@ -22,7 +24,11 @@ export async function cli(args) {
       break;
     }
     case 'extract-types': {
-      // TODO
+      getTypes(args);
+      break;
+    }
+    case 'upload-types': {
+      uploadTypes(args);
       break;
     }
     default: {

package/src/common.ts

@@ -0,0 +1,5 @@
+export function getSeparatorByPlatform() {
+  const isWin = process.platform === 'win32';
+  const separator = isWin ? '\\' : '/';
+  return separator;
+}

package/src/types/interfaces.ts

@@ -0,0 +1,54 @@
+export interface ReducedType {
+  slug: string;
+  label: string;
+  typePath: string;
+  isArchived: boolean;
+  typeProperties: ReducedType[];
+}
+
+export interface ReducedTypeProperties {
+  id: string;
+  isArchived: boolean;
+  propertyType: PropertyType;
+  slug: string;
+  label: string;
+  editable: boolean;
+  core: boolean;
+  typePropertyOptionSetId: string;
+  formula: string;
+  referencedTypeRootSlug: string;
+  defaultValue: string;
+  propertyLevel: string;
+  inherited: boolean;
+}
+
+export interface ReducedOptionSet {
+  id: string;
+  name: string;
+  isArchived: boolean;
+  optionSet: any[];
+}
+
+export declare enum PropertyType {
+  Text = 'text',
+  String = 'string',
+  Number = 'number',
+  Date = 'date',
+  Boolean = 'boolean',
+  MultiSelect = 'multi_select',
+  SingleSelect = 'choice',
+  Url = 'url',
+  Currency = 'currency',
+  Percent = 'percent',
+  Rating = 'rating',
+  Formula = 'formula',
+  ObjectReference = 'object_reference',
+  ObjectReferenceList = 'object_ref_list',
+  DataGrid = 'data_grid',
+  CascadingSelect = 'cascading_select',
+  Sequence = 'sequence',
+  Constant = 'constant',
+  Composite = 'composite',
+  UserList = 'userList',
+  Image = 'image',
+}

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

@@ -0,0 +1,83 @@
+import { Entities } from '@contrail/sdk';
+import { ReducedOptionSet } from './interfaces';
+import fs from 'fs';
+import { getSeparatorByPlatform } from '../common';
+
+const yaml = require('js-yaml');
+
+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.optionSets;
+  } catch (e) {
+    throw new Error(`ERROR PARSING YAML: ${e}`);
+  }
+}
+
+export async function uploadOptionSets() {
+  const optionSets: ReducedOptionSet[] = loadOptionSets();
+
+  const currentOptionSets = await new Entities().get({
+    entityName: 'type-property-option-set',
+  });
+
+  const currentOptionSetsByName = {};
+  for (const currentOptionSet of currentOptionSets) {
+    currentOptionSetsByName[currentOptionSet.name] = currentOptionSet;
+  }
+
+  const newOptionSetsByName = {};
+  for (const optionSet of optionSets) {
+    newOptionSetsByName[optionSet.name] = optionSet;
+  }
+
+  for (const optionSet of optionSets) {
+    try {
+      const found = currentOptionSetsByName[optionSet.name];
+      if (!found) {
+        console.log('Creating: ', optionSet.name);
+        await new Entities().create({
+          entityName: 'type-property-option-set',
+          object: {
+            name: optionSet.name,
+            optionSet: optionSet.optionSet,
+            isArchived: optionSet.isArchived,
+          },
+        });
+      }
+      else
+      {
+        console.log('Updating: ', optionSet.name);
+        await new Entities().update({
+          entityName: 'type-property-option-set',
+          id: found.id,
+          object: {
+            name: optionSet.name,
+            optionSet: optionSet.optionSet,
+            isArchived: optionSet.isArchived,
+          },
+        });
+      }
+    } catch (err) {
+      throw new Error(`Error Uploading OptionSets: ${err}`);
+    }
+  }
+
+  for (const currentOptionSet of currentOptionSets) {
+    try {
+      const found = newOptionSetsByName[currentOptionSet.name];
+      if (!found) {
+        console.log('Deleting: ', currentOptionSet.name);
+        await new Entities().delete({
+          entityName: 'type-property-option-set',
+          id: currentOptionSet.id,
+        });
+      }
+    } catch (err) {
+      throw new Error(`Error Deleting OptionSets: ${err}`);
+    }
+  }
+
+}

package/src/types/types-extractor.ts

@@ -0,0 +1,116 @@
+import { Entities } from '@contrail/sdk';
+import { ReducedType, ReducedOptionSet, ReducedTypeProperties } from './interfaces';
+import chalk from 'chalk';
+import fs from 'fs';
+import { authUser } from '../auth/login';
+import { getSeparatorByPlatform } from '../common';
+
+const yaml = require('js-yaml');
+
+export async function getTypes(args) {
+  try {
+    const userConfig = await authUser();
+    console.log(`%s Getting all types for orgId: ${userConfig.orgId}`, chalk.blue.bold('START'));
+
+    console.log(`%s Retrieving`, chalk.yellow.bold('OPTION SETS'));
+    await getOptionSets();
+    console.log(`%s Retrieved`, chalk.yellow.bold('OPTION SETS'));
+
+    console.log(`%s Retrieving`, chalk.yellow.bold('TYPES'));
+    await getReducedTypes();
+    console.log(`%s Retrieved`, chalk.yellow.bold('TYPES'));
+
+  }
+  catch (e) {
+    console.log(`%s Types Retrieval Failed. ${e}`, chalk.red.bold('FAIL'));
+    return;
+  }
+
+  console.log('%s Types Retrieval Complete.', chalk.green.bold('COMPLETE'));
+}
+
+async function getOptionSets() {
+  const optionSets = await new Entities().get({
+    entityName: 'type-property-option-set',
+  });
+
+  const reducedOptionSets = [];
+  for (const optionSet of optionSets) {
+    const reducedOptionSet: ReducedOptionSet = {
+      id: optionSet.id,
+      name: optionSet.name,
+      isArchived: optionSet.isArchived,
+      optionSet: optionSet.optionSet,
+    };
+
+    reducedOptionSets.push(reducedOptionSet);
+  }
+
+  const optionSetsHolder = {
+    optionSets: reducedOptionSets,
+  };
+
+  const CURRENT_DIR = process.cwd();
+  const separator = getSeparatorByPlatform();
+
+  const yamlStr = yaml.dump(optionSetsHolder);
+  fs.writeFileSync(CURRENT_DIR + separator + 'option_sets.yml', yamlStr, 'utf8');
+}
+
+async function getReducedTypes() {
+  const types = await new Entities().get({
+    entityName: 'type',
+  });
+
+  console.log('Found types: ', types.length);
+
+  const reducedTypes = [];
+  for (const type of types) {
+    const typeWithProperties = await new Entities().get({
+      entityName: 'type',
+      id: type.id,
+      relations: ['typeProperties'],
+    });
+
+    const reducedTypeProperties = [];
+    for (const typeProperty of typeWithProperties.typeProperties) {
+      const reducedTypeProperty: ReducedTypeProperties = {
+        id: typeProperty.id,
+        isArchived: typeProperty.isArchived,
+        propertyType: typeProperty.propertyType,
+        slug: typeProperty.slug,
+        label: typeProperty.label,
+        editable: typeProperty.editable,
+        core: typeProperty.core,
+        typePropertyOptionSetId: typeProperty.typePropertyOptionSetId,
+        formula: typeProperty.formula,
+        referencedTypeRootSlug: typeProperty.referencedTypeRootSlug,
+        defaultValue: typeProperty.defaultValue,
+        propertyLevel: typeProperty.propertyLevel,
+        inherited: typeProperty.inherited,
+      };
+
+      reducedTypeProperties.push(reducedTypeProperty);
+    }
+
+    const reducedType: ReducedType = {
+      slug: typeWithProperties.slug,
+      label: typeWithProperties.label,
+      typePath: typeWithProperties.typePath,
+      isArchived: typeWithProperties.isArchived,
+      typeProperties: reducedTypeProperties,
+    };
+
+    reducedTypes.push(reducedType);
+  }
+
+  const typesHolder = {
+    types: reducedTypes,
+  };
+
+  const CURRENT_DIR = process.cwd();
+  const separator = getSeparatorByPlatform();
+
+  const yamlStr = yaml.dump(typesHolder);
+  fs.writeFileSync(CURRENT_DIR + separator + 'types.yml', yamlStr, 'utf8');
+}

package/src/types/types-uploader.ts

@@ -0,0 +1,198 @@
+import { Entities, Request } from '@contrail/sdk';
+import { ReducedType, ReducedTypeProperties } from './interfaces';
+import { uploadOptionSets } from './option-set-uploader';
+import chalk from 'chalk';
+import fs from 'fs';
+import { authUser } from '../auth/login';
+import { getSeparatorByPlatform } from '../common';
+
+const yaml = require('js-yaml');
+
+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'));
+
+  }
+  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 loadReducedTypes(){
+  const TARGET_DIR = process.cwd();
+  try {
+    const separator = getSeparatorByPlatform();
+    const doc = yaml.load(fs.readFileSync(TARGET_DIR + separator + 'types.yml', 'utf8'));
+    return doc.types;
+  } catch (e) {
+    throw new Error(`ERROR PARSING YAML: ${e}`);
+  }
+}
+
+async function uploadReducedTypes() {
+  const types: ReducedType[] = loadReducedTypes();
+
+  const currentTypesWithoutProperties = await new Entities().get({
+    entityName: 'type',
+  });
+
+  const currentTypes = [];
+  for (const currentTypeWithoutProperties of currentTypesWithoutProperties) {
+    const typeWithProperties = await new Entities().get({
+      entityName: 'type',
+      id: currentTypeWithoutProperties.id,
+      relations: ['typeProperties'],
+    });
+    currentTypes.push(typeWithProperties);
+  }
+
+  const currentTypesBySlug = {};
+  for (const currentType of currentTypes) {
+    currentTypesBySlug[currentType.slug] = currentType;
+  }
+
+  const newTypesBySlug = {};
+  for (const type of types) {
+    newTypesBySlug[type.slug] = type;
+  }
+
+  for (const type of types) {
+    try {
+      const found = currentTypesBySlug[type.slug];
+      if (!found) {
+        if (!type.typePath.includes(':')) {
+          console.log('Cannot create a base type. Skipping: ', type.slug);
+          continue;
+        }
+
+        console.log('Creating Type: ', type.slug);
+
+        const createdType = await new Entities().create({
+          entityName: 'type',
+          object: {
+            slug: type.slug,
+            label: type.label,
+            typePath: type.typePath,
+            isArchived: type.isArchived,
+          },
+        });
+
+        await uploadReducedTypeProperties(createdType, [], type.typeProperties);
+      }
+      else
+      {
+        console.log('Updating Type: ', type.slug);
+        const updatedType = await new Entities().update({
+          entityName: 'type',
+          id: found.id,
+          object: {
+            slug: type.slug,
+            label: type.label,
+            typePath: type.typePath,
+            isArchived: type.isArchived,
+          },
+        });
+
+        await uploadReducedTypeProperties(updatedType, found.typeProperties, type.typeProperties);
+      }
+
+    } catch (err) {
+      console.log('Error Uploading Types: ', err);
+    }
+  }
+
+  for (const currentType of currentTypes) {
+    try {
+      const found = newTypesBySlug[currentType.slug];
+      if (!found) {
+        console.log('Deleting Type: ', currentType.slug);
+        await new Entities().delete({
+          entityName: 'type',
+          id: currentType.id,
+        });
+      }
+    } catch (err) {
+      throw new Error(`Error Deleting Types: ${err}`);
+    }
+  }
+
+}
+
+async function uploadReducedTypeProperties(type, currentPropertyTypes, newPropertyTypes) {
+  const currentPropertyTypeBySlug = {};
+  for (const currentPropertyType of currentPropertyTypes) {
+    currentPropertyTypeBySlug[currentPropertyType.slug] = currentPropertyType;
+  }
+
+  const newPropertyTypesBySlug = {};
+  for (const newPropertyType of newPropertyTypes) {
+    newPropertyTypesBySlug[newPropertyType.slug] = newPropertyType;
+  }
+
+  for (const newPropertyType of newPropertyTypes) {
+    try {
+      const found = currentPropertyTypeBySlug[newPropertyType.slug];
+      if (!found && !newPropertyType.inherited) {
+        console.log('Creating Type-Property: ', newPropertyType.slug);
+
+        await Request.request(
+          `/types/${type.id}/type-properties`,
+          {
+          method: 'POST',
+          body: JSON.stringify({
+            isArchived: newPropertyType.isArchived,
+            propertyType: newPropertyType.propertyType,
+            slug: newPropertyType.slug,
+            label: newPropertyType.label,
+            editable: newPropertyType.editable,
+            core: newPropertyType.core,
+            typePropertyOptionSetId: newPropertyType.typePropertyOptionSetId,
+            formula: newPropertyType.formula,
+            referencedTypeRootSlug: newPropertyType.referencedTypeRootSlug,
+            defaultValue: newPropertyType.defaultValue,
+            propertyLevel: newPropertyType.propertyLevel,
+          }),
+          headers: {
+              'Accept': 'application/json',
+              'Content-Type': 'application/json',
+          },
+      });
+      }
+
+    } catch (err) {
+      console.log('Error Creating Properties: ', err);
+    }
+  }
+
+  for (const currentPropertyType of currentPropertyTypes) {
+    try {
+      const found = newPropertyTypesBySlug[currentPropertyType.slug];
+      if (!found && !currentPropertyType.inherited) {
+        console.log('Deleting Type-Property: ', currentPropertyType.slug);
+        await Request.request(
+          `/types/${type.id}/type-properties/${currentPropertyType.id}`,
+          {
+          method: 'DELETE',
+          headers: {
+              'Accept': 'application/json',
+              'Content-Type': 'application/json',
+          },
+      });
+      }
+    } catch (err) {
+      throw new Error(`Error Deleting Properties: ${err}`);
+    }
+  }
+}

package/tsconfig.json

@@ -1,6 +1,6 @@
 {
   "compilerOptions": {
-    "target": "esnext",
+    "target": "es2017",
     "module": "esnext",
     "declaration": true,
     "esModuleInterop": true,
@@ -11,7 +11,15 @@
     "noImplicitAny": false,
     "emitDecoratorMetadata": true,
     "skipLibCheck": true,
-    "moduleResolution": "node"
+    "moduleResolution": "node",
+    "lib": [
+      "es5",
+      "ES2015",
+      "ES2016",
+      "ES2017",
+      "dom",
+      "esnext.asynciterable"
+    ],
   },
   "include": [
     "src"

package/templates/javascript/set_auth.bat

@@ -1,3 +0,0 @@
-set CONTRAIL_CLI_EMAIL=
-set CONTRAIL_CLI_PASSWORD=
-set CONTRAIL_CLI_ORGSLUG=

package/templates/javascript/set_auth.sh

@@ -1,3 +0,0 @@
-export CONTRAIL_CLI_EMAIL=
-export CONTRAIL_CLI_PASSWORD=
-export CONTRAIL_CLI_ORGSLUG=

package/templates/typescript/set_auth.bat

@@ -1,3 +0,0 @@
-set CONTRAIL_CLI_EMAIL=
-set CONTRAIL_CLI_PASSWORD=
-set CONTRAIL_CLI_ORGSLUG=

package/templates/typescript/set_auth.sh

@@ -1,3 +0,0 @@
-export CONTRAIL_CLI_EMAIL=
-export CONTRAIL_CLI_PASSWORD=
-export CONTRAIL_CLI_ORGSLUG=