Skip to content

Commit acda82c

Browse files
tboschalxhub
tbosch
authored and
alxhub
committed
refactor(compiler): remove private exports
All of `@angular/compiler` is private, so we can export everything we need directly.
1 parent a8815d6 commit acda82c

10 files changed

Lines changed: 66 additions & 252 deletions

File tree

‎modules/@angular/compiler-cli/src/codegen.ts‎

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ import * as path from 'path';
1717
import * as ts from 'typescript';
1818

1919
import {PathMappedReflectorHost} from './path_mapped_reflector_host';
20-
import {CompileMetadataResolver, DirectiveNormalizer, DomElementSchemaRegistry, HtmlParser, Lexer, NgModuleCompiler, Parser, StyleCompiler, TemplateParser, TypeScriptEmitter, ViewCompiler} from './private_import_compiler';
2120
import {Console} from './private_import_core';
2221
import {ReflectorHost, ReflectorHostContext} from './reflector_host';
2322
import {StaticAndDynamicReflectionCapabilities} from './static_reflection_capabilities';
@@ -173,27 +172,27 @@ export class CodeGenerator {
173172
const staticReflector = new StaticReflector(reflectorHost);
174173
StaticAndDynamicReflectionCapabilities.install(staticReflector);
175174
const htmlParser =
176-
new compiler.I18NHtmlParser(new HtmlParser(), transContent, cliOptions.i18nFormat);
175+
new compiler.I18NHtmlParser(new compiler.HtmlParser(), transContent, cliOptions.i18nFormat);
177176
const config = new compiler.CompilerConfig({
178177
genDebugInfo: options.debug === true,
179178
defaultEncapsulation: ViewEncapsulation.Emulated,
180179
logBindingUpdate: false,
181180
useJit: false
182181
});
183-
const normalizer = new DirectiveNormalizer(resourceLoader, urlResolver, htmlParser, config);
184-
const expressionParser = new Parser(new Lexer());
185-
const elementSchemaRegistry = new DomElementSchemaRegistry();
182+
const normalizer = new compiler.DirectiveNormalizer(resourceLoader, urlResolver, htmlParser, config);
183+
const expressionParser = new compiler.Parser(new compiler.Lexer());
184+
const elementSchemaRegistry = new compiler.DomElementSchemaRegistry();
186185
const console = new Console();
187186
const tmplParser =
188-
new TemplateParser(expressionParser, elementSchemaRegistry, htmlParser, console, []);
189-
const resolver = new CompileMetadataResolver(
187+
new compiler.TemplateParser(expressionParser, elementSchemaRegistry, htmlParser, console, []);
188+
const resolver = new compiler.CompileMetadataResolver(
190189
new compiler.NgModuleResolver(staticReflector),
191190
new compiler.DirectiveResolver(staticReflector), new compiler.PipeResolver(staticReflector),
192191
elementSchemaRegistry, staticReflector);
193192
// TODO(vicb): do not pass cliOptions.i18nFormat here
194193
const offlineCompiler = new compiler.OfflineCompiler(
195-
resolver, normalizer, tmplParser, new StyleCompiler(urlResolver), new ViewCompiler(config),
196-
new NgModuleCompiler(), new TypeScriptEmitter(reflectorHost), cliOptions.locale,
194+
resolver, normalizer, tmplParser, new compiler.StyleCompiler(urlResolver), new compiler.ViewCompiler(config),
195+
new compiler.NgModuleCompiler(), new compiler.TypeScriptEmitter(reflectorHost), cliOptions.locale,
197196
cliOptions.i18nFormat);
198197

199198
return new CodeGenerator(

‎modules/@angular/compiler-cli/src/extract_i18n.ts‎

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ import {Component, NgModule, ViewEncapsulation} from '@angular/core';
2121
import * as path from 'path';
2222
import * as ts from 'typescript';
2323
import * as tsc from '@angular/tsc-wrapped';
24-
import {CompileMetadataResolver, DirectiveNormalizer, DomElementSchemaRegistry, HtmlParser, Lexer, NgModuleCompiler, Parser, StyleCompiler, TemplateParser, TypeScriptEmitter, ViewCompiler, ParseError} from './private_import_compiler';
2524
import {Console} from './private_import_core';
2625
import {ReflectorHost, ReflectorHostContext} from './reflector_host';
2726
import {StaticAndDynamicReflectionCapabilities} from './static_reflection_capabilities';
@@ -63,8 +62,8 @@ export class Extractor {
6362
constructor(
6463
private program: ts.Program, public host: ts.CompilerHost,
6564
private staticReflector: StaticReflector, private messageBundle: compiler.MessageBundle,
66-
private reflectorHost: ReflectorHost, private metadataResolver: CompileMetadataResolver,
67-
private directiveNormalizer: DirectiveNormalizer,
65+
private reflectorHost: ReflectorHost, private metadataResolver: compiler.CompileMetadataResolver,
66+
private directiveNormalizer: compiler.DirectiveNormalizer,
6867
private compiler: compiler.OfflineCompiler) {}
6968

7069
private readFileMetadata(absSourcePath: string): FileMetadata {
@@ -106,7 +105,7 @@ export class Extractor {
106105
return ngModules;
107106
}, <StaticSymbol[]>[]);
108107
const analyzedNgModules = this.compiler.analyzeModules(ngModules);
109-
const errors: ParseError[] = [];
108+
const errors: compiler.ParseError[] = [];
110109

111110
let bundlePromise =
112111
Promise
@@ -168,19 +167,19 @@ export class Extractor {
168167
useJit: false
169168
});
170169

171-
const normalizer = new DirectiveNormalizer(resourceLoader, urlResolver, htmlParser, config);
172-
const expressionParser = new Parser(new Lexer());
173-
const elementSchemaRegistry = new DomElementSchemaRegistry();
170+
const normalizer = new compiler.DirectiveNormalizer(resourceLoader, urlResolver, htmlParser, config);
171+
const expressionParser = new compiler.Parser(new compiler.Lexer());
172+
const elementSchemaRegistry = new compiler.DomElementSchemaRegistry();
174173
const console = new Console();
175174
const tmplParser =
176-
new TemplateParser(expressionParser, elementSchemaRegistry, htmlParser, console, []);
177-
const resolver = new CompileMetadataResolver(
175+
new compiler.TemplateParser(expressionParser, elementSchemaRegistry, htmlParser, console, []);
176+
const resolver = new compiler.CompileMetadataResolver(
178177
new compiler.NgModuleResolver(staticReflector),
179178
new compiler.DirectiveResolver(staticReflector), new compiler.PipeResolver(staticReflector),
180179
elementSchemaRegistry, staticReflector);
181180
const offlineCompiler = new compiler.OfflineCompiler(
182-
resolver, normalizer, tmplParser, new StyleCompiler(urlResolver), new ViewCompiler(config),
183-
new NgModuleCompiler(), new TypeScriptEmitter(reflectorHost), null, null);
181+
resolver, normalizer, tmplParser, new compiler.StyleCompiler(urlResolver), new compiler.ViewCompiler(config),
182+
new compiler.NgModuleCompiler(), new compiler.TypeScriptEmitter(reflectorHost), null, null);
184183

185184
// TODO(vicb): implicit tags & attributes
186185
let messageBundle = new compiler.MessageBundle(htmlParser, [], {});

‎modules/@angular/compiler-cli/src/private_import_compiler.ts‎

Lines changed: 0 additions & 54 deletions
This file was deleted.

‎modules/@angular/compiler-cli/src/reflector_host.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@
66
* found in the LICENSE file at https://angular.io/license
77
*/
88

9+
import {AssetUrl, ImportGenerator} from '@angular/compiler';
910
import {AngularCompilerOptions, MetadataCollector, ModuleMetadata} from '@angular/tsc-wrapped';
1011
import * as fs from 'fs';
1112
import * as path from 'path';
1213
import * as ts from 'typescript';
1314

14-
import {AssetUrl, ImportGenerator} from './private_import_compiler';
1515
import {StaticReflectorHost, StaticSymbol} from './static_reflector';
1616

1717
const EXT = /(\.ts|\.d\.ts|\.js|\.jsx|\.tsx)$/;

‎modules/@angular/compiler/index.ts‎

Lines changed: 31 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,36 @@
2121
* </p>
2222
* </div>
2323
*/
24-
export * from './src/index';
24+
export * from './src/template_parser/template_ast';
25+
export {TEMPLATE_TRANSFORMS} from './src/template_parser/template_parser';
26+
export {CompilerConfig, RenderTypes} from './src/config';
27+
export * from './src/compile_metadata';
28+
export * from './src/offline_compiler';
29+
export {RuntimeCompiler} from './src/runtime_compiler';
30+
export * from './src/url_resolver';
31+
export * from './src/resource_loader';
32+
export * from './src/compiler';
33+
export {DirectiveResolver} from './src/directive_resolver';
34+
export {PipeResolver} from './src/pipe_resolver';
35+
export {NgModuleResolver} from './src/ng_module_resolver';
36+
export {DEFAULT_INTERPOLATION_CONFIG, InterpolationConfig} from './src/ml_parser/interpolation_config';
37+
export {ElementSchemaRegistry} from './src/schema/element_schema_registry';
38+
export * from './src/i18n/index';
39+
export * from './src/template_parser/template_ast';
40+
export * from './src/directive_normalizer';
41+
export * from './src/expression_parser/lexer';
42+
export * from './src/expression_parser/parser';
43+
export * from './src/metadata_resolver';
44+
export * from './src/ml_parser/html_parser';
45+
export * from './src/ml_parser/interpolation_config';
46+
export {NgModuleCompiler} from './src/ng_module_compiler';
47+
export * from './src/output/path_util';
48+
export * from './src/output/ts_emitter';
49+
export * from './src/parse_util';
50+
export * from './src/schema/dom_element_schema_registry';
51+
export * from './src/selector';
52+
export * from './src/style_compiler';
53+
export * from './src/template_parser/template_parser';
54+
export {ViewCompiler} from './src/view_compiler/view_compiler';
2555

2656
// This file only reexports content of the `src` folder. Keep it that way.

‎modules/@angular/compiler/src/compiler.ts‎

Lines changed: 15 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -8,39 +8,26 @@
88

99
import {COMPILER_OPTIONS, Compiler, CompilerFactory, CompilerOptions, Inject, Injectable, Optional, PLATFORM_INITIALIZER, PlatformRef, Provider, ReflectiveInjector, TRANSLATIONS, TRANSLATIONS_FORMAT, Type, ViewEncapsulation, createPlatformFactory, isDevMode, platformCore} from '@angular/core';
1010

11-
export * from './template_parser/template_ast';
12-
export {TEMPLATE_TRANSFORMS} from './template_parser/template_parser';
13-
export {CompilerConfig, RenderTypes} from './config';
14-
export * from './compile_metadata';
15-
export * from './offline_compiler';
16-
export {RuntimeCompiler} from './runtime_compiler';
17-
export * from './url_resolver';
18-
export * from './resource_loader';
19-
20-
export {DirectiveResolver} from './directive_resolver';
21-
export {PipeResolver} from './pipe_resolver';
22-
export {NgModuleResolver} from './ng_module_resolver';
23-
24-
import {TemplateParser} from './template_parser/template_parser';
25-
import {HtmlParser} from './ml_parser/html_parser';
11+
import {CompilerConfig} from './config';
2612
import {DirectiveNormalizer} from './directive_normalizer';
13+
import {DirectiveResolver} from './directive_resolver';
14+
import {Lexer} from './expression_parser/lexer';
15+
import {Parser} from './expression_parser/parser';
16+
import * as i18n from './i18n/index';
2717
import {CompileMetadataResolver} from './metadata_resolver';
28-
import {StyleCompiler} from './style_compiler';
29-
import {ViewCompiler} from './view_compiler/view_compiler';
18+
import {HtmlParser} from './ml_parser/html_parser';
3019
import {NgModuleCompiler} from './ng_module_compiler';
31-
import {CompilerConfig} from './config';
32-
import {RuntimeCompiler} from './runtime_compiler';
33-
import {ElementSchemaRegistry} from './schema/element_schema_registry';
34-
import {DomElementSchemaRegistry} from './schema/dom_element_schema_registry';
35-
import {UrlResolver, DEFAULT_PACKAGE_URL_PROVIDER} from './url_resolver';
36-
import {Parser} from './expression_parser/parser';
37-
import {Lexer} from './expression_parser/lexer';
38-
import {DirectiveResolver} from './directive_resolver';
39-
import {PipeResolver} from './pipe_resolver';
4020
import {NgModuleResolver} from './ng_module_resolver';
41-
import {Console, Reflector, reflector, ReflectorReader, ReflectionCapabilities} from './private_import_core';
21+
import {PipeResolver} from './pipe_resolver';
22+
import {Console, ReflectionCapabilities, Reflector, ReflectorReader, reflector} from './private_import_core';
4223
import {ResourceLoader} from './resource_loader';
43-
import * as i18n from './i18n/index';
24+
import {RuntimeCompiler} from './runtime_compiler';
25+
import {DomElementSchemaRegistry} from './schema/dom_element_schema_registry';
26+
import {ElementSchemaRegistry} from './schema/element_schema_registry';
27+
import {StyleCompiler} from './style_compiler';
28+
import {TemplateParser} from './template_parser/template_parser';
29+
import {DEFAULT_PACKAGE_URL_PROVIDER, UrlResolver} from './url_resolver';
30+
import {ViewCompiler} from './view_compiler/view_compiler';
4431

4532
const _NO_RESOURCE_LOADER: ResourceLoader = {
4633
get(url: string): Promise<string>{

‎modules/@angular/compiler/src/index.ts‎

Lines changed: 0 additions & 20 deletions
This file was deleted.

‎modules/@angular/compiler/src/private_export.ts‎

Lines changed: 0 additions & 112 deletions
This file was deleted.

0 commit comments

Comments
 (0)