@glowgreen/gg-questionnaire-v2 0.0.82 → 0.0.84

package/fesm5/glowgreen-gg-questionnaire-v2.js

@@ -1,55 +1,39 @@
 import { __values } from 'tslib';
-import { Injectable, ɵɵdefineInjectable, ɵɵinject, EventEmitter, Inject, NgModule } from '@angular/core';
+import { ɵɵdefineInjectable, ɵsetClassMetadata, Injectable, ɵɵinject, EventEmitter, Inject, ɵɵdefineNgModule, ɵɵdefineInjector, ɵɵsetNgModuleScope, NgModule } from '@angular/core';
 import { Validators, FormBuilder, FormArray, FormsModule, ReactiveFormsModule } from '@angular/forms';
 import { clone, get, keys, cloneDeep } from 'lodash';
 
-/**
- * @fileoverview added by tsickle
- * @suppress {checkTypes,constantProperty,extraRequire,missingOverride,missingReturn,unusedPrivateMembers,uselessCode} checked by tsc
- */
-/** @enum {string} */
-var QuestionType = {
-    Input: 'input',
-    Select: 'select',
-    Textarea: 'textarea',
-    Repeater: 'repeater',
-    Checklist: 'checklist',
-    Attachment: 'attachment',
-    Upload: 'upload',
-    Signature: 'signature',
-    Slider: 'slider',
-    Info: 'info',
-    Feedback: 'feedback',
-};
+var QuestionType;
+(function (QuestionType) {
+    QuestionType["Input"] = "input";
+    QuestionType["Select"] = "select";
+    QuestionType["Textarea"] = "textarea";
+    QuestionType["Repeater"] = "repeater";
+    QuestionType["Checklist"] = "checklist";
+    QuestionType["Attachment"] = "attachment";
+    QuestionType["Upload"] = "upload";
+    QuestionType["Signature"] = "signature";
+    QuestionType["Slider"] = "slider";
+    QuestionType["Info"] = "info";
+    QuestionType["Feedback"] = "feedback";
+})(QuestionType || (QuestionType = {}));
 
-/**
- * @fileoverview added by tsickle
- * @suppress {checkTypes,constantProperty,extraRequire,missingOverride,missingReturn,unusedPrivateMembers,uselessCode} checked by tsc
- */
-/** @enum {string} */
-var ConditionType = {
-    EqualTo: 'equalTo',
-    NotEqualTo: 'notEqualTo',
-    LessThan: 'lessThan',
-    GreaterThan: 'greaterThan',
-    Includes: 'includes',
-    Excludes: 'excludes',
-};
+var ConditionType;
+(function (ConditionType) {
+    ConditionType["EqualTo"] = "equalTo";
+    ConditionType["NotEqualTo"] = "notEqualTo";
+    ConditionType["LessThan"] = "lessThan";
+    ConditionType["GreaterThan"] = "greaterThan";
+    ConditionType["Includes"] = "includes";
+    ConditionType["Excludes"] = "excludes";
+})(ConditionType || (ConditionType = {}));
 
-/**
- * @fileoverview added by tsickle
- * @suppress {checkTypes,constantProperty,extraRequire,missingOverride,missingReturn,unusedPrivateMembers,uselessCode} checked by tsc
- */
-/** @enum {string} */
-var ConditionRelationship = {
-    Every: 'every',
-    Any: 'any',
-};
+var ConditionRelationship;
+(function (ConditionRelationship) {
+    ConditionRelationship["Every"] = "every";
+    ConditionRelationship["Any"] = "any";
+})(ConditionRelationship || (ConditionRelationship = {}));
 
