fix: minor fixes

Author: GochoMugo

lib/form.js

@@ -58,13 +58,11 @@ class Form extends EventEmitter {
         const event = "done";
         if (this.listenerCount(event)) {
             debug("emitting done event");
-            // TODO: Don't return here!
-            return this.emit(event, formset, answers, ref);
+            this.emit(event, formset, answers, ref);
         }
         if (this.options.cb) {
             debug("firing form callback");
-            // TODO: Await cb!
-            this.options.cb(answers, ref);
+            await this.options.cb(answers, ref);
         }
     }
 

lib/formset.js

@@ -79,8 +79,6 @@ class FormSet extends EventEmitter {
         return this._forms;
     }
 
-    // TODO: i18n should also use promises!
-
     /**
      * Add a new form to this set.
      * @param  {String} name Name of the form e.g. "profile"
@@ -254,7 +252,7 @@ class FormSet extends EventEmitter {
             throw new errors.SessionError(error);
         }
 
-        this.emit("query", question, ref);
+        this._emitQuery(question, ref);
     }
 
     /**
@@ -273,6 +271,15 @@ class FormSet extends EventEmitter {
             throw new errors.SessionError(error);
         }
     }
+
+    /**
+     * Emits the `query` event.
+     * @param {Object} question Query
+     * @param {Object} ref Reference
+     */
+    _emitQuery(question, ref) {
+        this.emit("query", question, ref);
+    }
 }
 
 

lib/query-controller.js

@@ -174,8 +174,7 @@ class QueryController {
      */
     async advance(answer) {
         debug("advancing on queries: current-index=%d", this._index);
-        // TODO: Assert answer is a string!
-        assert.ok(answer || answer === null, "Answer must be provided.");
+        assert.ok(typeof answer === "string" || answer === null, "Answer must be provided.");
 
         if (this.currentQuery) {
             debug("found current query");
@@ -423,9 +422,7 @@ class QueryController {
     async send(id) {
         debug("sending text message: %s", id);
         const text = await this.text(id, this.getAnswers());
-        // TODO: pass callback to `query` event
-        // TODO: Refactor to use a formset method instead.
-        this.formset.emit("query", { text }, this.ref);
+        this.formset._emitQuery({ text }, this.ref);
     }
 
     /**

store/redis.js

@@ -11,6 +11,7 @@ const redis = require("redis");
 
 
 // own modules
+const errors = require("../lib/errors");
 const SessionStore = require("./base");
 
 
@@ -44,8 +45,11 @@ class RedisSessionStore extends SessionStore {
         if (!data) {
             return null;
         }
-        // TODO: Throw proper error if parsing fails.
-        return JSON.parse(data);
+        try {
+            return JSON.parse(data);
+        } catch (error) {
+            throw new errors.SessionError(error);
+        }
     }
     async put(sid, session, options) {
         await this._connect();