Revert "refactor(compiler): remove cyclic dependencies (angular#42062)…

…" (angular#43033)

This reverts commit 7585519.

PR Close angular#43033

goldens/circular-deps/packages.json

@@ -41,6 +41,55 @@
     "packages/compiler-cli/src/ngtsc/scope/src/component_scope.ts",
     "packages/compiler-cli/src/ngtsc/scope/src/local.ts"
   ],
+  [
+    "packages/compiler/src/compile_metadata.ts",
+    "packages/compiler/src/lifecycle_reflector.ts",
+    "packages/compiler/src/compile_reflector.ts",
+    "packages/compiler/src/output/output_ast.ts",
+    "packages/compiler/src/parse_util.ts"
+  ],
+  [
+    "packages/compiler/src/compile_metadata.ts",
+    "packages/compiler/src/ml_parser/parser.ts",
+    "packages/compiler/src/ml_parser/ast.ts",
+    "packages/compiler/src/i18n/i18n_ast.ts",
+    "packages/compiler/src/parse_util.ts"
+  ],
+  [
+    "packages/compiler/src/compile_metadata.ts",
+    "packages/compiler/src/ml_parser/parser.ts",
+    "packages/compiler/src/ml_parser/ast.ts",
+    "packages/compiler/src/parse_util.ts"
+  ],
+  [
+    "packages/compiler/src/compile_metadata.ts",
+    "packages/compiler/src/ml_parser/parser.ts",
+    "packages/compiler/src/ml_parser/lexer.ts",
+    "packages/compiler/src/parse_util.ts"
+  ],
+  [
+    "packages/compiler/src/compile_metadata.ts",
+    "packages/compiler/src/ml_parser/parser.ts",
+    "packages/compiler/src/parse_util.ts"
+  ],
+  [
+    "packages/compiler/src/compile_metadata.ts",
+    "packages/compiler/src/util.ts",
+    "packages/compiler/src/constant_pool.ts",
+    "packages/compiler/src/output/output_ast.ts",
+    "packages/compiler/src/parse_util.ts"
+  ],
+  [
+    "packages/compiler/src/compile_metadata.ts",
+    "packages/compiler/src/util.ts",
+    "packages/compiler/src/output/output_ast.ts",
+    "packages/compiler/src/parse_util.ts"
+  ],
+  [
+    "packages/compiler/src/compile_metadata.ts",
+    "packages/compiler/src/util.ts",
+    "packages/compiler/src/parse_util.ts"
+  ],
   [
     "packages/compiler/src/output/output_ast.ts",
     "packages/compiler/src/render3/view/i18n/meta.ts"
@@ -50,6 +99,11 @@
     "packages/compiler/src/render3/view/i18n/meta.ts",
     "packages/compiler/src/render3/view/i18n/util.ts"
   ],
