@contrail/cli 1.0.10 → 1.0.14

package/.eslint.js

@@ -0,0 +1,54 @@
+module.exports = {
+  env: {
+    browser: true,
+    es2021: true,
+    node: true
+
+  },
+  extends: [
+    'eslint:recommended',
+    'plugin:@typescript-eslint/eslint-recommended',
+    'plugin:@typescript-eslint/recommended'
+  ],
+  parser: '@typescript-eslint/parser',
+  parserOptions: {
+    ecmaVersion: 'latest',
+    sourceType: 'module'
+  },
+  plugins: [
+    '@typescript-eslint',
+    'unused-imports'
+  ],
+  rules: {
+    indent: [
+      'error',
+      2
+    ],
+    'linebreak-style': [
+      'error',
+      'unix'
+    ],
+    'quote-props': ['error', 'as-needed'],
+    quotes: [
+      'error',
+      'single'
+    ],
+    semi: [
+      'error',
+      'always'
+    ],
+    'no-multiple-empty-lines': ['error', { max: 1, maxEOF: 0 }],
+    'no-trailing-spaces': 'error',
+    'no-mixed-spaces-and-tabs': ['error', 'smart-tabs'],
+    '@typescript-eslint/no-empty-function': ['error', { allow: ['arrowFunctions'] }],
+    '@typescript-eslint/no-explicit-any': 'off',
+    '@typescript-eslint/no-var-requires': 'warn',
+    'no-unused-vars': 'off',
+    'unused-imports/no-unused-imports': 'error',
+    'unused-imports/no-unused-vars': [
+      'warn',
+      { vars: 'all', varsIgnorePattern: '^_', args: 'after-used', argsIgnorePattern: '^_' }
+    ]
+  }
+};
+

package/.eslintrc.js

@@ -0,0 +1,20 @@
+module.exports = {
+    "env": {
+        "browser": true,
+        "es2021": true
+    },
+    "extends": [
+        "eslint:recommended",
+        "plugin:@typescript-eslint/recommended"
+    ],
+    "parser": "@typescript-eslint/parser",
+    "parserOptions": {
+        "ecmaVersion": "latest",
+        "sourceType": "module"
+    },
+    "plugins": [
+        "@typescript-eslint"
+    ],
+    "rules": {
+    }
+}

package/lib/auth/login.js

@@ -1,12 +1,33 @@
 const AmazonCognitoIdentity = require('amazon-cognito-identity-js');
 import inquirer from 'inquirer';
-import { Request, setConfig } from '@contrail/sdk';
+import { Request, setConfig as setSdkConfig } from '@contrail/sdk';
 import { Auth } from './auth';
