fix(compiler-cli): report invalid imports in standalone components during resolve phase (#45827)

JoostK · dylhunn · commit 9cfea3d522c0 · 2022-05-02T14:59:01.000-07:00
The analysis phase of the compiler should operate on individual classes, independently of the analysis of other classes. The validation that `Component.imports` only contains standalone entities or NgModules however did happen during the analysis phase, introducing a dependency on other classes and causing inconsistencies due to ordering and/or asynchronous timing differences. This commit fixes the issue by moving the validation to the resolve phase, which occurs after all classes have been analyzed. Fixes #45819 PR Close #45827
diff --git a/packages/compiler-cli/src/ngtsc/annotations/component/src/handler.ts b/packages/compiler-cli/src/ngtsc/annotations/component/src/handler.ts
@@ -276,16 +276,6 @@ export class ComponentDecoratorHandler implements
         }
         diagnostics.push(...importDiagnostics);
       }
-
-      const validationDiagnostics =
-          validateStandaloneImports(resolvedImports, rawImports, this.metaReader, this.scopeReader);
-      if (validationDiagnostics.length > 0) {
-        isPoisoned = true;
-        if (diagnostics === undefined) {
-          diagnostics = [];
-        }
-        diagnostics.push(...validationDiagnostics);
-      }
     }
 
     let schemas: SchemaMetadata[]|null = null;
@@ -801,6 +791,12 @@ export class ComponentDecoratorHandler implements
       }
     }
 
+    if (analysis.resolvedImports !== null && analysis.rawImports !== null) {
+      const standaloneDiagnostics = validateStandaloneImports(
+          analysis.resolvedImports, analysis.rawImports, this.metaReader, this.scopeReader);
+      diagnostics.push(...standaloneDiagnostics);
+    }
+
     if (analysis.providersRequiringFactory !== null &&
         analysis.meta.providers instanceof WrappedNodeExpr) {
       const providerDiagnostics = getProviderDiagnostics(

Original file line number	Diff line number	Diff line change
`@@ -276,16 +276,6 @@ export class ComponentDecoratorHandler implements`
`276`	`276`	`}`
`277`	`277`	`diagnostics.push(...importDiagnostics);`
`278`	`278`	`}`
`279`		`-`
`280`		`- const validationDiagnostics =`
`281`		`- validateStandaloneImports(resolvedImports, rawImports, this.metaReader, this.scopeReader);`
`282`		`- if (validationDiagnostics.length > 0) {`
`283`		`- isPoisoned = true;`
`284`		`- if (diagnostics === undefined) {`
`285`		`- diagnostics = [];`
`286`		`- }`
`287`		`- diagnostics.push(...validationDiagnostics);`
`288`		`- }`
`289`	`279`	`}`
`290`	`280`
`291`	`281`	`let schemas: SchemaMetadata[]\|null = null;`
`@@ -801,6 +791,12 @@ export class ComponentDecoratorHandler implements`
`801`	`791`	`}`
`802`	`792`	`}`
`803`	`793`
	`794`	`+ if (analysis.resolvedImports !== null && analysis.rawImports !== null) {`
	`795`	`+ const standaloneDiagnostics = validateStandaloneImports(`
	`796`	`+ analysis.resolvedImports, analysis.rawImports, this.metaReader, this.scopeReader);`
	`797`	`+ diagnostics.push(...standaloneDiagnostics);`
	`798`	`+ }`
	`799`	`+`
`804`	`800`	`if (analysis.providersRequiringFactory !== null &&`
`805`	`801`	`analysis.meta.providers instanceof WrappedNodeExpr) {`
`806`	`802`	`const providerDiagnostics = getProviderDiagnostics(`