From e4d5102b17b9d2b9bb6132ace46dae6697343da8 Mon Sep 17 00:00:00 2001
From: Paul Gschwendtner <paulgschwendtner@gmail.com>
Date: Fri, 2 Aug 2019 16:42:11 +0200
Subject: [PATCH] build: ensure schematics are built with typescript strict
 flag (#31967)

Follow-up to #30993 where we build all Angular packages with
the TypeScript `--strict` flag. The flag improves overall code
health and also helps us catch issues easier.

PR Close #31967
---
 .../usage_strategy/usage_strategy.ts          | 26 ++++++++++---------
 packages/core/schematics/tsconfig.json        |  4 +--
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/packages/core/schematics/migrations/static-queries/strategies/usage_strategy/usage_strategy.ts b/packages/core/schematics/migrations/static-queries/strategies/usage_strategy/usage_strategy.ts
index c8b6ac0f3b..81de639b55 100644
--- a/packages/core/schematics/migrations/static-queries/strategies/usage_strategy/usage_strategy.ts
+++ b/packages/core/schematics/migrations/static-queries/strategies/usage_strategy/usage_strategy.ts
@@ -166,16 +166,18 @@ function filterQueryClassMemberNodes(
   //  (1) queries used in the "ngOnInit" lifecycle hook are static.
   //  (2) inputs with setters can access queries statically.
   return classDecl.members
-      .filter(m => {
-        if (ts.isMethodDeclaration(m) && m.body && hasPropertyNameText(m.name) &&
-            STATIC_QUERY_LIFECYCLE_HOOKS[query.type].indexOf(m.name.text) !== -1) {
-          return true;
-        } else if (
-            knownInputNames && ts.isSetAccessor(m) && m.body && hasPropertyNameText(m.name) &&
-            knownInputNames.indexOf(m.name.text) !== -1) {
-          return true;
-        }
-        return false;
-      })
-      .map((member: ts.SetAccessorDeclaration | ts.MethodDeclaration) => member.body !);
+      .filter(
+          (m):
+              m is(ts.SetAccessorDeclaration | ts.MethodDeclaration) => {
+                if (ts.isMethodDeclaration(m) && m.body && hasPropertyNameText(m.name) &&
+                    STATIC_QUERY_LIFECYCLE_HOOKS[query.type].indexOf(m.name.text) !== -1) {
+                  return true;
+                } else if (
+                    knownInputNames && ts.isSetAccessor(m) && m.body &&
+                    hasPropertyNameText(m.name) && knownInputNames.indexOf(m.name.text) !== -1) {
+                  return true;
+                }
+                return false;
+              })
+      .map(member => member.body !);
 }
diff --git a/packages/core/schematics/tsconfig.json b/packages/core/schematics/tsconfig.json
index fc07f36196..21b63c7f32 100644
--- a/packages/core/schematics/tsconfig.json
+++ b/packages/core/schematics/tsconfig.json
@@ -1,10 +1,8 @@
 {
   "compilerOptions": {
     "noImplicitReturns": true,
-    "noImplicitAny": true,
     "noFallthroughCasesInSwitch": true,
-    "strictNullChecks": true,
-    "strictPropertyInitialization": true,
+    "strict": true,
     "lib": ["es2015"],
     "types": [],
     "baseUrl": ".",