+  [
+    "packages/compiler/src/render3/r3_factory.ts",
+    "packages/compiler/src/render3/view/util.ts",
+    "packages/compiler/src/render3/view/api.ts"
+  ],
   [
     "packages/compiler/src/render3/view/styling_builder.ts",
     "packages/compiler/src/render3/view/template.ts"

packages/compiler/src/aot/compiler.ts

@@ -6,9 +6,9 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {CompileDirectiveMetadata, CompileInjectableMetadata, CompileNgModuleMetadata, CompilePipeMetadata, CompilePipeSummary, CompileProviderMetadata, CompileShallowModuleMetadata, CompileStylesheetMetadata, CompileTypeMetadata, CompileTypeSummary, componentFactoryName, flatten, templateSourceUrl} from '../compile_metadata';
+import {CompileDirectiveMetadata, CompileIdentifierMetadata, CompileInjectableMetadata, CompileNgModuleMetadata, CompilePipeMetadata, CompilePipeSummary, CompileProviderMetadata, CompileShallowModuleMetadata, CompileStylesheetMetadata, CompileTypeMetadata, CompileTypeSummary, componentFactoryName, flatten, identifierName, templateSourceUrl} from '../compile_metadata';
 import {CompilerConfig} from '../config';
-import {ConstantPool, OutputContext} from '../constant_pool';
+import {ConstantPool} from '../constant_pool';
 import {ViewEncapsulation} from '../core';
 import {MessageBundle} from '../i18n/message_bundle';
 import {createTokenForExternalReference, Identifiers} from '../identifiers';
@@ -19,12 +19,12 @@ import {InterpolationConfig} from '../ml_parser/interpolation_config';
 import {NgModuleCompiler} from '../ng_module_compiler';
 import {OutputEmitter} from '../output/abstract_emitter';
 import * as o from '../output/output_ast';
-import {CompileIdentifierMetadata, identifierName, ParseError, syntaxError} from '../parse_util';
+import {ParseError} from '../parse_util';
 import {CompiledStylesheet, StyleCompiler} from '../style_compiler';
 import {SummaryResolver} from '../summary_resolver';
 import {TemplateAst} from '../template_parser/template_ast';
 import {TemplateParser} from '../template_parser/template_parser';
-import {newArray, ValueVisitor, visitValue} from '../util';
+import {newArray, OutputContext, syntaxError, ValueVisitor, visitValue} from '../util';
 import {TypeCheckCompiler} from '../view_compiler/type_check_compiler';
 import {ViewCompiler, ViewCompileResult} from '../view_compiler/view_compiler';
 

packages/compiler/src/aot/compiler_factory.ts

@@ -19,12 +19,12 @@ import {HtmlParser} from '../ml_parser/html_parser';
 import {NgModuleCompiler} from '../ng_module_compiler';
 import {NgModuleResolver} from '../ng_module_resolver';
 import {TypeScriptEmitter} from '../output/ts_emitter';
-import {syntaxError} from '../parse_util';
 import {PipeResolver} from '../pipe_resolver';
 import {DomElementSchemaRegistry} from '../schema/dom_element_schema_registry';
 import {StyleCompiler} from '../style_compiler';
 import {TemplateParser} from '../template_parser/template_parser';
 import {UrlResolver} from '../url_resolver';
+import {syntaxError} from '../util';
 import {TypeCheckCompiler} from '../view_compiler/type_check_compiler';
 import {ViewCompiler} from '../view_compiler/view_compiler';
 

packages/compiler/src/aot/formatted_error.ts

@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {syntaxError} from '../parse_util';
+import {syntaxError} from '../util';
 
 export interface Position {
   fileName: string;

packages/compiler/src/aot/static_reflector.ts

@@ -10,8 +10,8 @@ import {CompileSummaryKind} from '../compile_metadata';
 import {CompileReflector} from '../compile_reflector';
 import {createAttribute, createComponent, createContentChild, createContentChildren, createDirective, createHost, createHostBinding, createHostListener, createInject, createInjectable, createInput, createNgModule, createOptional, createOutput, createPipe, createSelf, createSkipSelf, createViewChild, createViewChildren, MetadataFactory} from '../core';
 import * as o from '../output/output_ast';
-import {syntaxError} from '../parse_util';
 import {SummaryResolver} from '../summary_resolver';
+import {syntaxError} from '../util';
 
 import {formattedError, FormattedMessageChain} from './formatted_error';
 import {StaticSymbol} from './static_symbol';

packages/compiler/src/aot/summary_serializer.ts

@@ -6,10 +6,9 @@
  * found in the LICENSE file at https://angular.io/license
  */
 import {CompileDirectiveMetadata, CompileDirectiveSummary, CompileNgModuleMetadata, CompileNgModuleSummary, CompilePipeMetadata, CompileProviderMetadata, CompileSummaryKind, CompileTypeMetadata, CompileTypeSummary} from '../compile_metadata';
-import {OutputContext} from '../constant_pool';
 import * as o from '../output/output_ast';
 import {Summary, SummaryResolver} from '../summary_resolver';
-import {ValueTransformer, ValueVisitor, visitValue} from '../util';
+import {OutputContext, ValueTransformer, ValueVisitor, visitValue} from '../util';
 
 import {StaticSymbol, StaticSymbolCache} from './static_symbol';
 import {ResolvedStaticSymbol, StaticSymbolResolver, unwrapResolvedMetadata} from './static_symbol_resolver';

packages/compiler/src/compile_metadata.ts

@@ -10,15 +10,57 @@ import {StaticSymbol} from './aot/static_symbol';
 import {ChangeDetectionStrategy, SchemaMetadata, Type, ViewEncapsulation} from './core';
 import {LifecycleHooks} from './lifecycle_reflector';
 import {ParseTreeResult as HtmlParseTreeResult} from './ml_parser/parser';
-import {CompileIdentifierMetadata, identifierName, sanitizeIdentifier} from './parse_util';
-import {splitAtColon} from './util';
+import {splitAtColon, stringify} from './util';
 
 // group 0: "[prop] or (event) or @trigger"
 // group 1: "prop" from "[prop]"
 // group 2: "event" from "(event)"
 // group 3: "@trigger" from "@trigger"
 const HOST_REG_EXP = /^(?:(?:\[([^\]]+)\])|(?:\(([^\)]+)\)))|(\@[-\w]+)$/;
 