-/**
- * @fileoverview added by tsickle
- * @suppress {checkTypes,constantProperty,extraRequire,missingOverride,missingReturn,unusedPrivateMembers,uselessCode} checked by tsc
- */
 var FilterService = /** @class */ (function () {
     function FilterService() {
     }
@@ -60,25 +44,8 @@ var FilterService = /** @class */ (function () {
      * @returns An array of filtered sections with their filtered questions.
      * @author Will Poulson
      */
-    /**
-     * Filters an array of sections based on their condition groups.
-     * @author Will Poulson
-     * @param {?} sections The array of sections to filter.
-     * @param {?} currentQuestionnaireForm The current form data, can be null/undefined.
-     * @param {?=} additionalData
-     * @return {?} An array of filtered sections with their filtered questions.
-     */
-    FilterService.prototype.filterSections = /**
-     * Filters an array of sections based on their condition groups.
-     * @author Will Poulson
-     * @param {?} sections The array of sections to filter.
-     * @param {?} currentQuestionnaireForm The current form data, can be null/undefined.
-     * @param {?=} additionalData
-     * @return {?} An array of filtered sections with their filtered questions.
-     */
-    function (sections, currentQuestionnaireForm, additionalData) {
+    FilterService.prototype.filterSections = function (sections, currentQuestionnaireForm, additionalData) {
         var e_1, _a, e_2, _b, e_3, _c, e_4, _d;
-        /** @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()) {
@@ -86,7 +53,6 @@ var FilterService = /** @class */ (function () {
                 if (!this.meetsConditionGroups(section.conditionGroups, currentQuestionnaireForm, additionalData)) {
                     continue;
                 }
-                /** @type {?} */
                 var filteredQuestions = [];
                 try {
                     for (var _e = (e_2 = void 0, __values(section.questions)), _f = _e.next(); !_f.done; _f = _e.next()) {
@@ -96,23 +62,19 @@ var FilterService = /** @class */ (function () {
                         }
                         // If it's a repeater we need to do a lot of extra filtering due to per item conditions.
                         if (question.type === 'repeater' && currentQuestionnaireForm) {
-                            /** @type {?} */
-                            var items = (/** @type {?} */ (currentQuestionnaireForm.get([section.name, question.name])));
+                            var items = currentQuestionnaireForm.get([section.name, question.name]);
                             if (items && items.controls) {
                                 try {
                                     for (var _g = (e_3 = void 0, __values(items.controls)), _h = _g.next(); !_h.done; _h = _g.next()) {
                                         var repeaterItem = _h.value;
-                                        /** @type {?} */
                                         var filteredRepeaterItemQuestions = [];
                                         try {
                                             for (var _j = (e_4 = void 0, __values(question.repeaterQuestions)), _k = _j.next(); !_k.done; _k = _j.next()) {
                                                 var repeaterQuestion = _k.value;
-                                                /** @type {?} */
-                                                var meetsConditions = this.meetsConditionGroups(repeaterQuestion.conditionGroups, currentQuestionnaireForm, additionalData, (/** @type {?} */ (repeaterItem)));
+                                                var meetsConditions = this.meetsConditionGroups(repeaterQuestion.conditionGroups, currentQuestionnaireForm, additionalData, repeaterItem);
                                                 if (meetsConditions) {
-                                                    /** @type {?} */
                                                     var cloneQuestion = clone(repeaterQuestion);
-                                                    cloneQuestion.selectOptions = this.getFetchOptionsForQuestion(repeaterQuestion, additionalData, currentQuestionnaireForm, (/** @type {?} */ (repeaterItem)));
+                                                    cloneQuestion.selectOptions = this.getFetchOptionsForQuestion(repeaterQuestion, additionalData, currentQuestionnaireForm, repeaterItem);
                                                     filteredRepeaterItemQuestions.push(cloneQuestion);
                                                 }
                                             }
@@ -124,7 +86,6 @@ var FilterService = /** @class */ (function () {
                                             }
                                             finally { if (e_4) throw e_4.error; }
                                         }
-                                        /** @type {?} */
                                         var index = items.controls.indexOf(repeaterItem);
                                         if (!question.filteredRepeaterQuestions) {
                                             question.filteredRepeaterQuestions = [];
@@ -168,30 +129,12 @@ var FilterService = /** @class */ (function () {
         }
         return filteredSections;
     };
-    /**
-     * @private
-     * @param {?} question
-     * @param {?} additionalData
-     * @param {?} currentQuestionnaireForm
-     * @param {?=} repeaterItem
-     * @return {?}
-     */
-    FilterService.prototype.getFetchOptionsForQuestion = /**
-     * @private
-     * @param {?} question
-     * @param {?} additionalData
-     * @param {?} currentQuestionnaireForm
-     * @param {?=} repeaterItem
-     * @return {?}
-     */
-    function (question, additionalData, currentQuestionnaireForm, repeaterItem) {
+    FilterService.prototype.getFetchOptionsForQuestion = function (question, additionalData, currentQuestionnaireForm, repeaterItem) {
         if (!question.fetchPath) {
             return question.selectOptions;
         }
-        /** @type {?} */
         var options = additionalData[question.fetchPath];
         if (question.fetchSelectors && question.fetchSelectors.length > 0) {
-            /** @type {?} */
             var values = this.getValuesForArray(question.fetchSelectors, currentQuestionnaireForm, additionalData, repeaterItem);
             options = get(additionalData[question.fetchPath], values);
         }
@@ -201,17 +144,7 @@ var FilterService = /** @class */ (function () {
         }
         return question.selectOptions.concat(options);
     };
-    /**
-     * @private
-     * @param {?} items
-     * @return {?}
-     */
-    FilterService.prototype.getFinalFetchArray = /**
-     * @private
-     * @param {?} items
-     * @return {?}
-     */
-    function (items) {
+    FilterService.prototype.getFinalFetchArray = function (items) {
         var e_5, _a;
         if (!items) {
             return null;
@@ -222,13 +155,12 @@ var FilterService = /** @class */ (function () {
         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) {
+                    if (item instanceof Object && (item.value !== undefined) && item.label) {
                         convertedArray.push(item);
                     }
                     else {
@@ -246,17 +178,10 @@ var FilterService = /** @class */ (function () {
         }
         return convertedArray;
     };
-    /**
-     * @private
-     * @param {?} item
-     * @return {?}
-     */
-    FilterService.prototype.uppercase = /**
-     * @private
-     * @param {?} item
-     * @return {?}
-     */
-    function (item) {
+    FilterService.prototype.uppercase = function (item) {
+        if (!isNaN(item)) {
+            return item;
+        }
         return item.charAt(0).toUpperCase() + item.slice(1);
     };
     /**
@@ -266,38 +191,14 @@ var FilterService = /** @class */ (function () {
      * @returns A boolean stating if the condition groups conditions has been met.
      * @author Will Poulson
      */
-    /**
-     * Checks if each condition groups conditions have been met.
-     * @author Will Poulson
-     * @private
-     * @param {?} conditionGroups The array of condition groups.
-     * @param {?} currentQuestionnaireForm The current form data, can be null/undefined.
-     * @param {?=} additionalData
-     * @param {?=} repeaterItem
-     * @return {?} A boolean stating if the condition groups conditions has been met.
-     */
-    FilterService.prototype.meetsConditionGroups = /**
-     * Checks if each condition groups conditions have been met.
-     * @author Will Poulson
-     * @private
-     * @param {?} conditionGroups The array of condition groups.
-     * @param {?} currentQuestionnaireForm The current form data, can be null/undefined.
-     * @param {?=} additionalData
-     * @param {?=} repeaterItem
-     * @return {?} A boolean stating if the condition groups conditions has been met.
-     */
-    function (conditionGroups, currentQuestionnaireForm, additionalData, repeaterItem) {
+    FilterService.prototype.meetsConditionGroups = function (conditionGroups, currentQuestionnaireForm, additionalData, repeaterItem) {
         var _this = this;
         if (!conditionGroups || conditionGroups.length === 0) {
             return true;
         }
-        return conditionGroups.every((/**
-         * @param {?} x
-         * @return {?}
-         */
-        function (x) {
+        return conditionGroups.every(function (x) {
             return _this.meetsConditionGroup(x, currentQuestionnaireForm, additionalData, repeaterItem) === true;
-        }));
+        });
     };
     /**
      * Checks if a condition groups conditions have been met.
@@ -306,32 +207,11 @@ var FilterService = /** @class */ (function () {
      * @returns A boolean stating if the condition group conditions has been met.
      * @author Will Poulson
      */
-    /**
-     * Checks if a condition groups conditions have been met.
-     * @author Will Poulson
-     * @private
-     * @param {?} conditionGroup The condition group to check.
-     * @param {?} currentQuestionnaireForm The current form data, can be null/undefined.
-     * @param {?=} additionalData
-     * @param {?=} repeaterItem
-     * @return {?} A boolean stating if the condition group conditions has been met.
-     */
-    FilterService.prototype.meetsConditionGroup = /**
-     * Checks if a condition groups conditions have been met.
-     * @author Will Poulson
-     * @private
-     * @param {?} conditionGroup The condition group to check.
-     * @param {?} currentQuestionnaireForm The current form data, can be null/undefined.
-     * @param {?=} additionalData
-     * @param {?=} repeaterItem
-     * @return {?} A boolean stating if the condition group conditions has been met.
-     */
-    function (conditionGroup, currentQuestionnaireForm, additionalData, repeaterItem) {
+    FilterService.prototype.meetsConditionGroup = function (conditionGroup, currentQuestionnaireForm, additionalData, repeaterItem) {
         var e_6, _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()) {
@@ -348,21 +228,13 @@ var FilterService = /** @class */ (function () {
         }
         switch (conditionGroup.relationship) {
             case ConditionRelationship.Every:
-                return results.every((/**
-                 * @param {?} x
-                 * @return {?}
-                 */
-                function (x) {
+                return results.every(function (x) {
                     return x === true;
-                }));
+                });
             case ConditionRelationship.Any:
-                return !!results.find((/**
-                 * @param {?} x
-                 * @return {?}
-                 */
-                function (x) {
+                return !!results.find(function (x) {
                     return x === true;
-                }));
+                });
             default:
                 return true;
         }
@@ -374,52 +246,21 @@ var FilterService = /** @class */ (function () {
      * @returns A boolean stating if the condition group conditions has been met.
      * @author Will Poulson
      */
-    /**
-     * Checks if a condition has been met.
-     * @author Will Poulson
-     * @private
-     * @param {?} condition The condition to check.
-     * @param {?} currentQuestionnaireForm The current form data, can be null/undefined.
-     * @param {?=} additionalData
-     * @param {?=} repeaterItem
-     * @return {?} A boolean stating if the condition group conditions has been met.
-     */
-    FilterService.prototype.meetsCondition = /**
-     * Checks if a condition has been met.
-     * @author Will Poulson
-     * @private
-     * @param {?} condition The condition to check.
-     * @param {?} currentQuestionnaireForm The current form data, can be null/undefined.
-     * @param {?=} additionalData
-     * @param {?=} repeaterItem
-     * @return {?} A boolean stating if the condition group conditions has been met.
-     */
-    function (condition, currentQuestionnaireForm, additionalData, repeaterItem) {
+    FilterService.prototype.meetsCondition = function (condition, currentQuestionnaireForm, additionalData, repeaterItem) {
         var e_7, _a, e_8, _b;
-        /** @type {?} */
         var v1s = this.getValuesForArray(condition.v1s, currentQuestionnaireForm, additionalData, repeaterItem);
-        /** @type {?} */
         var v2s = this.getValuesForArray(condition.v2s, currentQuestionnaireForm, additionalData, repeaterItem);
-        /** @type {?} */
         var result = false;
         switch (condition.type) {
             case ConditionType.Excludes:
-                result = v1s.filter((/**
-                 * @param {?} v1
-                 * @return {?}
-                 */
-                function (v1) {
+                result = v1s.filter(function (v1) {
                     return v2s.indexOf(v1) > -1;
-                })).length === 0;
+                }).length === 0;
                 break;
             case ConditionType.Includes:
-                result = v1s.filter((/**
-                 * @param {?} v1
-                 * @return {?}
-                 */
-                function (v1) {
+                result = v1s.filter(function (v1) {
                     return v2s.indexOf(v1) > -1;
-                })).length !== 0;
+                }).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()) {
@@ -478,17 +319,7 @@ var FilterService = /** @class */ (function () {
         }
         return result;
     };
-    /**
-     * @private
-     * @param {?} value
-     * @return {?}
-     */
-    FilterService.prototype.getStringForValue = /**
-     * @private
-     * @param {?} value
-     * @return {?}
-     */
-    function (value) {
+    FilterService.prototype.getStringForValue = function (value) {
         switch (value) {
             case null:
                 return 'null';
@@ -503,35 +334,13 @@ var FilterService = /** @class */ (function () {
      * @returns An array of strings/values
      * @author Will Poulson
      */
-    /**
-     * Gets the current values for an array of strings.
-     * @author Will Poulson
-     * @private
-     * @param {?} paths The array of strings to check.
-     * @param {?} currentQuestionnaireForm The current form data, can be null/undefined.
-     * @param {?=} additionalData
-     * @param {?=} repeaterItem
-     * @return {?} An array of strings/values
-     */
-    FilterService.prototype.getValuesForArray = /**
-     * Gets the current values for an array of strings.
-     * @author Will Poulson
-     * @private
-     * @param {?} paths The array of strings to check.
-     * @param {?} currentQuestionnaireForm The current form data, can be null/undefined.
-     * @param {?=} additionalData
-     * @param {?=} repeaterItem
-     * @return {?} An array of strings/values
-     */
-    function (paths, currentQuestionnaireForm, additionalData, repeaterItem) {
+    FilterService.prototype.getValuesForArray = function (paths, currentQuestionnaireForm, additionalData, repeaterItem) {
         var e_9, _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, repeaterItem);
                     values.push(value);
                 }
@@ -556,37 +365,15 @@ var FilterService = /** @class */ (function () {
      * @returns A string/value.
      * @author Will Poulson
      */
-    /**
-     * Gets a current value for a string.
-     * @author Will Poulson
-     * @private
-     * @param {?} path The string value to check.
-     * @param {?} currentQuestionnaireForm The current form data, can be null/undefined.
-     * @param {?=} additionalData
-     * @param {?=} repeaterItem
-     * @return {?} A string/value.
-     */
-    FilterService.prototype.getValueForString = /**
-     * Gets a current value for a string.
-     * @author Will Poulson
-     * @private
-     * @param {?} path The string value to check.
-     * @param {?} currentQuestionnaireForm The current form data, can be null/undefined.
-     * @param {?=} additionalData
-     * @param {?=} repeaterItem
-     * @return {?} A string/value.
-     */
-    function (path, currentQuestionnaireForm, additionalData, repeaterItem) {
+    FilterService.prototype.getValueForString = function (path, currentQuestionnaireForm, additionalData, repeaterItem) {
         if (currentQuestionnaireForm) {
             if (!additionalData) {
                 additionalData = {};
             }
-            /** @type {?} */
             var control = currentQuestionnaireForm.get(path.toString());
             if (!control && repeaterItem) {
                 control = repeaterItem.get(path);
             }
-            /** @type {?} */
             var value = control ? control.value : this.convertStringToValue(path);
             return get(additionalData, path, value);
         }
@@ -601,23 +388,7 @@ var FilterService = /** @class */ (function () {
      * @returns Either a string or the converted value.
      * @author Will Poulson
      */
-    /**
-     * Converts a string to a value.
-     * Eg. true/false.
-     * @author Will Poulson
-     * @private
-     * @param {?} path The string value to check for conversion;
-     * @return {?} Either a string or the converted value.
-     */
-    FilterService.prototype.convertStringToValue = /**
-     * Converts a string to a value.
-     * Eg. true/false.
-     * @author Will Poulson
-     * @private
-     * @param {?} path The string value to check for conversion;
-     * @return {?} Either a string or the converted value.
-     */
-    function (path) {
+    FilterService.prototype.convertStringToValue = function (path) {
         switch (path) {
             case 'true':
                 return true;
@@ -629,35 +400,27 @@ var FilterService = /** @class */ (function () {
                 return path;
         }
     };
-    FilterService.decorators = [
-        { type: Injectable, args: [{
-                    providedIn: 'root'
-                },] }
-    ];
-    /** @nocollapse */
-    FilterService.ctorParameters = function () { return []; };
-    /** @nocollapse */ FilterService.ngInjectableDef = ɵɵdefineInjectable({ factory: function FilterService_Factory() { return new FilterService(); }, token: FilterService, providedIn: "root" });
+    FilterService.ɵfac = function FilterService_Factory(t) { return new (t || FilterService)(); };
+    FilterService.ɵprov = ɵɵdefineInjectable({ token: FilterService, factory: FilterService.ɵfac, providedIn: 'root' });
     return FilterService;
 }());
+/*@__PURE__*/ (function () { ɵsetClassMetadata(FilterService, [{
+        type: Injectable,
+        args: [{
+                providedIn: 'root'
+            }]
+    }], function () { return []; }, null); })();
 
-/**
- * @fileoverview added by tsickle
- * @suppress {checkTypes,constantProperty,extraRequire,missingOverride,missingReturn,unusedPrivateMembers,uselessCode} checked by tsc
- */
-/** @enum {string} */
-var ValidationType = {
-    Required: 'required',
-    Boolean: 'boolean',
-    Number: 'number',
-    String: 'string',
-    Email: 'email',
-    Telephone: 'telephone',
-};
+var ValidationType;
+(function (ValidationType) {
+    ValidationType["Required"] = "required";
+    ValidationType["Boolean"] = "boolean";
+    ValidationType["Number"] = "number";
+    ValidationType["String"] = "string";
+    ValidationType["Email"] = "email";
+    ValidationType["Telephone"] = "telephone";
+})(ValidationType || (ValidationType = {}));
 
-/**
- * @fileoverview added by tsickle
- * @suppress {checkTypes,constantProperty,extraRequire,missingOverride,missingReturn,unusedPrivateMembers,uselessCode} checked by tsc
- */
 var FormConstructorService = /** @class */ (function () {
     function FormConstructorService(fb, filterService) {
         this.fb = fb;
@@ -670,62 +433,23 @@ var FormConstructorService = /** @class */ (function () {
      * @returns A filted form group.
      * @author Will Poulson
      */
-    /**
-     * Constructs a form group based on the questionnaire data.
-     * This form group has been filtered down based on the conditions of the sections and questions.
-     * @author Will Poulson
-     * @param {?} questionnaire The questionnaire data to build the form group on.
-     * @param {?} currentQuestionnaire
-     * @param {?} currentQuestionnaireForm
-     * @param {?=} additionalData
-     * @param {?=} skipFilter
-     * @return {?} A filted form group.
-     */
-    FormConstructorService.prototype.generateFormsForQuestionnaire = /**
-     * Constructs a form group based on the questionnaire data.
-     * This form group has been filtered down based on the conditions of the sections and questions.
-     * @author Will Poulson
-     * @param {?} questionnaire The questionnaire data to build the form group on.
-     * @param {?} currentQuestionnaire
-     * @param {?} currentQuestionnaireForm
-     * @param {?=} additionalData
-     * @param {?=} skipFilter
-     * @return {?} A filted form group.
-     */
-    function (questionnaire, currentQuestionnaire, currentQuestionnaireForm, additionalData, skipFilter) {
-        /** @type {?} */
+    FormConstructorService.prototype.generateFormsForQuestionnaire = function (questionnaire, currentQuestionnaire, currentQuestionnaireForm, additionalData, skipFilter) {
         var sections = skipFilter ?
             questionnaire.sections :
             this.filterService.filterSections(questionnaire.sections, currentQuestionnaireForm, additionalData);
-        /** @type {?} */
         var noChange = currentQuestionnaireForm && (sections === currentQuestionnaire.sections);
         if (noChange && !skipFilter) {
             return null;
         }
-        /** @type {?} */
         var questionnaireForms = this.generateFormsForSections(sections, currentQuestionnaireForm);
         return { sections: sections, forms: questionnaireForms };
     };
-    /**
-     * @private
-     * @param {?} sections
-     * @param {?} currentQuestionnaireForm
-     * @return {?}
-     */
-    FormConstructorService.prototype.generateFormsForSections = /**
-     * @private
-     * @param {?} sections
-     * @param {?} currentQuestionnaireForm
-     * @return {?}
-     */
-    function (sections, currentQuestionnaireForm) {
+    FormConstructorService.prototype.generateFormsForSections = 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);
             }
@@ -746,27 +470,8 @@ var FormConstructorService = /** @class */ (function () {
      * @returns A filtered form group.
      * @author Will Poulson
      */
-    /**
-     * Constructs a form group based on the section data.
-     * This form group has been filtered down based on the conditions of the questions.
-     * @author Will Poulson
-     * @private
-     * @param {?} section The section data to build the form group on.
-     * @param {?} currentQuestionnaireForm
-     * @return {?} A filtered form group.
-     */
-    FormConstructorService.prototype.generateFormsForSection = /**
-     * Constructs a form group based on the section data.
-     * This form group has been filtered down based on the conditions of the questions.
-     * @author Will Poulson
-     * @private
-     * @param {?} section The section data to build the form group on.
-     * @param {?} currentQuestionnaireForm
-     * @return {?} A filtered form group.
-     */
-    function (section, currentQuestionnaireForm) {
+    FormConstructorService.prototype.generateFormsForSection = 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()) {
@@ -774,7 +479,6 @@ var FormConstructorService = /** @class */ (function () {
                 if (question.type === QuestionType.Info) {
                     continue;
                 }
-                /** @type {?} */
                 var questionControl = this.generateControlForQuestion(question, section, currentQuestionnaireForm);
                 sectionForms.addControl(question.name, questionControl);
             }
@@ -794,65 +498,30 @@ var FormConstructorService = /** @class */ (function () {
      * @returns An abstract control.
      * @author Will Poulson
      */
-    /**
-     * Constructs an astract form control based on the question data.
-     * @author Will Poulson
-     * @private
-     * @param {?} question The question data to build the abstract control on.
-     * @param {?} section
-     * @param {?} currentQuestionnaireForm
-     * @return {?} An abstract control.
-     */
-    FormConstructorService.prototype.generateControlForQuestion = /**
-     * Constructs an astract form control based on the question data.
-     * @author Will Poulson
-     * @private
-     * @param {?} question The question data to build the abstract control on.
-     * @param {?} section
-     * @param {?} currentQuestionnaireForm
-     * @return {?} An abstract control.
-     */
-    function (question, section, currentQuestionnaireForm) {
+    FormConstructorService.prototype.generateControlForQuestion = function (question, section, currentQuestionnaireForm) {
         var e_3, _a;
-        /** @type {?} */
         var convertedValidators = this.convertValidators(question.validators);
-        /** @type {?} */
         var defaultValue = question.defaultValue ? question.defaultValue : null;
         switch (question.type) {
             case QuestionType.Repeater:
-                /** @type {?} */
                 var newArray = this.fb.array([], convertedValidators);
-                /** @type {?} */
-                var currentArray = currentQuestionnaireForm ? ((/** @type {?} */ (currentQuestionnaireForm.get([section.name, question.name])))) : false;
+                var currentArray = currentQuestionnaireForm ? currentQuestionnaireForm.get([section.name, question.name]) : false;
                 if (currentArray && question.filteredRepeaterQuestions) {
                     var _loop_1 = function (control) {
                         var e_4, _a, e_5, _b;
-                        /** @type {?} */
                         var index = currentArray.controls.indexOf(control);
                         if (index === -1) {
                             return "continue";
                         }
-                        /** @type {?} */
                         var filteredQuestions = question.filteredRepeaterQuestions[index];
                         if (!filteredQuestions) {
                             return "continue";
                         }
-                        /** @type {?} */
-                        var filteredQuestionNames = filteredQuestions.map((/**
-                         * @param {?} x
-                         * @return {?}
-                         */
-                        function (x) { return x.name; }));
-                        /** @type {?} */
-                        var filteredOutQuestions = question.repeaterQuestions.filter((/**
-                         * @param {?} x
-                         * @return {?}
-                         */
-                        function (x) { return !filteredQuestionNames.includes(x.name); }));
+                        var filteredQuestionNames = filteredQuestions.map(function (x) { return x.name; });
+                        var filteredOutQuestions = question.repeaterQuestions.filter(function (x) { return !filteredQuestionNames.includes(x.name); });
                         try {
                             for (var filteredOutQuestions_1 = (e_4 = void 0, __values(filteredOutQuestions)), filteredOutQuestions_1_1 = filteredOutQuestions_1.next(); !filteredOutQuestions_1_1.done; filteredOutQuestions_1_1 = filteredOutQuestions_1.next()) {
                                 var filteredOutQuestion = filteredOutQuestions_1_1.value;
-                                /** @type {?} */
                                 var childControl = control.get(filteredOutQuestion.name);
                                 childControl.setValidators([]);
                                 childControl.updateValueAndValidity({ onlySelf: true, emitEvent: false });
@@ -868,13 +537,11 @@ var FormConstructorService = /** @class */ (function () {
                         try {
                             for (var filteredQuestions_1 = (e_5 = void 0, __values(filteredQuestions)), filteredQuestions_1_1 = filteredQuestions_1.next(); !filteredQuestions_1_1.done; filteredQuestions_1_1 = filteredQuestions_1.next()) {
                                 var filteredQuestion = filteredQuestions_1_1.value;
-                                /** @type {?} */
                                 var childControl = control.get(filteredQuestion.name);
                                 if (childControl.value) {
                                     // If there's a value just skip it, no need to redo the validators each time.
                                     continue;
                                 }
-                                /** @type {?} */
                                 var convertedValidators_1 = this_1.convertValidators(filteredQuestion.validators);
                                 childControl.setValidators(convertedValidators_1);
                                 childControl.updateValueAndValidity({ onlySelf: true, emitEvent: false });
@@ -918,33 +585,15 @@ var FormConstructorService = /** @class */ (function () {
      * @returns A form group.
      * @author Will Poulson
      */
-    /**
-     * Generates the form group for a checklist question.
-     * @author Will Poulson
-     * @private
-     * @param {?} question The question. Must be of type checklist or else null is returned.
-     * @param {?} convertedValidators
-     * @return {?} A form group.
-     */
-    FormConstructorService.prototype.generateGroupForChecklist = /**
-     * Generates the form group for a checklist question.
-     * @author Will Poulson
-     * @private
-     * @param {?} question The question. Must be of type checklist or else null is returned.
-     * @param {?} convertedValidators
-     * @return {?} A form group.
-     */
-    function (question, convertedValidators) {
+    FormConstructorService.prototype.generateGroupForChecklist = function (question, convertedValidators) {
         var e_6, _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);
             }
@@ -964,32 +613,16 @@ var FormConstructorService = /** @class */ (function () {
      * @returns A form group.
      * @author Will Poulson
      */
-    /**
-     * Generates the form template for a repeater question.
-     * @author Will Poulson
-     * @param {?} question The question. Must be of type repeater or else null is returned.
-     * @param {?=} index
-     * @return {?} A form group.
-     */
-    FormConstructorService.prototype.generateFormsForRepeater = /**
-     * Generates the form template for a repeater question.
-     * @author Will Poulson
-     * @param {?} question The question. Must be of type repeater or else null is returned.
-     * @param {?=} index
-     * @return {?} A form group.
-     */
-    function (question, index) {
+    FormConstructorService.prototype.generateFormsForRepeater = function (question, index) {
         var e_7, _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);
             }
@@ -1009,22 +642,7 @@ var FormConstructorService = /** @class */ (function () {
      * @returns An abstract control.
      * @author Will Poulson
      */
-    /**
-     * Generates a control for a repeaters question.
-     * @author Will Poulson
-     * @private
-     * @param {?} repeaterQuestion A repeater question.
-     * @return {?} An abstract control.
-     */
-    FormConstructorService.prototype.generateControlForRepeaterQuestion = /**
-     * Generates a control for a repeaters question.
-     * @author Will Poulson
-     * @private
-     * @param {?} repeaterQuestion A repeater question.
-     * @return {?} An abstract control.
-     */
-    function (repeaterQuestion) {
-        /** @type {?} */
+    FormConstructorService.prototype.generateControlForRepeaterQuestion = function (repeaterQuestion) {
         var convertedValidators = this.convertValidators(repeaterQuestion.validators);
         return this.fb.control(null, { validators: convertedValidators, updateOn: repeaterQuestion.type === 'select' ? 'change' : 'blur' });
     };
@@ -1034,31 +652,15 @@ var FormConstructorService = /** @class */ (function () {
      * @returns A convered array of form validators.
      * @author Will Poulson
      */
-    /**
-     * Converts an array of validators into form validators.
-     * @author Will Poulson
-     * @private
-     * @param {?} validators The uncoverted array of validators.
-     * @return {?} A convered array of form validators.
-     */
-    FormConstructorService.prototype.convertValidators = /**
-     * Converts an array of validators into form validators.
-     * @author Will Poulson
-     * @private
-     * @param {?} validators The uncoverted array of validators.
-     * @return {?} A convered array of form validators.
-     */
-    function (validators) {
+    FormConstructorService.prototype.convertValidators = function (validators) {
         var e_8, _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);
@@ -1080,21 +682,7 @@ var FormConstructorService = /** @class */ (function () {
      * @returns A converted form validator.
      * @author Will Poulson
      */
-    /**
-     * Converts a single validator into a form validator.
-     * @author Will Poulson
-     * @private
-     * @param {?} validator The unconverted validator.
-     * @return {?} A converted form validator.
-     */
-    FormConstructorService.prototype.convertValidator = /**
-     * Converts a single validator into a form validator.
-     * @author Will Poulson
-     * @private
-     * @param {?} validator The unconverted validator.
-     * @return {?} A converted form validator.
-     */
-    function (validator) {
+    FormConstructorService.prototype.convertValidator = function (validator) {
         switch (validator.type) {
             case ValidationType.Required:
                 return Validators.required;
@@ -1107,21 +695,7 @@ var FormConstructorService = /** @class */ (function () {
      * @param savedState The saved state to load.
      * @param sections The sections already generated by the form constructor.
      */
-    /**
-     * Constructs the forms for repeaters from saved state.
-     * @param {?} savedState The saved state to load.
-     * @param {?} sections The sections already generated by the form constructor.
-     * @param {?} currentQuestionnaireForm
-     * @return {?}
-     */
-    FormConstructorService.prototype.constructRepeaterFromsFromState = /**
-     * Constructs the forms for repeaters from saved state.
-     * @param {?} savedState The saved state to load.
-     * @param {?} sections The sections already generated by the form constructor.
-     * @param {?} currentQuestionnaireForm
-     * @return {?}
-     */
-    function (savedState, sections, currentQuestionnaireForm) {
+    FormConstructorService.prototype.constructRepeaterFromsFromState = function (savedState, sections, currentQuestionnaireForm) {
         var e_9, _a, e_10, _b, e_11, _c;
         try {
             for (var sections_2 = __values(sections), sections_2_1 = sections_2.next(); !sections_2_1.done; sections_2_1 = sections_2.next()) {
@@ -1132,13 +706,11 @@ var FormConstructorService = /** @class */ (function () {
                         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])));
+                        var repeaterFormArray = currentQuestionnaireForm.get([section.name, question.name]);
                         if (repeaterFormArray.controls.length === repeaterArray.length) {
                             continue;
                         }
@@ -1146,9 +718,7 @@ var FormConstructorService = /** @class */ (function () {
                             // For each item that used to be there push a new empty template there to be populated.
                             for (var repeaterArray_1 = (e_11 = 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 index = repeaterArray.indexOf(repeaterItem);
-                                /** @type {?} */
                                 var repeaterItemTemplate = this.generateFormsForRepeater(question, index);
                                 repeaterFormArray.push(repeaterItemTemplate);
                             }
@@ -1179,36 +749,17 @@ var FormConstructorService = /** @class */ (function () {
             finally { if (e_9) throw e_9.error; }
         }
     };
-    FormConstructorService.decorators = [
-        { type: Injectable, args: [{
-                    providedIn: 'root'
-                },] }
-    ];
-    /** @nocollapse */
-    FormConstructorService.ctorParameters = function () { return [
-        { type: FormBuilder },
-        { type: FilterService }
-    ]; };
-    /** @nocollapse */ FormConstructorService.ngInjectableDef = ɵɵdefineInjectable({ factory: function FormConstructorService_Factory() { return new FormConstructorService(ɵɵinject(FormBuilder), ɵɵinject(FilterService)); }, token: FormConstructorService, providedIn: "root" });
+    FormConstructorService.ɵfac = function FormConstructorService_Factory(t) { return new (t || FormConstructorService)(ɵɵinject(FormBuilder), ɵɵinject(FilterService)); };
+    FormConstructorService.ɵprov = ɵɵdefineInjectable({ token: FormConstructorService, factory: FormConstructorService.ɵfac, providedIn: 'root' });
     return FormConstructorService;
 }());
-if (false) {
-    /**
-     * @type {?}
-     * @private
-     */
-    FormConstructorService.prototype.fb;
-    /**
-     * @type {?}
-     * @private
-     */
-    FormConstructorService.prototype.filterService;
-}
+/*@__PURE__*/ (function () { ɵsetClassMetadata(FormConstructorService, [{
+        type: Injectable,
+        args: [{
+                providedIn: 'root'
+            }]
+    }], function () { return [{ type: FormBuilder }, { type: FilterService }]; }, null); })();
 
-/**
- * @fileoverview added by tsickle
- * @suppress {checkTypes,constantProperty,extraRequire,missingOverride,missingReturn,unusedPrivateMembers,uselessCode} checked by tsc
- */
 var QuestionnaireService = /** @class */ (function () {
     function QuestionnaireService(formConstuctor, options) {
         this.formConstuctor = formConstuctor;
@@ -1224,28 +775,11 @@ var QuestionnaireService = /** @class */ (function () {
      * @returns null
      * @author Will Poulson
      */
-    /**
-     * Loads a questionnaire from data.
-     * @author Will Poulson
-     * @param {?} questionnaire The questionnaire data to load, often parsed JSON from the editor.
-     * @param {?=} savedState The saved state of the questionnaire, often from localstorage.
-     * @param {?=} additionalData
-     * @return {?} null
-     */
-    QuestionnaireService.prototype.loadQuestionnaire = /**
-     * Loads a questionnaire from data.
-     * @author Will Poulson
-     * @param {?} questionnaire The questionnaire data to load, often parsed JSON from the editor.
-     * @param {?=} savedState The saved state of the questionnaire, often from localstorage.
-     * @param {?=} additionalData
-     * @return {?} null
-     */
-    function (questionnaire, savedState, additionalData) {
+    QuestionnaireService.prototype.loadQuestionnaire = function (questionnaire, savedState, additionalData) {
         this.originalQuestionnaire = cloneDeep(questionnaire);
         this.currentQuestionnaire = cloneDeep(questionnaire);
         this.additionalData = additionalData;
         if (savedState && Object.keys(savedState).length > 0) {
-            /** @type {?} */
             var newData = this.formConstuctor.generateFormsForQuestionnaire(cloneDeep(this.originalQuestionnaire), cloneDeep(this.currentQuestionnaire), this.currentQuestionnaireForm, this.additionalData, true);
             if (newData) {
                 this.formConstuctor.constructRepeaterFromsFromState(savedState, newData.sections, newData.forms);
@@ -1267,33 +801,10 @@ var QuestionnaireService = /** @class */ (function () {
      * @returns null
      * @author Will Poulson
      */
-    /**
-     * 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
-     */
-    QuestionnaireService.prototype.updateQuestionnaire = /**
-     * 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) {
+    QuestionnaireService.prototype.updateQuestionnaire = function (savedState) {
         var e_1, _a, e_2, _b;
         var _this = this;
-        /** @type {?} */
-        var oldLength = this.currentQuestionnaire.sections.map((/**
-         * @param {?} x
-         * @return {?}
-         */
-        function (x) { return x.questions.length; })).reduce((/**
-         * @param {?} a
-         * @param {?} b
-         * @return {?}
-         */
-        function (a, b) { return a + b; }), 0);
-        /** @type {?} */
+        var oldLength = this.currentQuestionnaire.sections.map(function (x) { return x.questions.length; }).reduce(function (a, b) { return a + b; }, 0);
         var newData = this.formConstuctor.generateFormsForQuestionnaire(cloneDeep(this.originalQuestionnaire), cloneDeep(this.currentQuestionnaire), this.currentQuestionnaireForm, this.additionalData);
         if (newData) {
             this.currentQuestionnaireForm = newData.forms;
@@ -1308,32 +819,16 @@ var QuestionnaireService = /** @class */ (function () {
         if (this.questionValueChangeSubscription) {
             this.questionValueChangeSubscription.unsubscribe();
         }
-        this.questionnaireValueChangeSubscription = this.currentQuestionnaireForm.valueChanges.subscribe((/**
-         * @return {?}
-         */
-        function () {
+        this.questionnaireValueChangeSubscription = this.currentQuestionnaireForm.valueChanges.subscribe(function () {
             _this.dataChangedEvent.emit();
             _this.updateQuestionnaire(_this.currentQuestionnaireForm.getRawValue());
-        }));
+        });
         if (this.currentQuestion && this.currentQuestion.formControl) {
-            this.questionValueChangeSubscription = this.currentQuestion.formControl.valueChanges.subscribe((/**
-             * @return {?}
-             */
-            function () {
+            this.questionValueChangeSubscription = this.currentQuestion.formControl.valueChanges.subscribe(function () {
                 _this.clearFields(_this.currentQuestion.data.clearfields);
-            }));
+            });
         }
-        /** @type {?} */
-        var newLength = this.currentQuestionnaire.sections.map((/**
-         * @param {?} x
-         * @return {?}
-         */
-        function (x) { return x.questions.length; })).reduce((/**
-         * @param {?} a
-         * @param {?} b
-         * @return {?}
-         */
-        function (a, b) { return a + b; }), 0);
+        var newLength = this.currentQuestionnaire.sections.map(function (x) { return x.questions.length; }).reduce(function (a, b) { return a + b; }, 0);
         if (oldLength !== newLength) {
             try {
                 for (var _c = __values(this.currentQuestionnaire.sections), _d = _c.next(); !_d.done; _d = _c.next()) {
@@ -1341,7 +836,6 @@ var QuestionnaireService = /** @class */ (function () {
                     try {
                         for (var _e = (e_2 = void 0, __values(section.questions)), _f = _e.next(); !_f.done; _f = _e.next()) {
                             var question = _f.value;
-                            /** @type {?} */
                             var control = this.currentQuestionnaireForm.get([section.name, question.name]);
                             if (control && control.value === null && question.defaultValue) {
                                 control.setValue(question.defaultValue);
@@ -1366,47 +860,26 @@ var QuestionnaireService = /** @class */ (function () {
             }
         }
     };
-    /**
-     * @param {?} payload
-     * @return {?}
-     */
-    QuestionnaireService.prototype.updateAdditionalData = /**
-     * @param {?} payload
-     * @return {?}
-     */
-    function (payload) {
+    QuestionnaireService.prototype.updateAdditionalData = function (payload) {
         this.additionalData = Object.assign(this.additionalData, payload);
         this.updateQuestionnaire(this.currentQuestionnaireForm.getRawValue());
     };
-    /**
-     * @return {?}
-     */
-    QuestionnaireService.prototype.clearAdditionalData = /**
-     * @return {?}
-     */
-    function () {
+    QuestionnaireService.prototype.clearAdditionalData = function () {
         this.additionalData = {};
         this.updateQuestionnaire(this.currentQuestionnaireForm.getRawValue());
     };
     Object.defineProperty(QuestionnaireService.prototype, "isValid", {
-        get: /**
-         * @return {?}
-         */
-        function () {
+        get: function () {
             return this.currentQuestionnaireForm.valid;
         },
         enumerable: true,
         configurable: true
     });
     Object.defineProperty(QuestionnaireService.prototype, "isFirstQuestion", {
-        get: /**
-         * @return {?}
-         */
-        function () {
+        get: function () {
             if (!this.currentSection || !this.currentQuestion) {
                 return false;
             }
-            /** @type {?} */
             var currentIndex = this.currentSection.data.questions.indexOf(this.currentQuestion.data);
             return currentIndex === 0;
         },
@@ -1414,16 +887,11 @@ var QuestionnaireService = /** @class */ (function () {
         configurable: true
     });
     Object.defineProperty(QuestionnaireService.prototype, "isLastQuestion", {
-        get: /**
-         * @return {?}
-         */
-        function () {
+        get: function () {
             if (!this.currentSection || !this.currentQuestion) {
                 return false;
             }
-            /** @type {?} */
             var currentIndex = this.currentSection.data.questions.indexOf(this.currentQuestion.data);
-            /** @type {?} */
             var maxIndex = this.currentSection.data.questions.length - 1;
             return currentIndex === maxIndex;
         },
@@ -1431,14 +899,10 @@ var QuestionnaireService = /** @class */ (function () {
         configurable: true
     });
     Object.defineProperty(QuestionnaireService.prototype, "isFirstSection", {
-        get: /**
-         * @return {?}
-         */
-        function () {
+        get: function () {
             if (!this.currentSection) {
                 return false;
             }
-            /** @type {?} */
             var currentIndex = this.currentQuestionnaire.sections.indexOf(this.currentSection.data);
             return currentIndex === 0;
         },
@@ -1446,31 +910,18 @@ var QuestionnaireService = /** @class */ (function () {
         configurable: true
     });
     Object.defineProperty(QuestionnaireService.prototype, "isLastSection", {
-        get: /**
-         * @return {?}
-         */
-        function () {
+        get: function () {
             if (!this.currentSection) {
                 return false;
             }
-            /** @type {?} */
             var currentIndex = this.currentQuestionnaire.sections.indexOf(this.currentSection.data);
-            /** @type {?} */
             var maxIndex = this.currentQuestionnaire.sections.length - 1;
             return currentIndex === maxIndex;
         },
         enumerable: true,
         configurable: true
     });
-    /**
-     * @param {?} name
-     * @return {?}
-     */
-    QuestionnaireService.prototype.sectionValid = /**
-     * @param {?} name
-     * @return {?}
-     */
-    function (name) {
+    QuestionnaireService.prototype.sectionValid = function (name) {
         return this.currentQuestionnaireForm.get(name).valid;
     };
     /**
@@ -1478,21 +929,7 @@ var QuestionnaireService = /** @class */ (function () {
      * @param clearfields An array of strings, paths to clear.
      * @author Will Poulson
      */
-    /**
-     * Clears all the fields parsed
-     * @author Will Poulson
-     * @private
-     * @param {?} clearfields An array of strings, paths to clear.
-     * @return {?}
-     */
-    QuestionnaireService.prototype.clearFields = /**
-     * Clears all the fields parsed
-     * @author Will Poulson
-     * @private
-     * @param {?} clearfields An array of strings, paths to clear.
-     * @return {?}
-     */
-    function (clearfields) {
+    QuestionnaireService.prototype.clearFields = function (clearfields) {
         var e_3, _a;
         if (!clearfields || clearfields.length === 0) {
             return;
@@ -1500,7 +937,6 @@ var QuestionnaireService = /** @class */ (function () {
         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);
@@ -1520,19 +956,7 @@ var QuestionnaireService = /** @class */ (function () {
      * Useful when exiting a questionnaire page or completing a questionnaire.
      * @author Will Poulson
      */
-    /**
-     * Unloads the current questionnaire.
-     * Useful when exiting a questionnaire page or completing a questionnaire.
-     * @author Will Poulson
-     * @return {?}
-     */
-    QuestionnaireService.prototype.unloadQuestionnaire = /**
-     * Unloads the current questionnaire.
-     * Useful when exiting a questionnaire page or completing a questionnaire.
-     * @author Will Poulson
-     * @return {?}
-     */
-    function () {
+    QuestionnaireService.prototype.unloadQuestionnaire = function () {
         this.originalQuestionnaire = undefined;
         this.currentQuestionnaireForm = undefined;
         this.currentQuestionnaire = undefined;
@@ -1546,30 +970,20 @@ var QuestionnaireService = /** @class */ (function () {
          * @returns An object containing the section data and the related form group.
          * @author Will Poulson
          */
-        get: /**
-         * Gets the current selected section.
-         * @author Will Poulson
-         * @return {?} An object containing the section data and the related form group.
-         */
-        function () {
+        get: function () {
             var _this = this;
             if (!this.currentSectionName) {
                 return null;
             }
-            /** @type {?} */
-            var data = this.currentQuestionnaire.sections.find((/**
-             * @param {?} x
-             * @return {?}
-             */
-            function (x) {
+            var data = this.currentQuestionnaire.sections.find(function (x) {
                 return x.name === _this.currentSectionName;
-            }));
+            });
             if (!data) {
                 return null;
             }
             return {
                 data: data,
-                formGroup: (/** @type {?} */ (this.currentQuestionnaireForm.get(data.name)))
+                formGroup: this.currentQuestionnaireForm.get(data.name)
             };
         },
         enumerable: true,
@@ -1581,12 +995,7 @@ var QuestionnaireService = /** @class */ (function () {
          * @returns An array of all avaialble sections.
          * @author Will Poulson
          */
-        get: /**
-         * Gets all the avaialble sections.
-         * @author Will Poulson
-         * @return {?} An array of all avaialble sections.
-         */
-        function () {
+        get: function () {
             if (!this.currentQuestionnaire || !this.currentQuestionnaire.sections) {
                 return [];
             }
@@ -1601,12 +1010,7 @@ var QuestionnaireService = /** @class */ (function () {
          * @returns An object of data.
          * @author Will Poulson
          */
-        get: /**
-         * Gets the current data for the entire questionnaire.
-         * @author Will Poulson
-         * @return {?} An object of data.
-         */
-        function () {
+        get: function () {
             return this.currentQuestionnaireForm ? this.currentQuestionnaireForm.getRawValue() : {};
         },
         enumerable: true,
@@ -1618,29 +1022,18 @@ var QuestionnaireService = /** @class */ (function () {
          * @returns An object containing the question data and the related form control.
          * @author Will Poulson
          */
-        get: /**
-         * Gets the current selected question.
-         * @author Will Poulson
-         * @return {?} An object containing the question data and the related form control.
-         */
-        function () {
+        get: function () {
             var _this = this;
             if (!this.currentQuestionName) {
                 return null;
             }
-            /** @type {?} */
-            var data = this.currentSection.data.questions.find((/**
-             * @param {?} x
-             * @return {?}
-             */
-            function (x) {
+            var data = this.currentSection.data.questions.find(function (x) {
                 return x.name === _this.currentQuestionName;
-            }));
+            });
             if (!data) {
                 return null;
             }
-            /** @type {?} */
-            var formControl = (/** @type {?} */ (this.currentSection.formGroup.get(data.name)));
+            var formControl = this.currentSection.formGroup.get(data.name);
             return {
                 data: data,
                 formControl: formControl
@@ -1657,70 +1050,31 @@ var QuestionnaireService = /** @class */ (function () {
      * @returns A promise which will resolve when the question has been navigated to.
      * @author Will Poulson
      */
-    /**
-     * Navigates to the next question.
-     * If there is no question to navigate to it will reject with a out of bounds exception.
-     * If allowSkipRequiredField is false then it will reject if the current question is invalid.
-     * If emitSectionFinishEvent is true then it will emit an event if it's navigating past the length of questions.
-     * @author Will Poulson
-     * @return {?} A promise which will resolve when the question has been navigated to.
-     */
-    QuestionnaireService.prototype.nextQuestion = /**
-     * Navigates to the next question.
-     * If there is no question to navigate to it will reject with a out of bounds exception.
-     * If allowSkipRequiredField is false then it will reject if the current question is invalid.
-     * If emitSectionFinishEvent is true then it will emit an event if it's navigating past the length of questions.
-     * @author Will Poulson
-     * @return {?} A promise which will resolve when the question has been navigated to.
-     */
-    function () {
+    QuestionnaireService.prototype.nextQuestion = function () {
         var _this = this;
-        return new Promise((/**
-         * @param {?} resolve
-         * @param {?} reject
-         * @return {?}
-         */
-        function (resolve, reject) {
+        return new Promise(function (resolve, reject) {
             if (!_this.options.allowSkipRequiredField) {
                 if (_this.currentQuestion.formControl && !_this.currentQuestion.formControl.valid) {
                     return reject('Current question is invalid');
                 }
             }
-            _this.getCurrentQuestionIndex().then((/**
-             * @param {?} currentIndex
-             * @return {?}
-             */
-            function (currentIndex) {
-                /** @type {?} */
+            _this.getCurrentQuestionIndex().then(function (currentIndex) {
                 var lastQuestionIndex = _this.currentSection.data.questions.length - 1;
-                /** @type {?} */
                 var isLastQuestion = lastQuestionIndex === currentIndex;
                 if (isLastQuestion) {
                     _this.sectionFinishedEvent.emit();
                     return resolve();
                 }
-                /** @type {?} */
                 var newIndex = currentIndex + 1;
-                _this.navigateToQuestion(newIndex).then((/**
-                 * @return {?}
-                 */
-                function () {
+                _this.navigateToQuestion(newIndex).then(function () {
                     return resolve();
-                })).catch((/**
-                 * @param {?} error
-                 * @return {?}
-                 */
-                function (error) {
+                }).catch(function (error) {
                     return reject(error);
-                }));
-            })).catch((/**
-             * @param {?} error
-             * @return {?}
-             */
-            function (error) {
+                });
+            }).catch(function (error) {
                 return reject(error);
-            }));
-        }));
+            });
+        });
     };
     /**
      * Navigates to the previous question.
@@ -1729,91 +1083,38 @@ var QuestionnaireService = /** @class */ (function () {
      * @returns A promise which will resolve when the question has been navigated to.
      * @author Will Poulson
      */
-    /**
-     * Navigates to the previous question.
-     * If there is no question to navigate to it will reject with a out of bounds exception.
-     * If allowNavigateBackwards is false then it will reject.
-     * @author Will Poulson
-     * @return {?} A promise which will resolve when the question has been navigated to.
-     */
-    QuestionnaireService.prototype.prevQuestion = /**
-     * Navigates to the previous question.
-     * If there is no question to navigate to it will reject with a out of bounds exception.
-     * If allowNavigateBackwards is false then it will reject.
-     * @author Will Poulson
-     * @return {?} A promise which will resolve when the question has been navigated to.
-     */
-    function () {
+    QuestionnaireService.prototype.prevQuestion = function () {
         var _this = this;
-        return new Promise((/**
-         * @param {?} resolve
-         * @param {?} reject
-         * @return {?}
-         */
-        function (resolve, reject) {
+        return new Promise(function (resolve, reject) {
             if (!_this.options.allowNavigateBackwards) {
                 return reject('This questionnaire does not allow for backwards navigation');
             }
-            _this.getCurrentQuestionIndex().then((/**
-             * @param {?} currentIndex
-             * @return {?}
-             */
-            function (currentIndex) {
-                /** @type {?} */
+            _this.getCurrentQuestionIndex().then(function (currentIndex) {
                 var newIndex = currentIndex - 1;
-                _this.navigateToQuestion(newIndex).then((/**
-                 * @return {?}
-                 */
-                function () {
+                _this.navigateToQuestion(newIndex).then(function () {
                     return resolve();
-                })).catch((/**
-                 * @param {?} error
-                 * @return {?}
-                 */
-                function (error) {
+                }).catch(function (error) {
                     return reject(error);
-                }));
-            })).catch((/**
-             * @param {?} error
-             * @return {?}
-             */
-            function (error) {
+                });
+            }).catch(function (error) {
                 return reject(error);
-            }));
-        }));
+            });
+        });
     };
     /**
      * Gets the current questions index.
      * @returns A promise which resolves a number.
      * @author Will Poulson
      */
-    /**
-     * Gets the current questions index.
-     * @author Will Poulson
-     * @private
-     * @return {?} A promise which resolves a number.
-     */
-    QuestionnaireService.prototype.getCurrentQuestionIndex = /**
-     * Gets the current questions index.
-     * @author Will Poulson
-     * @private
-     * @return {?} A promise which resolves a number.
-     */
-    function () {
+    QuestionnaireService.prototype.getCurrentQuestionIndex = function () {
         var _this = this;
-        return new Promise((/**
-         * @param {?} resolve
-         * @param {?} reject
-         * @return {?}
-         */
-        function (resolve, reject) {
-            /** @type {?} */
+        return new Promise(function (resolve, reject) {
             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.
@@ -1821,167 +1122,70 @@ var QuestionnaireService = /** @class */ (function () {
      * @returns A promise which will resolve when the question has been navigated to.
      * @author Will Poulson
      */
-    /**
-     * Checks a question is in bounds then navigates to it.
-     * @author Will Poulson
-     * @param {?} index The index to navigate to.
-     * @return {?} A promise which will resolve when the question has been navigated to.
-     */
-    QuestionnaireService.prototype.navigateToQuestion = /**
-     * Checks a question is in bounds then navigates to it.
-     * @author Will Poulson
-     * @param {?} index The index to navigate to.
-     * @return {?} A promise which will resolve when the question has been navigated to.
-     */
-    function (index) {
+    QuestionnaireService.prototype.navigateToQuestion = function (index) {
         var _this = this;
-        return new Promise((/**
-         * @param {?} resolve
-         * @param {?} reject
-         * @return {?}
-         */
-        function (resolve, reject) {
+        return new Promise(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.
      * @author Will Poulson
      */
-    /**
-     * Navigates to the next section.
-     * @author Will Poulson
-     * @return {?} A promise which will resolve when the section has been navigated to.
-     */
-    QuestionnaireService.prototype.nextSection = /**
-     * Navigates to the next section.
-     * @author Will Poulson
-     * @return {?} A promise which will resolve when the section has been navigated to.
-     */
-    function () {
+    QuestionnaireService.prototype.nextSection = function () {
         var _this = this;
-        return new Promise((/**
-         * @param {?} resolve
-         * @param {?} reject
-         * @return {?}
-         */
-        function (resolve, reject) {
-            _this.getCurrentSectionIndex().then((/**
-             * @param {?} currentIndex
-             * @return {?}
-             */
-            function (currentIndex) {
-                /** @type {?} */
+        return new Promise(function (resolve, reject) {
+            _this.getCurrentSectionIndex().then(function (currentIndex) {
                 var newIndex = currentIndex + 1;
-                _this.navigateToSection(newIndex).then((/**
-                 * @return {?}
-                 */
-                function () {
+                _this.navigateToSection(newIndex).then(function () {
                     return resolve();
-                })).catch((/**
-                 * @param {?} error
-                 * @return {?}
-                 */
-                function (error) {
+                }).catch(function (error) {
                     return reject(error);
-                }));
-            })).catch((/**
-             * @param {?} error
-             * @return {?}
-             */
-            function (error) {
+                });
+            }).catch(function (error) {
                 return reject(error);
-            }));
-        }));
+            });
+        });
     };
     /**
      * Navigates to the previous section.
      * @returns A promise which will resolve when the section has been navigated to.
      * @author Will Poulson
      */
-    /**
-     * Navigates to the previous section.
-     * @author Will Poulson
-     * @return {?} A promise which will resolve when the section has been navigated to.
-     */
-    QuestionnaireService.prototype.prevSection = /**
-     * Navigates to the previous section.
-     * @author Will Poulson
-     * @return {?} A promise which will resolve when the section has been navigated to.
-     */
-    function () {
+    QuestionnaireService.prototype.prevSection = function () {
         var _this = this;
-        return new Promise((/**
-         * @param {?} resolve
-         * @param {?} reject
-         * @return {?}
-         */
-        function (resolve, reject) {
-            _this.getCurrentSectionIndex().then((/**
-             * @param {?} currentIndex
-             * @return {?}
-             */
-            function (currentIndex) {
-                /** @type {?} */
+        return new Promise(function (resolve, reject) {
+            _this.getCurrentSectionIndex().then(function (currentIndex) {
                 var newIndex = currentIndex - 1;
-                _this.navigateToSection(newIndex).then((/**
-                 * @return {?}
-                 */
-                function () {
+                _this.navigateToSection(newIndex).then(function () {
                     return resolve();
-                })).catch((/**
-                 * @param {?} error
-                 * @return {?}
-                 */
-                function (error) {
+                }).catch(function (error) {
                     return reject(error);
-                }));
-            })).catch((/**
-             * @param {?} error
-             * @return {?}
-             */
-            function (error) {
+                });
+            }).catch(function (error) {
                 return reject(error);
-            }));
-        }));
+            });
+        });
     };
     /**
      * Gets the current section index.
      * @returns A promise which resolves a number.
      * @author Will Poulson
      */
-    /**
-     * Gets the current section index.
-     * @author Will Poulson
-     * @private
-     * @return {?} A promise which resolves a number.
-     */
-    QuestionnaireService.prototype.getCurrentSectionIndex = /**
-     * Gets the current section index.
-     * @author Will Poulson
-     * @private
-     * @return {?} A promise which resolves a number.
-     */
-    function () {
+    QuestionnaireService.prototype.getCurrentSectionIndex = function () {
         var _this = this;
-        return new Promise((/**
-         * @param {?} resolve
-         * @param {?} reject
-         * @return {?}
-         */
-        function (resolve, reject) {
-            /** @type {?} */
+        return new Promise(function (resolve, reject) {
             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.
@@ -1989,53 +1193,22 @@ var QuestionnaireService = /** @class */ (function () {
      * @returns A promise which will resolve when the section has been navigated to.
      * @author Will Poulson
      */
-    /**
-     * Checks a section is in bounds then navigates to it.
-     * @author Will Poulson
-     * @param {?} index The index to navigate to.
-     * @return {?} A promise which will resolve when the section has been navigated to.
-     */
-    QuestionnaireService.prototype.navigateToSection = /**
-     * Checks a section is in bounds then navigates to it.
-     * @author Will Poulson
-     * @param {?} index The index to navigate to.
-     * @return {?} A promise which will resolve when the section has been navigated to.
-     */
-    function (index) {
+    QuestionnaireService.prototype.navigateToSection = function (index) {
         var _this = this;
-        return new Promise((/**
-         * @param {?} resolve
-         * @param {?} reject
-         * @return {?}
-         */
-        function (resolve, reject) {
+        return new Promise(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.
      * @author Will Poulson
      */
-    /**
-     * Answers the current question with the parsed value.
-     * @author Will Poulson
-     * @param {?} answer The value to answer the question with.
-     * @param {?=} sendToNextQuestion
-     * @return {?}
-     */
-    QuestionnaireService.prototype.answerCurrentQuestion = /**
-     * Answers the current question with the parsed value.
-     * @author Will Poulson
-     * @param {?} answer The value to answer the question with.
-     * @param {?=} sendToNextQuestion
-     * @return {?}
-     */
-    function (answer, sendToNextQuestion) {
+    QuestionnaireService.prototype.answerCurrentQuestion = function (answer, sendToNextQuestion) {
         var _this = this;
         if (!sendToNextQuestion) {
             this.currentQuestion.formControl.setValue(answer);
@@ -2043,18 +1216,12 @@ var QuestionnaireService = /** @class */ (function () {
         }
         if (this.skippable) { // Timeout to prevent skipping glitch.
             this.skippable = false;
-            setTimeout((/**
-             * @return {?}
-             */
-            function () {
+            setTimeout(function () {
                 _this.currentQuestion.formControl.setValue(answer);
-                _this.nextQuestion().then((/**
-                 * @return {?}
-                 */
-                function () {
+                _this.nextQuestion().then(function () {
                     _this.skippable = true;
-                }));
-            }), 150);
+                });
+            }, 150);
         }
     };
     /**
@@ -2063,30 +1230,12 @@ var QuestionnaireService = /** @class */ (function () {
      * @returns A promise which resolves when the repeater item has been added.
      * @author Will Poulson
      */
-    /**
-     * Adds a repeater item to the current question.
-     * Current question must be of type Repeater.
-     * @author Will Poulson
-     * @return {?} A promise which resolves when the repeater item has been added.
-     */
-    QuestionnaireService.prototype.addRepeaterItem = /**
-     * Adds a repeater item to the current question.
-     * Current question must be of type Repeater.
-     * @author Will Poulson
-     * @return {?} A promise which resolves when the repeater item has been added.
-     */
-    function () {
+    QuestionnaireService.prototype.addRepeaterItem = function () {
         var _this = this;
-        return new Promise((/**
-         * @param {?} resolve
-         * @param {?} reject
-         * @return {?}
-         */
-        function (resolve, reject) {
+        return new Promise(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.");
@@ -2096,7 +1245,7 @@ var QuestionnaireService = /** @class */ (function () {
             }
             _this.currentQuestion.formControl.push(repeaterForm);
             return resolve();
-        }));
+        });
     };
     /**
      * Removes a repeater item on the current question.
@@ -2105,28 +1254,9 @@ var QuestionnaireService = /** @class */ (function () {
      * @returns A promise which resolves when the repeater item has been removed.
      * @author Will Poulson
      */
-    /**
-     * Removes a repeater item on the current question.
-     * Current question must be of type Repeater.
-     * @author Will Poulson
-     * @param {?} index The index at which to remove.
-     * @return {?} A promise which resolves when the repeater item has been removed.
-     */
-    QuestionnaireService.prototype.removeRepeaterItem = /**
-     * Removes a repeater item on the current question.
-     * Current question must be of type Repeater.
-     * @author Will Poulson
-     * @param {?} index The index at which to remove.
-     * @return {?} A promise which resolves when the repeater item has been removed.
-     */
-    function (index) {
+    QuestionnaireService.prototype.removeRepeaterItem = function (index) {
         var _this = this;
-        return new Promise((/**
-         * @param {?} resolve
-         * @param {?} reject
-         * @return {?}
-         */
-        function (resolve, reject) {
+        return new Promise(function (resolve, reject) {
             if (_this.currentQuestion.data.type !== QuestionType.Repeater) {
                 return reject("Current question isn't a repeater");
             }
@@ -2135,7 +1265,7 @@ var QuestionnaireService = /** @class */ (function () {
             }
             _this.currentQuestion.formControl.removeAt(index);
             return resolve();
-        }));
+        });
     };
     /**
      * Returns the display text for a given repeater item
@@ -2143,43 +1273,24 @@ var QuestionnaireService = /** @class */ (function () {
      * @returns A string which is the display text.
      * @author Will Poulson
      */
-    /**
-     * Returns the display text for a given repeater item
-     * @author Will Poulson
-     * @param {?} index The index at which to get the label for.
-     * @return {?} A string which is the display text.
-     */
-    QuestionnaireService.prototype.getRepeaterItemLabel = /**
-     * Returns the display text for a given repeater item
-     * @author Will Poulson
-     * @param {?} index The index at which to get the label for.
-     * @return {?} A string which is the display text.
-     */
-    function (index) {
+    QuestionnaireService.prototype.getRepeaterItemLabel = function (index) {
         var e_4, _a;
         if (!this.currentQuestion.formControl || !(this.currentQuestion.formControl instanceof 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 && item.value ? item.value : '?');
                     displayArray.push(value);
                 }
@@ -2195,98 +1306,27 @@ var QuestionnaireService = /** @class */ (function () {
             }
             finally { if (e_4) throw e_4.error; }
         }
-        /** @type {?} */
         var display = displayArray.join(' ');
         return display;
     };
-    QuestionnaireService.decorators = [
-        { type: Injectable, args: [{
-                    providedIn: 'root'
-                },] }
-    ];
-    /** @nocollapse */
-    QuestionnaireService.ctorParameters = function () { return [
-        { type: FormConstructorService },
-        { type: undefined, decorators: [{ type: Inject, args: ['options',] }] }
-    ]; };
-    /** @nocollapse */ QuestionnaireService.ngInjectableDef = ɵɵdefineInjectable({ factory: function QuestionnaireService_Factory() { return new QuestionnaireService(ɵɵinject(FormConstructorService), ɵɵinject("options")); }, token: QuestionnaireService, providedIn: "root" });
+    QuestionnaireService.ɵfac = function QuestionnaireService_Factory(t) { return new (t || QuestionnaireService)(ɵɵinject(FormConstructorService), ɵɵinject('options')); };
+    QuestionnaireService.ɵprov = ɵɵdefineInjectable({ token: QuestionnaireService, factory: QuestionnaireService.ɵfac, providedIn: 'root' });
     return QuestionnaireService;
 }());
-if (false) {
-    /** @type {?} */
-    QuestionnaireService.prototype.dataChangedEvent;
-    /** @type {?} */
-    QuestionnaireService.prototype.sectionFinishedEvent;
-    /**
-     * @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 {?} */
-    QuestionnaireService.prototype.additionalData;
-    /**
-     * @type {?}
-     * @private
-     */
-    QuestionnaireService.prototype.skippable;
-    /**
-     * @type {?}
-     * @private
-     */
-    QuestionnaireService.prototype.formConstuctor;
-    /**
-     * @type {?}
-     * @private
-     */
-    QuestionnaireService.prototype.options;
-}
+/*@__PURE__*/ (function () { ɵsetClassMetadata(QuestionnaireService, [{
+        type: Injectable,
+        args: [{
+                providedIn: 'root'
+            }]
+    }], function () { return [{ type: FormConstructorService }, { type: undefined, decorators: [{
+                type: Inject,
+                args: ['options']
+            }] }]; }, null); })();
 
-/**
- * @fileoverview added by tsickle
- * @suppress {checkTypes,constantProperty,extraRequire,missingOverride,missingReturn,unusedPrivateMembers,uselessCode} checked by tsc
- */
 var GgQuestionnaireV2Module = /** @class */ (function () {
     function GgQuestionnaireV2Module() {
     }
-    /**
-     * @param {?} options
-     * @return {?}
-     */
-    GgQuestionnaireV2Module.forRoot = /**
-     * @param {?} options
-     * @return {?}
-     */
-    function (options) {
+    GgQuestionnaireV2Module.forRoot = function (options) {
         return {
             ngModule: GgQuestionnaireV2Module,
             providers: [
@@ -2298,61 +1338,60 @@ var GgQuestionnaireV2Module = /** @class */ (function () {
             ]
         };
     };
-    GgQuestionnaireV2Module.decorators = [
-        { type: NgModule, args: [{
-                    declarations: [],
-                    providers: [
-                        FormConstructorService,
-                        FilterService
-                    ],
-                    imports: [
-                        FormsModule,
-                        ReactiveFormsModule
-                    ],
-                },] }
-    ];
+    GgQuestionnaireV2Module.ɵmod = ɵɵdefineNgModule({ type: GgQuestionnaireV2Module });
+    GgQuestionnaireV2Module.ɵinj = ɵɵdefineInjector({ factory: function GgQuestionnaireV2Module_Factory(t) { return new (t || GgQuestionnaireV2Module)(); }, providers: [
+            FormConstructorService,
+            FilterService
+        ], imports: [[
+                FormsModule,
+                ReactiveFormsModule
+            ]] });
     return GgQuestionnaireV2Module;
 }());
+(function () { (typeof ngJitMode === "undefined" || ngJitMode) && ɵɵsetNgModuleScope(GgQuestionnaireV2Module, { imports: [FormsModule,
+        ReactiveFormsModule] }); })();
+/*@__PURE__*/ (function () { ɵsetClassMetadata(GgQuestionnaireV2Module, [{
+        type: NgModule,
+        args: [{
+                declarations: [],
+                providers: [
+                    FormConstructorService,
+                    FilterService
+                ],
+                imports: [
+                    FormsModule,
+                    ReactiveFormsModule
+                ],
+            }]
+    }], null, null); })();
 
-/**
- * @fileoverview added by tsickle
- * @suppress {checkTypes,constantProperty,extraRequire,missingOverride,missingReturn,unusedPrivateMembers,uselessCode} checked by tsc
- */
-/** @enum {string} */
-var InputType = {
-    Text: 'text',
-    Number: 'number',
-    Email: 'email',
-    Telephone: 'tel',
-    Password: 'password',
-    Color: 'color',
-    Date: 'date',
-    DateTimeLocal: 'datetime-local',
-    Time: 'time',
-    Month: 'month',
-    Week: 'week',
-};
+var InputType;
+(function (InputType) {
+    InputType["Text"] = "text";
+    InputType["Number"] = "number";
+    InputType["Email"] = "email";
+    InputType["Telephone"] = "tel";
+    InputType["Password"] = "password";
+    InputType["Color"] = "color";
+    InputType["Date"] = "date";
+    InputType["DateTimeLocal"] = "datetime-local";
+    InputType["Time"] = "time";
+    InputType["Month"] = "month";
+    InputType["Week"] = "week";
+})(InputType || (InputType = {}));
 
-/**
- * @fileoverview added by tsickle
- * @suppress {checkTypes,constantProperty,extraRequire,missingOverride,missingReturn,unusedPrivateMembers,uselessCode} checked by tsc
- */
-/** @enum {string} */
-var RepeaterQuestionType = {
-    Input: 'input',
-    Select: 'select',
-    Upload: 'upload',
-};
+var RepeaterQuestionType;
+(function (RepeaterQuestionType) {
+    RepeaterQuestionType["Input"] = "input";
+    RepeaterQuestionType["Select"] = "select";
+    RepeaterQuestionType["Upload"] = "upload";
+})(RepeaterQuestionType || (RepeaterQuestionType = {}));
 
-/**
- * @fileoverview added by tsickle
- * @suppress {checkTypes,constantProperty,extraRequire,missingOverride,missingReturn,unusedPrivateMembers,uselessCode} checked by tsc
- */
+// Services
 
 /**
- * @fileoverview added by tsickle
- * @suppress {checkTypes,constantProperty,extraRequire,missingOverride,missingReturn,unusedPrivateMembers,uselessCode} checked by tsc
+ * Generated bundle index. Do not edit.
  */
 
-export { ConditionRelationship, ConditionType, GgQuestionnaireV2Module, InputType, QuestionType, QuestionnaireService, RepeaterQuestionType, ValidationType, FormConstructorService as ɵa, FilterService as ɵb };
+export { ConditionRelationship, ConditionType, GgQuestionnaireV2Module, InputType, QuestionType, QuestionnaireService, RepeaterQuestionType, ValidationType };
 //# sourceMappingURL=glowgreen-gg-questionnaire-v2.js.map