From b0c75611d6ff193afd29cd12152c1b3e3f04424a Mon Sep 17 00:00:00 2001
From: cexbrayat <cedric@ninja-squad.com>
Date: Wed, 7 Nov 2018 20:38:07 +0100
Subject: [PATCH] fix(forms): typed argument for FormBuilder group (#26985)

PR Close #26985
---
 packages/forms/src/form_builder.ts      | 35 ++++++++++++++++---------
 tools/public_api_guard/forms/forms.d.ts |  2 +-
 2 files changed, 23 insertions(+), 14 deletions(-)

diff --git a/packages/forms/src/form_builder.ts b/packages/forms/src/form_builder.ts
index 2a42a9a233..1d672c20ab 100644
--- a/packages/forms/src/form_builder.ts
+++ b/packages/forms/src/form_builder.ts
@@ -11,6 +11,13 @@ import {Injectable} from '@angular/core';
 import {AsyncValidatorFn, ValidatorFn} from './directives/validators';
 import {AbstractControl, AbstractControlOptions, FormArray, FormControl, FormGroup, FormHooks} from './model';
 
+function isAbstractControlOptions(options: AbstractControlOptions | {[key: string]: any}):
+    options is AbstractControlOptions {
+  return (<AbstractControlOptions>options).asyncValidators !== undefined ||
+      (<AbstractControlOptions>options).validators !== undefined ||
+      (<AbstractControlOptions>options).updateOn !== undefined;
+}
+
 /**
  * @description
  * Creates an `AbstractControl` from a user-specified configuration.
@@ -32,7 +39,7 @@ export class FormBuilder {
    * @param controlsConfig A collection of child controls. The key for each child is the name
    * under which it is registered.
    *
-   * @param legacyOrOpts Configuration options object for the `FormGroup`. The object can
+   * @param options Configuration options object for the `FormGroup`. The object can
    * have two shapes:
    *
    * 1) `AbstractControlOptions` object (preferred), which consists of:
@@ -46,24 +53,26 @@ export class FormBuilder {
    * * `asyncValidator`: A single async validator or array of async validator functions
    *
    */
-  group(controlsConfig: {[key: string]: any}, legacyOrOpts: {[key: string]: any}|null = null):
-      FormGroup {
+  group(
+      controlsConfig: {[key: string]: any},
+      options: AbstractControlOptions|{[key: string]: any}|null = null): FormGroup {
     const controls = this._reduceControls(controlsConfig);
 
     let validators: ValidatorFn|ValidatorFn[]|null = null;
     let asyncValidators: AsyncValidatorFn|AsyncValidatorFn[]|null = null;
     let updateOn: FormHooks|undefined = undefined;
 
-    if (legacyOrOpts != null &&
-        (legacyOrOpts.asyncValidator !== undefined || legacyOrOpts.validator !== undefined)) {
-      // `legacyOrOpts` are legacy form group options
-      validators = legacyOrOpts.validator != null ? legacyOrOpts.validator : null;
-      asyncValidators = legacyOrOpts.asyncValidator != null ? legacyOrOpts.asyncValidator : null;
-    } else if (legacyOrOpts != null) {
-      // `legacyOrOpts` are `AbstractControlOptions`
-      validators = legacyOrOpts.validators != null ? legacyOrOpts.validators : null;
-      asyncValidators = legacyOrOpts.asyncValidators != null ? legacyOrOpts.asyncValidators : null;
-      updateOn = legacyOrOpts.updateOn != null ? legacyOrOpts.updateOn : undefined;
+    if (options != null) {
+      if (isAbstractControlOptions(options)) {
+        // `options` are `AbstractControlOptions`
+        validators = options.validators != null ? options.validators : null;
+        asyncValidators = options.asyncValidators != null ? options.asyncValidators : null;
+        updateOn = options.updateOn != null ? options.updateOn : undefined;
+      } else {
+        // `options` are legacy form group options
+        validators = options.validator != null ? options.validator : null;
+        asyncValidators = options.asyncValidator != null ? options.asyncValidator : null;
+      }
     }
 
     return new FormGroup(controls, {asyncValidators, updateOn, validators});
diff --git a/tools/public_api_guard/forms/forms.d.ts b/tools/public_api_guard/forms/forms.d.ts
index 8744ac8a96..b75a2aa6e8 100644
--- a/tools/public_api_guard/forms/forms.d.ts
+++ b/tools/public_api_guard/forms/forms.d.ts
@@ -205,7 +205,7 @@ export declare class FormBuilder {
     control(formState: any, validatorOrOpts?: ValidatorFn | ValidatorFn[] | AbstractControlOptions | null, asyncValidator?: AsyncValidatorFn | AsyncValidatorFn[] | null): FormControl;
     group(controlsConfig: {
         [key: string]: any;
-    }, legacyOrOpts?: {
+    }, options?: AbstractControlOptions | {
         [key: string]: any;
     } | null): FormGroup;
 }