+export function sanitizeIdentifier(name: string): string {
+  return name.replace(/\W/g, '_');
+}
+
+let _anonymousTypeIndex = 0;
+
+export function identifierName(compileIdentifier: CompileIdentifierMetadata|null|undefined): string|
+    null {
+  if (!compileIdentifier || !compileIdentifier.reference) {
+    return null;
+  }
+  const ref = compileIdentifier.reference;
+  if (ref instanceof StaticSymbol) {
+    return ref.name;
+  }
+  if (ref['__anonymousType']) {
+    return ref['__anonymousType'];
+  }
+  if (ref['__forward_ref__']) {
+    // We do not want to try to stringify a `forwardRef()` function because that would cause the
+    // inner function to be evaluated too early, defeating the whole point of the `forwardRef`.
+    return '__forward_ref__';
+  }
+  let identifier = stringify(ref);
+  if (identifier.indexOf('(') >= 0) {
+    // case: anonymous functions!
+    identifier = `anonymous_${_anonymousTypeIndex++}`;
+    ref['__anonymousType'] = identifier;
+  } else {
+    identifier = sanitizeIdentifier(identifier);
+  }
+  return identifier;
+}
+
+export function identifierModuleUrl(compileIdentifier: CompileIdentifierMetadata): string {
+  const ref = compileIdentifier.reference;
+  if (ref instanceof StaticSymbol) {
+    return ref.filePath;
+  }
+  // Runtime type
+  return `./${stringify(ref)}`;
+}
+
 export function viewClassName(compType: any, embeddedTemplateIndex: number): string {
   return `View_${identifierName({reference: compType})}_${embeddedTemplateIndex}`;
 }
@@ -39,6 +81,10 @@ export interface ProxyClass {
   setDelegate(delegate: any): void;
 }
 
+export interface CompileIdentifierMetadata {
+  reference: any;
+}
+
 export enum CompileSummaryKind {
   Pipe,
   Directive,

packages/compiler/src/compiler.ts

@@ -88,7 +88,7 @@ export * from './selector';
 export * from './style_compiler';
 export * from './template_parser/template_parser';
 export {ViewCompiler} from './view_compiler/view_compiler';
-export {Version} from './util';
+export {getParseErrors, isSyntaxError, syntaxError, Version} from './util';
 export {SourceMap} from './output/source_map';
 export * from './injectable_compiler_2';
 export * from './render3/partial/api';

packages/compiler/src/constant_pool.ts

@@ -7,6 +7,7 @@
  */
 
 import * as o from './output/output_ast';
+import {error, OutputContext} from './util';
 
 const CONSTANT_PREFIX = '_c';
 
@@ -275,13 +276,6 @@ export class ConstantPool {
   }
 }
 
