@contrail/cli 1.0.5 → 1.0.6

package/lib/apps/deploy-app/actions-deployer.js

@@ -75,7 +75,7 @@ export class ActionsDeployer {
             id: existingActionDefinition.id,
             object: updates,
         });
-        console.log(`%s      Updated existingaction defintion: ${actionDefinition.identifier}`, chalk.yellow.bold('APP'));
+        console.log(`%s      Updated existing action definition: ${actionDefinition.identifier}`, chalk.yellow.bold('APP'));
         return actionDefinition;
     }
     getActionDeclarationIdentifier(actionKey, app) {

package/lib/types/types-extractor.js

@@ -25,11 +25,11 @@ async function getOptionSets() {
     const optionSets = await new Entities().get({
         entityName: 'type-property-option-set',
     });
-    const reducedOptionSets = [];
+    let reducedOptionSets = [];
     for (const optionSet of optionSets) {
         const reducedOptionSet = {
-            id: optionSet.id,
             name: optionSet.name,
+            id: optionSet.id,
             isArchived: optionSet.isArchived,
             optionSet: optionSet.optionSet,
         };
@@ -38,6 +38,7 @@ async function getOptionSets() {
     const optionSetsHolder = {
         optionSets: reducedOptionSets,
     };
+    reducedOptionSets = reducedOptionSets.sort((one, two) => (one.name < two.name ? -1 : 1));
     const CURRENT_DIR = process.cwd();
     const separator = getSeparatorByPlatform();
     const yamlStr = yaml.dump(optionSetsHolder);
@@ -48,7 +49,7 @@ async function getReducedTypes() {
         entityName: 'type',
     });
     console.log('Found types: ', types.length);
-    const reducedTypes = [];
+    let reducedTypes = [];
     for (const type of types) {
         const typeWithProperties = await new Entities().get({
             entityName: 'type',
@@ -58,10 +59,10 @@ async function getReducedTypes() {
         const reducedTypeProperties = [];
         for (const typeProperty of typeWithProperties.typeProperties) {
             const reducedTypeProperty = {
+                slug: typeProperty.slug,
                 id: typeProperty.id,
                 isArchived: typeProperty.isArchived,
                 propertyType: typeProperty.propertyType,
-                slug: typeProperty.slug,
                 label: typeProperty.label,
                 editable: typeProperty.editable,
                 core: typeProperty.core,
@@ -75,14 +76,15 @@ async function getReducedTypes() {
             reducedTypeProperties.push(reducedTypeProperty);
         }
         const reducedType = {
+            typePath: typeWithProperties.typePath,
             slug: typeWithProperties.slug,
             label: typeWithProperties.label,
-            typePath: typeWithProperties.typePath,
             isArchived: typeWithProperties.isArchived,
             typeProperties: reducedTypeProperties,
         };
         reducedTypes.push(reducedType);
     }
+    reducedTypes = reducedTypes.sort((one, two) => (one.typePath < two.typePath ? -1 : 1));
     const typesHolder = {
         types: reducedTypes,
     };

package/package.json

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

package/src/apps/deploy-app/actions-deployer.ts

@@ -95,7 +95,7 @@ export class ActionsDeployer {
       object: updates,
     });
 
-    console.log(`%s      Updated existingaction defintion: ${actionDefinition.identifier}`, chalk.yellow.bold('APP'));
+    console.log(`%s      Updated existing action definition: ${actionDefinition.identifier}`, chalk.yellow.bold('APP'));
 
     return actionDefinition;
   }

package/src/types/types-extractor.ts

@@ -34,11 +34,11 @@ async function getOptionSets() {
     entityName: 'type-property-option-set',
   });
 
-  const reducedOptionSets = [];
+  let reducedOptionSets = [];
   for (const optionSet of optionSets) {
     const reducedOptionSet: ReducedOptionSet = {
-      id: optionSet.id,
       name: optionSet.name,
+      id: optionSet.id,
       isArchived: optionSet.isArchived,
       optionSet: optionSet.optionSet,
     };
@@ -50,6 +50,8 @@ async function getOptionSets() {
     optionSets: reducedOptionSets,
   };
 
+  reducedOptionSets = reducedOptionSets.sort((one, two) => (one.name < two.name ? -1 : 1));
+
   const CURRENT_DIR = process.cwd();
   const separator = getSeparatorByPlatform();
 
@@ -64,7 +66,7 @@ async function getReducedTypes() {
 
   console.log('Found types: ', types.length);
 
-  const reducedTypes = [];
+  let reducedTypes = [];
   for (const type of types) {
     const typeWithProperties = await new Entities().get({
       entityName: 'type',
@@ -75,10 +77,10 @@ async function getReducedTypes() {
     const reducedTypeProperties = [];
     for (const typeProperty of typeWithProperties.typeProperties) {
       const reducedTypeProperty: ReducedTypeProperties = {
+        slug: typeProperty.slug,
         id: typeProperty.id,
         isArchived: typeProperty.isArchived,
         propertyType: typeProperty.propertyType,
-        slug: typeProperty.slug,
         label: typeProperty.label,
         editable: typeProperty.editable,
         core: typeProperty.core,
@@ -94,9 +96,9 @@ async function getReducedTypes() {
     }
 
     const reducedType: ReducedType = {
+      typePath: typeWithProperties.typePath,
       slug: typeWithProperties.slug,
       label: typeWithProperties.label,
-      typePath: typeWithProperties.typePath,
       isArchived: typeWithProperties.isArchived,
       typeProperties: reducedTypeProperties,
     };
@@ -104,6 +106,8 @@ async function getReducedTypes() {
     reducedTypes.push(reducedType);
   }
 
+  reducedTypes = reducedTypes.sort((one, two) => (one.typePath < two.typePath ? -1 : 1));
+
   const typesHolder = {
     types: reducedTypes,
   };

package/templates/typescript/actions/exampleAction.ts

@@ -1,38 +1,39 @@
-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!');        
-  }    
+export { } // Leave empty export - This allows for multiple files with a function named execute.
+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!');
+  }
 }