From c2136d18bd643155a5df1f8f6657b8b576f1a36b Mon Sep 17 00:00:00 2001 From: Jason Aden Date: Wed, 30 Aug 2017 19:01:47 -0700 Subject: [PATCH] Revert "refactor(compiler-cli): expose ngtools api separately (#18952)" This reverts commit 1953e2af7ae3457880f8d2b29053804da1dbf377. --- packages/compiler-cli/ngtools2.ts | 8 -- packages/compiler-cli/src/ngtools_api2.ts | 128 ------------------ packages/compiler-cli/src/transformers/api.ts | 7 + .../compiler-cli/src/transformers/program.ts | 2 + packages/compiler-cli/tsconfig-build.json | 1 - 5 files changed, 9 insertions(+), 137 deletions(-) delete mode 100644 packages/compiler-cli/ngtools2.ts delete mode 100644 packages/compiler-cli/src/ngtools_api2.ts diff --git a/packages/compiler-cli/ngtools2.ts b/packages/compiler-cli/ngtools2.ts deleted file mode 100644 index 5d598ac228..0000000000 --- a/packages/compiler-cli/ngtools2.ts +++ /dev/null @@ -1,8 +0,0 @@ -/** - * @license - * Copyright Google Inc. All Rights Reserved. - * - * Use of this source code is governed by an MIT-style license that can be - * found in the LICENSE file at https://angular.io/license - */ -export {CompilerHost, CustomTransformers, Diagnostic, EmitFlags, Program, createCompilerHost, createProgram, formatDiagnostics} from './src/ngtools_api2'; \ No newline at end of file diff --git a/packages/compiler-cli/src/ngtools_api2.ts b/packages/compiler-cli/src/ngtools_api2.ts deleted file mode 100644 index fe71abab03..0000000000 --- a/packages/compiler-cli/src/ngtools_api2.ts +++ /dev/null @@ -1,128 +0,0 @@ -/** - * @license - * Copyright Google Inc. All Rights Reserved. - * - * Use of this source code is governed by an MIT-style license that can be - * found in the LICENSE file at https://angular.io/license - */ - -/** - * This is a private API for @ngtools/webpack. This API should be stable for NG 5. - * - * It contains copies of the interfaces needed and wrapper functions to ensure that - * they are not broken accidentally. - * - * Once the ngc api is public and stable, this can be removed. - */ - -import {ParseSourceSpan} from '@angular/compiler'; -import * as ts from 'typescript'; - -import {formatDiagnostics as formatDiagnosticsOrig} from './perform-compile'; -import {createCompilerHost as createCompilerOrig} from './transformers/compiler_host'; -import {createProgram as createProgramOrig} from './transformers/program'; - -// Interfaces from ./transformers/api; -export interface Diagnostic { - message: string; - span?: ParseSourceSpan; - category: ts.DiagnosticCategory; -} - -export interface CompilerOptions extends ts.CompilerOptions { - basePath?: string; - skipMetadataEmit?: boolean; - strictMetadataEmit?: boolean; - skipTemplateCodegen?: boolean; - flatModuleOutFile?: string; - flatModuleId?: string; - generateCodeForLibraries?: boolean; - annotateForClosureCompiler?: boolean; - annotationsAs?: 'decorators'|'static fields'; - trace?: boolean; - enableLegacyTemplate?: boolean; - disableExpressionLowering?: boolean; - i18nOutLocale?: string; - i18nOutFormat?: string; - i18nOutFile?: string; - i18nInFormat?: string; - i18nInLocale?: string; - i18nInFile?: string; - i18nInMissingTranslations?: 'error'|'warning'|'ignore'; - preserveWhitespaces?: boolean; -} - -export interface CompilerHost extends ts.CompilerHost { - moduleNameToFileName(moduleName: string, containingFile?: string): string|null; - fileNameToModuleName(importedFilePath: string, containingFilePath: string): string|null; - resourceNameToFileName(resourceName: string, containingFilePath: string): string|null; - toSummaryFileName(fileName: string, referringSrcFileName: string): string; - fromSummaryFileName(fileName: string, referringLibFileName: string): string; - readResource?(fileName: string): Promise|string; -} - -export enum EmitFlags { - DTS = 1 << 0, - JS = 1 << 1, - - Default = DTS | JS -} - -export interface CustomTransformers { - beforeTs?: ts.TransformerFactory[]; - afterTs?: ts.TransformerFactory[]; -} - -export interface TsEmitArguments { - program: ts.Program; - host: CompilerHost; - options: CompilerOptions; - targetSourceFile?: ts.SourceFile; - writeFile?: ts.WriteFileCallback; - cancellationToken?: ts.CancellationToken; - emitOnlyDtsFiles?: boolean; - customTransformers?: ts.CustomTransformers; -} - -export interface TsEmitCallback { (args: TsEmitArguments): ts.EmitResult; } - -export interface Program { - getTsProgram(): ts.Program; - getTsOptionDiagnostics(cancellationToken?: ts.CancellationToken): ts.Diagnostic[]; - getNgOptionDiagnostics(cancellationToken?: ts.CancellationToken): Diagnostic[]; - getTsSyntacticDiagnostics(sourceFile?: ts.SourceFile, cancellationToken?: ts.CancellationToken): - ts.Diagnostic[]; - getNgStructuralDiagnostics(cancellationToken?: ts.CancellationToken): Diagnostic[]; - getTsSemanticDiagnostics(sourceFile?: ts.SourceFile, cancellationToken?: ts.CancellationToken): - ts.Diagnostic[]; - getNgSemanticDiagnostics(fileName?: string, cancellationToken?: ts.CancellationToken): - Diagnostic[]; - loadNgStructureAsync(): Promise; - emit({emitFlags, cancellationToken, customTransformers, emitCallback}: { - emitFlags?: EmitFlags, - cancellationToken?: ts.CancellationToken, - customTransformers?: CustomTransformers, - emitCallback?: TsEmitCallback - }): ts.EmitResult; -} - -// Wrapper for createProgram. -export function createProgram( - {rootNames, options, host, oldProgram}: - {rootNames: string[], options: CompilerOptions, host: CompilerHost, oldProgram?: Program}): - Program { - return createProgramOrig({rootNames, options, host, oldProgram}); -} - -// Wrapper for createCompilerHost. -export function createCompilerHost( - {options, tsHost = ts.createCompilerHost(options, true)}: - {options: CompilerOptions, tsHost?: ts.CompilerHost}): CompilerHost { - return createCompilerOrig({options, tsHost}); -} - -// Wrapper for formatDiagnostics. -export type Diagnostics = Array; -export function formatDiagnostics(options: CompilerOptions, diags: Diagnostics): string { - return formatDiagnosticsOrig(options, diags); -} \ No newline at end of file diff --git a/packages/compiler-cli/src/transformers/api.ts b/packages/compiler-cli/src/transformers/api.ts index ccd91ec8bf..2a34ed43ac 100644 --- a/packages/compiler-cli/src/transformers/api.ts +++ b/packages/compiler-cli/src/transformers/api.ts @@ -250,6 +250,13 @@ export interface Program { */ loadNgStructureAsync(): Promise; + /** + * Retrieve the lazy route references in the program. + * + * Angular structural information is required to produce these routes. + */ + getLazyRoutes(cancellationToken?: ts.CancellationToken): {[route: string]: string}; + /** * Emit the files requested by emitFlags implied by the program. * diff --git a/packages/compiler-cli/src/transformers/program.ts b/packages/compiler-cli/src/transformers/program.ts index 057fc6d845..33be37321a 100644 --- a/packages/compiler-cli/src/transformers/program.ts +++ b/packages/compiler-cli/src/transformers/program.ts @@ -134,6 +134,8 @@ class AngularCompilerProgram implements Program { }); } + getLazyRoutes(cancellationToken?: ts.CancellationToken): {[route: string]: string} { return {}; } + emit({emitFlags = EmitFlags.Default, cancellationToken, customTransformers, emitCallback = defaultEmitCallback}: { emitFlags?: EmitFlags, diff --git a/packages/compiler-cli/tsconfig-build.json b/packages/compiler-cli/tsconfig-build.json index f3dc44bcaf..14d2bb226b 100644 --- a/packages/compiler-cli/tsconfig-build.json +++ b/packages/compiler-cli/tsconfig-build.json @@ -26,7 +26,6 @@ ], "files": [ "index.ts", - "ngtools2.ts", "src/main.ts", "src/extract_i18n.ts", "src/language_services.ts",