+import { getConfig, storeConfig } from '../config/config';
 const CONFIGURATION = {
     userPoolId: 'us-east-1_x8hXZUsL6',
     clientId: process.env.CONTRAIL_COGNITO_CLIENT_ID || '2oubek96sue5rsncovtqhs3scm',
 };
 export async function authUser() {
+    console.debug("authorizing user");
+    const config = await getConfig();
+    if (config &&
+        config.apiUserToken &&
+        config.apiGateway &&
+        config.orgSlug) {
+        console.debug("populating auth config from fs config");
+        Auth.config = {
+            apiUserToken: config.apiUserToken,
+            apiGateway: config.apiGateway,
+            orgSlug: config.orgSlug,
+        };
+        setSdkConfig(Auth.config);
+        try {
+            return await refreshCurrentUserOrg();
+        }
+        catch (e) {
+            console.log("Token expired. Requesting auth credentials...");
+        }
+    }
     const questions = [];
     if (!process.env.CONTRAIL_CLI_EMAIL) {
         questions.push({
@@ -70,19 +91,20 @@ export async function authUser() {
     });
 }
 async function setAuthContext(user, params) {
-    // TODO Dont allow user to set this - they could set dev
-    const questions = [];
-    questions.push({
-        type: 'list',
-        name: 'environment',
-        message: 'Which environment would you like to use?',
-        choices: ['Dev', 'Prod'],
-        default: 'Dev',
-    });
+    const config = await getConfig();
     let apiGateway;
-    const answers = await inquirer.prompt(questions);
-    if (answers.environment === 'Dev') {
-        apiGateway = 'https://api.vibeiq.com/dev/api';
+    console.log(config.environments);
+    if (config.environments) {
+        const questions = [];
+        questions.push({
+            type: 'list',
+            name: 'environment',
+            message: 'Which environment would you like to use?',
+            choices: Object.keys(config.environments),
+            default: Object.keys(config.environments)[0],
+        });
+        const answers = await inquirer.prompt(questions);
+        apiGateway = config.environments[answers.environment];
     }
     else {
         apiGateway = 'https://api.vibeiq.com/prod/api';
@@ -94,7 +116,11 @@ async function setAuthContext(user, params) {
         orgSlug: params.orgSlug,
     };
     // SET SDK CONFIG
-    setConfig(Auth.config);
+    setSdkConfig(Auth.config);
+    return refreshCurrentUserOrg();
+}
+async function refreshCurrentUserOrg() {
+    console.debug("refreshing current user org");
     const currentUser = await Request.request('/users/current', {
         method: 'GET',
         headers: {
@@ -109,5 +135,7 @@ async function setAuthContext(user, params) {
     if (org) {
         Auth.config.orgId = org.orgId || org.id;
     }
+    // cache config in the fs
+    storeConfig(Object.assign({}, Auth.config));
     return Object.assign({}, Auth.config);
 }

package/lib/cli.js

@@ -12,6 +12,10 @@ export async function cli(args) {
     const fullCommand = args[2];
     let domain;
     let command;
+    if (!fullCommand) {
+        printIllegalCommand();
+        return;
+    }
     const commandParts = fullCommand.split('.');
     if (!(commandParts === null || commandParts === void 0 ? void 0 : commandParts.length)) {
         printIllegalCommand();

package/lib/config/config.d.ts

@@ -0,0 +1,5 @@
+export declare function initializeVibeIQConfig(): Promise<void>;
+export declare function readVibeIQConfig(): Promise<any>;
+export declare function writeVibeIQConfig(config: Object): Promise<void>;
+export declare function getConfig(): Promise<any>;
+export declare function storeConfig(incomingConfig: Object): Promise<void>;

package/lib/config/config.js

@@ -0,0 +1,59 @@
+import { promises as fsPromises } from 'fs';
+import { join } from 'path';
+import { homedir } from 'os';
+const userHomeDir = homedir();
+const configDirectoryLocation = join(userHomeDir, '.vibeiq');
+const configFileLocation = join(configDirectoryLocation, 'config.json');
+export async function initializeVibeIQConfig() {
+    try {
+        await fsPromises.mkdir(configDirectoryLocation, { recursive: true });
+    }
+    catch (e) {
+        console.error("could not initialize vibeiq directory");
+        throw e;
+    }
+    try {
+        await fsPromises.writeFile(configFileLocation, '{}');
+    }
+    catch (e) {
+        console.error(`could not initialize config file (${configFileLocation}).`);
+        throw e;
+    }
+}
+export async function readVibeIQConfig() {
+    let fileContent;
+    try {
+        fileContent = await fsPromises.readFile(configFileLocation);
+    }
+    catch (e) {
+        console.debug(`failed to open config file (${configFileLocation}) for reading.`);
+        console.debug('trying to initialize config file');
+        await initializeVibeIQConfig();
+        console.error(`Could not open config file (${configFileLocation}) for reading.`);
+        throw e;
+    }
+    try {
+        return JSON.parse(fileContent);
+    }
+    catch (e) {
+        console.error(`Could not parse local vibeiq config. The file (${configFileLocation}) might be malformed`);
+    }
+}
+export async function writeVibeIQConfig(config) {
+    try {
+        await fsPromises.writeFile(configFileLocation, JSON.stringify(config, null, 2));
+    }
+    catch (e) {
+        console.error(`Could not open config file (${configFileLocation}) for writing.`);
+        throw e;
+    }
+}
+export async function getConfig() {
+    console.debug("getting config from file system");
+    return await readVibeIQConfig();
+}
+export async function storeConfig(incomingConfig) {
+    const config = await readVibeIQConfig();
+    const newConfig = Object.assign(Object.assign({}, config), incomingConfig);
+    await writeVibeIQConfig(newConfig);
+}

package/lib/types/interfaces.d.ts

@@ -19,6 +19,8 @@ export interface ReducedTypeProperties {
     defaultValue: string;
     propertyLevel: string;
     inherited: boolean;
+    formulaFunction?: string;
+    validationFunction?: string;
 }
 export interface ReducedOptionSet {
     name: string;
@@ -46,5 +48,6 @@ export declare enum PropertyType {
     Constant = "constant",
     Composite = "composite",
     UserList = "userList",
-    Image = "image"
+    Image = "image",
+    Json = "json"
 }

package/lib/types/types-extractor.js

@@ -75,6 +75,8 @@ async function getReducedTypes(optionSets) {
                 defaultValue: typeProperty.defaultValue,
                 propertyLevel: typeProperty.propertyLevel,
                 inherited: typeProperty.inherited,
+                formulaFunction: typeProperty.formulaFunction,
+                validationFunction: typeProperty.validationFunction,
             };
             reducedTypeProperties.push(reducedTypeProperty);
         }

package/lib/types/types-uploader.js

@@ -146,6 +146,8 @@ async function uploadReducedTypeProperties(type, currentPropertyTypes, newProper
                         referencedTypeRootSlug: newPropertyType.referencedTypeRootSlug,
                         defaultValue: newPropertyType.defaultValue,
                         propertyLevel: newPropertyType.propertyLevel,
+                        formulaFunction: newPropertyType.formulaFunction,
+                        validationFunction: newPropertyType.validationFunction,
                     }),
                     headers: {
                         'Accept': 'application/json',
@@ -170,6 +172,8 @@ async function uploadReducedTypeProperties(type, currentPropertyTypes, newProper
                         referencedTypeRootSlug: newPropertyType.referencedTypeRootSlug,
                         defaultValue: newPropertyType.defaultValue,
                         propertyLevel: newPropertyType.propertyLevel,
+                        formulaFunction: newPropertyType.formulaFunction,
+                        validationFunction: newPropertyType.validationFunction,
                     },
                 });
             }
@@ -210,6 +214,8 @@ function typePropertiesEqual(typeProperty1, typeProperty2, optionSetIdByName) {
         referencedTypeRootSlug: typeProperty1.referencedTypeRootSlug,
         defaultValue: typeProperty1.defaultValue,
         propertyLevel: typeProperty1.propertyLevel,
+        formulaFunction: typeProperty1.formulaFunction,
+        validationFunction: typeProperty1.validationFunction,
     };
     const reducedProperty2 = {
         isArchived: typeProperty2.isArchived,
@@ -223,6 +229,8 @@ function typePropertiesEqual(typeProperty1, typeProperty2, optionSetIdByName) {
         referencedTypeRootSlug: typeProperty2.referencedTypeRootSlug,
         defaultValue: typeProperty2.defaultValue,
         propertyLevel: typeProperty2.propertyLevel,
+        formulaFunction: typeProperty2.formulaFunction,
+        validationFunction: typeProperty2.validationFunction,
     };
     return _.isEqual(reducedProperty1, reducedProperty2);
 }

package/option_sets.yml

@@ -0,0 +1,15 @@
+optionSets:
+  - name: Collection
+    isArchived: false
+    optionSet:
+      - value: collection_1
+        display: Collection 1
+      - value: collection_2
+        display: Collection 2
+  - name: Gender
+    isArchived: false
+    optionSet:
+      - value: womens
+        display: Women's
+      - value: mens
+        display: Men's

package/package.json

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

package/src/auth/login.ts

@@ -1,14 +1,37 @@
 const AmazonCognitoIdentity = require('amazon-cognito-identity-js');
 import inquirer from 'inquirer';
-import { Request, setConfig } from '@contrail/sdk';
+import { Request, setConfig as setSdkConfig } from '@contrail/sdk';
 import { Auth, AuthContext } from './auth';
+import { getConfig, storeConfig } from '../config/config';
 
 const CONFIGURATION = {
     userPoolId: 'us-east-1_x8hXZUsL6',
     clientId: process.env.CONTRAIL_COGNITO_CLIENT_ID || '2oubek96sue5rsncovtqhs3scm',
 };
 
-export async function authUser(): Promise<AuthContext>{
+export async function authUser(): Promise<AuthContext> {
+    console.debug("authorizing user")
+    const config = await getConfig();
+    if (
+        config &&
+        config.apiUserToken &&
+        config.apiGateway &&
+        config.orgSlug
+    ) {
+        console.debug("populating auth config from fs config")
+        Auth.config = {
+            apiUserToken: config.apiUserToken,
+            apiGateway: config.apiGateway,
+            orgSlug: config.orgSlug,
+        };
+        setSdkConfig(Auth.config);
+        try {
+            return await refreshCurrentUserOrg();
+        } catch (e) {
+            console.log("Token expired. Requesting auth credentials...")
+        }
+
+    }
     const questions = [];
     if (!process.env.CONTRAIL_CLI_EMAIL) {
         questions.push({
@@ -41,7 +64,7 @@ export async function authUser(): Promise<AuthContext>{
         password: process.env.CONTRAIL_CLI_PASSWORD || answers.password,
         orgSlug: process.env.CONTRAIL_CLI_ORGSLUG || answers.orgSlug,
     };
-    if (!params.email || !params.password){
+    if (!params.email || !params.password) {
         throw new Error('Email and Password required');
     }
 
@@ -64,7 +87,7 @@ export async function authUser(): Promise<AuthContext>{
 
     const cognitoUser = new AmazonCognitoIdentity.CognitoUser(userData);
 
-    return new Promise( (resolve, reject) => {
+    return new Promise((resolve, reject) => {
         cognitoUser.authenticateUser(authDetails, {
             onSuccess: async (result) => {
                 const user = result;
@@ -80,21 +103,20 @@ export async function authUser(): Promise<AuthContext>{
 }
 
 async function setAuthContext(user, params): Promise<AuthContext> {
-
-    // TODO Dont allow user to set this - they could set dev
-    const questions = [];
-    questions.push({
-        type: 'list',
-        name: 'environment',
-        message: 'Which environment would you like to use?',
-        choices: ['Dev', 'Prod'],
-        default: 'Dev',
-    });
-
+    const config = await getConfig();
     let apiGateway;
-    const answers = await inquirer.prompt(questions);
-    if (answers.environment === 'Dev') {
-        apiGateway = 'https://api.vibeiq.com/dev/api';
+    console.log(config.environments)
+    if(config.environments) {
+        const questions = [];
+        questions.push({
+            type: 'list',
+            name: 'environment',
+            message: 'Which environment would you like to use?',
+            choices: Object.keys(config.environments),
+            default: Object.keys(config.environments)[0],
+        });
+        const answers = await inquirer.prompt(questions);
+        apiGateway = config.environments[answers.environment]
     } else {
         apiGateway = 'https://api.vibeiq.com/prod/api';
     }
@@ -106,8 +128,13 @@ async function setAuthContext(user, params): Promise<AuthContext> {
         orgSlug: params.orgSlug,
     };
     // SET SDK CONFIG
-    setConfig(Auth.config);
+    setSdkConfig(Auth.config);
 
+    return refreshCurrentUserOrg();
+}
+
+async function refreshCurrentUserOrg() {
+    console.debug("refreshing current user org")
     const currentUser = await Request.request('/users/current', {
         method: 'GET',
         headers: {
@@ -122,6 +149,7 @@ async function setAuthContext(user, params): Promise<AuthContext> {
     if (org) {
         Auth.config.orgId = org.orgId || org.id;
     }
-
+    // cache config in the fs
+    storeConfig(Object.assign({}, Auth.config))
     return Object.assign({}, Auth.config);
 }

package/src/cli.ts

@@ -15,6 +15,10 @@ export async function cli(args) {
   const fullCommand = args[2];
   let domain;
   let command;
+  if(!fullCommand) {
+    printIllegalCommand();
+    return;
+  }
   const commandParts = fullCommand.split('.');
 
   if (!commandParts?.length) {

package/src/config/config.ts

@@ -0,0 +1,65 @@
+import { readFileSync, access, promises as fsPromises, write } from 'fs';
+import { join } from 'path';
+import {homedir} from  'os';
+const userHomeDir = homedir();
+const configDirectoryLocation = join(userHomeDir, '.vibeiq');
+const configFileLocation = join(configDirectoryLocation, 'config.json');
+
+export async function initializeVibeIQConfig() {
+  try{
+    await fsPromises.mkdir(configDirectoryLocation, {recursive: true})
+  } catch (e) {
+    console.error("could not initialize vibeiq directory")
+    throw e
+  }
+
+  try {
+    await fsPromises.writeFile(configFileLocation, '{}');
+  } catch (e) {
+    console.error(`could not initialize config file (${configFileLocation}).`)
+    throw e;
+  }
+}
+export async function readVibeIQConfig() {
+  let fileContent;
+  try {
+    fileContent = await fsPromises.readFile(configFileLocation);
+  } catch (e) {
+    console.debug(`failed to open config file (${configFileLocation}) for reading.`);
+    console.debug('trying to initialize config file');
+    await initializeVibeIQConfig();
+    console.error(`Could not open config file (${configFileLocation}) for reading.`);
+    throw e
+  }
+
+  try {
+    return JSON.parse(fileContent);
+  } catch (e) {
+    console.error(`Could not parse local vibeiq config. The file (${configFileLocation}) might be malformed`);
+  }
+}
+
+
+export async function writeVibeIQConfig(config: Object) {
+  try {
+    await fsPromises.writeFile(configFileLocation, JSON.stringify(config, null, 2));
+  } catch (e) {
+    console.error(`Could not open config file (${configFileLocation}) for writing.`);
+    throw e
+  }
+}
+
+export async function getConfig() {
+  console.debug("getting config from file system")
+  return await readVibeIQConfig();
+}
+
+export async function storeConfig(incomingConfig: Object) {
+  const config = await readVibeIQConfig();
+  const newConfig = {
+    ...config,
+    ...incomingConfig
+  };
+  await writeVibeIQConfig(newConfig);
+}
+

package/src/types/interfaces.ts

@@ -20,6 +20,8 @@ export interface ReducedTypeProperties {
   defaultValue: string;
   propertyLevel: string;
   inherited: boolean;
+  formulaFunction?: string;
+  validationFunction?: string;
 }
 
 export interface ReducedOptionSet {
@@ -50,4 +52,5 @@ export declare enum PropertyType {
   Composite = 'composite',
   UserList = 'userList',
   Image = 'image',
+  Json = 'json',
 }

package/src/types/types-extractor.ts

@@ -95,6 +95,8 @@ async function getReducedTypes(optionSets) {
         defaultValue: typeProperty.defaultValue,
         propertyLevel: typeProperty.propertyLevel,
         inherited: typeProperty.inherited,
+        formulaFunction: typeProperty.formulaFunction,
+        validationFunction: typeProperty.validationFunction,
       };
 
       reducedTypeProperties.push(reducedTypeProperty);

package/src/types/types-uploader.ts

@@ -173,6 +173,8 @@ async function uploadReducedTypeProperties(type, currentPropertyTypes, newProper
             referencedTypeRootSlug: newPropertyType.referencedTypeRootSlug,
             defaultValue: newPropertyType.defaultValue,
             propertyLevel: newPropertyType.propertyLevel,
+            formulaFunction: newPropertyType.formulaFunction,
+            validationFunction: newPropertyType.validationFunction,
           }),
           headers: {
               'Accept': 'application/json',
@@ -197,6 +199,8 @@ async function uploadReducedTypeProperties(type, currentPropertyTypes, newProper
             referencedTypeRootSlug: newPropertyType.referencedTypeRootSlug,
             defaultValue: newPropertyType.defaultValue,
             propertyLevel: newPropertyType.propertyLevel,
+            formulaFunction: newPropertyType.formulaFunction,
+            validationFunction: newPropertyType.validationFunction,
           },
         });
       }
@@ -241,6 +245,8 @@ function typePropertiesEqual(typeProperty1, typeProperty2, optionSetIdByName): b
     referencedTypeRootSlug: typeProperty1.referencedTypeRootSlug,
     defaultValue: typeProperty1.defaultValue,
     propertyLevel: typeProperty1.propertyLevel,
+    formulaFunction: typeProperty1.formulaFunction,
+    validationFunction: typeProperty1.validationFunction,
   };
 
   const reducedProperty2 = {
@@ -255,6 +261,8 @@ function typePropertiesEqual(typeProperty1, typeProperty2, optionSetIdByName): b
     referencedTypeRootSlug: typeProperty2.referencedTypeRootSlug,
     defaultValue: typeProperty2.defaultValue,
     propertyLevel: typeProperty2.propertyLevel,
+    formulaFunction: typeProperty2.formulaFunction,
+    validationFunction: typeProperty2.validationFunction,
   };
 
   return _.isEqual(reducedProperty1, reducedProperty2);

package/templates/typescript/package-lock.json

@@ -0,0 +1,14 @@
+{
+  "name": "test-app",
+  "version": "1.0.0",
+  "lockfileVersion": 1,
+  "requires": true,
+  "dependencies": {
+    "typescript": {
+      "version": "4.7.4",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.7.4.tgz",
+      "integrity": "sha512-C0WQT0gezHuw6AdY1M2jxUO83Rjf0HP7Sk1DtXj6j1EwkQNZrHAg2XPWlq62oqEhYvONq5pkC2Y9oPljWToLmQ==",
+      "dev": true
+    }
+  }
+}

package/templates/typescript/package.json

@@ -14,11 +14,13 @@
     "build": "tsc",
     "test": "echo \"Error: no test specified\" && exit 1"
   },
-  "keywords": [
-  ],
+  "keywords": [],
   "author": "",
   "license": "ISC",
   "dependencies": {
     "chalk": "^4.0.0"
+  },
+  "devDependencies": {
+    "typescript": "^4.7.4"
   }
 }

package/test/actions/exampleAction.d.ts

@@ -0,0 +1 @@
+export {};

package/test/actions/exampleAction.js

@@ -0,0 +1,40 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+async function execute(config, event, Functions) {
+    const getBodyFromEvent = (config, event) => {
+        let body = Functions.stringUtil.parseVariables(config.message, event);
+        console.log('body: ', body);
+        if (config.sendDetails) {
+            const data = event;
+            const properties = {};
+            let addedProperty = false;
+            for (const property of config.fieldsToForward) {
+                const variableLevels = property.split('.');
+                let replacementValue = data;
+                for (let i = 0; i < variableLevels.length; i++) {
+                    replacementValue = replacementValue[variableLevels[i]];
+                }
+                properties[property] = replacementValue;
+                addedProperty = true;
+            }
+            if (addedProperty) {
+                body = body + ' Properties: ' + JSON.stringify(properties) + '.';
+            }
+        }
+        return JSON.stringify({ text: body });
+    };
+    const body = getBodyFromEvent(config, event);
+    console.log('Sending message: ', body);
+    const response = await Functions.fetch(config.url, {
+        method: 'POST',
+        body: body,
+        headers: { 'Content-Type': 'application/json' }
+    });
+    if (!response.ok) {
+        console.log('Webhook event failed to publish');
+        console.log('Response: ', JSON.stringify(response));
+    }
+    else {
+        console.log('Published!');
+    }
+}