@angular/compiler-cli 13.0.0-next.8 → 13.0.0-rc.2

package/ngcc/src/migrations/utils.d.ts

@@ -6,7 +6,7 @@
  * 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
  */
-import * as ts from 'typescript';
+import ts from 'typescript';
 import { ClassDeclaration, Decorator } from '../../../src/ngtsc/reflection';
 import { MigrationHost } from './migration';
 export declare function isClassDeclaration(clazz: ts.Node): clazz is ClassDeclaration<ts.Declaration>;

package/ngcc/src/packages/build_marker.d.ts

@@ -9,7 +9,7 @@
 import { AbsoluteFsPath } from '../../../src/ngtsc/file_system';
 import { PackageJsonUpdater } from '../writing/package_json_updater';
 import { EntryPointPackageJson, PackageJsonFormatProperties } from './entry_point';
-export declare const NGCC_VERSION = "13.0.0-next.8";
+export declare const NGCC_VERSION = "13.0.0-rc.2";
 /**
  * Returns true if there is a format in this entry-point that was compiled with an outdated version
  * of ngcc.

package/ngcc/src/packages/bundle_program.d.ts

@@ -6,7 +6,7 @@
  * 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
  */
-import * as ts from 'typescript';
+import ts from 'typescript';
 import { AbsoluteFsPath, ReadonlyFileSystem } from '../../../src/ngtsc/file_system';
 /**
  * An entry point bundle contains one or two programs, e.g. `src` and `dts`,

package/ngcc/src/packages/configuration.d.ts

@@ -4,12 +4,12 @@ import { PackageJsonFormatPropertiesMap } from './entry_point';
 /**
  * The format of a project level configuration file.
  */
-export interface NgccProjectConfig<T = RawNgccPackageConfig> {
+export interface NgccProjectConfig {
     /**
      * The packages that are configured by this project config.
      */
     packages?: {
-        [packagePath: string]: T | undefined;
+        [packagePath: string]: RawNgccPackageConfig | undefined;
     };
     /**
      * Options that control how locking the process is handled.
@@ -82,6 +82,44 @@ export interface NgccEntryPointConfig {
      */
     generateDeepReexports?: boolean;
 }
+interface VersionedPackageConfig extends RawNgccPackageConfig {
+    versionRange: string;
+}
+/**
+ * The internal representation of a configuration file. Configured packages are transformed into
+ * `ProcessedNgccPackageConfig` when a certain version is requested.
+ */
+export declare class PartiallyProcessedConfig {
+    /**
+     * The packages that are configured by this project config, keyed by package name.
+     */
+    packages: Map<string, VersionedPackageConfig[]>;
+    /**
+     * Options that control how locking the process is handled.
+     */
+    locking: ProcessLockingConfiguration;
+    /**
+     * Name of hash algorithm used to generate hashes of the configuration.
+     *
+     * Defaults to `sha256`.
+     */
+    hashAlgorithm: string;
+    constructor(projectConfig: NgccProjectConfig);
+    private splitNameAndVersion;
+    /**
+     * Registers the configuration for a particular version of the provided package.
+     */
+    private addPackageConfig;
+    /**
+     * Finds the configuration for a particular version of the provided package.
+     */
+    findPackageConfig(packageName: string, version: string | null): VersionedPackageConfig | null;
+    /**
+     * Converts the configuration into a JSON representation that is used to compute a hash of the
+     * configuration.
+     */
+    toJson(): string;
+}
 /**
  * The default configuration for ngcc.
  *
@@ -177,10 +215,9 @@ export declare class NgccConfiguration {
      */
     getPackageConfig(packageName: string, packagePath: AbsoluteFsPath, version: string | null): ProcessedNgccPackageConfig;
     private getRawPackageConfig;
-    private processProjectConfig;
     private loadProjectConfig;
     private loadPackageConfig;
     private evalSrcFile;
-    private splitNameAndVersion;
     private computeHash;
 }
+export {};

package/ngcc/src/packages/entry_point_bundle.d.ts

@@ -6,7 +6,7 @@
  * 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
  */
