cargdev/angular
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "feat(compiler-cli): lower metadata useValue and data literal fields (#18905)"

Browse Source 
This reverts commit c685cc2f0a.
This commit is contained in:
Jason Aden
2017-08-30 19:02:17 -07:00
parent 3a6d270bb8
commit c7e1bda32f
8 changed files with 28 additions and 324 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
packages/compiler/src/output/ts_emitter.ts
View File

@ -35,14 +35,12 @@ export function debugOutputAstAsTypeScript(ast: o.Statement | o.Expression | o.T
return ctx.toSource();
}
export type ReferenceFilter = (reference: o.ExternalReference) => boolean;
export class TypeScriptEmitter implements OutputEmitter {
emitStatementsAndContext(
srcFilePath: string, genFilePath: string, stmts: o.Statement[], preamble: string = '',
emitSourceMaps: boolean = true,
referenceFilter?: ReferenceFilter): {sourceText: string, context: EmitterVisitorContext} {
const converter = new _TsEmitterVisitor(referenceFilter);
emitSourceMaps: boolean = true): {sourceText: string, context: EmitterVisitorContext} {
const converter = new _TsEmitterVisitor();
const ctx = EmitterVisitorContext.createRoot();
@ -80,11 +78,10 @@ export class TypeScriptEmitter implements OutputEmitter {
}
}
class _TsEmitterVisitor extends AbstractEmitterVisitor implements o.TypeVisitor {
private typeExpression = 0;
constructor(private referenceFilter?: ReferenceFilter) { super(false); }
constructor() { super(false); }
importsWithPrefixes = new Map<string, string>();
reexports = new Map<string, {name: string, as: string}[]>();
@ -380,10 +377,6 @@ class _TsEmitterVisitor extends AbstractEmitterVisitor implements o.TypeVisitor
private _visitIdentifier(
value: o.ExternalReference, typeParams: o.Type[]|null, ctx: EmitterVisitorContext): void {
const {name, moduleName} = value;
if (this.referenceFilter && this.referenceFilter(value)) {
ctx.print(null, '(null as any)');
return;
}
if (moduleName) {
let prefix = this.importsWithPrefixes.get(moduleName);
if (prefix == null) {

9
packages/compiler/test/aot/test_util.ts
View File

@ -12,8 +12,6 @@ import * as fs from 'fs';
import * as path from 'path';
import * as ts from 'typescript';
export interface MetadataProvider { getMetadata(source: ts.SourceFile): ModuleMetadata|undefined; }
let nodeModulesPath: string;
let angularSourcePath: string;
let rootPath: string;
@ -329,13 +327,12 @@ const DTS = /\.d\.ts$/;
const GENERATED_FILES = /\.ngfactory\.ts$|\.ngstyle\.ts$/;
export class MockAotCompilerHost implements AotCompilerHost {
private metadataCollector = new MetadataCollector();
private metadataVisible: boolean = true;
private dtsAreSource: boolean = true;
private resolveModuleNameHost: ts.ModuleResolutionHost;
constructor(
private tsHost: MockCompilerHost,
private metadataProvider: MetadataProvider = new MetadataCollector()) {
constructor(private tsHost: MockCompilerHost) {
this.resolveModuleNameHost = Object.create(tsHost);
this.resolveModuleNameHost.fileExists = (fileName) => {
fileName = stripNgResourceSuffix(fileName);
@ -362,7 +359,7 @@ export class MockAotCompilerHost implements AotCompilerHost {
}
} else {
const sf = this.tsHost.getSourceFile(modulePath, ts.ScriptTarget.Latest);
const metadata = this.metadataProvider.getMetadata(sf);
const metadata = this.metadataCollector.getMetadata(sf);
return metadata ? [metadata] : [];
}
return undefined;