-export interface OutputContext {
-  genFilePath: string;
-  statements: o.Statement[];
-  constantPool: ConstantPool;
-  importExpr(reference: any, typeParams?: o.Type[]|null, useSummaries?: boolean): o.Expression;
-}
-
 /**
  * Visitor used to determine if 2 expressions are equivalent and can be shared in the
  * `ConstantPool`.

packages/compiler/src/directive_normalizer.ts

@@ -13,12 +13,11 @@ import * as html from './ml_parser/ast';
 import {HtmlParser} from './ml_parser/html_parser';
 import {InterpolationConfig} from './ml_parser/interpolation_config';
 import {ParseTreeResult as HtmlParseTreeResult} from './ml_parser/parser';
-import {syntaxError} from './parse_util';
 import {ResourceLoader} from './resource_loader';
 import {extractStyleUrls, isStyleUrlResolvable} from './style_url_resolver';
 import {PreparsedElementType, preparseElement} from './template_parser/template_preparser';
 import {UrlResolver} from './url_resolver';
-import {isDefined, stringify, SyncAsync} from './util';
+import {isDefined, stringify, SyncAsync, syntaxError} from './util';
 
 export interface PrenormalizedTemplateMetadata {
   ngModuleType: any;

packages/compiler/src/i18n/extractor.ts

@@ -28,6 +28,7 @@ import {NgModuleResolver} from '../ng_module_resolver';
 import {ParseError} from '../parse_util';
 import {PipeResolver} from '../pipe_resolver';
 import {DomElementSchemaRegistry} from '../schema/dom_element_schema_registry';
+import {syntaxError} from '../util';
 
 import {MessageBundle} from './message_bundle';
 

packages/compiler/src/injectable_compiler.ts

@@ -7,15 +7,14 @@
  */
 
 import {StaticSymbol} from './aot/static_symbol';
-import {CompileInjectableMetadata} from './compile_metadata';
+import {CompileInjectableMetadata, identifierName} from './compile_metadata';
 import {CompileReflector} from './compile_reflector';
-import {OutputContext} from './constant_pool';
 import {InjectFlags} from './core';
 import {Identifiers} from './identifiers';
 import * as o from './output/output_ast';
 import {convertValueToOutputAst} from './output/value_util';
-import {identifierName} from './parse_util';
 import {Identifiers as R3} from './render3/r3_identifiers';
