@glowgreen/gg-questionnaire-v2 0.0.12 → 0.0.13

package/bundles/glowgreen-gg-questionnaire-v2.umd.js

@@ -1,126 +1,199 @@
 (function (global, factory) {
-    typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports, require('lodash'), require('@angular/core'), require('@angular/forms')) :
-    typeof define === 'function' && define.amd ? define('@glowgreen/gg-questionnaire-v2', ['exports', 'lodash', '@angular/core', '@angular/forms'], factory) :
-    (factory((global.glowgreen = global.glowgreen || {}, global.glowgreen['gg-questionnaire-v2'] = {}),global._,global.ng.core,global.ng.forms));
-}(this, (function (exports,_,i0,i1) { 'use strict';
+    typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports, require('@angular/core'), require('@angular/forms'), require('lodash')) :
+    typeof define === 'function' && define.amd ? define('@glowgreen/gg-questionnaire-v2', ['exports', '@angular/core', '@angular/forms', 'lodash'], factory) :
+    (global = global || self, factory((global.glowgreen = global.glowgreen || {}, global.glowgreen['gg-questionnaire-v2'] = {}), global.ng.core, global.ng.forms, global.lodash));
+}(this, function (exports, core, forms, lodash) { 'use strict';
 
-    /*! *****************************************************************************
-    Copyright (c) Microsoft Corporation. All rights reserved.
-    Licensed under the Apache License, Version 2.0 (the "License"); you may not use
-    this file except in compliance with the License. You may obtain a copy of the
-    License at http://www.apache.org/licenses/LICENSE-2.0
-
-    THIS CODE IS PROVIDED ON AN *AS IS* BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-    KIND, EITHER EXPRESS OR IMPLIED, INCLUDING WITHOUT LIMITATION ANY IMPLIED
-    WARRANTIES OR CONDITIONS OF TITLE, FITNESS FOR A PARTICULAR PURPOSE,
-    MERCHANTABLITY OR NON-INFRINGEMENT.
-
-    See the Apache Version 2.0 License for specific language governing permissions
-    and limitations under the License.
-    ***************************************************************************** */
-    function __awaiter(thisArg, _arguments, P, generator) {
-        return new (P || (P = Promise))(function (resolve, reject) {
-            function fulfilled(value) { try {
-                step(generator.next(value));
-            }
-            catch (e) {
-                reject(e);
-            } }
-            function rejected(value) { try {
-                step(generator["throw"](value));
-            }
-            catch (e) {
-                reject(e);
-            } }
-            function step(result) { result.done ? resolve(result.value) : new P(function (resolve) { resolve(result.value); }).then(fulfilled, rejected); }
-            step((generator = generator.apply(thisArg, _arguments || [])).next());
-        });
-    }
-    function __generator(thisArg, body) {
-        var _$$1 = { label: 0, sent: function () { if (t[0] & 1)
-                throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
-        return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function () { return this; }), g;
-        function verb(n) { return function (v) { return step([n, v]); }; }
-        function step(op) {
-            if (f)
-                throw new TypeError("Generator is already executing.");
-            while (_$$1)
-                try {
-                    if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done)
-                        return t;
-                    if (y = 0, t)
-                        op = [op[0] & 2, t.value];
-                    switch (op[0]) {
-                        case 0:
-                        case 1:
-                            t = op;
-                            break;
-                        case 4:
-                            _$$1.label++;
-                            return { value: op[1], done: false };
-                        case 5:
-                            _$$1.label++;
-                            y = op[1];
-                            op = [0];
-                            continue;
-                        case 7:
-                            op = _$$1.ops.pop();
-                            _$$1.trys.pop();
-                            continue;
-                        default:
-                            if (!(t = _$$1.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) {
-                                _$$1 = 0;
-                                continue;
-                            }
-                            if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) {
-                                _$$1.label = op[1];
-                                break;
-                            }
-                            if (op[0] === 6 && _$$1.label < t[1]) {
-                                _$$1.label = t[1];
-                                t = op;
-                                break;
-                            }
-                            if (t && _$$1.label < t[2]) {
-                                _$$1.label = t[2];
-                                _$$1.ops.push(op);
-                                break;
-                            }
-                            if (t[2])
-                                _$$1.ops.pop();
-                            _$$1.trys.pop();
-                            continue;
-                    }
-                    op = body.call(thisArg, _$$1);
-                }
-                catch (e) {
-                    op = [6, e];
-                    y = 0;
-                }
-                finally {
-                    f = t = 0;
-                }
-            if (op[0] & 5)
-                throw op[1];
-            return { value: op[0] ? op[1] : void 0, done: true };
-        }
-    }
-    function __values(o) {
-        var m = typeof Symbol === "function" && o[Symbol.iterator], i = 0;
-        if (m)
-            return m.call(o);
-        return {
-            next: function () {
-                if (o && i >= o.length)
-                    o = void 0;
-                return { value: o && o[i++], done: !o };
-            }
-        };
+    /*! *****************************************************************************
+    Copyright (c) Microsoft Corporation. All rights reserved.
+    Licensed under the Apache License, Version 2.0 (the "License"); you may not use
+    this file except in compliance with the License. You may obtain a copy of the
+    License at http://www.apache.org/licenses/LICENSE-2.0
+
+    THIS CODE IS PROVIDED ON AN *AS IS* BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, EITHER EXPRESS OR IMPLIED, INCLUDING WITHOUT LIMITATION ANY IMPLIED
+    WARRANTIES OR CONDITIONS OF TITLE, FITNESS FOR A PARTICULAR PURPOSE,
+    MERCHANTABLITY OR NON-INFRINGEMENT.
+
+    See the Apache Version 2.0 License for specific language governing permissions
+    and limitations under the License.
+    ***************************************************************************** */
+    /* global Reflect, Promise */
+
+    var extendStatics = function(d, b) {
+        extendStatics = Object.setPrototypeOf ||
+            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
+            function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
+        return extendStatics(d, b);
+    };
+
+    function __extends(d, b) {
+        extendStatics(d, b);
+        function __() { this.constructor = d; }
+        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+    }
+
+    var __assign = function() {
+        __assign = Object.assign || function __assign(t) {
+            for (var s, i = 1, n = arguments.length; i < n; i++) {
+                s = arguments[i];
+                for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p)) t[p] = s[p];
+            }
+            return t;
+        };
+        return __assign.apply(this, arguments);
+    };
+
+    function __rest(s, e) {
+        var t = {};
+        for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
+            t[p] = s[p];
+        if (s != null && typeof Object.getOwnPropertySymbols === "function")
+            for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) if (e.indexOf(p[i]) < 0)
+                t[p[i]] = s[p[i]];
+        return t;
+    }
+
+    function __decorate(decorators, target, key, desc) {
+        var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+        if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+        else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+        return c > 3 && r && Object.defineProperty(target, key, r), r;
+    }
+
+    function __param(paramIndex, decorator) {
+        return function (target, key) { decorator(target, key, paramIndex); }
+    }
+
+    function __metadata(metadataKey, metadataValue) {
+        if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(metadataKey, metadataValue);
+    }
+
+    function __awaiter(thisArg, _arguments, P, generator) {
+        return new (P || (P = Promise))(function (resolve, reject) {
+            function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+            function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+            function step(result) { result.done ? resolve(result.value) : new P(function (resolve) { resolve(result.value); }).then(fulfilled, rejected); }
+            step((generator = generator.apply(thisArg, _arguments || [])).next());
+        });
+    }
+
+    function __generator(thisArg, body) {
+        var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
+        return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
+        function verb(n) { return function (v) { return step([n, v]); }; }
+        function step(op) {
+            if (f) throw new TypeError("Generator is already executing.");
+            while (_) try {
+                if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
+                if (y = 0, t) op = [op[0] & 2, t.value];
+                switch (op[0]) {
+                    case 0: case 1: t = op; break;
+                    case 4: _.label++; return { value: op[1], done: false };
+                    case 5: _.label++; y = op[1]; op = [0]; continue;
+                    case 7: op = _.ops.pop(); _.trys.pop(); continue;
+                    default:
+                        if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
+                        if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
+                        if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
+                        if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
+                        if (t[2]) _.ops.pop();
+                        _.trys.pop(); continue;
+                }
+                op = body.call(thisArg, _);
+            } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
+            if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
+        }
+    }
+
+    function __exportStar(m, exports) {
+        for (var p in m) if (!exports.hasOwnProperty(p)) exports[p] = m[p];
+    }
+
+    function __values(o) {
+        var m = typeof Symbol === "function" && o[Symbol.iterator], i = 0;
+        if (m) return m.call(o);
+        return {
+            next: function () {
+                if (o && i >= o.length) o = void 0;
+                return { value: o && o[i++], done: !o };
+            }
+        };
+    }
+
+    function __read(o, n) {
+        var m = typeof Symbol === "function" && o[Symbol.iterator];
+        if (!m) return o;
+        var i = m.call(o), r, ar = [], e;
+        try {
+            while ((n === void 0 || n-- > 0) && !(r = i.next()).done) ar.push(r.value);
+        }
+        catch (error) { e = { error: error }; }
+        finally {
+            try {
+                if (r && !r.done && (m = i["return"])) m.call(i);
+            }
+            finally { if (e) throw e.error; }
+        }
+        return ar;
+    }
+
+    function __spread() {
+        for (var ar = [], i = 0; i < arguments.length; i++)
+            ar = ar.concat(__read(arguments[i]));
+        return ar;
+    }
+
+    function __await(v) {
+        return this instanceof __await ? (this.v = v, this) : new __await(v);
+    }
+
+    function __asyncGenerator(thisArg, _arguments, generator) {
+        if (!Symbol.asyncIterator) throw new TypeError("Symbol.asyncIterator is not defined.");
+        var g = generator.apply(thisArg, _arguments || []), i, q = [];
+        return i = {}, verb("next"), verb("throw"), verb("return"), i[Symbol.asyncIterator] = function () { return this; }, i;
+        function verb(n) { if (g[n]) i[n] = function (v) { return new Promise(function (a, b) { q.push([n, v, a, b]) > 1 || resume(n, v); }); }; }
+        function resume(n, v) { try { step(g[n](v)); } catch (e) { settle(q[0][3], e); } }
+        function step(r) { r.value instanceof __await ? Promise.resolve(r.value.v).then(fulfill, reject) : settle(q[0][2], r); }
+        function fulfill(value) { resume("next", value); }
+        function reject(value) { resume("throw", value); }
+        function settle(f, v) { if (f(v), q.shift(), q.length) resume(q[0][0], q[0][1]); }
+    }
+
+    function __asyncDelegator(o) {
+        var i, p;
+        return i = {}, verb("next"), verb("throw", function (e) { throw e; }), verb("return"), i[Symbol.iterator] = function () { return this; }, i;
+        function verb(n, f) { i[n] = o[n] ? function (v) { return (p = !p) ? { value: __await(o[n](v)), done: n === "return" } : f ? f(v) : v; } : f; }
+    }
+
+    function __asyncValues(o) {
+        if (!Symbol.asyncIterator) throw new TypeError("Symbol.asyncIterator is not defined.");
+        var m = o[Symbol.asyncIterator], i;
+        return m ? m.call(o) : (o = typeof __values === "function" ? __values(o) : o[Symbol.iterator](), i = {}, verb("next"), verb("throw"), verb("return"), i[Symbol.asyncIterator] = function () { return this; }, i);
+        function verb(n) { i[n] = o[n] && function (v) { return new Promise(function (resolve, reject) { v = o[n](v), settle(resolve, reject, v.done, v.value); }); }; }
+        function settle(resolve, reject, d, v) { Promise.resolve(v).then(function(v) { resolve({ value: v, done: d }); }, reject); }
+    }
+
+    function __makeTemplateObject(cooked, raw) {
+        if (Object.defineProperty) { Object.defineProperty(cooked, "raw", { value: raw }); } else { cooked.raw = raw; }
+        return cooked;
+    };
+
+    function __importStar(mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k in mod) if (Object.hasOwnProperty.call(mod, k)) result[k] = mod[k];
+        result.default = mod;
+        return result;
+    }
+
+    function __importDefault(mod) {
+        return (mod && mod.__esModule) ? mod : { default: mod };
     }
 
     /**
      * @fileoverview added by tsickle
-     * @suppress {checkTypes,extraRequire,missingOverride,missingReturn,unusedPrivateMembers,uselessCode} checked by tsc
+     * @suppress {checkTypes,constantProperty,extraRequire,missingOverride,missingReturn,unusedPrivateMembers,uselessCode} checked by tsc
      */
     /** @enum {string} */
     var QuestionType = {
@@ -136,7 +209,7 @@
 
     /**
      * @fileoverview added by tsickle
-     * @suppress {checkTypes,extraRequire,missingOverride,missingReturn,unusedPrivateMembers,uselessCode} checked by tsc
+     * @suppress {checkTypes,constantProperty,extraRequire,missingOverride,missingReturn,unusedPrivateMembers,uselessCode} checked by tsc
      */
     /** @enum {string} */
     var ConditionType = {
@@ -150,7 +223,7 @@
 
     /**
      * @fileoverview added by tsickle
-     * @suppress {checkTypes,extraRequire,missingOverride,missingReturn,unusedPrivateMembers,uselessCode} checked by tsc
+     * @suppress {checkTypes,constantProperty,extraRequire,missingOverride,missingReturn,unusedPrivateMembers,uselessCode} checked by tsc
      */
     /** @enum {string} */
     var ConditionRelationship = {
@@ -160,7 +233,7 @@
 
     /**
      * @fileoverview added by tsickle
-     * @suppress {checkTypes,extraRequire,missingOverride,missingReturn,unusedPrivateMembers,uselessCode} checked by tsc
+     * @suppress {checkTypes,constantProperty,extraRequire,missingOverride,missingReturn,unusedPrivateMembers,uselessCode} checked by tsc
      */
     var FilterService = /** @class */ (function () {
         function FilterService() {
@@ -188,94 +261,80 @@
          * @param {?=} additionalData
          * @return {?} An array of filtered sections with their filtered questions.
          */
-            function (sections, currentQuestionnaireForm, additionalData) {
-                var e_1, _a, e_2, _b, e_3, _c;
-                /** @type {?} */
-                var filteredSections = [];
-                try {
-                    for (var sections_1 = __values(sections), sections_1_1 = sections_1.next(); !sections_1_1.done; sections_1_1 = sections_1.next()) {
-                        var section = sections_1_1.value;
-                        if (!this.meetsConditionGroups(section.conditionGroups, currentQuestionnaireForm, additionalData)) {
-                            continue;
-                        }
-                        /** @type {?} */
-                        var filteredQuestions = [];
-                        try {
-                            for (var _d = __values(section.questions), _e = _d.next(); !_e.done; _e = _d.next()) {
-                                var question = _e.value;
-                                if (!this.meetsConditionGroups(question.conditionGroups, currentQuestionnaireForm, additionalData)) {
-                                    continue;
-                                }
-                                if (question.repeaterQuestions) {
-                                    try {
-                                        for (var _f = __values(question.repeaterQuestions), _g = _f.next(); !_g.done; _g = _f.next()) {
-                                            var repeaterQuestion = _g.value;
-                                            if (this.meetsConditionGroups(repeaterQuestion.conditionGroups, currentQuestionnaireForm, additionalData)) ;
-                                        }
-                                    }
-                                    catch (e_3_1) {
-                                        e_3 = { error: e_3_1 };
-                                    }
-                                    finally {
-                                        try {
-                                            if (_g && !_g.done && (_c = _f.return))
-                                                _c.call(_f);
-                                        }
-                                        finally {
-                                            if (e_3)
-                                                throw e_3.error;
+        function (sections, currentQuestionnaireForm, additionalData) {
+            var e_1, _a, e_2, _b, e_3, _c;
+            /** @type {?} */
+            var filteredSections = [];
+            try {
+                for (var sections_1 = __values(sections), sections_1_1 = sections_1.next(); !sections_1_1.done; sections_1_1 = sections_1.next()) {
+                    var section = sections_1_1.value;
+                    if (!this.meetsConditionGroups(section.conditionGroups, currentQuestionnaireForm, additionalData)) {
+                        continue;
+                    }
+                    /** @type {?} */
+                    var filteredQuestions = [];
+                    try {
+                        for (var _d = (e_2 = void 0, __values(section.questions)), _e = _d.next(); !_e.done; _e = _d.next()) {
+                            var question = _e.value;
+                            if (!this.meetsConditionGroups(question.conditionGroups, currentQuestionnaireForm, additionalData)) {
+                                continue;
+                            }
+                            if (question.repeaterQuestions) {
+                                /** @type {?} */
+                                var filteredRepeaterQuestions = [];
+                                try {
+                                    for (var _f = (e_3 = void 0, __values(question.repeaterQuestions)), _g = _f.next(); !_g.done; _g = _f.next()) {
+                                        var repeaterQuestion = _g.value;
+                                        if (this.meetsConditionGroups(repeaterQuestion.conditionGroups, currentQuestionnaireForm, additionalData)) {
+                                            filteredRepeaterQuestions.push(repeaterQuestion);
                                         }
                                     }
                                 }
-                                if (question.fetchPath) {
-                                    /** @type {?} */
-                                    var options = additionalData[question.fetchPath];
-                                    if (question.fetchSelectors && question.fetchSelectors.length > 0) {
-                                        /** @type {?} */
-                                        var values = this.getValuesForArray(question.fetchSelectors, currentQuestionnaireForm, additionalData);
-                                        options = _.get(additionalData[question.fetchPath], values);
-                                    }
-                                    options = this.getFinalFetchArray(options);
-                                    if (!question.selectOptions) {
-                                        question.selectOptions = [];
+                                catch (e_3_1) { e_3 = { error: e_3_1 }; }
+                                finally {
+                                    try {
+                                        if (_g && !_g.done && (_c = _f.return)) _c.call(_f);
                                     }
-                                    question.selectOptions = question.selectOptions.concat(options);
+                                    finally { if (e_3) throw e_3.error; }
                                 }
-                                filteredQuestions.push(question);
                             }
-                        }
-                        catch (e_2_1) {
-                            e_2 = { error: e_2_1 };
-                        }
-                        finally {
-                            try {
-                                if (_e && !_e.done && (_b = _d.return))
-                                    _b.call(_d);
-                            }
-                            finally {
-                                if (e_2)
-                                    throw e_2.error;
+                            if (question.fetchPath) {
+                                /** @type {?} */
+                                var options = additionalData[question.fetchPath];
+                                if (question.fetchSelectors && question.fetchSelectors.length > 0) {
+                                    /** @type {?} */
+                                    var values = this.getValuesForArray(question.fetchSelectors, currentQuestionnaireForm, additionalData);
+                                    options = lodash.get(additionalData[question.fetchPath], values);
+                                }
+                                options = this.getFinalFetchArray(options);
+                                if (!question.selectOptions) {
+                                    question.selectOptions = [];
+                                }
+                                question.selectOptions = question.selectOptions.concat(options);
                             }
+                            filteredQuestions.push(question);
                         }
-                        section.questions = filteredQuestions;
-                        filteredSections.push(section);
-                    }
-                }
-                catch (e_1_1) {
-                    e_1 = { error: e_1_1 };
-                }
-                finally {
-                    try {
-                        if (sections_1_1 && !sections_1_1.done && (_a = sections_1.return))
-                            _a.call(sections_1);
                     }
+                    catch (e_2_1) { e_2 = { error: e_2_1 }; }
                     finally {
-                        if (e_1)
-                            throw e_1.error;
+                        try {
+                            if (_e && !_e.done && (_b = _d.return)) _b.call(_d);
+                        }
+                        finally { if (e_2) throw e_2.error; }
                     }
+                    section.questions = filteredQuestions;
+                    filteredSections.push(section);
                 }
-                return filteredSections;
-            };
+            }
+            catch (e_1_1) { e_1 = { error: e_1_1 }; }
+            finally {
+                try {
+                    if (sections_1_1 && !sections_1_1.done && (_a = sections_1.return)) _a.call(sections_1);
+                }
+                finally { if (e_1) throw e_1.error; }
+            }
+            return filteredSections;
+        };
         /**
          * @private
          * @param {?} items
@@ -286,47 +345,41 @@
          * @param {?} items
          * @return {?}
          */
-            function (items) {
-                var e_4, _a;
-                if (!items) {
-                    return null;
-                }
-                if (!Array.isArray(items)) {
-                    items = _.keys(items);
-                }
-                if (items.length <= 0) {
-                    return null;
-                }
-                /** @type {?} */
-                var convertedArray = [];
-                try {
-                    for (var items_1 = __values(items), items_1_1 = items_1.next(); !items_1_1.done; items_1_1 = items_1.next()) {
-                        var item = items_1_1.value;
-                        if (item) {
-                            if (item instanceof Object && item.value && item.label) {
-                                convertedArray.push(item);
-                            }
-                            else {
-                                convertedArray.push({ label: this.uppercase(item), value: item });
-                            }
+        function (items) {
+            var e_4, _a;
+            if (!items) {
+                return null;
+            }
+            if (!Array.isArray(items)) {
+                items = lodash.keys(items);
+            }
+            if (items.length <= 0) {
+                return null;
+            }
+            /** @type {?} */
+            var convertedArray = [];
+            try {
+                for (var items_1 = __values(items), items_1_1 = items_1.next(); !items_1_1.done; items_1_1 = items_1.next()) {
+                    var item = items_1_1.value;
+                    if (item) {
+                        if (item instanceof Object && item.value && item.label) {
+                            convertedArray.push(item);
+                        }
+                        else {
+                            convertedArray.push({ label: this.uppercase(item), value: item });
                         }
                     }
                 }
-                catch (e_4_1) {
-                    e_4 = { error: e_4_1 };
-                }
-                finally {
-                    try {
-                        if (items_1_1 && !items_1_1.done && (_a = items_1.return))
-                            _a.call(items_1);
-                    }
-                    finally {
-                        if (e_4)
-                            throw e_4.error;
-                    }
+            }
+            catch (e_4_1) { e_4 = { error: e_4_1 }; }
+            finally {
+                try {
+                    if (items_1_1 && !items_1_1.done && (_a = items_1.return)) _a.call(items_1);
                 }
-                return convertedArray;
-            };
+                finally { if (e_4) throw e_4.error; }
+            }
+            return convertedArray;
+        };
         /**
          * @private
          * @param {?} item
@@ -337,9 +390,9 @@
          * @param {?} item
          * @return {?}
          */
-            function (item) {
-                return item.charAt(0).toUpperCase() + item.slice(1);
-            };
+        function (item) {
+            return item.charAt(0).toUpperCase() + item.slice(1);
+        };
         /**
          * Checks if each condition groups conditions have been met.
          * @param conditionGroups The array of condition groups.
@@ -365,18 +418,19 @@
          * @param {?=} additionalData
          * @return {?} A boolean stating if the condition groups conditions has been met.
          */
-            function (conditionGroups, currentQuestionnaireForm, additionalData) {
-                var _this = this;
-                if (!conditionGroups || conditionGroups.length === 0) {
-                    return true;
-                }
-                return conditionGroups.every(( /**
-                 * @param {?} x
-                 * @return {?}
-                 */function (x) {
-                    return _this.meetsConditionGroup(x, currentQuestionnaireForm, additionalData) === true;
-                }));
-            };
+        function (conditionGroups, currentQuestionnaireForm, additionalData) {
+            var _this = this;
+            if (!conditionGroups || conditionGroups.length === 0) {
+                return true;
+            }
+            return conditionGroups.every((/**
+             * @param {?} x
+             * @return {?}
+             */
+            function (x) {
+                return _this.meetsConditionGroup(x, currentQuestionnaireForm, additionalData) === true;
+            }));
+        };
         /**
          * Checks if a condition groups conditions have been met.
          * @param conditionGroup The condition group to check.
@@ -402,51 +456,47 @@
          * @param {?=} additionalData
          * @return {?} A boolean stating if the condition group conditions has been met.
          */
-            function (conditionGroup, currentQuestionnaireForm, additionalData) {
-                var e_5, _a;
-                if (!conditionGroup.conditions || conditionGroup.conditions.length === 0) {
-                    return true;
+        function (conditionGroup, currentQuestionnaireForm, additionalData) {
+            var e_5, _a;
+            if (!conditionGroup.conditions || conditionGroup.conditions.length === 0) {
+                return true;
+            }
+            /** @type {?} */
+            var results = [];
+            try {
+                for (var _b = __values(conditionGroup.conditions), _c = _b.next(); !_c.done; _c = _b.next()) {
+                    var condition = _c.value;
+                    results.push(this.meetsCondition(condition, currentQuestionnaireForm, additionalData));
                 }
-                /** @type {?} */
-                var results = [];
+            }
+            catch (e_5_1) { e_5 = { error: e_5_1 }; }
+            finally {
                 try {
-                    for (var _b = __values(conditionGroup.conditions), _c = _b.next(); !_c.done; _c = _b.next()) {
-                        var condition = _c.value;
-                        results.push(this.meetsCondition(condition, currentQuestionnaireForm, additionalData));
-                    }
-                }
-                catch (e_5_1) {
-                    e_5 = { error: e_5_1 };
+                    if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
                 }
-                finally {
-                    try {
-                        if (_c && !_c.done && (_a = _b.return))
-                            _a.call(_b);
-                    }
-                    finally {
-                        if (e_5)
-                            throw e_5.error;
-                    }
-                }
-                switch (conditionGroup.relationship) {
-                    case ConditionRelationship.Every:
-                        return results.every(( /**
-                         * @param {?} x
-                         * @return {?}
-                         */function (x) {
-                            return x === true;
-                        }));
-                    case ConditionRelationship.Any:
-                        return !!results.find(( /**
-                         * @param {?} x
-                         * @return {?}
-                         */function (x) {
-                            return x === true;
-                        }));
-                    default:
-                        return true;
-                }
-            };
+                finally { if (e_5) throw e_5.error; }
+            }
+            switch (conditionGroup.relationship) {
+                case ConditionRelationship.Every:
+                    return results.every((/**
+                     * @param {?} x
+                     * @return {?}
+                     */
+                    function (x) {
+                        return x === true;
+                    }));
+                case ConditionRelationship.Any:
+                    return !!results.find((/**
+                     * @param {?} x
+                     * @return {?}
+                     */
+                    function (x) {
+                        return x === true;
+                    }));
+                default:
+                    return true;
+            }
+        };
         /**
          * Checks if a condition has been met.
          * @param condition The condition to check.
@@ -472,100 +522,90 @@
          * @param {?=} additionalData
          * @return {?} A boolean stating if the condition group conditions has been met.
          */
-            function (condition, currentQuestionnaireForm, additionalData) {
-                var e_6, _a, e_7, _b;
-                /** @type {?} */
-                var v1s = this.getValuesForArray(condition.v1s, currentQuestionnaireForm, additionalData);
-                /** @type {?} */
-                var v2s = this.getValuesForArray(condition.v2s, currentQuestionnaireForm, additionalData);
-                /** @type {?} */
-                var result = false;
-                switch (condition.type) {
-                    case ConditionType.Excludes:
-                        result = v1s.filter(( /**
-                         * @param {?} v1
-                         * @return {?}
-                         */function (v1) {
-                            return v2s.indexOf(v1) > -1;
-                        })).length === 0;
-                        break;
-                    case ConditionType.Includes:
-                        result = v1s.filter(( /**
-                         * @param {?} v1
-                         * @return {?}
-                         */function (v1) {
-                            return v2s.indexOf(v1) > -1;
-                        })).length !== 0;
-                        break;
-                    default: try {
-                        for (var v2s_1 = __values(v2s), v2s_1_1 = v2s_1.next(); !v2s_1_1.done; v2s_1_1 = v2s_1.next()) {
-                            var v2 = v2s_1_1.value;
-                            try {
-                                for (var v1s_1 = __values(v1s), v1s_1_1 = v1s_1.next(); !v1s_1_1.done; v1s_1_1 = v1s_1.next()) {
-                                    var v1 = v1s_1_1.value;
-                                    switch (condition.type) {
-                                        case ConditionType.EqualTo:
-                                            v1 = this.getStringForValue(v1);
-                                            v2 = this.getStringForValue(v2);
-                                            if (v1 === v2) {
-                                                result = true;
-                                            }
-                                            break;
-                                        case ConditionType.NotEqualTo:
-                                            v1 = this.getStringForValue(v1);
-                                            v2 = this.getStringForValue(v2);
-                                            if (v1 !== v2) {
-                                                result = true;
-                                            }
-                                            break;
-                                        case ConditionType.GreaterThan:
-                                            v1 = parseFloat(v1);
-                                            v2 = parseFloat(v2);
-                                            if (v1 >= v2) {
-                                                result = true;
-                                            }
-                                            break;
-                                        case ConditionType.LessThan:
-                                            v1 = parseFloat(v1);
-                                            v2 = parseFloat(v2);
-                                            if (v1 <= v2) {
-                                                result = true;
-                                            }
-                                            break;
-                                    }
-                                }
-                            }
-                            catch (e_7_1) {
-                                e_7 = { error: e_7_1 };
-                            }
-                            finally {
-                                try {
-                                    if (v1s_1_1 && !v1s_1_1.done && (_b = v1s_1.return))
-                                        _b.call(v1s_1);
-                                }
-                                finally {
-                                    if (e_7)
-                                        throw e_7.error;
+        function (condition, currentQuestionnaireForm, additionalData) {
+            var e_6, _a, e_7, _b;
+            /** @type {?} */
+            var v1s = this.getValuesForArray(condition.v1s, currentQuestionnaireForm, additionalData);
+            /** @type {?} */
+            var v2s = this.getValuesForArray(condition.v2s, currentQuestionnaireForm, additionalData);
+            /** @type {?} */
+            var result = false;
+            switch (condition.type) {
+                case ConditionType.Excludes:
+                    result = v1s.filter((/**
+                     * @param {?} v1
+                     * @return {?}
+                     */
+                    function (v1) {
+                        return v2s.indexOf(v1) > -1;
+                    })).length === 0;
+                    break;
+                case ConditionType.Includes:
+                    result = v1s.filter((/**
+                     * @param {?} v1
+                     * @return {?}
+                     */
+                    function (v1) {
+                        return v2s.indexOf(v1) > -1;
+                    })).length !== 0;
+                    break;
+                default: try {
+                    for (var v2s_1 = __values(v2s), v2s_1_1 = v2s_1.next(); !v2s_1_1.done; v2s_1_1 = v2s_1.next()) {
+                        var v2 = v2s_1_1.value;
+                        try {
+                            for (var v1s_1 = (e_7 = void 0, __values(v1s)), v1s_1_1 = v1s_1.next(); !v1s_1_1.done; v1s_1_1 = v1s_1.next()) {
+                                var v1 = v1s_1_1.value;
+                                switch (condition.type) {
+                                    case ConditionType.EqualTo:
+                                        v1 = this.getStringForValue(v1);
+                                        v2 = this.getStringForValue(v2);
+                                        if (v1 === v2) {
+                                            result = true;
+                                        }
+                                        break;
+                                    case ConditionType.NotEqualTo:
+                                        v1 = this.getStringForValue(v1);
+                                        v2 = this.getStringForValue(v2);
+                                        if (v1 !== v2) {
+                                            result = true;
+                                        }
+                                        break;
+                                    case ConditionType.GreaterThan:
+                                        v1 = parseFloat(v1);
+                                        v2 = parseFloat(v2);
+                                        if (v1 >= v2) {
+                                            result = true;
+                                        }
+                                        break;
+                                    case ConditionType.LessThan:
+                                        v1 = parseFloat(v1);
+                                        v2 = parseFloat(v2);
+                                        if (v1 <= v2) {
+                                            result = true;
+                                        }
+                                        break;
                                 }
                             }
                         }
-                    }
-                    catch (e_6_1) {
-                        e_6 = { error: e_6_1 };
-                    }
-                    finally {
-                        try {
-                            if (v2s_1_1 && !v2s_1_1.done && (_a = v2s_1.return))
-                                _a.call(v2s_1);
-                        }
+                        catch (e_7_1) { e_7 = { error: e_7_1 }; }
                         finally {
-                            if (e_6)
-                                throw e_6.error;
+                            try {
+                                if (v1s_1_1 && !v1s_1_1.done && (_b = v1s_1.return)) _b.call(v1s_1);
+                            }
+                            finally { if (e_7) throw e_7.error; }
                         }
                     }
                 }
-                return result;
-            };
+                catch (e_6_1) { e_6 = { error: e_6_1 }; }
+                finally {
+                    try {
+                        if (v2s_1_1 && !v2s_1_1.done && (_a = v2s_1.return)) _a.call(v2s_1);
+                    }
+                    finally { if (e_6) throw e_6.error; }
+                }
+            }
+            return result;
+        };
         /**
          * @private
          * @param {?} value
@@ -576,14 +616,14 @@
          * @param {?} value
          * @return {?}
          */
-            function (value) {
-                switch (value) {
-                    case null:
-                        return 'null';
-                    default:
-                        return value.toString();
-                }
-            };
+        function (value) {
+            switch (value) {
+                case null:
+                    return 'null';
+                default:
+                    return value.toString();
+            }
+        };
         /**
          * Gets the current values for an array of strings.
          * @param paths The array of strings to check.
@@ -609,38 +649,32 @@
          * @param {?=} additionalData
          * @return {?} An array of strings/values
          */
-            function (paths, currentQuestionnaireForm, additionalData) {
-                var e_8, _a;
-                if (currentQuestionnaireForm) {
-                    /** @type {?} */
-                    var values = [];
-                    try {
-                        for (var paths_1 = __values(paths), paths_1_1 = paths_1.next(); !paths_1_1.done; paths_1_1 = paths_1.next()) {
-                            var path = paths_1_1.value;
-                            /** @type {?} */
-                            var value = this.getValueForString(path, currentQuestionnaireForm, additionalData);
-                            values.push(value);
-                        }
-                    }
-                    catch (e_8_1) {
-                        e_8 = { error: e_8_1 };
-                    }
-                    finally {
-                        try {
-                            if (paths_1_1 && !paths_1_1.done && (_a = paths_1.return))
-                                _a.call(paths_1);
-                        }
-                        finally {
-                            if (e_8)
-                                throw e_8.error;
-                        }
+        function (paths, currentQuestionnaireForm, additionalData) {
+            var e_8, _a;
+            if (currentQuestionnaireForm) {
+                /** @type {?} */
+                var values = [];
+                try {
+                    for (var paths_1 = __values(paths), paths_1_1 = paths_1.next(); !paths_1_1.done; paths_1_1 = paths_1.next()) {
+                        var path = paths_1_1.value;
+                        /** @type {?} */
+                        var value = this.getValueForString(path, currentQuestionnaireForm, additionalData);
+                        values.push(value);
                     }
-                    return values;
                 }
-                else {
-                    return paths;
+                catch (e_8_1) { e_8 = { error: e_8_1 }; }
+                finally {
+                    try {
+                        if (paths_1_1 && !paths_1_1.done && (_a = paths_1.return)) _a.call(paths_1);
+                    }
+                    finally { if (e_8) throw e_8.error; }
                 }
-            };
+                return values;
+            }
+            else {
+                return paths;
+            }
+        };
         /**
          * Gets a current value for a string.
          * @param path The string value to check.
@@ -666,21 +700,21 @@
          * @param {?=} additionalData
          * @return {?} A string/value.
          */
-            function (path, currentQuestionnaireForm, additionalData) {
-                if (currentQuestionnaireForm) {
-                    if (!additionalData) {
-                        additionalData = {};
-                    }
-                    /** @type {?} */
-                    var control = currentQuestionnaireForm.get(path);
-                    /** @type {?} */
-                    var value = control ? control.value : this.convertStringToValue(path);
-                    return _.get(additionalData, path, value);
+        function (path, currentQuestionnaireForm, additionalData) {
+            if (currentQuestionnaireForm) {
+                if (!additionalData) {
+                    additionalData = {};
                 }
-                else {
-                    return this.convertStringToValue(path);
-                }
-            };
+                /** @type {?} */
+                var control = currentQuestionnaireForm.get(path);
+                /** @type {?} */
+                var value = control ? control.value : this.convertStringToValue(path);
+                return lodash.get(additionalData, path, value);
+            }
+            else {
+                return this.convertStringToValue(path);
+            }
+        };
         /**
          * Converts a string to a value.
          * Eg. true/false.
@@ -704,32 +738,32 @@
          * @param {?} path The string value to check for conversion;
          * @return {?} Either a string or the converted value.
          */
-            function (path) {
-                switch (path) {
-                    case 'true':
-                        return true;
-                    case 'false':
-                        return false;
-                    case 'null':
-                        return null;
-                    default:
-                        return path;
-                }
-            };
+        function (path) {
+            switch (path) {
+                case 'true':
+                    return true;
+                case 'false':
+                    return false;
+                case 'null':
+                    return null;
+                default:
+                    return path;
+            }
+        };
         FilterService.decorators = [
-            { type: i0.Injectable, args: [{
+            { type: core.Injectable, args: [{
                         providedIn: 'root'
                     },] }
         ];
         /** @nocollapse */
         FilterService.ctorParameters = function () { return []; };
-        /** @nocollapse */ FilterService.ngInjectableDef = i0.defineInjectable({ factory: function FilterService_Factory() { return new FilterService(); }, token: FilterService, providedIn: "root" });
+        /** @nocollapse */ FilterService.ngInjectableDef = core.ɵɵdefineInjectable({ factory: function FilterService_Factory() { return new FilterService(); }, token: FilterService, providedIn: "root" });
         return FilterService;
     }());
 
     /**
      * @fileoverview added by tsickle
-     * @suppress {checkTypes,extraRequire,missingOverride,missingReturn,unusedPrivateMembers,uselessCode} checked by tsc
+     * @suppress {checkTypes,constantProperty,extraRequire,missingOverride,missingReturn,unusedPrivateMembers,uselessCode} checked by tsc
      */
     /** @enum {string} */
     var ValidationType = {
@@ -743,7 +777,7 @@
 
     /**
      * @fileoverview added by tsickle
-     * @suppress {checkTypes,extraRequire,missingOverride,missingReturn,unusedPrivateMembers,uselessCode} checked by tsc
+     * @suppress {checkTypes,constantProperty,extraRequire,missingOverride,missingReturn,unusedPrivateMembers,uselessCode} checked by tsc
      */
     var FormConstructorService = /** @class */ (function () {
         function FormConstructorService(fb, filterService) {
@@ -777,15 +811,15 @@
          * @param {?=} skipFilter
          * @return {?} A filted form group.
          */
-            function (questionnaire, currentQuestionnaireForm, additionalData, skipFilter) {
-                /** @type {?} */
-                var sections = skipFilter ?
-                    questionnaire.sections :
-                    this.filterService.filterSections(questionnaire.sections, currentQuestionnaireForm, additionalData);
-                /** @type {?} */
-                var questionnaireForms = this.generateFormsForSections(sections, currentQuestionnaireForm);
-                return { sections: sections, forms: questionnaireForms };
-            };
+        function (questionnaire, currentQuestionnaireForm, additionalData, skipFilter) {
+            /** @type {?} */
+            var sections = skipFilter ?
+                questionnaire.sections :
+                this.filterService.filterSections(questionnaire.sections, currentQuestionnaireForm, additionalData);
+            /** @type {?} */
+            var questionnaireForms = this.generateFormsForSections(sections, currentQuestionnaireForm);
+            return { sections: sections, forms: questionnaireForms };
+        };
         /**
          * @private
          * @param {?} sections
@@ -798,33 +832,27 @@
          * @param {?} currentQuestionnaireForm
          * @return {?}
          */
-            function (sections, currentQuestionnaireForm) {
-                var e_1, _a;
-                /** @type {?} */
-                var questionnaireForms = this.fb.group({});
-                try {
-                    for (var sections_1 = __values(sections), sections_1_1 = sections_1.next(); !sections_1_1.done; sections_1_1 = sections_1.next()) {
-                        var section = sections_1_1.value;
-                        /** @type {?} */
-                        var sectionForms = this.generateFormsForSection(section, currentQuestionnaireForm);
-                        questionnaireForms.addControl(section.name, sectionForms);
-                    }
-                }
-                catch (e_1_1) {
-                    e_1 = { error: e_1_1 };
+        function (sections, currentQuestionnaireForm) {
+            var e_1, _a;
+            /** @type {?} */
+            var questionnaireForms = this.fb.group({});
+            try {
+                for (var sections_1 = __values(sections), sections_1_1 = sections_1.next(); !sections_1_1.done; sections_1_1 = sections_1.next()) {
+                    var section = sections_1_1.value;
+                    /** @type {?} */
+                    var sectionForms = this.generateFormsForSection(section, currentQuestionnaireForm);
+                    questionnaireForms.addControl(section.name, sectionForms);
                 }
-                finally {
-                    try {
-                        if (sections_1_1 && !sections_1_1.done && (_a = sections_1.return))
-                            _a.call(sections_1);
-                    }
-                    finally {
-                        if (e_1)
-                            throw e_1.error;
-                    }
+            }
+            catch (e_1_1) { e_1 = { error: e_1_1 }; }
+            finally {
+                try {
+                    if (sections_1_1 && !sections_1_1.done && (_a = sections_1.return)) _a.call(sections_1);
                 }
-                return questionnaireForms;
-            };
+                finally { if (e_1) throw e_1.error; }
+            }
+            return questionnaireForms;
+        };
         /**
          * Constructs a form group based on the section data.
          * This form group has been filtered down based on the conditions of the questions.
@@ -850,33 +878,27 @@
          * @param {?} currentQuestionnaireForm
          * @return {?} A filtered form group.
          */
-            function (section, currentQuestionnaireForm) {
-                var e_2, _a;
-                /** @type {?} */
-                var sectionForms = this.fb.group({});
-                try {
-                    for (var _b = __values(section.questions), _c = _b.next(); !_c.done; _c = _b.next()) {
-                        var question = _c.value;
-                        /** @type {?} */
-                        var questionControl = this.generateControlForQuestion(question, section, currentQuestionnaireForm);
-                        sectionForms.addControl(question.name, questionControl);
-                    }
-                }
-                catch (e_2_1) {
-                    e_2 = { error: e_2_1 };
+        function (section, currentQuestionnaireForm) {
+            var e_2, _a;
+            /** @type {?} */
+            var sectionForms = this.fb.group({});
+            try {
+                for (var _b = __values(section.questions), _c = _b.next(); !_c.done; _c = _b.next()) {
+                    var question = _c.value;
+                    /** @type {?} */
+                    var questionControl = this.generateControlForQuestion(question, section, currentQuestionnaireForm);
+                    sectionForms.addControl(question.name, questionControl);
                 }
-                finally {
-                    try {
-                        if (_c && !_c.done && (_a = _b.return))
-                            _a.call(_b);
-                    }
-                    finally {
-                        if (e_2)
-                            throw e_2.error;
-                    }
+            }
+            catch (e_2_1) { e_2 = { error: e_2_1 }; }
+            finally {
+                try {
+                    if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
                 }
-                return sectionForms;
-            };
+                finally { if (e_2) throw e_2.error; }
+            }
+            return sectionForms;
+        };
         /**
          * Constructs an astract form control based on the question data.
          * @param question The question data to build the abstract control on.
@@ -901,20 +923,20 @@
          * @param {?} currentQuestionnaireForm
          * @return {?} An abstract control.
          */
-            function (question, section, currentQuestionnaireForm) {
-                /** @type {?} */
-                var convertedValidators = this.convertValidators(question.validators);
-                switch (question.type) {
-                    case QuestionType.Repeater:
-                        /** @type {?} */
-                        var currentArray = currentQuestionnaireForm ? (( /** @type {?} */(currentQuestionnaireForm.get([section.name, question.name])))) : false;
-                        return currentArray ? currentArray : this.fb.array([], convertedValidators);
-                    case QuestionType.Checklist:
-                        return this.generateGroupForChecklist(question, convertedValidators);
-                    default:
-                        return this.fb.control(null, { validators: convertedValidators, updateOn: 'blur' });
-                }
-            };
+        function (question, section, currentQuestionnaireForm) {
+            /** @type {?} */
+            var convertedValidators = this.convertValidators(question.validators);
+            switch (question.type) {
+                case QuestionType.Repeater:
+                    /** @type {?} */
+                    var currentArray = currentQuestionnaireForm ? ((/** @type {?} */ (currentQuestionnaireForm.get([section.name, question.name])))) : false;
+                    return currentArray ? currentArray : this.fb.array([], convertedValidators);
+                case QuestionType.Checklist:
+                    return this.generateGroupForChecklist(question, convertedValidators);
+                default:
+                    return this.fb.control(null, { validators: convertedValidators, updateOn: 'blur' });
+            }
+        };
         /**
          * Generates the form group for a checklist question.
          * @param question The question. Must be of type checklist or else null is returned.
@@ -937,36 +959,30 @@
          * @param {?} convertedValidators
          * @return {?} A form group.
          */
-            function (question, convertedValidators) {
-                var e_3, _a;
-                if (question.type !== QuestionType.Checklist || question.checklistItems.length === 0) {
-                    return null;
+        function (question, convertedValidators) {
+            var e_3, _a;
+            if (question.type !== QuestionType.Checklist || question.checklistItems.length === 0) {
+                return null;
+            }
+            /** @type {?} */
+            var checklistForms = this.fb.group({});
+            try {
+                for (var _b = __values(question.checklistItems), _c = _b.next(); !_c.done; _c = _b.next()) {
+                    var checklistItem = _c.value;
+                    /** @type {?} */
+                    var checklistItemControl = this.fb.control(null, convertedValidators);
+                    checklistForms.addControl(checklistItem.name, checklistItemControl);
                 }
-                /** @type {?} */
-                var checklistForms = this.fb.group({});
+            }
+            catch (e_3_1) { e_3 = { error: e_3_1 }; }
+            finally {
                 try {
-                    for (var _b = __values(question.checklistItems), _c = _b.next(); !_c.done; _c = _b.next()) {
-                        var checklistItem = _c.value;
-                        /** @type {?} */
-                        var checklistItemControl = this.fb.control(null, convertedValidators);
-                        checklistForms.addControl(checklistItem.name, checklistItemControl);
-                    }
-                }
-                catch (e_3_1) {
-                    e_3 = { error: e_3_1 };
-                }
-                finally {
-                    try {
-                        if (_c && !_c.done && (_a = _b.return))
-                            _a.call(_b);
-                    }
-                    finally {
-                        if (e_3)
-                            throw e_3.error;
-                    }
+                    if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
                 }
-                return checklistForms;
-            };
+                finally { if (e_3) throw e_3.error; }
+            }
+            return checklistForms;
+        };
         /**
          * Generates the form template for a repeater question.
          * @param question The question. Must be of type repeater or else null is returned.
@@ -985,37 +1001,31 @@
          * @param {?} question The question. Must be of type repeater or else null is returned.
          * @return {?} A form group.
          */
-            function (question) {
-                var e_4, _a;
-                if (question.type !== QuestionType.Repeater || question.repeaterQuestions.length === 0) {
-                    console.log('Question isnt a repeater or has no questions, returning null');
-                    return null;
+        function (question) {
+            var e_4, _a;
+            if (question.type !== QuestionType.Repeater || question.repeaterQuestions.length === 0) {
+                console.log('Question isnt a repeater or has no questions, returning null');
+                return null;
+            }
+            /** @type {?} */
+            var repeaterForms = this.fb.group({});
+            try {
+                for (var _b = __values(question.repeaterQuestions), _c = _b.next(); !_c.done; _c = _b.next()) {
+                    var repeaterQuestion = _c.value;
+                    /** @type {?} */
+                    var repeaterQuestionControl = this.generateControlForRepeaterQuestion(repeaterQuestion);
+                    repeaterForms.addControl(repeaterQuestion.name, repeaterQuestionControl);
                 }
-                /** @type {?} */
-                var repeaterForms = this.fb.group({});
+            }
+            catch (e_4_1) { e_4 = { error: e_4_1 }; }
+            finally {
                 try {
-                    for (var _b = __values(question.repeaterQuestions), _c = _b.next(); !_c.done; _c = _b.next()) {
-                        var repeaterQuestion = _c.value;
-                        /** @type {?} */
-                        var repeaterQuestionControl = this.generateControlForRepeaterQuestion(repeaterQuestion);
-                        repeaterForms.addControl(repeaterQuestion.name, repeaterQuestionControl);
-                    }
-                }
-                catch (e_4_1) {
-                    e_4 = { error: e_4_1 };
-                }
-                finally {
-                    try {
-                        if (_c && !_c.done && (_a = _b.return))
-                            _a.call(_b);
-                    }
-                    finally {
-                        if (e_4)
-                            throw e_4.error;
-                    }
+                    if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
                 }
-                return repeaterForms;
-            };
+                finally { if (e_4) throw e_4.error; }
+            }
+            return repeaterForms;
+        };
         /**
          * Generates a control for a repeaters question.
          * @param repeaterQuestion A repeater question.
@@ -1036,11 +1046,11 @@
          * @param {?} repeaterQuestion A repeater question.
          * @return {?} An abstract control.
          */
-            function (repeaterQuestion) {
-                /** @type {?} */
-                var convertedValidators = this.convertValidators(repeaterQuestion.validators);
-                return this.fb.control(null, { validators: convertedValidators, updateOn: 'blur' });
-            };
+        function (repeaterQuestion) {
+            /** @type {?} */
+            var convertedValidators = this.convertValidators(repeaterQuestion.validators);
+            return this.fb.control(null, { validators: convertedValidators, updateOn: 'blur' });
+        };
         /**
          * Converts an array of validators into form validators.
          * @param validators The uncoverted array of validators.
@@ -1061,38 +1071,32 @@
          * @param {?} validators The uncoverted array of validators.
          * @return {?} A convered array of form validators.
          */
-            function (validators) {
-                var e_5, _a;
-                if (!validators || validators.length === 0) {
-                    return [];
-                }
-                /** @type {?} */
-                var convertedValidators = [];
-                try {
-                    for (var validators_1 = __values(validators), validators_1_1 = validators_1.next(); !validators_1_1.done; validators_1_1 = validators_1.next()) {
-                        var validator = validators_1_1.value;
-                        /** @type {?} */
-                        var convertedValidator = this.convertValidator(validator);
-                        if (convertedValidator) {
-                            convertedValidators.push(convertedValidator);
-                        }
+        function (validators) {
+            var e_5, _a;
+            if (!validators || validators.length === 0) {
+                return [];
+            }
+            /** @type {?} */
+            var convertedValidators = [];
+            try {
+                for (var validators_1 = __values(validators), validators_1_1 = validators_1.next(); !validators_1_1.done; validators_1_1 = validators_1.next()) {
+                    var validator = validators_1_1.value;
+                    /** @type {?} */
+                    var convertedValidator = this.convertValidator(validator);
+                    if (convertedValidator) {
+                        convertedValidators.push(convertedValidator);
                     }
                 }
-                catch (e_5_1) {
-                    e_5 = { error: e_5_1 };
-                }
-                finally {
-                    try {
-                        if (validators_1_1 && !validators_1_1.done && (_a = validators_1.return))
-                            _a.call(validators_1);
-                    }
-                    finally {
-                        if (e_5)
-                            throw e_5.error;
-                    }
+            }
+            catch (e_5_1) { e_5 = { error: e_5_1 }; }
+            finally {
+                try {
+                    if (validators_1_1 && !validators_1_1.done && (_a = validators_1.return)) _a.call(validators_1);
                 }
-                return convertedValidators;
-            };
+                finally { if (e_5) throw e_5.error; }
+            }
+            return convertedValidators;
+        };
         /**
          * Converts a single validator into a form validator.
          * @param validator The unconverted validator.
@@ -1113,14 +1117,14 @@
          * @param {?} validator The unconverted validator.
          * @return {?} A converted form validator.
          */
-            function (validator) {
-                switch (validator.type) {
-                    case ValidationType.Required:
-                        return i1.Validators.required;
-                    default:
-                        return null;
-                }
-            };
+        function (validator) {
+            switch (validator.type) {
+                case ValidationType.Required:
+                    return forms.Validators.required;
+                default:
+                    return null;
+            }
+        };
         /**
          * Constructs the forms for repeaters from saved state.
          * @param savedState The saved state to load.
@@ -1140,105 +1144,97 @@
          * @param {?} currentQuestionnaireForm
          * @return {?}
          */
-            function (savedState, sections, currentQuestionnaireForm) {
-                var e_6, _a, e_7, _b, e_8, _c;
-                try {
-                    for (var sections_2 = __values(sections), sections_2_1 = sections_2.next(); !sections_2_1.done; sections_2_1 = sections_2.next()) {
-                        var section = sections_2_1.value;
-                        try {
-                            for (var _d = __values(section.questions), _e = _d.next(); !_e.done; _e = _d.next()) {
-                                var question = _e.value;
-                                if (question.type !== QuestionType.Repeater) {
-                                    continue;
-                                }
-                                /** @type {?} */
-                                var repeaterArray = savedState[section.name][question.name];
-                                if (!repeaterArray || repeaterArray.length === 0) {
-                                    continue;
-                                }
-                                /** @type {?} */
-                                var repeaterFormArray = ( /** @type {?} */(currentQuestionnaireForm.get([section.name, question.name])));
-                                if (repeaterFormArray.controls.length === repeaterArray.length) {
-                                    continue;
-                                }
-                                try {
-                                    // For each item that used to be there push a new empty template there to be populated.
-                                    for (var repeaterArray_1 = __values(repeaterArray), repeaterArray_1_1 = repeaterArray_1.next(); !repeaterArray_1_1.done; repeaterArray_1_1 = repeaterArray_1.next()) {
-                                        var repeaterItem = repeaterArray_1_1.value;
-                                        /** @type {?} */
-                                        var repeaterItemTemplate = this.generateFormsForRepeater(question);
-                                        repeaterFormArray.push(repeaterItemTemplate);
-                                    }
-                                }
-                                catch (e_8_1) {
-                                    e_8 = { error: e_8_1 };
-                                }
-                                finally {
-                                    try {
-                                        if (repeaterArray_1_1 && !repeaterArray_1_1.done && (_c = repeaterArray_1.return))
-                                            _c.call(repeaterArray_1);
-                                    }
-                                    finally {
-                                        if (e_8)
-                                            throw e_8.error;
-                                    }
-                                }
+        function (savedState, sections, currentQuestionnaireForm) {
+            var e_6, _a, e_7, _b, e_8, _c;
+            try {
+                for (var sections_2 = __values(sections), sections_2_1 = sections_2.next(); !sections_2_1.done; sections_2_1 = sections_2.next()) {
+                    var section = sections_2_1.value;
+                    try {
+                        for (var _d = (e_7 = void 0, __values(section.questions)), _e = _d.next(); !_e.done; _e = _d.next()) {
+                            var question = _e.value;
+                            if (question.type !== QuestionType.Repeater) {
+                                continue;
+                            }
+                            /** @type {?} */
+                            var repeaterArray = savedState[section.name][question.name];
+                            if (!repeaterArray || repeaterArray.length === 0) {
+                                continue;
+                            }
+                            /** @type {?} */
+                            var repeaterFormArray = (/** @type {?} */ (currentQuestionnaireForm.get([section.name, question.name])));
+                            if (repeaterFormArray.controls.length === repeaterArray.length) {
+                                continue;
                             }
-                        }
-                        catch (e_7_1) {
-                            e_7 = { error: e_7_1 };
-                        }
-                        finally {
                             try {
-                                if (_e && !_e.done && (_b = _d.return))
-                                    _b.call(_d);
+                                // For each item that used to be there push a new empty template there to be populated.
+                                for (var repeaterArray_1 = (e_8 = void 0, __values(repeaterArray)), repeaterArray_1_1 = repeaterArray_1.next(); !repeaterArray_1_1.done; repeaterArray_1_1 = repeaterArray_1.next()) {
+                                    var repeaterItem = repeaterArray_1_1.value;
+                                    /** @type {?} */
+                                    var repeaterItemTemplate = this.generateFormsForRepeater(question);
+                                    repeaterFormArray.push(repeaterItemTemplate);
+                                }
                             }
+                            catch (e_8_1) { e_8 = { error: e_8_1 }; }
                             finally {
-                                if (e_7)
-                                    throw e_7.error;
+                                try {
+                                    if (repeaterArray_1_1 && !repeaterArray_1_1.done && (_c = repeaterArray_1.return)) _c.call(repeaterArray_1);
+                                }
+                                finally { if (e_8) throw e_8.error; }
                             }
                         }
                     }
-                }
-                catch (e_6_1) {
-                    e_6 = { error: e_6_1 };
-                }
-                finally {
-                    try {
-                        if (sections_2_1 && !sections_2_1.done && (_a = sections_2.return))
-                            _a.call(sections_2);
-                    }
+                    catch (e_7_1) { e_7 = { error: e_7_1 }; }
                     finally {
-                        if (e_6)
-                            throw e_6.error;
+                        try {
+                            if (_e && !_e.done && (_b = _d.return)) _b.call(_d);
+                        }
+                        finally { if (e_7) throw e_7.error; }
                     }
                 }
-            };
+            }
+            catch (e_6_1) { e_6 = { error: e_6_1 }; }
+            finally {
+                try {
+                    if (sections_2_1 && !sections_2_1.done && (_a = sections_2.return)) _a.call(sections_2);
+                }
+                finally { if (e_6) throw e_6.error; }
+            }
+        };
         FormConstructorService.decorators = [
-            { type: i0.Injectable, args: [{
+            { type: core.Injectable, args: [{
                         providedIn: 'root'
                     },] }
         ];
         /** @nocollapse */
-        FormConstructorService.ctorParameters = function () {
-            return [
-                { type: i1.FormBuilder },
-                { type: FilterService }
-            ];
-        };
-        /** @nocollapse */ FormConstructorService.ngInjectableDef = i0.defineInjectable({ factory: function FormConstructorService_Factory() { return new FormConstructorService(i0.inject(i1.FormBuilder), i0.inject(FilterService)); }, token: FormConstructorService, providedIn: "root" });
+        FormConstructorService.ctorParameters = function () { return [
+            { type: forms.FormBuilder },
+            { type: FilterService }
+        ]; };
+        /** @nocollapse */ FormConstructorService.ngInjectableDef = core.ɵɵdefineInjectable({ factory: function FormConstructorService_Factory() { return new FormConstructorService(core.ɵɵinject(forms.FormBuilder), core.ɵɵinject(FilterService)); }, token: FormConstructorService, providedIn: "root" });
         return FormConstructorService;
     }());
+    if (false) {
+        /**
+         * @type {?}
+         * @private
+         */
+        FormConstructorService.prototype.fb;
+        /**
+         * @type {?}
+         * @private
+         */
+        FormConstructorService.prototype.filterService;
+    }
 
     /**
      * @fileoverview added by tsickle
-     * @suppress {checkTypes,extraRequire,missingOverride,missingReturn,unusedPrivateMembers,uselessCode} checked by tsc
+     * @suppress {checkTypes,constantProperty,extraRequire,missingOverride,missingReturn,unusedPrivateMembers,uselessCode} checked by tsc
      */
     var QuestionnaireService = /** @class */ (function () {
         function QuestionnaireService(formConstuctor, options) {
             this.formConstuctor = formConstuctor;
             this.options = options;
-            this.dataChangedEvent = new i0.EventEmitter();
+            this.dataChangedEvent = new core.EventEmitter();
             this.skippable = false;
         }
         /**
@@ -1264,75 +1260,64 @@
          * @param {?=} additionalData
          * @return {?} null
          */
-            function (questionnaire, savedState, additionalData) {
-                return __awaiter(this, void 0, void 0, function () {
-                    var e_1, _a, e_2, _b, newData, _c, _d, section, _e, _f, question, control;
-                    return __generator(this, function (_g) {
-                        switch (_g.label) {
-                            case 0:
-                                this.originalQuestionnaire = _.cloneDeep(questionnaire);
-                                this.currentQuestionnaire = _.cloneDeep(questionnaire);
-                                this.additionalData = additionalData;
-                                if (savedState && Object.keys(savedState).length > 0) {
-                                    newData = this.formConstuctor.generateFormsForQuestionnaire(_.cloneDeep(this.originalQuestionnaire), this.currentQuestionnaireForm, this.additionalData, true);
-                                    this.formConstuctor.constructRepeaterFromsFromState(savedState, newData.sections, newData.forms);
-                                    this.currentQuestionnaireForm = newData.forms;
-                                    this.currentQuestionnaireForm.patchValue(savedState);
-                                }
-                                return [4 /*yield*/, this.updateQuestionnaire(savedState)];
-                            case 1:
-                                _g.sent();
-                                try {
-                                    for (_c = __values(this.currentQuestionnaire.sections), _d = _c.next(); !_d.done; _d = _c.next()) {
-                                        section = _d.value;
-                                        try {
-                                            for (_e = __values(section.questions), _f = _e.next(); !_f.done; _f = _e.next()) {
-                                                question = _f.value;
-                                                control = this.currentQuestionnaireForm.get([section.name, question.name]);
-                                                if (!control.value && question.defaultValue) {
-                                                    control.setValue(question.defaultValue);
-                                                }
-                                            }
-                                        }
-                                        catch (e_2_1) {
-                                            e_2 = { error: e_2_1 };
-                                        }
-                                        finally {
-                                            try {
-                                                if (_f && !_f.done && (_b = _e.return))
-                                                    _b.call(_e);
-                                            }
-                                            finally {
-                                                if (e_2)
-                                                    throw e_2.error;
+        function (questionnaire, savedState, additionalData) {
+            return __awaiter(this, void 0, void 0, function () {
+                var newData, _a, _b, section, _c, _d, question, control;
+                var e_1, _e, e_2, _f;
+                return __generator(this, function (_g) {
+                    switch (_g.label) {
+                        case 0:
+                            this.originalQuestionnaire = lodash.cloneDeep(questionnaire);
+                            this.currentQuestionnaire = lodash.cloneDeep(questionnaire);
+                            this.additionalData = additionalData;
+                            if (savedState && Object.keys(savedState).length > 0) {
+                                newData = this.formConstuctor.generateFormsForQuestionnaire(lodash.cloneDeep(this.originalQuestionnaire), this.currentQuestionnaireForm, this.additionalData, true);
+                                this.formConstuctor.constructRepeaterFromsFromState(savedState, newData.sections, newData.forms);
+                                this.currentQuestionnaireForm = newData.forms;
+                                this.currentQuestionnaireForm.patchValue(savedState);
+                            }
+                            return [4 /*yield*/, this.updateQuestionnaire(savedState)];
+                        case 1:
+                            _g.sent();
+                            try {
+                                for (_a = __values(this.currentQuestionnaire.sections), _b = _a.next(); !_b.done; _b = _a.next()) {
+                                    section = _b.value;
+                                    try {
+                                        for (_c = (e_2 = void 0, __values(section.questions)), _d = _c.next(); !_d.done; _d = _c.next()) {
+                                            question = _d.value;
+                                            control = this.currentQuestionnaireForm.get([section.name, question.name]);
+                                            if (!control.value && question.defaultValue) {
+                                                control.setValue(question.defaultValue);
                                             }
                                         }
                                     }
-                                }
-                                catch (e_1_1) {
-                                    e_1 = { error: e_1_1 };
-                                }
-                                finally {
-                                    try {
-                                        if (_d && !_d.done && (_a = _c.return))
-                                            _a.call(_c);
-                                    }
+                                    catch (e_2_1) { e_2 = { error: e_2_1 }; }
                                     finally {
-                                        if (e_1)
-                                            throw e_1.error;
+                                        try {
+                                            if (_d && !_d.done && (_f = _c.return)) _f.call(_c);
+                                        }
+                                        finally { if (e_2) throw e_2.error; }
                                     }
                                 }
-                                if (this.options.skipToFirstSection) {
-                                    this.currentSectionName = Object.keys(this.currentQuestionnaireForm.controls)[0];
-                                }
-                                if (this.options.skipToFirstQuestion) {
-                                    this.currentQuestionName = Object.keys(this.currentSection.formGroup.controls)[0];
+                            }
+                            catch (e_1_1) { e_1 = { error: e_1_1 }; }
+                            finally {
+                                try {
+                                    if (_b && !_b.done && (_e = _a.return)) _e.call(_a);
                                 }
-                                return [2 /*return*/];
-                        }
-                    });
+                                finally { if (e_1) throw e_1.error; }
+                            }
+                            if (this.options.skipToFirstSection) {
+                                this.currentSectionName = Object.keys(this.currentQuestionnaireForm.controls)[0];
+                            }
+                            if (this.options.skipToFirstQuestion) {
+                                this.currentQuestionName = Object.keys(this.currentSection.formGroup.controls)[0];
+                            }
+                            return [2 /*return*/];
+                    }
                 });
-            };
+            });
+        };
         /**
          * Updates the current questionnaire, used when a value is updated to check conditions.
          * @param savedState The saved state of the questionnaire, often from localstorage.
@@ -1349,42 +1334,45 @@
          * Updates the current questionnaire, used when a value is updated to check conditions.
          * @author Will Poulson
          * @param {?=} savedState The saved state of the questionnaire, often from localstorage.
-         * @return {?} null
-         */
-            function (savedState) {
-                var _this = this;
-                /** @type {?} */
-                var newData = this.formConstuctor.generateFormsForQuestionnaire(_.cloneDeep(this.originalQuestionnaire), this.currentQuestionnaireForm, this.additionalData);
-                this.currentQuestionnaireForm = newData.forms;
-                this.currentQuestionnaire.sections = newData.sections;
-                if (savedState && Object.keys(savedState).length > 0) {
-                    this.currentQuestionnaireForm.patchValue(savedState);
-                }
-                if (this.questionnaireValueChangeSubscription) {
-                    this.questionnaireValueChangeSubscription.unsubscribe();
-                }
-                if (this.questionValueChangeSubscription) {
-                    this.questionValueChangeSubscription.unsubscribe();
-                }
-                this.questionnaireValueChangeSubscription = this.currentQuestionnaireForm.valueChanges.subscribe(( /**
+         * @return {?} null
+         */
+        function (savedState) {
+            var _this = this;
+            /** @type {?} */
+            var newData = this.formConstuctor.generateFormsForQuestionnaire(lodash.cloneDeep(this.originalQuestionnaire), this.currentQuestionnaireForm, this.additionalData);
+            this.currentQuestionnaireForm = newData.forms;
+            this.currentQuestionnaire.sections = newData.sections;
+            if (savedState && Object.keys(savedState).length > 0) {
+                this.currentQuestionnaireForm.patchValue(savedState);
+            }
+            if (this.questionnaireValueChangeSubscription) {
+                this.questionnaireValueChangeSubscription.unsubscribe();
+            }
+            if (this.questionValueChangeSubscription) {
+                this.questionValueChangeSubscription.unsubscribe();
+            }
+            this.questionnaireValueChangeSubscription = this.currentQuestionnaireForm.valueChanges.subscribe((/**
+             * @return {?}
+             */
+            function () {
+                _this.dataChangedEvent.emit();
+                _this.updateQuestionnaire(_this.currentQuestionnaireForm.getRawValue());
+            }));
+            if (this.currentQuestion) {
+                this.questionValueChangeSubscription = this.currentQuestion.formControl.valueChanges.subscribe((/**
                  * @return {?}
-                 */function () {
-                    _this.dataChangedEvent.emit();
-                    _this.updateQuestionnaire(_this.currentQuestionnaireForm.getRawValue());
+                 */
+                function () {
+                    _this.clearFields(_this.currentQuestion.data.clearfields);
                 }));
-                if (this.currentQuestion) {
-                    this.questionValueChangeSubscription = this.currentQuestion.formControl.valueChanges.subscribe(( /**
-                     * @return {?}
-                     */function () {
-                        _this.clearFields(_this.currentQuestion.data.clearfields);
-                    }));
-                }
-                return;
-            };
+            }
+            return;
+        };
         Object.defineProperty(QuestionnaireService.prototype, "isValid", {
             get: /**
              * @return {?}
-             */ function () {
+             */
+            function () {
                 return this.currentQuestionnaireForm.valid;
             },
             enumerable: true,
@@ -1398,9 +1386,9 @@
          * @param {?} name
          * @return {?}
          */
-            function (name) {
-                return this.currentQuestionnaireForm.get(name).valid;
-            };
+        function (name) {
+            return this.currentQuestionnaireForm.get(name).valid;
+        };
         /**
          * Clears all the fields parsed
          * @param clearfields An array of strings, paths to clear.
@@ -1420,35 +1408,29 @@
          * @param {?} clearfields An array of strings, paths to clear.
          * @return {?}
          */
-            function (clearfields) {
-                var e_3, _a;
-                if (!clearfields || clearfields.length === 0) {
-                    return;
-                }
-                try {
-                    for (var clearfields_1 = __values(clearfields), clearfields_1_1 = clearfields_1.next(); !clearfields_1_1.done; clearfields_1_1 = clearfields_1.next()) {
-                        var clearfield = clearfields_1_1.value;
-                        /** @type {?} */
-                        var control = this.currentQuestionnaireForm.get(clearfield);
-                        if (control) {
-                            control.reset(undefined);
-                        }
+        function (clearfields) {
+            var e_3, _a;
+            if (!clearfields || clearfields.length === 0) {
+                return;
+            }
+            try {
+                for (var clearfields_1 = __values(clearfields), clearfields_1_1 = clearfields_1.next(); !clearfields_1_1.done; clearfields_1_1 = clearfields_1.next()) {
+                    var clearfield = clearfields_1_1.value;
+                    /** @type {?} */
+                    var control = this.currentQuestionnaireForm.get(clearfield);
+                    if (control) {
+                        control.reset(undefined);
                     }
                 }
-                catch (e_3_1) {
-                    e_3 = { error: e_3_1 };
-                }
-                finally {
-                    try {
-                        if (clearfields_1_1 && !clearfields_1_1.done && (_a = clearfields_1.return))
-                            _a.call(clearfields_1);
-                    }
-                    finally {
-                        if (e_3)
-                            throw e_3.error;
-                    }
+            }
+            catch (e_3_1) { e_3 = { error: e_3_1 }; }
+            finally {
+                try {
+                    if (clearfields_1_1 && !clearfields_1_1.done && (_a = clearfields_1.return)) _a.call(clearfields_1);
                 }
-            };
+                finally { if (e_3) throw e_3.error; }
+            }
+        };
         /**
          * Unloads the current questionnaire.
          * Useful when exiting a questionnaire page or completing a questionnaire.
@@ -1466,14 +1448,14 @@
          * @author Will Poulson
          * @return {?}
          */
-            function () {
-                this.originalQuestionnaire = undefined;
-                this.currentQuestionnaireForm = undefined;
-                this.currentQuestionnaire = undefined;
-                this.currentSectionName = undefined;
-                this.currentQuestionName = undefined;
-                this.additionalData = undefined;
-            };
+        function () {
+            this.originalQuestionnaire = undefined;
+            this.currentQuestionnaireForm = undefined;
+            this.currentQuestionnaire = undefined;
+            this.currentSectionName = undefined;
+            this.currentQuestionName = undefined;
+            this.additionalData = undefined;
+        };
         Object.defineProperty(QuestionnaireService.prototype, "currentSection", {
             /**
              * Gets the current selected section.
@@ -1484,16 +1466,18 @@
              * Gets the current selected section.
              * @author Will Poulson
              * @return {?} An object containing the section data and the related form group.
-             */ function () {
+             */
+            function () {
                 var _this = this;
                 if (!this.currentSectionName) {
                     return null;
                 }
                 /** @type {?} */
-                var data = this.currentQuestionnaire.sections.find(( /**
+                var data = this.currentQuestionnaire.sections.find((/**
                  * @param {?} x
                  * @return {?}
-                 */function (x) {
+                 */
+                function (x) {
                     return x.name === _this.currentSectionName;
                 }));
                 if (!data) {
@@ -1501,7 +1485,7 @@
                 }
                 return {
                     data: data,
-                    formGroup: ( /** @type {?} */(this.currentQuestionnaireForm.get(data.name)))
+                    formGroup: (/** @type {?} */ (this.currentQuestionnaireForm.get(data.name)))
                 };
             },
             enumerable: true,
@@ -1517,7 +1501,8 @@
              * Gets all the avaialble sections.
              * @author Will Poulson
              * @return {?} An array of all avaialble sections.
-             */ function () {
+             */
+            function () {
                 if (!this.currentQuestionnaire || !this.currentQuestionnaire.sections) {
                     return [];
                 }
@@ -1536,7 +1521,8 @@
              * Gets the current data for the entire questionnaire.
              * @author Will Poulson
              * @return {?} An object of data.
-             */ function () {
+             */
+            function () {
                 return this.currentQuestionnaireForm.getRawValue();
             },
             enumerable: true,
@@ -1552,16 +1538,18 @@
              * Gets the current selected question.
              * @author Will Poulson
              * @return {?} An object containing the question data and the related form control.
-             */ function () {
+             */
+            function () {
                 var _this = this;
                 if (!this.currentQuestionName) {
                     return null;
                 }
                 /** @type {?} */
-                var data = this.currentSection.data.questions.find(( /**
+                var data = this.currentSection.data.questions.find((/**
                  * @param {?} x
                  * @return {?}
-                 */function (x) {
+                 */
+                function (x) {
                     return x.name === _this.currentQuestionName;
                 }));
                 if (!data) {
@@ -1569,7 +1557,7 @@
                 }
                 return {
                     data: data,
-                    formControl: ( /** @type {?} */(this.currentSection.formGroup.get(data.name)))
+                    formControl: (/** @type {?} */ (this.currentSection.formGroup.get(data.name)))
                 };
             },
             enumerable: true,
@@ -1599,42 +1587,47 @@
          * @author Will Poulson
          * @return {?} A promise which will resolve when the question has been navigated to.
          */
-            function () {
-                var _this = this;
-                return new Promise(( /**
-                 * @param {?} resolve
-                 * @param {?} reject
-                 * @return {?}
-                 */function (resolve, reject) {
-                    if (!_this.options.allowSkipRequiredField) {
-                        if (!_this.currentQuestion.formControl.valid) {
-                            return reject('Current question is invalid');
-                        }
+        function () {
+            var _this = this;
+            return new Promise((/**
+             * @param {?} resolve
+             * @param {?} reject
+             * @return {?}
+             */
+            function (resolve, reject) {
+                if (!_this.options.allowSkipRequiredField) {
+                    if (!_this.currentQuestion.formControl.valid) {
+                        return reject('Current question is invalid');
                     }
-                    _this.getCurrentQuestionIndex().then(( /**
-                     * @param {?} currentIndex
+                }
+                _this.getCurrentQuestionIndex().then((/**
+                 * @param {?} currentIndex
+                 * @return {?}
+                 */
+                function (currentIndex) {
+                    /** @type {?} */
+                    var newIndex = currentIndex + 1;
+                    _this.navigateToQuestion(newIndex).then((/**
                      * @return {?}
-                     */function (currentIndex) {
-                        /** @type {?} */
-                        var newIndex = currentIndex + 1;
-                        _this.navigateToQuestion(newIndex).then(( /**
-                         * @return {?}
-                         */function () {
-                            return resolve();
-                        })).catch(( /**
-                         * @param {?} error
-                         * @return {?}
-                         */function (error) {
-                            return reject(error);
-                        }));
-                    })).catch(( /**
+                     */
+                    function () {
+                        return resolve();
+                    })).catch((/**
                      * @param {?} error
                      * @return {?}
-                     */function (error) {
+                     */
+                    function (error) {
                         return reject(error);
                     }));
+                })).catch((/**
+                 * @param {?} error
+                 * @return {?}
+                 */
+                function (error) {
+                    return reject(error);
                 }));
-            };
+            }));
+        };
         /**
          * Navigates to the previous question.
          * If there is no question to navigate to it will reject with a out of bounds exception.
@@ -1656,40 +1649,45 @@
          * @author Will Poulson
          * @return {?} A promise which will resolve when the question has been navigated to.
          */
-            function () {
-                var _this = this;
-                return new Promise(( /**
-                 * @param {?} resolve
-                 * @param {?} reject
+        function () {
+            var _this = this;
+            return new Promise((/**
+             * @param {?} resolve
+             * @param {?} reject
+             * @return {?}
+             */
+            function (resolve, reject) {
+                if (!_this.options.allowNavigateBackwards) {
+                    return reject('This questionnaire does not allow for backwards navigation');
+                }
+                _this.getCurrentQuestionIndex().then((/**
+                 * @param {?} currentIndex
                  * @return {?}
-                 */function (resolve, reject) {
-                    if (!_this.options.allowNavigateBackwards) {
-                        return reject('This questionnaire does not allow for backwards navigation');
-                    }
-                    _this.getCurrentQuestionIndex().then(( /**
-                     * @param {?} currentIndex
+                 */
+                function (currentIndex) {
+                    /** @type {?} */
+                    var newIndex = currentIndex - 1;
+                    _this.navigateToQuestion(newIndex).then((/**
                      * @return {?}
-                     */function (currentIndex) {
-                        /** @type {?} */
-                        var newIndex = currentIndex - 1;
-                        _this.navigateToQuestion(newIndex).then(( /**
-                         * @return {?}
-                         */function () {
-                            return resolve();
-                        })).catch(( /**
-                         * @param {?} error
-                         * @return {?}
-                         */function (error) {
-                            return reject(error);
-                        }));
-                    })).catch(( /**
+                     */
+                    function () {
+                        return resolve();
+                    })).catch((/**
                      * @param {?} error
                      * @return {?}
-                     */function (error) {
+                     */
+                    function (error) {
                         return reject(error);
                     }));
+                })).catch((/**
+                 * @param {?} error
+                 * @return {?}
+                 */
+                function (error) {
+                    return reject(error);
                 }));
-            };
+            }));
+        };
         /**
          * Gets the current questions index.
          * @returns A promise which resolves a number.
@@ -1707,21 +1705,22 @@
          * @private
          * @return {?} A promise which resolves a number.
          */
-            function () {
-                var _this = this;
-                return new Promise(( /**
-                 * @param {?} resolve
-                 * @param {?} reject
-                 * @return {?}
-                 */function (resolve, reject) {
-                    /** @type {?} */
-                    var currentIndex = _this.currentSection.data.questions.indexOf(_this.currentQuestion.data);
-                    if (currentIndex === -1) {
-                        return reject('Could not find current question');
-                    }
-                    return resolve(currentIndex);
-                }));
-            };
+        function () {
+            var _this = this;
+            return new Promise((/**
+             * @param {?} resolve
+             * @param {?} reject
+             * @return {?}
+             */
+            function (resolve, reject) {
+                /** @type {?} */
+                var currentIndex = _this.currentSection.data.questions.indexOf(_this.currentQuestion.data);
+                if (currentIndex === -1) {
+                    return reject('Could not find current question');
+                }
+                return resolve(currentIndex);
+            }));
+        };
         /**
          * Checks a question is in bounds then navigates to it.
          * @param index The index to navigate to.
@@ -1740,20 +1739,21 @@
          * @param {?} index The index to navigate to.
          * @return {?} A promise which will resolve when the question has been navigated to.
          */
-            function (index) {
-                var _this = this;
-                return new Promise(( /**
-                 * @param {?} resolve
-                 * @param {?} reject
-                 * @return {?}
-                 */function (resolve, reject) {
-                    if (_this.currentSection.data.questions.length - 1 < index || index < 0) {
-                        return reject('Out of bounds exception');
-                    }
-                    _this.currentQuestionName = _this.currentSection.data.questions[index].name;
-                    return resolve();
-                }));
-            };
+        function (index) {
+            var _this = this;
+            return new Promise((/**
+             * @param {?} resolve
+             * @param {?} reject
+             * @return {?}
+             */
+            function (resolve, reject) {
+                if (_this.currentSection.data.questions.length - 1 < index || index < 0) {
+                    return reject('Out of bounds exception');
+                }
+                _this.currentQuestionName = _this.currentSection.data.questions[index].name;
+                return resolve();
+            }));
+        };
         /**
          * Navigates to the next section.
          * @returns A promise which will resolve when the section has been navigated to.
@@ -1769,37 +1769,42 @@
          * @author Will Poulson
          * @return {?} A promise which will resolve when the section has been navigated to.
          */
-            function () {
-                var _this = this;
-                return new Promise(( /**
-                 * @param {?} resolve
-                 * @param {?} reject
+        function () {
+            var _this = this;
+            return new Promise((/**
+             * @param {?} resolve
+             * @param {?} reject
+             * @return {?}
+             */
+            function (resolve, reject) {
+                _this.getCurrentSectionIndex().then((/**
+                 * @param {?} currentIndex
                  * @return {?}
-                 */function (resolve, reject) {
-                    _this.getCurrentSectionIndex().then(( /**
-                     * @param {?} currentIndex
+                 */
+                function (currentIndex) {
+                    /** @type {?} */
+                    var newIndex = currentIndex + 1;
+                    _this.navigateToSection(newIndex).then((/**
                      * @return {?}
-                     */function (currentIndex) {
-                        /** @type {?} */
-                        var newIndex = currentIndex + 1;
-                        _this.navigateToSection(newIndex).then(( /**
-                         * @return {?}
-                         */function () {
-                            return resolve();
-                        })).catch(( /**
-                         * @param {?} error
-                         * @return {?}
-                         */function (error) {
-                            return reject(error);
-                        }));
-                    })).catch(( /**
+                     */
+                    function () {
+                        return resolve();
+                    })).catch((/**
                      * @param {?} error
                      * @return {?}
-                     */function (error) {
+                     */
+                    function (error) {
                         return reject(error);
                     }));
+                })).catch((/**
+                 * @param {?} error
+                 * @return {?}
+                 */
+                function (error) {
+                    return reject(error);
                 }));
-            };
+            }));
+        };
         /**
          * Navigates to the previous section.
          * @returns A promise which will resolve when the section has been navigated to.
@@ -1815,37 +1820,42 @@
          * @author Will Poulson
          * @return {?} A promise which will resolve when the section has been navigated to.
          */
-            function () {
-                var _this = this;
-                return new Promise(( /**
-                 * @param {?} resolve
-                 * @param {?} reject
+        function () {
+            var _this = this;
+            return new Promise((/**
+             * @param {?} resolve
+             * @param {?} reject
+             * @return {?}
+             */
+            function (resolve, reject) {
+                _this.getCurrentSectionIndex().then((/**
+                 * @param {?} currentIndex
                  * @return {?}
-                 */function (resolve, reject) {
-                    _this.getCurrentSectionIndex().then(( /**
-                     * @param {?} currentIndex
+                 */
+                function (currentIndex) {
+                    /** @type {?} */
+                    var newIndex = currentIndex - 1;
+                    _this.navigateToQuestion(newIndex).then((/**
                      * @return {?}
-                     */function (currentIndex) {
-                        /** @type {?} */
-                        var newIndex = currentIndex - 1;
-                        _this.navigateToQuestion(newIndex).then(( /**
-                         * @return {?}
-                         */function () {
-                            return resolve();
-                        })).catch(( /**
-                         * @param {?} error
-                         * @return {?}
-                         */function (error) {
-                            return reject(error);
-                        }));
-                    })).catch(( /**
+                     */
+                    function () {
+                        return resolve();
+                    })).catch((/**
                      * @param {?} error
                      * @return {?}
-                     */function (error) {
+                     */
+                    function (error) {
                         return reject(error);
                     }));
+                })).catch((/**
+                 * @param {?} error
+                 * @return {?}
+                 */
+                function (error) {
+                    return reject(error);
                 }));
-            };
+            }));
+        };
         /**
          * Gets the current section index.
          * @returns A promise which resolves a number.
@@ -1863,21 +1873,22 @@
          * @private
          * @return {?} A promise which resolves a number.
          */
-            function () {
-                var _this = this;
-                return new Promise(( /**
-                 * @param {?} resolve
-                 * @param {?} reject
-                 * @return {?}
-                 */function (resolve, reject) {
-                    /** @type {?} */
-                    var currentIndex = _this.currentQuestionnaire.sections.indexOf(_this.currentSection.data);
-                    if (currentIndex === -1) {
-                        return reject('Could not find current section');
-                    }
-                    return resolve(currentIndex);
-                }));
-            };
+        function () {
+            var _this = this;
+            return new Promise((/**
+             * @param {?} resolve
+             * @param {?} reject
+             * @return {?}
+             */
+            function (resolve, reject) {
+                /** @type {?} */
+                var currentIndex = _this.currentQuestionnaire.sections.indexOf(_this.currentSection.data);
+                if (currentIndex === -1) {
+                    return reject('Could not find current section');
+                }
+                return resolve(currentIndex);
+            }));
+        };
         /**
          * Checks a section is in bounds then navigates to it.
          * @param index The index to navigate to.
@@ -1896,20 +1907,21 @@
          * @param {?} index The index to navigate to.
          * @return {?} A promise which will resolve when the section has been navigated to.
          */
-            function (index) {
-                var _this = this;
-                return new Promise(( /**
-                 * @param {?} resolve
-                 * @param {?} reject
-                 * @return {?}
-                 */function (resolve, reject) {
-                    if (_this.currentQuestionnaire.sections.length - 1 < index || index < 0) {
-                        return reject('Out of bounds exception');
-                    }
-                    _this.currentSectionName = _this.currentQuestionnaire.sections[index].name;
-                    return resolve();
-                }));
-            };
+        function (index) {
+            var _this = this;
+            return new Promise((/**
+             * @param {?} resolve
+             * @param {?} reject
+             * @return {?}
+             */
+            function (resolve, reject) {
+                if (_this.currentQuestionnaire.sections.length - 1 < index || index < 0) {
+                    return reject('Out of bounds exception');
+                }
+                _this.currentSectionName = _this.currentQuestionnaire.sections[index].name;
+                return resolve();
+            }));
+        };
         /**
          * Answers the current question with the parsed value.
          * @param answer The value to answer the question with.
@@ -1929,19 +1941,20 @@
          * @param {?=} sendToNextQuestion
          * @return {?}
          */
-            function (answer, sendToNextQuestion) {
-                var _this = this;
-                this.currentQuestion.formControl.setValue(answer);
-                if (sendToNextQuestion && this.skippable) { // Timeout to prevent skipping glitch.
-                    this.skippable = false;
-                    setTimeout(( /**
-                     * @return {?}
-                     */function () {
-                        _this.nextQuestion();
-                        _this.skippable = true;
-                    }), 150);
-                }
-            };
+        function (answer, sendToNextQuestion) {
+            var _this = this;
+            this.currentQuestion.formControl.setValue(answer);
+            if (sendToNextQuestion && this.skippable) { // Timeout to prevent skipping glitch.
+                this.skippable = false;
+                setTimeout((/**
+                 * @return {?}
+                 */
+                function () {
+                    _this.nextQuestion();
+                    _this.skippable = true;
+                }), 150);
+            }
+        };
         /**
          * Adds a repeater item to the current question.
          * Current question must be of type Repeater.
@@ -1960,28 +1973,29 @@
          * @author Will Poulson
          * @return {?} A promise which resolves when the repeater item has been added.
          */
-            function () {
-                var _this = this;
-                return new Promise(( /**
-                 * @param {?} resolve
-                 * @param {?} reject
-                 * @return {?}
-                 */function (resolve, reject) {
-                    if (_this.currentQuestion.data.type !== QuestionType.Repeater) {
-                        return reject("Current question isn't a repeater");
-                    }
-                    /** @type {?} */
-                    var repeaterForm = _this.formConstuctor.generateFormsForRepeater(_this.currentQuestion.data);
-                    if (!repeaterForm) {
-                        return reject("Repeater template failed to generate. May be due to the repeater having no items in the editor.");
-                    }
-                    if (!(_this.currentQuestion.formControl instanceof i1.FormArray)) {
-                        return reject("The current questions control isn't of type FormArray");
-                    }
-                    _this.currentQuestion.formControl.push(repeaterForm);
-                    return resolve();
-                }));
-            };
+        function () {
+            var _this = this;
+            return new Promise((/**
+             * @param {?} resolve
+             * @param {?} reject
+             * @return {?}
+             */
+            function (resolve, reject) {
+                if (_this.currentQuestion.data.type !== QuestionType.Repeater) {
+                    return reject("Current question isn't a repeater");
+                }
+                /** @type {?} */
+                var repeaterForm = _this.formConstuctor.generateFormsForRepeater(_this.currentQuestion.data);
+                if (!repeaterForm) {
+                    return reject("Repeater template failed to generate. May be due to the repeater having no items in the editor.");
+                }
+                if (!(_this.currentQuestion.formControl instanceof forms.FormArray)) {
+                    return reject("The current questions control isn't of type FormArray");
+                }
+                _this.currentQuestion.formControl.push(repeaterForm);
+                return resolve();
+            }));
+        };
         /**
          * Removes a repeater item on the current question.
          * Current question must be of type Repeater.
@@ -2003,23 +2017,24 @@
          * @param {?} index The index at which to remove.
          * @return {?} A promise which resolves when the repeater item has been removed.
          */
-            function (index) {
-                var _this = this;
-                return new Promise(( /**
-                 * @param {?} resolve
-                 * @param {?} reject
-                 * @return {?}
-                 */function (resolve, reject) {
-                    if (_this.currentQuestion.data.type !== QuestionType.Repeater) {
-                        return reject("Current question isn't a repeater");
-                    }
-                    if (!(_this.currentQuestion.formControl instanceof i1.FormArray)) {
-                        return reject("The current questions control isn't of type FormArray");
-                    }
-                    _this.currentQuestion.formControl.removeAt(index);
-                    return resolve();
-                }));
-            };
+        function (index) {
+            var _this = this;
+            return new Promise((/**
+             * @param {?} resolve
+             * @param {?} reject
+             * @return {?}
+             */
+            function (resolve, reject) {
+                if (_this.currentQuestion.data.type !== QuestionType.Repeater) {
+                    return reject("Current question isn't a repeater");
+                }
+                if (!(_this.currentQuestion.formControl instanceof forms.FormArray)) {
+                    return reject("The current questions control isn't of type FormArray");
+                }
+                _this.currentQuestion.formControl.removeAt(index);
+                return resolve();
+            }));
+        };
         /**
          * Returns the display text for a given repeater item
          * @param index The index at which to get the label for.
@@ -2038,75 +2053,126 @@
          * @param {?} index The index at which to get the label for.
          * @return {?} A string which is the display text.
          */
-            function (index) {
-                var e_4, _a;
-                if (!this.currentQuestion.formControl || !(this.currentQuestion.formControl instanceof i1.FormArray)) {
-                    return '';
-                }
-                /** @type {?} */
-                var repeaterItem = this.currentQuestion.formControl.controls[index];
-                if (!repeaterItem) {
-                    return '';
-                }
-                /** @type {?} */
-                var template = this.currentQuestion.data.repeaterDisplayName;
-                /** @type {?} */
-                var splitTemplate = template.split(' ');
-                /** @type {?} */
-                var displayArray = [];
-                try {
-                    for (var splitTemplate_1 = __values(splitTemplate), splitTemplate_1_1 = splitTemplate_1.next(); !splitTemplate_1_1.done; splitTemplate_1_1 = splitTemplate_1.next()) {
-                        var templateItem = splitTemplate_1_1.value;
-                        if (templateItem.match(/\[.*?\]/)) {
-                            /** @type {?} */
-                            var path = templateItem.replace(/[\[\]']+/g, '');
-                            /** @type {?} */
-                            var item = repeaterItem.get(path);
-                            /** @type {?} */
-                            var value = item.value ? item.value : '?';
-                            displayArray.push(value);
-                        }
-                        else {
-                            displayArray.push(templateItem);
-                        }
-                    }
-                }
-                catch (e_4_1) {
-                    e_4 = { error: e_4_1 };
-                }
-                finally {
-                    try {
-                        if (splitTemplate_1_1 && !splitTemplate_1_1.done && (_a = splitTemplate_1.return))
-                            _a.call(splitTemplate_1);
+        function (index) {
+            var e_4, _a;
+            if (!this.currentQuestion.formControl || !(this.currentQuestion.formControl instanceof forms.FormArray)) {
+                return '';
+            }
+            /** @type {?} */
+            var repeaterItem = this.currentQuestion.formControl.controls[index];
+            if (!repeaterItem) {
+                return '';
+            }
+            /** @type {?} */
+            var template = this.currentQuestion.data.repeaterDisplayName;
+            /** @type {?} */
+            var splitTemplate = template.split(' ');
+            /** @type {?} */
+            var displayArray = [];
+            try {
+                for (var splitTemplate_1 = __values(splitTemplate), splitTemplate_1_1 = splitTemplate_1.next(); !splitTemplate_1_1.done; splitTemplate_1_1 = splitTemplate_1.next()) {
+                    var templateItem = splitTemplate_1_1.value;
+                    if (templateItem.match(/\[.*?\]/)) {
+                        /** @type {?} */
+                        var path = templateItem.replace(/[\[\]']+/g, '');
+                        /** @type {?} */
+                        var item = repeaterItem.get(path);
+                        /** @type {?} */
+                        var value = item.value ? item.value : '?';
+                        displayArray.push(value);
                     }
-                    finally {
-                        if (e_4)
-                            throw e_4.error;
+                    else {
+                        displayArray.push(templateItem);
                     }
                 }
-                /** @type {?} */
-                var display = displayArray.join(' ');
-                return display;
-            };
+            }
+            catch (e_4_1) { e_4 = { error: e_4_1 }; }
+            finally {
+                try {
+                    if (splitTemplate_1_1 && !splitTemplate_1_1.done && (_a = splitTemplate_1.return)) _a.call(splitTemplate_1);
+                }
+                finally { if (e_4) throw e_4.error; }
+            }
+            /** @type {?} */
+            var display = displayArray.join(' ');
+            return display;
+        };
         QuestionnaireService.decorators = [
-            { type: i0.Injectable, args: [{
+            { type: core.Injectable, args: [{
                         providedIn: 'root'
                     },] }
         ];
         /** @nocollapse */
-        QuestionnaireService.ctorParameters = function () {
-            return [
-                { type: FormConstructorService },
-                { type: undefined, decorators: [{ type: i0.Inject, args: ['options',] }] }
-            ];
-        };
-        /** @nocollapse */ QuestionnaireService.ngInjectableDef = i0.defineInjectable({ factory: function QuestionnaireService_Factory() { return new QuestionnaireService(i0.inject(FormConstructorService), i0.inject("options")); }, token: QuestionnaireService, providedIn: "root" });
+        QuestionnaireService.ctorParameters = function () { return [
+            { type: FormConstructorService },
+            { type: undefined, decorators: [{ type: core.Inject, args: ['options',] }] }
+        ]; };
+        /** @nocollapse */ QuestionnaireService.ngInjectableDef = core.ɵɵdefineInjectable({ factory: function QuestionnaireService_Factory() { return new QuestionnaireService(core.ɵɵinject(FormConstructorService), core.ɵɵinject("options")); }, token: QuestionnaireService, providedIn: "root" });
         return QuestionnaireService;
     }());
+    if (false) {
+        /** @type {?} */
+        QuestionnaireService.prototype.dataChangedEvent;
+        /**
+         * @type {?}
+         * @private
+         */
+        QuestionnaireService.prototype.originalQuestionnaire;
+        /**
+         * @type {?}
+         * @private
+         */
+        QuestionnaireService.prototype.currentQuestionnaire;
+        /**
+         * @type {?}
+         * @private
+         */
+        QuestionnaireService.prototype.currentQuestionnaireForm;
+        /**
+         * @type {?}
+         * @private
+         */
+        QuestionnaireService.prototype.currentSectionName;
+        /**
+         * @type {?}
+         * @private
+         */
+        QuestionnaireService.prototype.currentQuestionName;
+        /**
+         * @type {?}
+         * @private
+         */
+        QuestionnaireService.prototype.questionnaireValueChangeSubscription;
+        /**
+         * @type {?}
+         * @private
+         */
+        QuestionnaireService.prototype.questionValueChangeSubscription;
+        /**
+         * @type {?}
+         * @private
+         */
+        QuestionnaireService.prototype.additionalData;
+        /**
+         * @type {?}
+         * @private
+         */
+        QuestionnaireService.prototype.skippable;
+        /**
+         * @type {?}
+         * @private
+         */
+        QuestionnaireService.prototype.formConstuctor;
+        /**
+         * @type {?}
+         * @private
+         */
+        QuestionnaireService.prototype.options;
+    }
 
     /**
      * @fileoverview added by tsickle
-     * @suppress {checkTypes,extraRequire,missingOverride,missingReturn,unusedPrivateMembers,uselessCode} checked by tsc
+     * @suppress {checkTypes,constantProperty,extraRequire,missingOverride,missingReturn,unusedPrivateMembers,uselessCode} checked by tsc
      */
     var GgQuestionnaireV2Module = /** @class */ (function () {
         function GgQuestionnaireV2Module() {
@@ -2119,28 +2185,28 @@
          * @param {?} options
          * @return {?}
          */
-            function (options) {
-                return {
-                    ngModule: GgQuestionnaireV2Module,
-                    providers: [
-                        QuestionnaireService,
-                        {
-                            provide: 'options',
-                            useValue: options
-                        }
-                    ]
-                };
+        function (options) {
+            return {
+                ngModule: GgQuestionnaireV2Module,
+                providers: [
+                    QuestionnaireService,
+                    {
+                        provide: 'options',
+                        useValue: options
+                    }
+                ]
             };
+        };
         GgQuestionnaireV2Module.decorators = [
-            { type: i0.NgModule, args: [{
+            { type: core.NgModule, args: [{
                         declarations: [],
                         providers: [
                             FormConstructorService,
                             FilterService
                         ],
                         imports: [
-                            i1.FormsModule,
-                            i1.ReactiveFormsModule
+                            forms.FormsModule,
+                            forms.ReactiveFormsModule
                         ],
                     },] }
         ];
@@ -2149,7 +2215,7 @@
 
     /**
      * @fileoverview added by tsickle
-     * @suppress {checkTypes,extraRequire,missingOverride,missingReturn,unusedPrivateMembers,uselessCode} checked by tsc
+     * @suppress {checkTypes,constantProperty,extraRequire,missingOverride,missingReturn,unusedPrivateMembers,uselessCode} checked by tsc
      */
     /** @enum {string} */
     var InputType = {
@@ -2168,7 +2234,7 @@
 
     /**
      * @fileoverview added by tsickle
-     * @suppress {checkTypes,extraRequire,missingOverride,missingReturn,unusedPrivateMembers,uselessCode} checked by tsc
+     * @suppress {checkTypes,constantProperty,extraRequire,missingOverride,missingReturn,unusedPrivateMembers,uselessCode} checked by tsc
      */
     /** @enum {string} */
     var RepeaterQuestionType = {
@@ -2176,29 +2242,18 @@
         Select: 'select',
     };
 
-    /**
-     * @fileoverview added by tsickle
-     * @suppress {checkTypes,extraRequire,missingOverride,missingReturn,unusedPrivateMembers,uselessCode} checked by tsc
-     */
-
-    /**
-     * @fileoverview added by tsickle
-     * @suppress {checkTypes,extraRequire,missingOverride,missingReturn,unusedPrivateMembers,uselessCode} checked by tsc
-     */
-
-    exports.QuestionnaireService = QuestionnaireService;
-    exports.GgQuestionnaireV2Module = GgQuestionnaireV2Module;
     exports.ConditionRelationship = ConditionRelationship;
     exports.ConditionType = ConditionType;
-    exports.QuestionType = QuestionType;
-    exports.ValidationType = ValidationType;
+    exports.GgQuestionnaireV2Module = GgQuestionnaireV2Module;
     exports.InputType = InputType;
+    exports.QuestionType = QuestionType;
+    exports.QuestionnaireService = QuestionnaireService;
     exports.RepeaterQuestionType = RepeaterQuestionType;
-    exports.ɵb = FilterService;
+    exports.ValidationType = ValidationType;
     exports.ɵa = FormConstructorService;
+    exports.ɵb = FilterService;
 
     Object.defineProperty(exports, '__esModule', { value: true });
 
-})));
-
-//# sourceMappingURL=glowgreen-gg-questionnaire-v2.umd.js.map
+}));
+//# sourceMappingURL=glowgreen-gg-questionnaire-v2.umd.js.map