diff --git a/packages/language-service/src/typescript_host.ts b/packages/language-service/src/typescript_host.ts index 0b5365efea..71416c8881 100644 --- a/packages/language-service/src/typescript_host.ts +++ b/packages/language-service/src/typescript_host.ts @@ -191,7 +191,7 @@ export class TypeScriptServiceHost implements LanguageServiceHost { let sourceFile = this.getSourceFile(fileName); if (sourceFile) { - this.context = sourceFile.path; + this.context = (sourceFile as any).path || sourceFile.fileName; ts.forEachChild(sourceFile, visit); } return result.length ? result : undefined; diff --git a/packages/platform-webworker/src/web_workers/shared/serializer.ts b/packages/platform-webworker/src/web_workers/shared/serializer.ts index 16a62d820b..dbba03316b 100644 --- a/packages/platform-webworker/src/web_workers/shared/serializer.ts +++ b/packages/platform-webworker/src/web_workers/shared/serializer.ts @@ -10,6 +10,18 @@ import {Injectable, RenderComponentType, RendererType2, Type, ɵstringify as str import {RenderStore} from './render_store'; +/** + * @experimental WebWorker support in Angular is currently experimental. + */ +export const enum SerializerTypes { + // RendererType2 + RENDERER_TYPE_2, + // Primitive types + PRIMITIVE, + // An object stored in a RenderStore + RENDER_STORE_OBJECT, +} + /** * Any type that does not need to be serialized (string, number, boolean) * @@ -25,18 +37,6 @@ export class LocationType { public origin: string) {} } -/** - * @experimental WebWorker support in Angular is currently experimental. - */ -export const enum SerializerTypes { - // RendererType2 - RENDERER_TYPE_2, - // Primitive types - PRIMITIVE, - // An object stored in a RenderStore - RENDER_STORE_OBJECT, -} - @Injectable() export class Serializer { constructor(private _renderStore: RenderStore) {} diff --git a/tools/@angular/tsc-wrapped/src/symbols.ts b/tools/@angular/tsc-wrapped/src/symbols.ts index 91ccb5c972..9107116b16 100644 --- a/tools/@angular/tsc-wrapped/src/symbols.ts +++ b/tools/@angular/tsc-wrapped/src/symbols.ts @@ -51,7 +51,7 @@ export class Symbols { // in the parent chain). This doesn't damage the node as the binder unconditionally // sets the parent. externalReference.expression.parent = externalReference; - externalReference.parent = this.sourceFile; + externalReference.parent = this.sourceFile as any; } const from = stripQuotes(externalReference.expression.getText()); symbols.set(importEqualsDeclaration.name.text, {__symbolic: 'reference', module: from}); diff --git a/tools/@angular/tsc-wrapped/test/typescript.mocks.ts b/tools/@angular/tsc-wrapped/test/typescript.mocks.ts index c270cc0f8c..39db1d2e37 100644 --- a/tools/@angular/tsc-wrapped/test/typescript.mocks.ts +++ b/tools/@angular/tsc-wrapped/test/typescript.mocks.ts @@ -84,6 +84,9 @@ export class MockNode implements ts.Node { getText(sourceFile?: ts.SourceFile): string { return ''; } getFirstToken(sourceFile?: ts.SourceFile): ts.Node { return null; } getLastToken(sourceFile?: ts.SourceFile): ts.Node { return null; } + forEachChild(cbNode: (node: ts.Node) => T, cbNodeArray?: (nodes: ts.Node[]) => T): T { + return null; + } } export class MockIdentifier extends MockNode implements ts.Identifier {