improved error handling for task actions

Author: ShMcK

lib/modules/page/task-actions/handle-action-string.js

@@ -10,6 +10,9 @@ var Type = {
 };
 function handleActionString(actionString) {
     return new Promise(function (resolve, reject) {
+        if (typeof actionString !== 'string') {
+            reject(actionString);
+        }
         var command = parser_1.getCommand(actionString);
         var params = parser_1.getParams(actionString);
         switch (command) {
@@ -45,7 +48,7 @@ function handleActionString(actionString) {
                 reject(false);
         }
     }).catch(function (err) {
-        console.error('Error with editor', err);
+        console.error('Error handling action string', err);
     });
 }
 Object.defineProperty(exports, "__esModule", { value: true });

lib/modules/page/task-actions/handle-actions.js

@@ -4,6 +4,9 @@ function handleTaskActions(actions) {
     var next = actions.shift();
     if (next && next.length) {
         next.reduce(function (total, curr) {
+            if (!curr || !curr.length) {
+                return total;
+            }
             return total.then(function () { return handle_action_string_1.default(curr); });
         }, Promise.resolve());
     }

lib/modules/page/task-actions/parser.js

@@ -4,19 +4,22 @@ function getCommand(actionString) {
     var command = actionString.substring(0, actionString.indexOf('('));
     if (!command.length) {
         console.log('Error loading editor action command ', actionString);
+        return '';
     }
-    else {
-        return command;
-    }
+    return command;
 }
 exports.getCommand = getCommand;
 function getParams(actionString) {
+    if (typeof actionString !== 'string') {
+        console.log('Error in tutorial with action command. Expected a string but received ', actionString);
+        return [];
+    }
     var parser = new parse_params_1.default();
     var command = getCommand(actionString);
     var params = actionString.substring(command.length + 1, actionString.length - 1);
     if (!params.length) {
         console.error('Error loading editor action params ', actionString);
-        return null;
+        return [];
     }
     var paramsList = parser.getParams(params);
     return paramsList;

src/modules/page/task-actions/handle-action-string.ts

@@ -14,6 +14,9 @@ export default function handleActionString(
   actionString: string
 ): Promise<void> {
   return new Promise((resolve, reject) => {
+    if (typeof actionString !== 'string') {
+      reject(actionString);
+    }
     const command: string = getCommand(actionString);
     const params: string[] = getParams(actionString);
 
@@ -63,6 +66,6 @@ export default function handleActionString(
         reject(false);
     }
   }).catch((err) => {
-    console.error('Error with editor', err);
+    console.error('Error handling action string', err);
   });
 }

src/modules/page/task-actions/handle-actions.ts

@@ -5,6 +5,9 @@ export default function handleTaskActions(actions: string[][]): void {
   if (next && next.length) {
     // resolve promises in order
     next.reduce((total: Promise<any>, curr: string) => {
+      if (!curr || !curr.length) {
+        return total;
+      }
       return total.then(() => handleActionString(curr));
     }, Promise.resolve());
   }

src/modules/page/task-actions/parser.ts

@@ -5,19 +5,23 @@ export function getCommand(actionString: string): string {
   let command = actionString.substring(0, actionString.indexOf('('));
   if (!command.length) {
     console.log('Error loading editor action command ', actionString);
-  } else {
-    return command;
+    return '';
   }
+  return command;
 }
 
 export function getParams(actionString: string): string[] {
+  if (typeof actionString !== 'string') {
+    console.log('Error in tutorial with action command. Expected a string but received ', actionString);
+    return [];
+  }
   // content in brackets, split by comma
   let parser = new ParseParams();
   let command = getCommand(actionString);
   let params = actionString.substring(command.length + 1, actionString.length - 1); // trim brackets
   if (!params.length) {
     console.error('Error loading editor action params ', actionString);
-    return null;
+    return [];
   }
   let paramsList: string[] = parser.getParams(params);
   return paramsList;