-import * as ts from 'typescript';
+import ts from 'typescript';
 import { AbsoluteFsPath, FileSystem } from '../../../src/ngtsc/file_system';
 import { DtsProcessing } from '../execution/tasks/api';
 import { PathMappings } from '../path_mappings';

package/ngcc/src/packages/ngcc_compiler_host.d.ts

@@ -6,7 +6,7 @@
  * 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
  */
-import * as ts from 'typescript';
+import ts from 'typescript';
 import { AbsoluteFsPath, FileSystem, NgtscCompilerHost } from '../../../src/ngtsc/file_system';
 import { EntryPointFileCache } from './source_file_cache';
 /**

package/ngcc/src/packages/source_file_cache.d.ts

@@ -6,7 +6,7 @@
  * 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
  */
-import * as ts from 'typescript';
+import ts from 'typescript';
 import { AbsoluteFsPath, ReadonlyFileSystem } from '../../../src/ngtsc/file_system';
 /**
  * A cache that holds on to source files that can be shared for processing all entry-points in a

package/ngcc/src/packages/transformer.d.ts

@@ -6,7 +6,7 @@
  * 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
  */
-import * as ts from 'typescript';
+import ts from 'typescript';
 import { ParsedConfiguration } from '../../..';
 import { ReadonlyFileSystem } from '../../../src/ngtsc/file_system';
 import { Logger } from '../../../src/ngtsc/logging';

package/ngcc/src/rendering/commonjs_rendering_formatter.d.ts

@@ -8,7 +8,7 @@
  */
 import { PathManipulation } from '@angular/compiler-cli/src/ngtsc/file_system';
 import MagicString from 'magic-string';
-import * as ts from 'typescript';
+import ts from 'typescript';
 import { Reexport } from '../../../src/ngtsc/imports';
 import { Import, ImportManager } from '../../../src/ngtsc/translator';
 import { ExportInfo } from '../analysis/private_declarations_analyzer';

package/ngcc/src/rendering/dts_renderer.d.ts

@@ -1,5 +1,5 @@
 /// <amd-module name="@angular/compiler-cli/ngcc/src/rendering/dts_renderer" />
-import * as ts from 'typescript';
+import ts from 'typescript';
 import { ReadonlyFileSystem } from '../../../src/ngtsc/file_system';
 import { Reexport } from '../../../src/ngtsc/imports';
 import { Logger } from '../../../src/ngtsc/logging';

package/ngcc/src/rendering/esm5_rendering_formatter.d.ts

@@ -8,7 +8,7 @@
  */
 import { Statement } from '@angular/compiler';
 import MagicString from 'magic-string';
-import * as ts from 'typescript';
+import ts from 'typescript';
 import { ImportManager } from '../../../src/ngtsc/translator';
 import { CompiledClass } from '../analysis/types';
 import { EsmRenderingFormatter } from './esm_rendering_formatter';

package/ngcc/src/rendering/esm_rendering_formatter.d.ts

@@ -8,7 +8,7 @@
  */
 import { Statement } from '@angular/compiler';
 import MagicString from 'magic-string';
-import * as ts from 'typescript';
+import ts from 'typescript';
 import { AbsoluteFsPath, PathManipulation } from '../../../src/ngtsc/file_system';
 import { Reexport } from '../../../src/ngtsc/imports';
 import { Import, ImportManager } from '../../../src/ngtsc/translator';

package/ngcc/src/rendering/renderer.d.ts

@@ -7,7 +7,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 import { ConstantPool } from '@angular/compiler';
-import * as ts from 'typescript';
+import ts from 'typescript';
 import { ReadonlyFileSystem } from '../../../src/ngtsc/file_system';
 import { Logger } from '../../../src/ngtsc/logging';
 import { ImportManager } from '../../../src/ngtsc/translator';

package/ngcc/src/rendering/rendering_formatter.d.ts

@@ -8,7 +8,7 @@
  */
 import { Statement } from '@angular/compiler';
 import MagicString from 'magic-string';
