fix(tsickle): put the tsickle support code at EOF

This commit is contained in:
Alex Eagle 2016-05-03 16:08:35 -06:00 committed by Tobias Bosch
parent 6eac4b68bc
commit 3cfe281790
1 changed files with 7 additions and 12 deletions

View File

@ -4,11 +4,6 @@ import {convertDecorators} from 'tsickle';
import {NodeReflectorHost} from './reflector_host'; import {NodeReflectorHost} from './reflector_host';
import {AngularCompilerOptions} from './codegen'; import {AngularCompilerOptions} from './codegen';
const DEBUG = false;
function debug(msg: string, ...o: any[]) {
if (DEBUG) console.log(msg, ...o);
}
/** /**
* Implementation of CompilerHost that forwards all methods to another instance. * Implementation of CompilerHost that forwards all methods to another instance.
* Useful for partial implementations to override only methods they care about. * Useful for partial implementations to override only methods they care about.
@ -37,11 +32,12 @@ export abstract class DelegatingHost implements ts.CompilerHost {
export class TsickleHost extends DelegatingHost { export class TsickleHost extends DelegatingHost {
// Additional diagnostics gathered by pre- and post-emit transformations. // Additional diagnostics gathered by pre- and post-emit transformations.
public diagnostics: ts.Diagnostic[] = []; public diagnostics: ts.Diagnostic[] = [];
private TSICKLE_SUPPORT = `interface DecoratorInvocation { private TSICKLE_SUPPORT = `
type: Function; interface DecoratorInvocation {
args?: any[]; type: Function;
} args?: any[];
`; }
`;
constructor(delegate: ts.CompilerHost, private options: ts.CompilerOptions) { super(delegate); } constructor(delegate: ts.CompilerHost, private options: ts.CompilerOptions) { super(delegate); }
getSourceFile = getSourceFile =
@ -53,8 +49,7 @@ export class TsickleHost extends DelegatingHost {
if (converted.diagnostics) { if (converted.diagnostics) {
this.diagnostics.push(...converted.diagnostics); this.diagnostics.push(...converted.diagnostics);
} }
newContent = this.TSICKLE_SUPPORT + converted.output; newContent = converted.output + this.TSICKLE_SUPPORT;
debug(newContent);
} }
return ts.createSourceFile(fileName, newContent, languageVersion, true); return ts.createSourceFile(fileName, newContent, languageVersion, true);
} }