@glowgreen/gg-questionnaire-v2 0.0.82 → 0.0.84

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

@@ -1,72 +1,53 @@
-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} */
-const 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} */
-const 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} */
-const 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
- */
 class FilterService {
     constructor() { }
     /**
      * Filters an array of sections based on their condition groups.
+     * @param sections The array of sections to filter.
+     * @param currentQuestionnaireForm The current form data, can be null/undefined.
+     * @returns An array of filtered sections with their filtered questions.
      * @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.
      */
     filterSections(sections, currentQuestionnaireForm, additionalData) {
-        /** @type {?} */
         const filteredSections = [];
         for (const section of sections) {
             if (!this.meetsConditionGroups(section.conditionGroups, currentQuestionnaireForm, additionalData)) {
                 continue;
             }
-            /** @type {?} */
             const filteredQuestions = [];
             for (const question of section.questions) {
                 if (!this.meetsConditionGroups(question.conditionGroups, currentQuestionnaireForm, additionalData)) {
@@ -74,23 +55,18 @@ class FilterService {
                 }
                 // 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 {?} */
-                    const items = (/** @type {?} */ (currentQuestionnaireForm.get([section.name, question.name])));
+                    const items = currentQuestionnaireForm.get([section.name, question.name]);
                     if (items && items.controls) {
                         for (const repeaterItem of items.controls) {
-                            /** @type {?} */
                             const filteredRepeaterItemQuestions = [];
                             for (const repeaterQuestion of question.repeaterQuestions) {
-                                /** @type {?} */
-                                const meetsConditions = this.meetsConditionGroups(repeaterQuestion.conditionGroups, currentQuestionnaireForm, additionalData, (/** @type {?} */ (repeaterItem)));
+                                const meetsConditions = this.meetsConditionGroups(repeaterQuestion.conditionGroups, currentQuestionnaireForm, additionalData, repeaterItem);
                                 if (meetsConditions) {
-                                    /** @type {?} */
                                     const cloneQuestion = clone(repeaterQuestion);
-                                    cloneQuestion.selectOptions = this.getFetchOptionsForQuestion(repeaterQuestion, additionalData, currentQuestionnaireForm, (/** @type {?} */ (repeaterItem)));
+                                    cloneQuestion.selectOptions = this.getFetchOptionsForQuestion(repeaterQuestion, additionalData, currentQuestionnaireForm, repeaterItem);
                                     filteredRepeaterItemQuestions.push(cloneQuestion);
                                 }
                             }
-                            /** @type {?} */
                             const index = items.controls.indexOf(repeaterItem);
                             if (!question.filteredRepeaterQuestions) {
                                 question.filteredRepeaterQuestions = [];
@@ -110,22 +86,12 @@ class FilterService {
         }
         return filteredSections;
     }
-    /**
-     * @private
-     * @param {?} question
-     * @param {?} additionalData
-     * @param {?} currentQuestionnaireForm
-     * @param {?=} repeaterItem
-     * @return {?}
-     */
     getFetchOptionsForQuestion(question, additionalData, currentQuestionnaireForm, repeaterItem) {
         if (!question.fetchPath) {
             return question.selectOptions;
         }
-        /** @type {?} */
         let options = additionalData[question.fetchPath];
         if (question.fetchSelectors && question.fetchSelectors.length > 0) {
-            /** @type {?} */
             const values = this.getValuesForArray(question.fetchSelectors, currentQuestionnaireForm, additionalData, repeaterItem);
             options = get(additionalData[question.fetchPath], values);
         }
@@ -135,11 +101,6 @@ class FilterService {
         }
         return question.selectOptions.concat(options);
     }
-    /**
-     * @private
-     * @param {?} items
-     * @return {?}
-     */
     getFinalFetchArray(items) {
         if (!items) {
             return null;
@@ -150,11 +111,10 @@ class FilterService {
         if (items.length <= 0) {
             return null;
         }
-        /** @type {?} */
         const convertedArray = [];
         for (const item of items) {
             if (item) {
-                if (item instanceof Object && item.value && item.label) {
+                if (item instanceof Object && (item.value !== undefined) && item.label) {
                     convertedArray.push(item);
                 }
                 else {
@@ -164,111 +124,76 @@ class FilterService {
         }
         return convertedArray;
     }
-    /**
-     * @private
-     * @param {?} item
-     * @return {?}
-     */
     uppercase(item) {
+        if (!isNaN(item)) {
+            return item;
+        }
         return item.charAt(0).toUpperCase() + item.slice(1);
     }
     /**
      * Checks if each condition groups conditions have been met.
+     * @param conditionGroups The array of condition groups.
+     * @param currentQuestionnaireForm The current form data, can be null/undefined.
+     * @returns A boolean stating if the condition groups conditions has 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.
      */
     meetsConditionGroups(conditionGroups, currentQuestionnaireForm, additionalData, repeaterItem) {
         if (!conditionGroups || conditionGroups.length === 0) {
             return true;
         }
-        return conditionGroups.every((/**
-         * @param {?} x
-         * @return {?}
-         */
-        (x) => {
+        return conditionGroups.every((x) => {
             return this.meetsConditionGroup(x, currentQuestionnaireForm, additionalData, repeaterItem) === true;
-        }));
+        });
     }
     /**
      * Checks if a condition groups conditions have been met.
+     * @param conditionGroup The condition group to check.
+     * @param currentQuestionnaireForm The current form data, can be null/undefined.
+     * @returns A boolean stating if the condition group conditions has 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.
      */
     meetsConditionGroup(conditionGroup, currentQuestionnaireForm, additionalData, repeaterItem) {
         if (!conditionGroup.conditions || conditionGroup.conditions.length === 0) {
             return true;
         }
-        /** @type {?} */
         const results = [];
         for (const condition of conditionGroup.conditions) {
             results.push(this.meetsCondition(condition, currentQuestionnaireForm, additionalData, repeaterItem));
         }
         switch (conditionGroup.relationship) {
             case ConditionRelationship.Every:
-                return results.every((/**
-                 * @param {?} x
-                 * @return {?}
-                 */
-                (x) => {
+                return results.every((x) => {
                     return x === true;
-                }));
+                });
             case ConditionRelationship.Any:
-                return !!results.find((/**
-                 * @param {?} x
-                 * @return {?}
-                 */
-                (x) => {
+                return !!results.find((x) => {
                     return x === true;
-                }));
+                });
             default:
                 return true;
         }
     }
     /**
      * Checks if a condition has been met.
+     * @param condition The condition to check.
+     * @param currentQuestionnaireForm The current form data, can be null/undefined.
+     * @returns A boolean stating if the condition group conditions 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.
      */
     meetsCondition(condition, currentQuestionnaireForm, additionalData, repeaterItem) {
-        /** @type {?} */
         const v1s = this.getValuesForArray(condition.v1s, currentQuestionnaireForm, additionalData, repeaterItem);
-        /** @type {?} */
         const v2s = this.getValuesForArray(condition.v2s, currentQuestionnaireForm, additionalData, repeaterItem);
-        /** @type {?} */
         let result = false;
         switch (condition.type) {
             case ConditionType.Excludes:
-                result = v1s.filter((/**
-                 * @param {?} v1
-                 * @return {?}
-                 */
-                (v1) => {
+                result = v1s.filter((v1) => {
                     return v2s.indexOf(v1) > -1;
-                })).length === 0;
+                }).length === 0;
                 break;
             case ConditionType.Includes:
-                result = v1s.filter((/**
-                 * @param {?} v1
-                 * @return {?}
-                 */
-                (v1) => {
+                result = v1s.filter((v1) => {
                     return v2s.indexOf(v1) > -1;
-                })).length !== 0;
+                }).length !== 0;
                 break;
             default:
                 for (let v2 of v2s) {
@@ -308,11 +233,6 @@ class FilterService {
         }
         return result;
     }
-    /**
-     * @private
-     * @param {?} value
-     * @return {?}
-     */
     getStringForValue(value) {
         switch (value) {
             case null:
@@ -323,20 +243,15 @@ class FilterService {
     }
     /**
      * Gets the current values for an array of strings.
+     * @param paths The array of strings to check.
+     * @param currentQuestionnaireForm The current form data, can be null/undefined.
+     * @returns An array of strings/values
      * @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
      */
     getValuesForArray(paths, currentQuestionnaireForm, additionalData, repeaterItem) {
         if (currentQuestionnaireForm) {
-            /** @type {?} */
             const values = [];
             for (const path of paths) {
-                /** @type {?} */
                 const value = this.getValueForString(path, currentQuestionnaireForm, additionalData, repeaterItem);
                 values.push(value);
             }
@@ -348,25 +263,20 @@ class FilterService {
     }
     /**
      * Gets a current value for a string.
+     * @param path The string value to check.
+     * @param currentQuestionnaireForm The current form data, can be null/undefined.
+     * @returns A string/value.
      * @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.
      */
     getValueForString(path, currentQuestionnaireForm, additionalData, repeaterItem) {
         if (currentQuestionnaireForm) {
             if (!additionalData) {
                 additionalData = {};
             }
-            /** @type {?} */
             let control = currentQuestionnaireForm.get(path.toString());
             if (!control && repeaterItem) {
                 control = repeaterItem.get(path);
             }
-            /** @type {?} */
             const value = control ? control.value : this.convertStringToValue(path);
             return get(additionalData, path, value);
         }
@@ -377,10 +287,9 @@ class FilterService {
     /**
      * Converts a string to a value.
      * Eg. true/false.
+     * @param path The string value to check for conversion;
+     * @returns Either a string or the converted value.
      * @author Will Poulson
-     * @private
-     * @param {?} path The string value to check for conversion;
-     * @return {?} Either a string or the converted value.
      */
     convertStringToValue(path) {
         switch (path) {
@@ -395,38 +304,26 @@ class FilterService {
         }
     }
 }
-FilterService.decorators = [
-    { type: Injectable, args: [{
+FilterService.ɵfac = function FilterService_Factory(t) { return new (t || FilterService)(); };
+FilterService.ɵprov = ɵɵdefineInjectable({ token: FilterService, factory: FilterService.ɵfac, providedIn: 'root' });
+/*@__PURE__*/ (function () { ɵsetClassMetadata(FilterService, [{
+        type: Injectable,
+        args: [{
                 providedIn: 'root'
-            },] }
-];
-/** @nocollapse */
-FilterService.ctorParameters = () => [];
-/** @nocollapse */ FilterService.ngInjectableDef = ɵɵdefineInjectable({ factory: function FilterService_Factory() { return new FilterService(); }, token: FilterService, providedIn: "root" });
+            }]
+    }], function () { return []; }, null); })();
 
-/**
- * @fileoverview added by tsickle
- * @suppress {checkTypes,constantProperty,extraRequire,missingOverride,missingReturn,unusedPrivateMembers,uselessCode} checked by tsc
- */
-/** @enum {string} */
-const 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
- */
 class FormConstructorService {
-    /**
-     * @param {?} fb
-     * @param {?} filterService
-     */
     constructor(fb, filterService) {
         this.fb = fb;
         this.filterService = filterService;
@@ -434,39 +331,24 @@ class FormConstructorService {
     /**
      * 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.
+     * @param questionnaire The questionnaire data to build the form group on.
+     * @returns A filted form group.
      * @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.
      */
     generateFormsForQuestionnaire(questionnaire, currentQuestionnaire, currentQuestionnaireForm, additionalData, skipFilter) {
-        /** @type {?} */
         const sections = skipFilter ?
             questionnaire.sections :
             this.filterService.filterSections(questionnaire.sections, currentQuestionnaireForm, additionalData);
-        /** @type {?} */
         const noChange = currentQuestionnaireForm && (sections === currentQuestionnaire.sections);
         if (noChange && !skipFilter) {
             return null;
         }
-        /** @type {?} */
         const questionnaireForms = this.generateFormsForSections(sections, currentQuestionnaireForm);
         return { sections: sections, forms: questionnaireForms };
     }
-    /**
-     * @private
-     * @param {?} sections
-     * @param {?} currentQuestionnaireForm
-     * @return {?}
-     */
     generateFormsForSections(sections, currentQuestionnaireForm) {
-        /** @type {?} */
         const questionnaireForms = this.fb.group({});
         for (const section of sections) {
-            /** @type {?} */
             const sectionForms = this.generateFormsForSection(section, currentQuestionnaireForm);
             questionnaireForms.addControl(section.name, sectionForms);
         }
@@ -475,20 +357,16 @@ class FormConstructorService {
     /**
      * Constructs a form group based on the section data.
      * This form group has been filtered down based on the conditions of the questions.
+     * @param section The section data to build the form group on.
+     * @returns A filtered form group.
      * @author Will Poulson
-     * @private
-     * @param {?} section The section data to build the form group on.
-     * @param {?} currentQuestionnaireForm
-     * @return {?} A filtered form group.
      */
     generateFormsForSection(section, currentQuestionnaireForm) {
-        /** @type {?} */
         const sectionForms = this.fb.group({});
         for (const question of section.questions) {
             if (question.type === QuestionType.Info) {
                 continue;
             }
-            /** @type {?} */
             const questionControl = this.generateControlForQuestion(question, section, currentQuestionnaireForm);
             sectionForms.addControl(question.name, questionControl);
         }
@@ -496,62 +374,40 @@ class FormConstructorService {
     }
     /**
      * Constructs an astract form control based on the question data.
+     * @param question The question data to build the abstract control on.
+     * @returns An abstract control.
      * @author Will Poulson
-     * @private
-     * @param {?} question The question data to build the abstract control on.
-     * @param {?} section
-     * @param {?} currentQuestionnaireForm
-     * @return {?} An abstract control.
      */
     generateControlForQuestion(question, section, currentQuestionnaireForm) {
-        /** @type {?} */
         const convertedValidators = this.convertValidators(question.validators);
-        /** @type {?} */
         const defaultValue = question.defaultValue ? question.defaultValue : null;
         switch (question.type) {
             case QuestionType.Repeater:
-                /** @type {?} */
                 const newArray = this.fb.array([], convertedValidators);
-                /** @type {?} */
-                const currentArray = currentQuestionnaireForm ? ((/** @type {?} */ (currentQuestionnaireForm.get([section.name, question.name])))) : false;
+                const currentArray = currentQuestionnaireForm ? currentQuestionnaireForm.get([section.name, question.name]) : false;
                 if (currentArray && question.filteredRepeaterQuestions) {
                     for (const control of currentArray.controls) {
-                        /** @type {?} */
                         const index = currentArray.controls.indexOf(control);
                         if (index === -1) {
                             continue;
                         }
-                        /** @type {?} */
                         const filteredQuestions = question.filteredRepeaterQuestions[index];
                         if (!filteredQuestions) {
                             continue;
                         }
-                        /** @type {?} */
-                        const filteredQuestionNames = filteredQuestions.map((/**
-                         * @param {?} x
-                         * @return {?}
-                         */
-                        x => x.name));
-                        /** @type {?} */
-                        const filteredOutQuestions = question.repeaterQuestions.filter((/**
-                         * @param {?} x
-                         * @return {?}
-                         */
-                        x => !filteredQuestionNames.includes(x.name)));
+                        const filteredQuestionNames = filteredQuestions.map(x => x.name);
+                        const filteredOutQuestions = question.repeaterQuestions.filter(x => !filteredQuestionNames.includes(x.name));
                         for (const filteredOutQuestion of filteredOutQuestions) {
-                            /** @type {?} */
                             const childControl = control.get(filteredOutQuestion.name);
                             childControl.setValidators([]);
                             childControl.updateValueAndValidity({ onlySelf: true, emitEvent: false });
                         }
                         for (const filteredQuestion of filteredQuestions) {
-                            /** @type {?} */
                             const 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 {?} */
                             const convertedValidators = this.convertValidators(filteredQuestion.validators);
                             childControl.setValidators(convertedValidators);
                             childControl.updateValueAndValidity({ onlySelf: true, emitEvent: false });
@@ -569,20 +425,16 @@ class FormConstructorService {
     }
     /**
      * Generates the form group for a checklist question.
+     * @param question The question. Must be of type checklist or else null is returned.
+     * @returns A form group.
      * @author Will Poulson
-     * @private
-     * @param {?} question The question. Must be of type checklist or else null is returned.
-     * @param {?} convertedValidators
-     * @return {?} A form group.
      */
     generateGroupForChecklist(question, convertedValidators) {
         if (question.type !== QuestionType.Checklist || question.checklistItems.length === 0) {
             return null;
         }
-        /** @type {?} */
         const checklistForms = this.fb.group({});
         for (const checklistItem of question.checklistItems) {
-            /** @type {?} */
             const checklistItemControl = this.fb.control(null, convertedValidators);
             checklistForms.addControl(checklistItem.name, checklistItemControl);
         }
@@ -590,20 +442,17 @@ class FormConstructorService {
     }
     /**
      * Generates the form template for a repeater question.
+     * @param question The question. Must be of type repeater or else null is returned.
+     * @returns A form group.
      * @author Will Poulson
-     * @param {?} question The question. Must be of type repeater or else null is returned.
-     * @param {?=} index
-     * @return {?} A form group.
      */
     generateFormsForRepeater(question, index) {
         if (question.type !== QuestionType.Repeater || question.repeaterQuestions.length === 0) {
             console.log('Question isnt a repeater or has no questions, returning null');
             return null;
         }
-        /** @type {?} */
         const repeaterForms = this.fb.group({});
         for (const repeaterQuestion of question.repeaterQuestions) {
-            /** @type {?} */
             const repeaterQuestionControl = this.generateControlForRepeaterQuestion(repeaterQuestion);
             repeaterForms.addControl(repeaterQuestion.name, repeaterQuestionControl);
         }
@@ -611,31 +460,26 @@ class FormConstructorService {
     }
     /**
      * Generates a control for a repeaters question.
+     * @param repeaterQuestion A repeater question.
+     * @returns An abstract control.
      * @author Will Poulson
-     * @private
-     * @param {?} repeaterQuestion A repeater question.
-     * @return {?} An abstract control.
      */
     generateControlForRepeaterQuestion(repeaterQuestion) {
-        /** @type {?} */
         const convertedValidators = this.convertValidators(repeaterQuestion.validators);
         return this.fb.control(null, { validators: convertedValidators, updateOn: repeaterQuestion.type === 'select' ? 'change' : 'blur' });
     }
     /**
      * Converts an array of validators into form validators.
+     * @param validators The uncoverted array of validators.
+     * @returns A convered array of form validators.
      * @author Will Poulson
-     * @private
-     * @param {?} validators The uncoverted array of validators.
-     * @return {?} A convered array of form validators.
      */
     convertValidators(validators) {
         if (!validators || validators.length === 0) {
             return [];
         }
-        /** @type {?} */
         const convertedValidators = [];
         for (const validator of validators) {
-            /** @type {?} */
             const convertedValidator = this.convertValidator(validator);
             if (convertedValidator) {
                 convertedValidators.push(convertedValidator);
@@ -645,10 +489,9 @@ class FormConstructorService {
     }
     /**
      * Converts a single validator into a form validator.
+     * @param validator The unconverted validator.
+     * @returns A converted form validator.
      * @author Will Poulson
-     * @private
-     * @param {?} validator The unconverted validator.
-     * @return {?} A converted form validator.
      */
     convertValidator(validator) {
         switch (validator.type) {
@@ -660,10 +503,8 @@ class FormConstructorService {
     }
     /**
      * 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 {?}
+     * @param savedState The saved state to load.
+     * @param sections The sections already generated by the form constructor.
      */
     constructRepeaterFromsFromState(savedState, sections, currentQuestionnaireForm) {
         for (const section of sections) {
@@ -671,21 +512,17 @@ class FormConstructorService {
                 if (question.type !== QuestionType.Repeater) {
                     continue;
                 }
-                /** @type {?} */
                 const repeaterArray = savedState[section.name][question.name];
                 if (!repeaterArray || repeaterArray.length === 0) {
                     continue;
                 }
-                /** @type {?} */
-                const repeaterFormArray = (/** @type {?} */ (currentQuestionnaireForm.get([section.name, question.name])));
+                const repeaterFormArray = currentQuestionnaireForm.get([section.name, question.name]);
                 if (repeaterFormArray.controls.length === repeaterArray.length) {
                     continue;
                 }
                 // For each item that used to be there push a new empty template there to be populated.
                 for (const repeaterItem of repeaterArray) {
-                    /** @type {?} */
                     const index = repeaterArray.indexOf(repeaterItem);
-                    /** @type {?} */
                     const repeaterItemTemplate = this.generateFormsForRepeater(question, index);
                     repeaterFormArray.push(repeaterItemTemplate);
                 }
@@ -693,39 +530,16 @@ class FormConstructorService {
         }
     }
 }
-FormConstructorService.decorators = [
-    { type: Injectable, args: [{
+FormConstructorService.ɵfac = function FormConstructorService_Factory(t) { return new (t || FormConstructorService)(ɵɵinject(FormBuilder), ɵɵinject(FilterService)); };
+FormConstructorService.ɵprov = ɵɵdefineInjectable({ token: FormConstructorService, factory: FormConstructorService.ɵfac, providedIn: 'root' });
+/*@__PURE__*/ (function () { ɵsetClassMetadata(FormConstructorService, [{
+        type: Injectable,
+        args: [{
                 providedIn: 'root'
-            },] }
-];
-/** @nocollapse */
-FormConstructorService.ctorParameters = () => [
-    { type: FormBuilder },
-    { type: FilterService }
-];
-/** @nocollapse */ FormConstructorService.ngInjectableDef = ɵɵdefineInjectable({ factory: function FormConstructorService_Factory() { return new FormConstructorService(ɵɵinject(FormBuilder), ɵɵinject(FilterService)); }, token: FormConstructorService, providedIn: "root" });
-if (false) {
-    /**
-     * @type {?}
-     * @private
-     */
-    FormConstructorService.prototype.fb;
-    /**
-     * @type {?}
-     * @private
-     */
-    FormConstructorService.prototype.filterService;
-}
+            }]
+    }], function () { return [{ type: FormBuilder }, { type: FilterService }]; }, null); })();
 
-/**
- * @fileoverview added by tsickle
- * @suppress {checkTypes,constantProperty,extraRequire,missingOverride,missingReturn,unusedPrivateMembers,uselessCode} checked by tsc
- */
 class QuestionnaireService {
-    /**
-     * @param {?} formConstuctor
-     * @param {?} options
-     */
     constructor(formConstuctor, options) {
         this.formConstuctor = formConstuctor;
         this.options = options;
@@ -735,18 +549,16 @@ class QuestionnaireService {
     }
     /**
      * Loads a questionnaire from data.
+     * @param questionnaire The questionnaire data to load, often parsed JSON from the editor.
+     * @param savedState The saved state of the questionnaire, often from localstorage.
+     * @returns null
      * @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
      */
     loadQuestionnaire(questionnaire, savedState, additionalData) {
         this.originalQuestionnaire = cloneDeep(questionnaire);
         this.currentQuestionnaire = cloneDeep(questionnaire);
         this.additionalData = additionalData;
         if (savedState && Object.keys(savedState).length > 0) {
-            /** @type {?} */
             const 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);
@@ -764,23 +576,12 @@ class QuestionnaireService {
     }
     /**
      * Updates the current questionnaire, used when a value is updated to check conditions.
+     * @param savedState The saved state of the questionnaire, often from localstorage.
+     * @returns null
      * @author Will Poulson
-     * @param {?=} savedState The saved state of the questionnaire, often from localstorage.
-     * @return {?} null
      */
     updateQuestionnaire(savedState) {
-        /** @type {?} */
-        const oldLength = this.currentQuestionnaire.sections.map((/**
-         * @param {?} x
-         * @return {?}
-         */
-        x => x.questions.length)).reduce((/**
-         * @param {?} a
-         * @param {?} b
-         * @return {?}
-         */
-        (a, b) => a + b), 0);
-        /** @type {?} */
+        const oldLength = this.currentQuestionnaire.sections.map(x => x.questions.length).reduce((a, b) => a + b, 0);
         const newData = this.formConstuctor.generateFormsForQuestionnaire(cloneDeep(this.originalQuestionnaire), cloneDeep(this.currentQuestionnaire), this.currentQuestionnaireForm, this.additionalData);
         if (newData) {
             this.currentQuestionnaireForm = newData.forms;
@@ -795,36 +596,19 @@ class QuestionnaireService {
         if (this.questionValueChangeSubscription) {
             this.questionValueChangeSubscription.unsubscribe();
         }
-        this.questionnaireValueChangeSubscription = this.currentQuestionnaireForm.valueChanges.subscribe((/**
-         * @return {?}
-         */
-        () => {
+        this.questionnaireValueChangeSubscription = this.currentQuestionnaireForm.valueChanges.subscribe(() => {
             this.dataChangedEvent.emit();
             this.updateQuestionnaire(this.currentQuestionnaireForm.getRawValue());
-        }));
+        });
         if (this.currentQuestion && this.currentQuestion.formControl) {
-            this.questionValueChangeSubscription = this.currentQuestion.formControl.valueChanges.subscribe((/**
-             * @return {?}
-             */
-            () => {
+            this.questionValueChangeSubscription = this.currentQuestion.formControl.valueChanges.subscribe(() => {
                 this.clearFields(this.currentQuestion.data.clearfields);
-            }));
+            });
         }
-        /** @type {?} */
-        const newLength = this.currentQuestionnaire.sections.map((/**
-         * @param {?} x
-         * @return {?}
-         */
-        x => x.questions.length)).reduce((/**
-         * @param {?} a
-         * @param {?} b
-         * @return {?}
-         */
-        (a, b) => a + b), 0);
+        const newLength = this.currentQuestionnaire.sections.map(x => x.questions.length).reduce((a, b) => a + b, 0);
         if (oldLength !== newLength) {
             for (const section of this.currentQuestionnaire.sections) {
                 for (const question of section.questions) {
-                    /** @type {?} */
                     const control = this.currentQuestionnaireForm.get([section.name, question.name]);
                     if (control && control.value === null && question.defaultValue) {
                         control.setValue(question.defaultValue);
@@ -833,95 +617,60 @@ class QuestionnaireService {
             }
         }
     }
-    /**
-     * @param {?} payload
-     * @return {?}
-     */
     updateAdditionalData(payload) {
         this.additionalData = Object.assign(this.additionalData, payload);
         this.updateQuestionnaire(this.currentQuestionnaireForm.getRawValue());
     }
-    /**
-     * @return {?}
-     */
     clearAdditionalData() {
         this.additionalData = {};
         this.updateQuestionnaire(this.currentQuestionnaireForm.getRawValue());
     }
-    /**
-     * @return {?}
-     */
     get isValid() {
         return this.currentQuestionnaireForm.valid;
     }
-    /**
-     * @return {?}
-     */
     get isFirstQuestion() {
         if (!this.currentSection || !this.currentQuestion) {
             return false;
         }
-        /** @type {?} */
         const currentIndex = this.currentSection.data.questions.indexOf(this.currentQuestion.data);
         return currentIndex === 0;
     }
-    /**
-     * @return {?}
-     */
     get isLastQuestion() {
         if (!this.currentSection || !this.currentQuestion) {
             return false;
         }
-        /** @type {?} */
         const currentIndex = this.currentSection.data.questions.indexOf(this.currentQuestion.data);
-        /** @type {?} */
         const maxIndex = this.currentSection.data.questions.length - 1;
         return currentIndex === maxIndex;
     }
-    /**
-     * @return {?}
-     */
     get isFirstSection() {
         if (!this.currentSection) {
             return false;
         }
-        /** @type {?} */
         const currentIndex = this.currentQuestionnaire.sections.indexOf(this.currentSection.data);
         return currentIndex === 0;
     }
-    /**
-     * @return {?}
-     */
     get isLastSection() {
         if (!this.currentSection) {
             return false;
         }
-        /** @type {?} */
         const currentIndex = this.currentQuestionnaire.sections.indexOf(this.currentSection.data);
-        /** @type {?} */
         const maxIndex = this.currentQuestionnaire.sections.length - 1;
         return currentIndex === maxIndex;
     }
-    /**
-     * @param {?} name
-     * @return {?}
-     */
     sectionValid(name) {
         return this.currentQuestionnaireForm.get(name).valid;
     }
     /**
      * Clears all the fields parsed
+     * @param clearfields An array of strings, paths to clear.
      * @author Will Poulson
-     * @private
-     * @param {?} clearfields An array of strings, paths to clear.
-     * @return {?}
      */
     clearFields(clearfields) {
         if (!clearfields || clearfields.length === 0) {
             return;
         }
         for (const clearfield of clearfields) {
-            /** @type {?} */
             const control = this.currentQuestionnaireForm.get(clearfield);
             if (control) {
                 control.reset(undefined);
@@ -932,7 +681,6 @@ class QuestionnaireService {
      * Unloads the current questionnaire.
      * Useful when exiting a questionnaire page or completing a questionnaire.
      * @author Will Poulson
-     * @return {?}
      */
     unloadQuestionnaire() {
         this.originalQuestionnaire = undefined;
@@ -944,33 +692,28 @@ class QuestionnaireService {
     }
     /**
      * Gets the current selected section.
+     * @returns An object containing the section data and the related form group.
      * @author Will Poulson
-     * @return {?} An object containing the section data and the related form group.
      */
     get currentSection() {
         if (!this.currentSectionName) {
             return null;
         }
-        /** @type {?} */
-        const data = this.currentQuestionnaire.sections.find((/**
-         * @param {?} x
-         * @return {?}
-         */
-        (x) => {
+        const data = this.currentQuestionnaire.sections.find((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)
         };
     }
     /**
      * Gets all the avaialble sections.
+     * @returns An array of all avaialble sections.
      * @author Will Poulson
-     * @return {?} An array of all avaialble sections.
      */
     get availableSections() {
         if (!this.currentQuestionnaire || !this.currentQuestionnaire.sections) {
@@ -980,34 +723,28 @@ class QuestionnaireService {
     }
     /**
      * Gets the current data for the entire questionnaire.
+     * @returns An object of data.
      * @author Will Poulson
-     * @return {?} An object of data.
      */
     get currentData() {
         return this.currentQuestionnaireForm ? this.currentQuestionnaireForm.getRawValue() : {};
     }
     /**
      * Gets the current selected question.
+     * @returns An object containing the question data and the related form control.
      * @author Will Poulson
-     * @return {?} An object containing the question data and the related form control.
      */
     get currentQuestion() {
         if (!this.currentQuestionName) {
             return null;
         }
-        /** @type {?} */
-        const data = this.currentSection.data.questions.find((/**
-         * @param {?} x
-         * @return {?}
-         */
-        (x) => {
+        const data = this.currentSection.data.questions.find((x) => {
             return x.name === this.currentQuestionName;
-        }));
+        });
         if (!data) {
             return null;
         }
-        /** @type {?} */
-        const formControl = (/** @type {?} */ (this.currentSection.formGroup.get(data.name)));
+        const formControl = this.currentSection.formGroup.get(data.name);
         return {
             data: data,
             formControl: formControl
@@ -1018,270 +755,158 @@ class QuestionnaireService {
      * 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.
+     * @returns A promise which will resolve when the question has been navigated to.
      * @author Will Poulson
-     * @return {?} A promise which will resolve when the question has been navigated to.
      */
     nextQuestion() {
-        return new Promise((/**
-         * @param {?} resolve
-         * @param {?} reject
-         * @return {?}
-         */
-        (resolve, reject) => {
+        return new Promise((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 {?}
-             */
-            (currentIndex) => {
-                /** @type {?} */
+            this.getCurrentQuestionIndex().then((currentIndex) => {
                 const lastQuestionIndex = this.currentSection.data.questions.length - 1;
-                /** @type {?} */
                 const isLastQuestion = lastQuestionIndex === currentIndex;
                 if (isLastQuestion) {
                     this.sectionFinishedEvent.emit();
                     return resolve();
                 }
-                /** @type {?} */
                 const newIndex = currentIndex + 1;
-                this.navigateToQuestion(newIndex).then((/**
-                 * @return {?}
-                 */
-                () => {
+                this.navigateToQuestion(newIndex).then(() => {
                     return resolve();
-                })).catch((/**
-                 * @param {?} error
-                 * @return {?}
-                 */
-                (error) => {
+                }).catch((error) => {
                     return reject(error);
-                }));
-            })).catch((/**
-             * @param {?} error
-             * @return {?}
-             */
-            (error) => {
+                });
+            }).catch((error) => {
                 return reject(error);
-            }));
-        }));
+            });
+        });
     }
     /**
      * Navigates to the previous question.
      * If there is no question to navigate to it will reject with a out of bounds exception.
      * If allowNavigateBackwards is false then it will reject.
+     * @returns A promise which will resolve when the question has been navigated to.
      * @author Will Poulson
-     * @return {?} A promise which will resolve when the question has been navigated to.
      */
     prevQuestion() {
-        return new Promise((/**
-         * @param {?} resolve
-         * @param {?} reject
-         * @return {?}
-         */
-        (resolve, reject) => {
+        return new Promise((resolve, reject) => {
             if (!this.options.allowNavigateBackwards) {
                 return reject('This questionnaire does not allow for backwards navigation');
             }
-            this.getCurrentQuestionIndex().then((/**
-             * @param {?} currentIndex
-             * @return {?}
-             */
-            (currentIndex) => {
-                /** @type {?} */
+            this.getCurrentQuestionIndex().then((currentIndex) => {
                 const newIndex = currentIndex - 1;
-                this.navigateToQuestion(newIndex).then((/**
-                 * @return {?}
-                 */
-                () => {
+                this.navigateToQuestion(newIndex).then(() => {
                     return resolve();
-                })).catch((/**
-                 * @param {?} error
-                 * @return {?}
-                 */
-                (error) => {
+                }).catch((error) => {
                     return reject(error);
-                }));
-            })).catch((/**
-             * @param {?} error
-             * @return {?}
-             */
-            (error) => {
+                });
+            }).catch((error) => {
                 return reject(error);
-            }));
-        }));
+            });
+        });
     }
     /**
      * Gets the current questions index.
+     * @returns A promise which resolves a number.
      * @author Will Poulson
-     * @private
-     * @return {?} A promise which resolves a number.
      */
     getCurrentQuestionIndex() {
-        return new Promise((/**
-         * @param {?} resolve
-         * @param {?} reject
-         * @return {?}
-         */
-        (resolve, reject) => {
-            /** @type {?} */
+        return new Promise((resolve, reject) => {
             const currentIndex = this.currentSection.data.questions.indexOf(this.currentQuestion.data);
             if (currentIndex === -1) {
                 return reject('Could not find current question');
             }
             return resolve(currentIndex);
-        }));
+        });
     }
     /**
      * Checks a question is in bounds then navigates to it.
+     * @param index The index to navigate to.
+     * @returns A promise which will resolve when the question has been navigated to.
      * @author Will Poulson
-     * @param {?} index The index to navigate to.
-     * @return {?} A promise which will resolve when the question has been navigated to.
      */
     navigateToQuestion(index) {
-        return new Promise((/**
-         * @param {?} resolve
-         * @param {?} reject
-         * @return {?}
-         */
-        (resolve, reject) => {
+        return new Promise((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
-     * @return {?} A promise which will resolve when the section has been navigated to.
      */
     nextSection() {
-        return new Promise((/**
-         * @param {?} resolve
-         * @param {?} reject
-         * @return {?}
-         */
-        (resolve, reject) => {
-            this.getCurrentSectionIndex().then((/**
-             * @param {?} currentIndex
-             * @return {?}
-             */
-            (currentIndex) => {
-                /** @type {?} */
+        return new Promise((resolve, reject) => {
+            this.getCurrentSectionIndex().then((currentIndex) => {
                 const newIndex = currentIndex + 1;
-                this.navigateToSection(newIndex).then((/**
-                 * @return {?}
-                 */
-                () => {
+                this.navigateToSection(newIndex).then(() => {
                     return resolve();
-                })).catch((/**
-                 * @param {?} error
-                 * @return {?}
-                 */
-                (error) => {
+                }).catch((error) => {
                     return reject(error);
-                }));
-            })).catch((/**
-             * @param {?} error
-             * @return {?}
-             */
-            (error) => {
+                });
+            }).catch((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
-     * @return {?} A promise which will resolve when the section has been navigated to.
      */
     prevSection() {
-        return new Promise((/**
-         * @param {?} resolve
-         * @param {?} reject
-         * @return {?}
-         */
-        (resolve, reject) => {
-            this.getCurrentSectionIndex().then((/**
-             * @param {?} currentIndex
-             * @return {?}
-             */
-            (currentIndex) => {
-                /** @type {?} */
+        return new Promise((resolve, reject) => {
+            this.getCurrentSectionIndex().then((currentIndex) => {
                 const newIndex = currentIndex - 1;
-                this.navigateToSection(newIndex).then((/**
-                 * @return {?}
-                 */
-                () => {
+                this.navigateToSection(newIndex).then(() => {
                     return resolve();
-                })).catch((/**
-                 * @param {?} error
-                 * @return {?}
-                 */
-                (error) => {
+                }).catch((error) => {
                     return reject(error);
-                }));
-            })).catch((/**
-             * @param {?} error
-             * @return {?}
-             */
-            (error) => {
+                });
+            }).catch((error) => {
                 return reject(error);
-            }));
-        }));
+            });
+        });
     }
     /**
      * Gets the current section index.
+     * @returns A promise which resolves a number.
      * @author Will Poulson
-     * @private
-     * @return {?} A promise which resolves a number.
      */
     getCurrentSectionIndex() {
-        return new Promise((/**
-         * @param {?} resolve
-         * @param {?} reject
-         * @return {?}
-         */
-        (resolve, reject) => {
-            /** @type {?} */
+        return new Promise((resolve, reject) => {
             const currentIndex = this.currentQuestionnaire.sections.indexOf(this.currentSection.data);
             if (currentIndex === -1) {
                 return reject('Could not find current section');
             }
             return resolve(currentIndex);
-        }));
+        });
     }
     /**
      * Checks a section is in bounds then navigates to it.
+     * @param index The index to navigate to.
+     * @returns A promise which will resolve when the section has been navigated to.
      * @author Will Poulson
-     * @param {?} index The index to navigate to.
-     * @return {?} A promise which will resolve when the section has been navigated to.
      */
     navigateToSection(index) {
-        return new Promise((/**
-         * @param {?} resolve
-         * @param {?} reject
-         * @return {?}
-         */
-        (resolve, reject) => {
+        return new Promise((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
-     * @param {?} answer The value to answer the question with.
-     * @param {?=} sendToNextQuestion
-     * @return {?}
      */
     answerCurrentQuestion(answer, sendToNextQuestion) {
         if (!sendToNextQuestion) {
@@ -1290,37 +915,25 @@ class QuestionnaireService {
         }
         if (this.skippable) { // Timeout to prevent skipping glitch.
             this.skippable = false;
-            setTimeout((/**
-             * @return {?}
-             */
-            () => {
+            setTimeout(() => {
                 this.currentQuestion.formControl.setValue(answer);
-                this.nextQuestion().then((/**
-                 * @return {?}
-                 */
-                () => {
+                this.nextQuestion().then(() => {
                     this.skippable = true;
-                }));
-            }), 150);
+                });
+            }, 150);
         }
     }
     /**
      * Adds a repeater item to the current question.
      * Current question must be of type Repeater.
+     * @returns A promise which resolves when the repeater item has been added.
      * @author Will Poulson
-     * @return {?} A promise which resolves when the repeater item has been added.
      */
     addRepeaterItem() {
-        return new Promise((/**
-         * @param {?} resolve
-         * @param {?} reject
-         * @return {?}
-         */
-        (resolve, reject) => {
+        return new Promise((resolve, reject) => {
             if (this.currentQuestion.data.type !== QuestionType.Repeater) {
                 return reject(`Current question isn't a repeater`);
             }
-            /** @type {?} */
             const 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.`);
@@ -1330,22 +943,17 @@ class QuestionnaireService {
             }
             this.currentQuestion.formControl.push(repeaterForm);
             return resolve();
-        }));
+        });
     }
     /**
      * Removes a repeater item on the current question.
      * Current question must be of type Repeater.
+     * @param index The index at which to remove.
+     * @returns A promise which resolves when the repeater item has been removed.
      * @author Will Poulson
-     * @param {?} index The index at which to remove.
-     * @return {?} A promise which resolves when the repeater item has been removed.
      */
     removeRepeaterItem(index) {
-        return new Promise((/**
-         * @param {?} resolve
-         * @param {?} reject
-         * @return {?}
-         */
-        (resolve, reject) => {
+        return new Promise((resolve, reject) => {
             if (this.currentQuestion.data.type !== QuestionType.Repeater) {
                 return reject(`Current question isn't a repeater`);
             }
@@ -1354,36 +962,29 @@ class QuestionnaireService {
             }
             this.currentQuestion.formControl.removeAt(index);
             return resolve();
-        }));
+        });
     }
     /**
      * Returns the display text for a given repeater item
+     * @param index The index at which to get the label for.
+     * @returns A string which is the display text.
      * @author Will Poulson
-     * @param {?} index The index at which to get the label for.
-     * @return {?} A string which is the display text.
      */
     getRepeaterItemLabel(index) {
         if (!this.currentQuestion.formControl || !(this.currentQuestion.formControl instanceof FormArray)) {
             return '';
         }
-        /** @type {?} */
         const repeaterItem = this.currentQuestion.formControl.controls[index];
         if (!repeaterItem) {
             return '';
         }
-        /** @type {?} */
         const template = this.currentQuestion.data.repeaterDisplayName;
-        /** @type {?} */
         const splitTemplate = template.split(' ');
-        /** @type {?} */
         const displayArray = [];
         for (const templateItem of splitTemplate) {
             if (templateItem.match(/\[.*?\]/)) {
-                /** @type {?} */
                 const path = templateItem.replace(/[\[\]']+/g, '');
-                /** @type {?} */
                 const item = repeaterItem.get(path);
-                /** @type {?} */
                 const value = (item && item.value ? item.value : '?');
                 displayArray.push(value);
             }
@@ -1391,90 +992,23 @@ class QuestionnaireService {
                 displayArray.push(templateItem);
             }
         }
-        /** @type {?} */
         const display = displayArray.join(' ');
         return display;
     }
 }
-QuestionnaireService.decorators = [
-    { type: Injectable, args: [{
+QuestionnaireService.ɵfac = function QuestionnaireService_Factory(t) { return new (t || QuestionnaireService)(ɵɵinject(FormConstructorService), ɵɵinject('options')); };
+QuestionnaireService.ɵprov = ɵɵdefineInjectable({ token: QuestionnaireService, factory: QuestionnaireService.ɵfac, providedIn: 'root' });
+/*@__PURE__*/ (function () { ɵsetClassMetadata(QuestionnaireService, [{
+        type: Injectable,
+        args: [{
                 providedIn: 'root'
-            },] }
-];
-/** @nocollapse */
-QuestionnaireService.ctorParameters = () => [
-    { 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" });
-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;
-}
+            }]
+    }], 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
- */
 class GgQuestionnaireV2Module {
-    /**
-     * @param {?} options
-     * @return {?}
-     */
     static forRoot(options) {
         return {
             ngModule: GgQuestionnaireV2Module,
@@ -1488,8 +1022,19 @@ class GgQuestionnaireV2Module {
         };
     }
 }
-GgQuestionnaireV2Module.decorators = [
-    { type: NgModule, args: [{
+GgQuestionnaireV2Module.ɵmod = ɵɵdefineNgModule({ type: GgQuestionnaireV2Module });
+GgQuestionnaireV2Module.ɵinj = ɵɵdefineInjector({ factory: function GgQuestionnaireV2Module_Factory(t) { return new (t || GgQuestionnaireV2Module)(); }, providers: [
+        FormConstructorService,
+        FilterService
+    ], imports: [[
+            FormsModule,
+            ReactiveFormsModule
+        ]] });
+(function () { (typeof ngJitMode === "undefined" || ngJitMode) && ɵɵsetNgModuleScope(GgQuestionnaireV2Module, { imports: [FormsModule,
+        ReactiveFormsModule] }); })();
+/*@__PURE__*/ (function () { ɵsetClassMetadata(GgQuestionnaireV2Module, [{
+        type: NgModule,
+        args: [{
                 declarations: [],
                 providers: [
                     FormConstructorService,
@@ -1499,48 +1044,36 @@ GgQuestionnaireV2Module.decorators = [
                     FormsModule,
                     ReactiveFormsModule
                 ],
-            },] }
-];
+            }]
+    }], null, null); })();
 
-/**
- * @fileoverview added by tsickle
- * @suppress {checkTypes,constantProperty,extraRequire,missingOverride,missingReturn,unusedPrivateMembers,uselessCode} checked by tsc
- */
-/** @enum {string} */
-const 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} */
-const 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