-import * as ts from 'typescript';
+import ts from 'typescript';
 import { Reexport } from '../../../src/ngtsc/imports';
 import { Import, ImportManager } from '../../../src/ngtsc/translator';
 import { ModuleWithProvidersInfo } from '../analysis/module_with_providers_analyzer';

package/ngcc/src/rendering/source_maps.d.ts

@@ -6,15 +6,15 @@
  * 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
  */
-import { SourceMapConverter } from 'convert-source-map';
+import mapHelpers from 'convert-source-map';
 import MagicString from 'magic-string';
-import * as ts from 'typescript';
+import ts from 'typescript';
 import { ReadonlyFileSystem } from '../../../src/ngtsc/file_system';
 import { Logger } from '../../../src/ngtsc/logging';
 import { FileToWrite } from './utils';
 export interface SourceMapInfo {
     source: string;
-    map: SourceMapConverter | null;
+    map: mapHelpers.SourceMapConverter | null;
     isInline: boolean;
 }
 /**

package/ngcc/src/rendering/umd_rendering_formatter.d.ts

@@ -7,7 +7,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 import MagicString from 'magic-string';
-import * as ts from 'typescript';
+import ts from 'typescript';
 import { PathManipulation } from '../../../src/ngtsc/file_system';
 import { Reexport } from '../../../src/ngtsc/imports';
 import { Import, ImportManager } from '../../../src/ngtsc/translator';

package/ngcc/src/rendering/utils.d.ts

@@ -6,7 +6,7 @@
  * 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
  */
-import * as ts from 'typescript';
+import ts from 'typescript';
 import { AbsoluteFsPath } from '../../../src/ngtsc/file_system';
 import { ImportRewriter } from '../../../src/ngtsc/imports';
 /**

package/ngcc/src/utils.d.ts

@@ -6,7 +6,7 @@
  * 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
  */
-import * as ts from 'typescript';
+import ts from 'typescript';
 import { AbsoluteFsPath, ReadonlyFileSystem } from '../../src/ngtsc/file_system';
 import { DeclarationNode, KnownDeclaration } from '../../src/ngtsc/reflection';
 /**

package/package.json

@@ -1,34 +1,73 @@
 {
   "name": "@angular/compiler-cli",
-  "version": "13.0.0-next.8",
+  "version": "13.0.0-rc.2",
   "description": "Angular - the compiler CLI for Node.js",
-  "main": "index.js",
   "typings": "index.d.ts",
   "bin": {
-    "ivy-ngcc": "./ngcc/main-ivy-ngcc.js",
-    "ngcc": "./ngcc/main-ngcc.js",
-    "ngc": "./src/main.js",
-    "ng-xi18n": "./src/extract_i18n.js"
+    "ngcc": "./bundles/ngcc/main-ngcc.js",
+    "ngc": "./bundles/src/bin/ngc.js",
+    "ng-xi18n": "./bundles/src/bin/ng_xi18n.js"
+  },
+  "type": "module",
+  "exports": {
+    ".": {
+      "types": "./index.d.ts",
+      "default": "./bundles/index.js"
+    },
+    "./package.json": {
+      "default": "./package.json"
+    },
+    "./ngcc": {
+      "types": "./ngcc/index.d.ts",
+      "default": "./bundles/ngcc/index.js"
+    },
+    "./linker": {
+      "types": "./linker/index.d.ts",
+      "default": "./bundles/linker/index.js"
+    },
+    "./linker/babel": {
+      "types": "./linker/babel/index.d.ts",
+      "default": "./bundles/linker/babel/index.js"
+    },
+    "./private/bazel": {
+      "types": "./private/bazel.d.ts",
+      "default": "./bundles/private/bazel.js"
+    },
+    "./private/localize": {
+      "types": "./private/localize.d.ts",
+      "default": "./bundles/private/localize.js"
+    },
+    "./private/migrations": {
+      "types": "./private/migrations.d.ts",
+      "default": "./bundles/private/migrations.js"
+    },
+    "./private/tooling": {
+      "types": "./private/tooling.d.ts",
+      "default": "./bundles/private/tooling.js"
+    },
+    "./ngcc/src/execution/cluster/ngcc_cluster_worker": {
+      "default": "./bundles/ngcc/src/execution/cluster/ngcc_cluster_worker.js"
+    },
+    "./ngcc/src/locking/lock_file_with_child_process/ngcc_lock_unlocker": {
+      "default": "./bundles/ngcc/src/locking/lock_file_with_child_process/ngcc_lock_unlocker.js"
+    }
   },
   "dependencies": {
     "@babel/core": "^7.8.6",
-    "@babel/types": "^7.8.6",
     "reflect-metadata": "^0.1.2",
-    "minimist": "^1.2.0",
     "canonical-path": "1.0.0",
     "chokidar": "^3.0.0",
     "convert-source-map": "^1.5.1",
     "dependency-graph": "^0.11.0",
     "magic-string": "^0.25.0",
     "semver": "^7.0.0",
-    "source-map": "^0.6.1",
     "sourcemap-codec": "^1.4.8",
     "tslib": "^2.3.0",
-    "yargs": "^17.0.0"
+    "yargs": "^17.2.1"
   },
   "peerDependencies": {
-    "@angular/compiler": "13.0.0-next.8",
-    "typescript": ">=4.2.3 <4.5"
+    "@angular/compiler": "13.0.0-rc.2",
+    "typescript": ">=4.4.2 <4.5"
   },
   "repository": {
     "type": "git",
@@ -41,7 +80,7 @@
   ],
   "license": "MIT",
   "engines": {
-    "node": "^12.14.1 || >=14.0.0"
+    "node": "^12.20.0 || ^14.15.0 || >=16.10.0"
   },
   "bugs": {
     "url": "https://github.com/angular/angular/issues"

package/private/bazel.d.ts

@@ -0,0 +1,13 @@
+/**
+ * @license
+ * Copyright Google LLC 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
+ */
+/// <amd-module name="@angular/compiler-cli/private/bazel" />
+/**
+ * @fileoverview The API from compiler-cli that the `@angular/bazel`
+ * package requires for ngc-wrapped.
+ */
+export { PerfPhase } from '../src/ngtsc/perf';

