Merge pull request #128 from TNG/feature-117-3

#117: Strict TypeScript mode

Author: Airblader

projects/ngqp/core/src/lib/accessors/multi-select-control-value-accessor.directive.ts

@@ -29,7 +29,7 @@ export class MultiSelectControlValueAccessorDirective<T> implements ControlValue
         this.selectedIds = Array.from(this.options.entries())
             .filter(([id, option]) => option.selected)
             .map(([id]) => id);
-        const values = this.selectedIds.map(id => this.optionMap.get(id));
+        const values = this.selectedIds.map(id => this.optionMap.get(id)!);
         this.fnChange(values);
     }
 
@@ -49,7 +49,7 @@ export class MultiSelectControlValueAccessorDirective<T> implements ControlValue
 
         this.selectedIds = values
             .map(value => this.getOptionId(value))
-            .filter(id => id !== null);
+            .filter((id: string | null): id is string => id !== null);
         this.options.forEach((option, id) => option.selected = this.selectedIds.includes(id));
     }
 

projects/ngqp/core/src/lib/accessors/multi-select-option.directive.ts

@@ -27,14 +27,14 @@ export class MultiSelectOptionDirective<T> implements OnInit, OnDestroy {
 
     public ngOnDestroy() {
         if (this.parent) {
-            this.parent.deregisterOption(this.id);
+            this.parent.deregisterOption(this.id!);
         }
     }
 
     @Input('value')
     public set value(value: T) {
         if (this.parent) {
-            this.parent.updateOptionValue(this.id, value);
+            this.parent.updateOptionValue(this.id!, value);
         }
     }
 

projects/ngqp/core/src/lib/accessors/number-control-value-accessor.directive.ts

@@ -15,7 +15,7 @@ export const NGQP_NUMBER_VALUE_ACCESSOR: any = {
 })
 export class NumberControlValueAccessorDirective implements ControlValueAccessor {
 
-    private fnChange = (_: number) => {};
+    private fnChange = (_: number | null) => {};
     private fnTouched = () => {};
 
     @HostListener('input', ['$event'])

projects/ngqp/core/src/lib/accessors/range-control-value-accessor.directive.ts

@@ -15,7 +15,7 @@ export const NGQP_RANGE_VALUE_ACCESSOR: any = {
 })
 export class RangeControlValueAccessorDirective implements ControlValueAccessor {
 
-    private fnChange = (_: number) => {};
+    private fnChange = (_: number | null) => {};
     private fnTouched = () => {};
 
     @HostListener('input', ['$event'])

projects/ngqp/core/src/lib/accessors/select-control-value-accessor.directive.ts

@@ -1,5 +1,6 @@
 import { Directive, ElementRef, forwardRef, HostListener, Renderer2, StaticProvider } from '@angular/core';
 import { ControlValueAccessor, NG_VALUE_ACCESSOR } from '@angular/forms';
+import { undefinedToNull } from '../util';
 
 /** @ignore */
 export const NGQP_SELECT_VALUE_ACCESSOR: StaticProvider = {
@@ -20,13 +21,13 @@ export class SelectControlValueAccessorDirective<T> implements ControlValueAcces
     private optionMap = new Map<string, T>();
 
     private idCounter = 0;
-    private fnChange = (_: T) => {};
+    private fnChange = (_: T | null) => {};
     private fnTouched = () => {};
 
     @HostListener('change', ['$event'])
     public onChange(event: UIEvent) {
         this.selectedId = (event.target as HTMLOptionElement).value;
-        this.value = this.optionMap.get(this.selectedId);
+        this.value = undefinedToNull(this.optionMap.get(this.selectedId));
         this.fnChange(this.value);
     }
 
@@ -38,10 +39,10 @@ export class SelectControlValueAccessorDirective<T> implements ControlValueAcces
     constructor(private renderer: Renderer2, private elementRef: ElementRef<HTMLSelectElement>) {
     }
 
-    public writeValue(value: T) {
+    public writeValue(value: T | null) {
         this.value = value;
 
-        this.selectedId = this.getOptionId(value);
+        this.selectedId = value === null ? null : this.getOptionId(value);
         if (this.selectedId === null) {
             this.renderer.setProperty(this.elementRef.nativeElement, 'selectedIndex', -1);
         }

projects/ngqp/core/src/lib/accessors/select-option.directive.ts

@@ -27,15 +27,15 @@ export class SelectOptionDirective<T> implements OnInit, OnDestroy {
 
     public ngOnDestroy() {
         if (this.parent) {
-            this.parent.deregisterOption(this.id);
+            this.parent.deregisterOption(this.id!);
             this.parent.writeValue(this.parent.value);
         }
     }
 
     @Input('value')
     public set value(value: T) {
         if (this.parent) {
-            this.parent.updateOptionValue(this.id, value);
+            this.parent.updateOptionValue(this.id!, value);
             this.parent.writeValue(this.parent.value);
         }
     }

projects/ngqp/core/src/lib/accessors/util.ts

@@ -10,9 +10,9 @@ import { NGQP_BUILT_IN_ACCESSORS } from './ngqp-accessors';
  *
  * @internal
  */
-export function selectValueAccessor(valueAccessors: ControlValueAccessor[]): ControlValueAccessor | null {
+export function selectValueAccessor(valueAccessors: ControlValueAccessor[]): ControlValueAccessor {
     if (!valueAccessors || !Array.isArray(valueAccessors)) {
-        return null;
+        throw new Error(`No matching ControlValueAccessor has been found for this form control`);
     }
 
     let defaultAccessor: ControlValueAccessor | null = null;

projects/ngqp/core/src/lib/directives/query-param-group.directive.ts

@@ -20,7 +20,7 @@ export class QueryParamGroupDirective implements OnChanges {
      * The {@link QueryParamGroup} to bind.
      */
     @Input('queryParamGroup')
-    public queryParamGroup: QueryParamGroup;
+    public queryParamGroup: QueryParamGroup | null = null;
 
     /** @internal */
     constructor(private groupService: QueryParamGroupService) {

projects/ngqp/core/src/lib/directives/query-param-group.service.ts

@@ -42,7 +42,7 @@ class NavigationData {
 export class QueryParamGroupService implements OnDestroy {
 
     /** The {@link QueryParamGroup} to bind. */
-    private queryParamGroup: QueryParamGroup;
+    private queryParamGroup: QueryParamGroup | null = null;
 
     /** List of {@link QueryParamAccessor} registered to this service. */
     private directives = new Map<string, QueryParamAccessor[]>();
@@ -122,7 +122,7 @@ export class QueryParamGroupService implements OnDestroy {
             })
         ).pipe(
             // Do not synchronize while the param is detached from the group
-            filter(() => !!this.queryParamGroup.get(queryParamName)),
+            filter(() => !!this.getQueryParamGroup().get(queryParamName)),
             map((newValue: unknown[]) => this.getParamsForValue(partitionedQueryParam, partitionedQueryParam.reduce(newValue))),
             takeUntil(this.destroy$),
         ).subscribe(params => this.enqueueNavigation(new NavigationData(params)));
@@ -154,7 +154,7 @@ export class QueryParamGroupService implements OnDestroy {
         });
 
         this.directives.delete(queryParamName);
-        const queryParam = this.queryParamGroup.get(queryParamName);
+        const queryParam = this.getQueryParamGroup().get(queryParamName);
         if (queryParam) {
             queryParam._clearChangeFunctions();
         }
@@ -170,10 +170,14 @@ export class QueryParamGroupService implements OnDestroy {
 
     /** Listens for programmatic changes on group level and synchronizes to the router. */
     private setupGroupChangeListener(): void {
-        this.queryParamGroup._registerOnChange((newValue: Record<string, unknown>) => {
+        this.getQueryParamGroup()._registerOnChange((newValue: Record<string, unknown> | null) => {
+            if (newValue === null) {
+                throw new Error(`Received null value from QueryParamGroup.`);
+            }
+
             let params: Params = {};
             Object.keys(newValue).forEach(queryParamName => {
-                const queryParam = this.queryParamGroup.get(queryParamName);
+                const queryParam = this.getQueryParamGroup().get(queryParamName);
                 if (isMissing(queryParam)) {
                     return;
                 }
@@ -187,12 +191,12 @@ export class QueryParamGroupService implements OnDestroy {
 
     /** Listens for programmatic changes on parameter level and synchronizes to the router. */
     private setupParamChangeListeners(): void {
-        Object.keys(this.queryParamGroup.queryParams)
+        Object.keys(this.getQueryParamGroup().queryParams)
             .forEach(queryParamName => this.setupParamChangeListener(queryParamName));
     }
 
     private setupParamChangeListener(queryParamName: string): void {
-        const queryParam = this.queryParamGroup.get(queryParamName);
+        const queryParam = this.getQueryParamGroup().get(queryParamName);
         if (!queryParam) {
             throw new Error(`No param in group found for name ${queryParamName}`);
         }
@@ -211,7 +215,7 @@ export class QueryParamGroupService implements OnDestroy {
                 // particular group; however, we do need to react if one of our parameters has
                 // vanished when it was set before.
                 distinctUntilChanged((previousMap, currentMap) => {
-                    const keys = Object.values(this.queryParamGroup.queryParams)
+                    const keys = Object.values(this.getQueryParamGroup().queryParams)
                         .map(queryParam => this.wrapIntoPartition(queryParam))
                         .map(partitionedQueryParam => partitionedQueryParam.queryParams.map(queryParam => queryParam.urlParam))
                         .reduce((a, b) => [...a, ...b], []);
@@ -227,9 +231,9 @@ export class QueryParamGroupService implements OnDestroy {
             const synthetic = this.isSyntheticNavigation();
             const groupValue: Record<string, unknown> = {};
 
-            Object.keys(this.queryParamGroup.queryParams).forEach(queryParamName => {
+            Object.keys(this.getQueryParamGroup().queryParams).forEach(queryParamName => {
                 const partitionedQueryParam = this.getQueryParamAsPartition(queryParamName);
-                const newValues = partitionedQueryParam.queryParams.map(queryParam => isMultiQueryParam(queryParam)
+                const newValues = partitionedQueryParam.queryParams.map(queryParam => isMultiQueryParam<unknown>(queryParam)
                     ? queryParam.deserializeValue(queryParamMap.getAll(queryParam.urlParam))
                     : queryParam.deserializeValue(queryParamMap.get(queryParam.urlParam))
                 );
@@ -243,7 +247,7 @@ export class QueryParamGroupService implements OnDestroy {
                 groupValue[ queryParamName ] = newValue;
             });
 
-            this.queryParamGroup.setValue(groupValue, {
+            this.getQueryParamGroup().setValue(groupValue, {
                 emitEvent: !synthetic,
                 emitModelToViewChange: false,
             });
@@ -252,7 +256,7 @@ export class QueryParamGroupService implements OnDestroy {
 
     /** Listens for newly added parameters and starts synchronization for them. */
     private watchNewParams(): void {
-        this.queryParamGroup.queryParamAdded$.pipe(
+        this.getQueryParamGroup().queryParamAdded$.pipe(
             takeUntil(this.destroy$)
         ).subscribe(queryParamName => {
             this.setupParamChangeListener(queryParamName);
@@ -342,7 +346,7 @@ export class QueryParamGroupService implements OnDestroy {
      * This merges the global configuration with the group specific configuration.
      */
     private get routerOptions(): RouterOptions {
-        const groupOptions = this.queryParamGroup ? this.queryParamGroup.routerOptions : {};
+        const groupOptions = this.getQueryParamGroup().routerOptions;
 
         return {
             ...(this.globalRouterOptions || {}),
@@ -358,7 +362,7 @@ export class QueryParamGroupService implements OnDestroy {
      * query parameters independent of whether they are partitioned.
      */
     private getQueryParamAsPartition(queryParamName: string): PartitionedQueryParam<unknown> {
-        const queryParam = this.queryParamGroup.get(queryParamName);
+        const queryParam = this.getQueryParamGroup().get(queryParamName);
         if (!queryParam) {
             throw new Error(`Could not find query param with name ${queryParamName}. Did you forget to add it to your QueryParamGroup?`);
         }
@@ -382,4 +386,12 @@ export class QueryParamGroupService implements OnDestroy {
         });
     }
 
+    private getQueryParamGroup(): QueryParamGroup {
+        if (!this.queryParamGroup) {
+            throw new Error(`No QueryParamGroup has been registered yet.`);
+        }
+
+        return this.queryParamGroup;
+    }
+
 }

projects/ngqp/core/src/lib/directives/query-param-name.directive.ts

@@ -21,10 +21,22 @@ export class QueryParamNameDirective implements QueryParamAccessor, OnChanges, O
      * Note that this does not refer to the [parameter name]{@link QueryParam#urlParam}.
      */
     @Input('queryParamName')
-    public name: string;
+    public set name(name: string) {
+        this._name = name;
+    }
+
+    public get name(): string {
+        if (!this._name) {
+            throw new Error(`No queryParamName has been specified.`);
+        }
+
+        return this._name;
+    }
 
     /** @internal */
-    public valueAccessor: ControlValueAccessor | null = null;
+    public valueAccessor: ControlValueAccessor;
+
+    private _name: string | null = null;
 
     /** @internal */
     constructor(