+import {OutputContext} from './util';
 
 type MapEntry = {
   key: string,

packages/compiler/src/jit/compiler.ts

@@ -6,22 +6,21 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {CompileDirectiveMetadata, CompileNgModuleMetadata, CompilePipeSummary, CompileProviderMetadata, CompileTypeSummary, ngModuleJitUrl, ProxyClass, sharedStylesheetJitUrl, templateJitUrl, templateSourceUrl} from '../compile_metadata';
+import {CompileDirectiveMetadata, CompileIdentifierMetadata, CompileNgModuleMetadata, CompilePipeSummary, CompileProviderMetadata, CompileStylesheetMetadata, CompileTypeSummary, identifierName, ngModuleJitUrl, ProviderMeta, ProxyClass, sharedStylesheetJitUrl, templateJitUrl, templateSourceUrl} from '../compile_metadata';
 import {CompileReflector} from '../compile_reflector';
 import {CompilerConfig} from '../config';
-import {ConstantPool, OutputContext} from '../constant_pool';
+import {ConstantPool} from '../constant_pool';
 import {Type} from '../core';
 import {CompileMetadataResolver} from '../metadata_resolver';
 import {NgModuleCompiler} from '../ng_module_compiler';
 import * as ir from '../output/output_ast';
 import {interpretStatements} from '../output/output_interpreter';
 import {JitEvaluator} from '../output/output_jit';
-import {CompileIdentifierMetadata, identifierName} from '../parse_util';
 import {CompiledStylesheet, StyleCompiler} from '../style_compiler';
 import {SummaryResolver} from '../summary_resolver';
 import {TemplateAst} from '../template_parser/template_ast';
 import {TemplateParser} from '../template_parser/template_parser';
-import {Console, stringify, SyncAsync} from '../util';
+import {Console, OutputContext, stringify, SyncAsync} from '../util';
 import {ViewCompiler} from '../view_compiler/view_compiler';
 
 export interface ModuleWithComponentFactories {

packages/compiler/src/metadata_resolver.ts

@@ -19,12 +19,11 @@ import {Identifiers} from './identifiers';
 import {getAllLifecycleHooks} from './lifecycle_reflector';
 import {HtmlParser} from './ml_parser/html_parser';
 import {NgModuleResolver} from './ng_module_resolver';
-import {CompileIdentifierMetadata, identifierName, syntaxError} from './parse_util';
 import {PipeResolver} from './pipe_resolver';
 import {ElementSchemaRegistry} from './schema/element_schema_registry';
 import {CssSelector} from './selector';
 import {SummaryResolver} from './summary_resolver';
-import {Console, isPromise, noUndefined, resolveForwardRef, stringify, SyncAsync, ValueTransformer, visitValue} from './util';
+import {Console, isPromise, noUndefined, resolveForwardRef, stringify, SyncAsync, syntaxError, ValueTransformer, visitValue} from './util';
 
 export type ErrorCollector = (error: any, type?: any) => void;
 
@@ -131,7 +130,7 @@ export class CompileMetadataResolver {
   }
 
   getHostComponentType(dirType: any): StaticSymbol|cpl.ProxyClass {
-    const name = `${identifierName({reference: dirType})}_Host`;
+    const name = `${cpl.identifierName({reference: dirType})}_Host`;
     if (dirType instanceof StaticSymbol) {
       return this._staticSymbolCache.get(dirType.filePath, name);
     }
@@ -534,14 +533,14 @@ export class CompileMetadataResolver {
     if (!meta) {
       return null;
     }
-    const declaredDirectives: CompileIdentifierMetadata[] = [];
-    const exportedNonModuleIdentifiers: CompileIdentifierMetadata[] = [];
-    const declaredPipes: CompileIdentifierMetadata[] = [];
+    const declaredDirectives: cpl.CompileIdentifierMetadata[] = [];
+    const exportedNonModuleIdentifiers: cpl.CompileIdentifierMetadata[] = [];
+    const declaredPipes: cpl.CompileIdentifierMetadata[] = [];
     const importedModules: cpl.CompileNgModuleSummary[] = [];
     const exportedModules: cpl.CompileNgModuleSummary[] = [];
     const providers: cpl.CompileProviderMetadata[] = [];
     const entryComponents: cpl.CompileEntryComponentMetadata[] = [];
-    const bootstrapComponents: CompileIdentifierMetadata[] = [];
+    const bootstrapComponents: cpl.CompileIdentifierMetadata[] = [];
     const schemas: SchemaMetadata[] = [];
 
     if (meta.imports) {
@@ -673,8 +672,8 @@ export class CompileMetadataResolver {
       });
     }
 
-    const exportedDirectives: CompileIdentifierMetadata[] = [];
-    const exportedPipes: CompileIdentifierMetadata[] = [];
+    const exportedDirectives: cpl.CompileIdentifierMetadata[] = [];
+    const exportedPipes: cpl.CompileIdentifierMetadata[] = [];
     exportedNonModuleIdentifiers.forEach((exportedId) => {
       if (transitiveModule.directivesSet.has(exportedId.reference)) {
         exportedDirectives.push(exportedId);
@@ -837,7 +836,7 @@ export class CompileMetadataResolver {
     return result;
   }
 
-  private _getIdentifierMetadata(type: Type): CompileIdentifierMetadata {
+  private _getIdentifierMetadata(type: Type): cpl.CompileIdentifierMetadata {
     type = resolveForwardRef(type);
     return {reference: type};
   }
@@ -1094,7 +1093,7 @@ export class CompileMetadataResolver {
   private _getEntryComponentsFromProvider(provider: cpl.ProviderMeta, type?: any):
       cpl.CompileEntryComponentMetadata[] {
     const components: cpl.CompileEntryComponentMetadata[] = [];
-    const collectedIdentifiers: CompileIdentifierMetadata[] = [];
+    const collectedIdentifiers: cpl.CompileIdentifierMetadata[] = [];
 
     if (provider.useFactory || provider.useExisting || provider.useClass) {
       this._reportError(
@@ -1264,12 +1263,12 @@ function isValidType(value: any): boolean {
   return (value instanceof StaticSymbol) || (value instanceof Type);
 }
 
-function extractIdentifiers(value: any, targetIdentifiers: CompileIdentifierMetadata[]) {
+function extractIdentifiers(value: any, targetIdentifiers: cpl.CompileIdentifierMetadata[]) {
   visitValue(value, new _CompileValueConverter(), targetIdentifiers);
 }
 
 class _CompileValueConverter extends ValueTransformer {
-  override visitOther(value: any, targetIdentifiers: CompileIdentifierMetadata[]): any {
+  override visitOther(value: any, targetIdentifiers: cpl.CompileIdentifierMetadata[]): any {
     targetIdentifiers.push({reference: value});
   }
 }