package/private/localize.d.ts

@@ -0,0 +1,15 @@
+/**
+ * @license
+ * Copyright Google LLC 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
+ */
+/// <amd-module name="@angular/compiler-cli/private/localize" />
+/**
+ * @fileoverview The API from compiler-cli that the `@angular/localize`
+ * package requires.
+ */
+export * from '../src/ngtsc/logging';
+export * from '../src/ngtsc/file_system';
+export { SourceFile, SourceFileLoader } from '../src/ngtsc/sourcemaps';

package/private/migrations.d.ts

@@ -0,0 +1,16 @@
+/**
+ * @license
+ * Copyright Google LLC 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
+ */
+/// <amd-module name="@angular/compiler-cli/private/migrations" />
+/**
+ * @fileoverview The API from compiler-cli that the `@angular/core`
+ * package requires for migration schematics.
+ */
+export { forwardRefResolver } from '../src/ngtsc/annotations';
+export { Reference } from '../src/ngtsc/imports';
+export { DynamicValue, PartialEvaluator, ResolvedValue, ResolvedValueMap, StaticInterpreter } from '../src/ngtsc/partial_evaluator';
+export { reflectObjectLiteral, TypeScriptReflectionHost } from '../src/ngtsc/reflection';

package/{src → private}/tooling.d.ts

@@ -5,14 +5,14 @@
  * 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
  */
-/// <amd-module name="@angular/compiler-cli/src/tooling" />
+/// <amd-module name="@angular/compiler-cli/private/tooling" />
 /**
  * @fileoverview
  * This file is used as a private API channel to shared Angular FW APIs with @angular/cli.
  *
  * Any changes to this file should be discussed with the Angular CLI team.
  */
-import * as ts from 'typescript';
+import ts from 'typescript';
 /**
  * Known values for global variables in `@angular/core` that Terser should set using
  * https://github.com/terser-js/terser#conditional-compilation

package/src/bin/ng_xi18n.d.ts

@@ -0,0 +1,10 @@
+#!/usr/bin/env node
+/**
+ * @license
+ * Copyright Google LLC 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
+ */
+/// <amd-module name="@angular/compiler-cli/src/bin/ng_xi18n" />
+import 'reflect-metadata';

package/{ngcc/main-ivy-ngcc.d.ts → src/bin/ngc.d.ts}

@@ -6,4 +6,5 @@
  * 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
  */
-/// <amd-module name="@angular/compiler-cli/ngcc/main-ivy-ngcc" />
+/// <amd-module name="@angular/compiler-cli/src/bin/ngc" />
+import 'reflect-metadata';

package/src/diagnostics/translate_diagnostics.d.ts

@@ -7,7 +7,7 @@
  */
 /// <amd-module name="@angular/compiler-cli/src/diagnostics/translate_diagnostics" />
 import { ParseSourceSpan } from '@angular/compiler';
-import * as ts from 'typescript';
+import ts from 'typescript';
 import { Diagnostic } from '../transformers/api';
 export interface TypeCheckHost {
     parseSourceSpanOf(fileName: string, line: number, character: number): ParseSourceSpan | null;

package/src/extract_i18n.d.ts

@@ -1,4 +1,3 @@
-#!/usr/bin/env node
 /**
  * @license
  * Copyright Google LLC All Rights Reserved.
@@ -7,8 +6,4 @@
  * found in the LICENSE file at https://angular.io/license
  */
 /// <amd-module name="@angular/compiler-cli/src/extract_i18n" />
-/**
- * Extract i18n messages from source code
- */
-import 'reflect-metadata';
 export declare function mainXi18n(args: string[], consoleError?: (msg: string) => void): number;

package/src/main.d.ts

@@ -1,4 +1,3 @@
-#!/usr/bin/env node
 /**
  * @license
  * Copyright Google LLC All Rights Reserved.
@@ -7,16 +6,19 @@
  * found in the LICENSE file at https://angular.io/license
  */
 /// <amd-module name="@angular/compiler-cli/src/main" />
-import 'reflect-metadata';
-import * as ts from 'typescript';
-import * as api from './transformers/api';
+import ts from 'typescript';
 import { Diagnostics, ParsedConfiguration } from './perform_compile';
+import * as api from './transformers/api';
+declare type TsickleModule = typeof import('tsickle');
 export declare function main(args: string[], consoleError?: (s: string) => void, config?: NgcParsedConfiguration, customTransformers?: api.CustomTransformers, programReuse?: {
     program: api.Program | undefined;
-}, modifiedResourceFiles?: Set<string> | null): number;
+}, modifiedResourceFiles?: Set<string> | null, tsickle?: TsickleModule): number;
 export declare function mainDiagnosticsForTest(args: string[], config?: NgcParsedConfiguration, programReuse?: {
     program: api.Program | undefined;
-}, modifiedResourceFiles?: Set<string> | null): ReadonlyArray<ts.Diagnostic | api.Diagnostic>;
+}, modifiedResourceFiles?: Set<string> | null, tsickle?: TsickleModule): {
+    exitCode: number;
+    diagnostics: ReadonlyArray<ts.Diagnostic | api.Diagnostic>;
+};
 export interface NgcParsedConfiguration extends ParsedConfiguration {
     watch?: boolean;
 }
@@ -27,3 +29,4 @@ export declare function watchMode(project: string, options: api.CompilerOptions,
     ready: (cb: () => void) => void;
     firstCompileResult: Diagnostics;
 };
+export {};

package/src/metadata/bundle_index_host.d.ts

@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 /// <amd-module name="@angular/compiler-cli/src/metadata/bundle_index_host" />
-import * as ts from 'typescript';
+import ts from 'typescript';
 import { CompilerOptions } from '../transformers/api';
 import { MetadataCache } from '../transformers/metadata_cache';
 export declare function createBundleIndexHost<H extends ts.CompilerHost>(ngOptions: CompilerOptions, rootFiles: ReadonlyArray<string>, host: H, getMetadataCache: () => MetadataCache): {

package/src/metadata/bundler.d.ts

@@ -1,5 +1,5 @@
 /// <amd-module name="@angular/compiler-cli/src/metadata/bundler" />
-import * as ts from 'typescript';
+import ts from 'typescript';
 import { MetadataCache } from '../transformers/metadata_cache';
 import { MetadataEntry, ModuleMetadata } from './schema';
 export interface BundleEntries {

package/src/metadata/collector.d.ts

@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 /// <amd-module name="@angular/compiler-cli/src/metadata/collector" />
-import * as ts from 'typescript';
+import ts from 'typescript';
 import { MetadataValue, ModuleMetadata } from './schema';
 /**
  * A set of collector options to use when collecting metadata.

package/src/metadata/evaluator.d.ts

@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 /// <amd-module name="@angular/compiler-cli/src/metadata/evaluator" />
-import * as ts from 'typescript';
+import ts from 'typescript';
 import { CollectorOptions } from './collector';
 import { MetadataEntry, MetadataError, MetadataValue } from './schema';
 import { Symbols } from './symbols';

package/src/metadata/symbols.d.ts

@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 /// <amd-module name="@angular/compiler-cli/src/metadata/symbols" />
-import * as ts from 'typescript';
+import ts from 'typescript';
 import { MetadataSymbolicReferenceExpression, MetadataValue } from './schema';
 export declare class Symbols {
     private sourceFile;

package/src/ngtsc/annotations/src/component.d.ts

@@ -7,7 +7,7 @@
  */
 /// <amd-module name="@angular/compiler-cli/src/ngtsc/annotations/src/component" />
 import { ConstantPool, InterpolationConfig, ParsedTemplate, ParseSourceFile, R3ClassMetadata, R3ComponentMetadata, TmplAstNode } from '@angular/compiler';
-import * as ts from 'typescript';
+import ts from 'typescript';
 import { CycleAnalyzer, CycleHandlingStrategy } from '../../cycles';
 import { ModuleResolver, Reference, ReferenceEmitter } from '../../imports';
 import { DependencyTracker } from '../../incremental/api';

package/src/ngtsc/annotations/src/diagnostics.d.ts

@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 /// <amd-module name="@angular/compiler-cli/src/ngtsc/annotations/src/diagnostics" />
-import * as ts from 'typescript';
+import ts from 'typescript';
 import { FatalDiagnosticError } from '../../diagnostics';
 import { Reference } from '../../imports';
 import { InjectableClassRegistry, MetadataReader } from '../../metadata';

package/src/ngtsc/annotations/src/directive.d.ts

@@ -7,7 +7,7 @@
  */
 /// <amd-module name="@angular/compiler-cli/src/ngtsc/annotations/src/directive" />
 import { ConstantPool, ParsedHostBindings, R3ClassMetadata, R3DirectiveMetadata, R3QueryMetadata } from '@angular/compiler';
-import * as ts from 'typescript';
+import ts from 'typescript';
 import { Reference } from '../../imports';
 import { SemanticDepGraphUpdater, SemanticSymbol, SemanticTypeParameter } from '../../incremental/semantic_graph';
 import { ClassPropertyMapping, DirectiveTypeCheckMeta, InjectableClassRegistry, MetadataReader, MetadataRegistry } from '../../metadata';

package/src/ngtsc/annotations/src/ng_module.d.ts

@@ -7,14 +7,13 @@
  */
 /// <amd-module name="@angular/compiler-cli/src/ngtsc/annotations/src/ng_module" />
 import { Expression, R3ClassMetadata, R3FactoryMetadata, R3InjectorMetadata, R3NgModuleMetadata, SchemaMetadata } from '@angular/compiler';
-import * as ts from 'typescript';
+import ts from 'typescript';
 import { Reference, ReferenceEmitter } from '../../imports';
 import { SemanticReference, SemanticSymbol } from '../../incremental/semantic_graph';
 import { InjectableClassRegistry, MetadataReader, MetadataRegistry } from '../../metadata';
 import { PartialEvaluator } from '../../partial_evaluator';
 import { PerfRecorder } from '../../perf';
 import { ClassDeclaration, Decorator, ReflectionHost } from '../../reflection';
-import { NgModuleRouteAnalyzer } from '../../routing';
 import { LocalModuleScopeRegistry } from '../../scope';
 import { FactoryTracker } from '../../shims/api';
 import { AnalysisOutput, CompileResult, DecoratorHandler, DetectResult, HandlerPrecedence, ResolveResult } from '../../transform';
@@ -58,14 +57,13 @@ export declare class NgModuleDecoratorHandler implements DecoratorHandler<Decora
     private scopeRegistry;
     private referencesRegistry;
     private isCore;
-    private routeAnalyzer;
     private refEmitter;
     private factoryTracker;
     private annotateForClosureCompiler;
     private injectableRegistry;
     private perf;
     private localeId?;
-    constructor(reflector: ReflectionHost, evaluator: PartialEvaluator, metaReader: MetadataReader, metaRegistry: MetadataRegistry, scopeRegistry: LocalModuleScopeRegistry, referencesRegistry: ReferencesRegistry, isCore: boolean, routeAnalyzer: NgModuleRouteAnalyzer | null, refEmitter: ReferenceEmitter, factoryTracker: FactoryTracker | null, annotateForClosureCompiler: boolean, injectableRegistry: InjectableClassRegistry, perf: PerfRecorder, localeId?: string | undefined);
+    constructor(reflector: ReflectionHost, evaluator: PartialEvaluator, metaReader: MetadataReader, metaRegistry: MetadataRegistry, scopeRegistry: LocalModuleScopeRegistry, referencesRegistry: ReferencesRegistry, isCore: boolean, refEmitter: ReferenceEmitter, factoryTracker: FactoryTracker | null, annotateForClosureCompiler: boolean, injectableRegistry: InjectableClassRegistry, perf: PerfRecorder, localeId?: string | undefined);
     readonly precedence = HandlerPrecedence.PRIMARY;
     readonly name: string;
     detect(node: ClassDeclaration, decorators: Decorator[] | null): DetectResult<Decorator> | undefined;

package/src/ngtsc/annotations/src/pipe.d.ts

@@ -7,7 +7,7 @@
  */
 /// <amd-module name="@angular/compiler-cli/src/ngtsc/annotations/src/pipe" />
 import { R3ClassMetadata, R3PipeMetadata } from '@angular/compiler';
-import * as ts from 'typescript';
+import ts from 'typescript';
 import { SemanticSymbol } from '../../incremental/semantic_graph';
 import { InjectableClassRegistry, MetadataRegistry } from '../../metadata';
 import { PartialEvaluator } from '../../partial_evaluator';

package/src/ngtsc/annotations/src/util.d.ts

@@ -6,10 +6,8 @@
  * found in the LICENSE file at https://angular.io/license
  */
 /// <amd-module name="@angular/compiler-cli/src/ngtsc/annotations/src/util" />
-import { Expression, ParseSourceSpan, R3CompiledExpression, R3DependencyMetadata, R3Reference, Statement, WrappedNodeExpr } from '@angular/compiler';
-import { R3FactoryMetadata } from '@angular/compiler/src/compiler';
-import { FactoryTarget } from '@angular/compiler/src/render3/partial/api';
-import * as ts from 'typescript';
+import { Expression, FactoryTarget, ParseSourceSpan, R3CompiledExpression, R3DependencyMetadata, R3FactoryMetadata, R3Reference, Statement, WrappedNodeExpr } from '@angular/compiler';
+import ts from 'typescript';
 import { Reference, ReferenceEmitter } from '../../imports';
 import { ForeignFunctionResolver, PartialEvaluator } from '../../partial_evaluator';
 import { ClassDeclaration, CtorParameter, Decorator, Import, ImportedTypeValueReference, LocalTypeValueReference, ReflectionHost, TypeValueReference, UnavailableValue } from '../../reflection';