@angular/compiler-cli 14.0.0-next.7 → 14.0.0-rc.0

package/linker/src/file_linker/emit_scopes/emit_scope.d.ts

@@ -6,7 +6,9 @@
  * 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 { ConstantPool, outputAst as o } from '@angular/compiler';
+import { ConstantPool } from '@angular/compiler';
+import { AstFactory } from '../../../../src/ngtsc/translator';
+import { LinkedDefinition } from '../partial_linkers/partial_linker';
 import { Translator } from '../translator';
 /**
  * This class represents (from the point of view of the `FileLinker`) the scope in which
@@ -20,16 +22,18 @@ import { Translator } from '../translator';
 export declare class EmitScope<TStatement, TExpression> {
     protected readonly ngImport: TExpression;
     protected readonly translator: Translator<TStatement, TExpression>;
+    private readonly factory;
     readonly constantPool: ConstantPool;
-    constructor(ngImport: TExpression, translator: Translator<TStatement, TExpression>);
+    constructor(ngImport: TExpression, translator: Translator<TStatement, TExpression>, factory: AstFactory<TStatement, TExpression>);
     /**
      * Translate the given Output AST definition expression into a generic `TExpression`.
      *
      * Use a `LinkerImportGenerator` to handle any imports in the definition.
      */
-    translateDefinition(definition: o.Expression): TExpression;
+    translateDefinition(definition: LinkedDefinition): TExpression;
     /**
      * Return any constant statements that are shared between all uses of this `EmitScope`.
      */
     getConstantStatements(): TStatement[];
+    private wrapInIifeWithStatements;
 }

package/linker/src/file_linker/emit_scopes/{iife_emit_scope.d.ts → local_emit_scope.d.ts}

@@ -1,4 +1,3 @@
-/// <amd-module name="@angular/compiler-cli/linker/src/file_linker/emit_scopes/iife_emit_scope" />
 /**
  * @license
  * Copyright Google LLC All Rights Reserved.
@@ -6,25 +5,22 @@
  * 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 { outputAst as o } from '@angular/compiler';
-import { AstFactory } from '../../../../src/ngtsc/translator';
-import { Translator } from '../translator';
+/// <amd-module name="@angular/compiler-cli/linker/src/file_linker/emit_scopes/local_emit_scope" />
+import { LinkedDefinition } from '../partial_linkers/partial_linker';
 import { EmitScope } from './emit_scope';
 /**
  * This class is a specialization of the `EmitScope` class that is designed for the situation where
  * there is no clear shared scope for constant statements. In this case they are bundled with the
- * translated definition inside an IIFE.
+ * translated definition and will be emitted into an IIFE.
  */
-export declare class IifeEmitScope<TStatement, TExpression> extends EmitScope<TStatement, TExpression> {
-    private readonly factory;
-    constructor(ngImport: TExpression, translator: Translator<TStatement, TExpression>, factory: AstFactory<TStatement, TExpression>);
+export declare class LocalEmitScope<TStatement, TExpression> extends EmitScope<TStatement, TExpression> {
     /**
      * Translate the given Output AST definition expression into a generic `TExpression`.
      *
-     * Wraps the output from `EmitScope.translateDefinition()` and `EmitScope.getConstantStatements()`
-     * in an IIFE.
+     * Merges the `ConstantPool` statements with the definition statements when generating the
+     * definition expression. This means that `ConstantPool` statements will be emitted into an IIFE.
      */
-    translateDefinition(definition: o.Expression): TExpression;
+    translateDefinition(definition: LinkedDefinition): TExpression;
     /**
      * It is not valid to call this method, since there will be no shared constant statements - they
      * are already emitted in the IIFE alongside the translated definition.

package/linker/src/file_linker/partial_linkers/partial_class_metadata_linker_1.d.ts

@@ -6,14 +6,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
  */
-import { ConstantPool, outputAst as o, R3ClassMetadata, R3DeclareClassMetadata, R3PartialDeclaration } from '@angular/compiler';
+import { ConstantPool, R3ClassMetadata, R3DeclareClassMetadata, R3PartialDeclaration } from '@angular/compiler';
 import { AstObject } from '../../ast/ast_value';
-import { PartialLinker } from './partial_linker';
+import { LinkedDefinition, PartialLinker } from './partial_linker';
 /**
  * A `PartialLinker` that is designed to process `ɵɵngDeclareClassMetadata()` call expressions.
  */
 export declare class PartialClassMetadataLinkerVersion1<TExpression> implements PartialLinker<TExpression> {
-    linkPartialDeclaration(constantPool: ConstantPool, metaObj: AstObject<R3PartialDeclaration, TExpression>): o.Expression;
+    linkPartialDeclaration(constantPool: ConstantPool, metaObj: AstObject<R3PartialDeclaration, TExpression>): LinkedDefinition;
 }
 /**
  * Derives the `R3ClassMetadata` structure from the AST object.

package/linker/src/file_linker/partial_linkers/partial_component_linker_1.d.ts

@@ -6,11 +6,11 @@
  * 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 { ConstantPool, outputAst as o, R3PartialDeclaration } from '@angular/compiler';
+import { ConstantPool, R3PartialDeclaration } from '@angular/compiler';
 import { AbsoluteFsPath } from '../../../../src/ngtsc/file_system';
 import { AstObject } from '../../ast/ast_value';
 import { GetSourceFileFn } from '../get_source_file';
-import { PartialLinker } from './partial_linker';
+import { LinkedDefinition, PartialLinker } from './partial_linker';
 /**
  * A `PartialLinker` that is designed to process `ɵɵngDeclareComponent()` call expressions.
  */
@@ -19,7 +19,7 @@ export declare class PartialComponentLinkerVersion1<TStatement, TExpression> imp
     private sourceUrl;
     private code;
     constructor(getSourceFile: GetSourceFileFn, sourceUrl: AbsoluteFsPath, code: string);
-    linkPartialDeclaration(constantPool: ConstantPool, metaObj: AstObject<R3PartialDeclaration, TExpression>): o.Expression;
+    linkPartialDeclaration(constantPool: ConstantPool, metaObj: AstObject<R3PartialDeclaration, TExpression>): LinkedDefinition;
     /**
      * This function derives the `R3ComponentMetadata` from the provided AST object.
      */

package/linker/src/file_linker/partial_linkers/partial_directive_linker_1.d.ts

@@ -6,11 +6,11 @@
  * 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 { ConstantPool, outputAst as o, ParseSourceSpan, R3DeclareDirectiveMetadata, R3DirectiveMetadata, R3PartialDeclaration } from '@angular/compiler';
+import { ConstantPool, ParseSourceSpan, R3DeclareDirectiveMetadata, R3DirectiveMetadata, R3PartialDeclaration } from '@angular/compiler';
 import { AbsoluteFsPath } from '../../../../src/ngtsc/file_system';
 import { Range } from '../../ast/ast_host';
 import { AstObject } from '../../ast/ast_value';
-import { PartialLinker } from './partial_linker';
+import { LinkedDefinition, PartialLinker } from './partial_linker';
 /**
  * A `PartialLinker` that is designed to process `ɵɵngDeclareDirective()` call expressions.
  */
@@ -18,7 +18,7 @@ export declare class PartialDirectiveLinkerVersion1<TExpression> implements Part
     private sourceUrl;
     private code;
     constructor(sourceUrl: AbsoluteFsPath, code: string);
-    linkPartialDeclaration(constantPool: ConstantPool, metaObj: AstObject<R3PartialDeclaration, TExpression>): o.Expression;
+    linkPartialDeclaration(constantPool: ConstantPool, metaObj: AstObject<R3PartialDeclaration, TExpression>): LinkedDefinition;
 }
 /**
  * Derives the `R3DirectiveMetadata` structure from the AST object.

package/linker/src/file_linker/partial_linkers/partial_factory_linker_1.d.ts

@@ -6,14 +6,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
  */
-import { ConstantPool, outputAst as o, R3DeclareFactoryMetadata, R3FactoryMetadata, R3PartialDeclaration } from '@angular/compiler';
+import { ConstantPool, R3DeclareFactoryMetadata, R3FactoryMetadata, R3PartialDeclaration } from '@angular/compiler';
 import { AstObject } from '../../ast/ast_value';
-import { PartialLinker } from './partial_linker';
+import { LinkedDefinition, PartialLinker } from './partial_linker';
 /**
  * A `PartialLinker` that is designed to process `ɵɵngDeclareFactory()` call expressions.
  */
 export declare class PartialFactoryLinkerVersion1<TExpression> implements PartialLinker<TExpression> {
-    linkPartialDeclaration(constantPool: ConstantPool, metaObj: AstObject<R3PartialDeclaration, TExpression>): o.Expression;
+    linkPartialDeclaration(constantPool: ConstantPool, metaObj: AstObject<R3PartialDeclaration, TExpression>): LinkedDefinition;
 }
 /**
  * Derives the `R3FactoryMetadata` structure from the AST object.

package/linker/src/file_linker/partial_linkers/partial_injectable_linker_1.d.ts

@@ -6,14 +6,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
  */
-import { ConstantPool, outputAst as o, R3DeclareInjectableMetadata, R3InjectableMetadata, R3PartialDeclaration } from '@angular/compiler';
+import { ConstantPool, R3DeclareInjectableMetadata, R3InjectableMetadata, R3PartialDeclaration } from '@angular/compiler';
 import { AstObject } from '../../ast/ast_value';
-import { PartialLinker } from './partial_linker';
+import { LinkedDefinition, PartialLinker } from './partial_linker';
 /**
  * A `PartialLinker` that is designed to process `ɵɵngDeclareInjectable()` call expressions.
  */
 export declare class PartialInjectableLinkerVersion1<TExpression> implements PartialLinker<TExpression> {
-    linkPartialDeclaration(constantPool: ConstantPool, metaObj: AstObject<R3PartialDeclaration, TExpression>): o.Expression;
+    linkPartialDeclaration(constantPool: ConstantPool, metaObj: AstObject<R3PartialDeclaration, TExpression>): LinkedDefinition;
 }
 /**
  * Derives the `R3InjectableMetadata` structure from the AST object.

package/linker/src/file_linker/partial_linkers/partial_injector_linker_1.d.ts

@@ -6,14 +6,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
  */
-import { ConstantPool, outputAst as o, R3DeclareInjectorMetadata, R3InjectorMetadata, R3PartialDeclaration } from '@angular/compiler';
+import { ConstantPool, R3DeclareInjectorMetadata, R3InjectorMetadata, R3PartialDeclaration } from '@angular/compiler';
 import { AstObject } from '../../ast/ast_value';
-import { PartialLinker } from './partial_linker';
+import { LinkedDefinition, PartialLinker } from './partial_linker';
 /**
  * A `PartialLinker` that is designed to process `ɵɵngDeclareInjector()` call expressions.
  */
 export declare class PartialInjectorLinkerVersion1<TExpression> implements PartialLinker<TExpression> {
-    linkPartialDeclaration(constantPool: ConstantPool, metaObj: AstObject<R3PartialDeclaration, TExpression>): o.Expression;
+    linkPartialDeclaration(constantPool: ConstantPool, metaObj: AstObject<R3PartialDeclaration, TExpression>): LinkedDefinition;
 }
 /**
  * Derives the `R3InjectorMetadata` structure from the AST object.

package/linker/src/file_linker/partial_linkers/partial_linker.d.ts

@@ -8,6 +8,13 @@
  */
 import { ConstantPool, outputAst as o, R3PartialDeclaration } from '@angular/compiler';
 import { AstObject } from '../../ast/ast_value';
+/**
+ * A definition generated by a `PartialLinker`, ready to emit.
+ */
+export interface LinkedDefinition {
+    expression: o.Expression;
+    statements: o.Statement[];
+}
 /**
  * An interface for classes that can link partial declarations into full definitions.
  */
@@ -18,5 +25,5 @@ export interface PartialLinker<TExpression> {
      * @param metaObj An object that fits one of the `R3DeclareDirectiveMetadata` or
      *     `R3DeclareComponentMetadata` interfaces.
      */
-    linkPartialDeclaration(constantPool: ConstantPool, metaObj: AstObject<R3PartialDeclaration, TExpression>): o.Expression;
+    linkPartialDeclaration(constantPool: ConstantPool, metaObj: AstObject<R3PartialDeclaration, TExpression>): LinkedDefinition;
 }

package/linker/src/file_linker/partial_linkers/partial_ng_module_linker_1.d.ts

@@ -6,9 +6,9 @@
  * 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 { ConstantPool, outputAst as o, R3DeclareNgModuleMetadata, R3NgModuleMetadata, R3PartialDeclaration } from '@angular/compiler';
+import { ConstantPool, R3DeclareNgModuleMetadata, R3NgModuleMetadata, R3PartialDeclaration } from '@angular/compiler';
 import { AstObject } from '../../ast/ast_value';
-import { PartialLinker } from './partial_linker';
+import { LinkedDefinition, PartialLinker } from './partial_linker';
 /**
  * A `PartialLinker` that is designed to process `ɵɵngDeclareNgModule()` call expressions.
  */
@@ -24,9 +24,9 @@ export declare class PartialNgModuleLinkerVersion1<TExpression> implements Parti
      * definition. These are only used by JIT compilation.
      */
     emitInline: boolean);
-    linkPartialDeclaration(constantPool: ConstantPool, metaObj: AstObject<R3PartialDeclaration, TExpression>): o.Expression;
+    linkPartialDeclaration(constantPool: ConstantPool, metaObj: AstObject<R3PartialDeclaration, TExpression>): LinkedDefinition;
 }
 /**
  * Derives the `R3NgModuleMetadata` structure from the AST object.
  */
-export declare function toR3NgModuleMeta<TExpression>(metaObj: AstObject<R3DeclareNgModuleMetadata, TExpression>, emitInline: boolean): R3NgModuleMetadata;
+export declare function toR3NgModuleMeta<TExpression>(metaObj: AstObject<R3DeclareNgModuleMetadata, TExpression>, supportJit: boolean): R3NgModuleMetadata;

package/linker/src/file_linker/partial_linkers/partial_pipe_linker_1.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 { ConstantPool, outputAst as o, R3DeclarePipeMetadata, R3PartialDeclaration, R3PipeMetadata } from '@angular/compiler';
+import { ConstantPool, R3DeclarePipeMetadata, R3PartialDeclaration, R3PipeMetadata } from '@angular/compiler';
 import { AstObject } from '../../ast/ast_value';
-import { PartialLinker } from './partial_linker';
+import { LinkedDefinition, PartialLinker } from './partial_linker';
 /**
  * A `PartialLinker` that is designed to process `ɵɵngDeclarePipe()` call expressions.
  */
 export declare class PartialPipeLinkerVersion1<TExpression> implements PartialLinker<TExpression> {
     constructor();
-    linkPartialDeclaration(constantPool: ConstantPool, metaObj: AstObject<R3PartialDeclaration, TExpression>): o.Expression;
+    linkPartialDeclaration(constantPool: ConstantPool, metaObj: AstObject<R3PartialDeclaration, TExpression>): LinkedDefinition;
 }
 /**
  * Derives the `R3PipeMetadata` structure from the AST object.

package/ngcc/src/dependencies/module_resolver.d.ts

@@ -65,14 +65,17 @@ export declare class ModuleResolver {
      * Try to resolve the `moduleName` as an external entry-point by searching the `node_modules`
      * folders up the tree for a matching `.../node_modules/${moduleName}`.
      *
-     * If a folder is found but the path does not contain a `package.json` then it is marked as a
-     * "deep-import".
+     * If a folder is found but the path is not considered an entry-point (see `isEntryPoint()`) then
+     * it is marked as a "deep-import".
      */
     private resolveAsEntryPoint;
     /**
      * Can we consider the given path as an entry-point to a package?
      *
      * This is achieved by checking for the existence of `${modulePath}/package.json`.
+     * If there is no `package.json`, we check whether this is an APF v14+ secondary entry-point,
+     * which does not have its own `package.json` but has an `exports` entry in the package's primary
+     * `package.json`.
      */
     private isEntryPoint;
     /**

package/ngcc/src/execution/cluster/api.d.ts

@@ -7,7 +7,7 @@
  */
 /// <amd-module name="@angular/compiler-cli/ngcc/src/execution/cluster/api" />
 import { AbsoluteFsPath } from '../../../../src/ngtsc/file_system';
-import { JsonObject } from '../../packages/entry_point';
+import { JsonObject } from '../../utils';
 import { PackageJsonChange } from '../../writing/package_json_updater';
 import { Task, TaskProcessingOutcome } from '../tasks/api';
 /** A message reporting that the worker is ready for retrieving tasks. */

package/ngcc/src/execution/cluster/package_json_updater.d.ts

@@ -7,7 +7,7 @@
  */
 /// <amd-module name="@angular/compiler-cli/ngcc/src/execution/cluster/package_json_updater" />
 import { AbsoluteFsPath } from '../../../../src/ngtsc/file_system';
-import { JsonObject } from '../../packages/entry_point';
+import { JsonObject } from '../../utils';
 import { PackageJsonChange, PackageJsonUpdate, PackageJsonUpdater } from '../../writing/package_json_updater';
 /**
  * A `PackageJsonUpdater` for cluster workers that will send update changes to the master process so

package/ngcc/src/execution/tasks/api.d.ts

@@ -6,8 +6,8 @@
  * 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 { EntryPoint, EntryPointJsonProperty, JsonObject } from '../../packages/entry_point';
-import { PartiallyOrderedList } from '../../utils';
+import { EntryPoint, EntryPointJsonProperty } from '../../packages/entry_point';
+import { JsonObject, PartiallyOrderedList } from '../../utils';
 /**
  * Represents a unit of work to be undertaken by an `Executor`.
  *

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 = "14.0.0-next.7";
+export declare const NGCC_VERSION = "14.0.0-rc.0";
 /**
  * Returns true if there is a format in this entry-point that was compiled with an outdated version
  * of ngcc.

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

@@ -1,6 +1,7 @@
 /// <amd-module name="@angular/compiler-cli/ngcc/src/packages/entry_point" />
 import { AbsoluteFsPath, ReadonlyFileSystem } from '../../../src/ngtsc/file_system';
 import { Logger } from '../../../src/ngtsc/logging';
+import { JsonObject } from '../utils';
 import { NgccConfiguration } from './configuration';
 /**
  * The possible values for the format of an entry-point.
@@ -35,13 +36,6 @@ export interface EntryPoint extends JsonObject {
     /** Should ngcc generate deep re-exports for this entrypoint? */
     generateDeepReexports: boolean;
 }
-export declare type JsonPrimitive = string | number | boolean | null;
-export declare type JsonValue = JsonPrimitive | JsonArray | JsonObject | undefined;
-export interface JsonArray extends Array<JsonValue> {
-}
-export interface JsonObject {
-    [key: string]: JsonValue;
-}
 export interface PackageJsonFormatPropertiesMap {
     browser?: string;
     fesm2015?: string;

package/ngcc/src/utils.d.ts

@@ -9,6 +9,13 @@
 import ts from 'typescript';
 import { AbsoluteFsPath, ReadonlyFileSystem } from '../../src/ngtsc/file_system';
 import { DeclarationNode, KnownDeclaration } from '../../src/ngtsc/reflection';
+export declare type JsonPrimitive = string | number | boolean | null;
+export declare type JsonValue = JsonPrimitive | JsonArray | JsonObject | undefined;
+export interface JsonArray extends Array<JsonValue> {
+}
+export interface JsonObject {
+    [key: string]: JsonValue;
+}
 /**
  * A list (`Array`) of partially ordered `T` items.
  *
@@ -85,3 +92,22 @@ export declare function getTsHelperFnFromIdentifier(id: ts.Identifier): KnownDec
  */
 export declare function stripDollarSuffix(value: string): string;
 export declare function stripExtension(fileName: string): string;
+/**
+ * Parse the JSON from a `package.json` file.
+ *
+ * @param packageJsonPath The absolute path to the `package.json` file.
+ * @returns JSON from the `package.json` file if it exists and is valid, `null` otherwise.
+ */
+export declare function loadJson<T extends JsonObject = JsonObject>(fs: ReadonlyFileSystem, packageJsonPath: AbsoluteFsPath): T | null;
+/**
+ * Given the parsed JSON of a `package.json` file, try to extract info for a secondary entry-point
+ * from the `exports` property. Such info will only be present for packages following Angular
+ * Package Format v14+.
+ *
+ * @param primaryPackageJson The parsed JSON of the primary `package.json` (or `null` if it failed
+ *     to be loaded).
+ * @param packagePath The absolute path to the containing npm package.
+ * @param entryPointPath The absolute path to the secondary entry-point.
+ * @returns The `exports` info for the specified entry-point if it exists, `null` otherwise.
+ */
+export declare function loadSecondaryEntryPointInfoForApfV14(fs: ReadonlyFileSystem, primaryPackageJson: JsonObject | null, packagePath: AbsoluteFsPath, entryPointPath: AbsoluteFsPath): JsonObject | null;

package/ngcc/src/writing/package_json_updater.d.ts

@@ -7,7 +7,7 @@
  */
 /// <amd-module name="@angular/compiler-cli/ngcc/src/writing/package_json_updater" />
 import { AbsoluteFsPath, FileSystem } from '../../../src/ngtsc/file_system';
-import { JsonObject, JsonValue } from '../packages/entry_point';
+import { JsonObject, JsonValue } from '../utils';
 export declare type PackageJsonChange = [string[], JsonValue, PackageJsonPropertyPositioning];
 export declare type PackageJsonPropertyPositioning = 'unimportant' | 'alphabetic' | {
     before: string;
@@ -87,6 +87,7 @@ export declare class PackageJsonUpdate {
      */
     writeChanges(packageJsonPath: AbsoluteFsPath, parsedJson?: JsonObject): void;
     private ensureNotApplied;
+    private ensureNotSynthesized;
 }
 /** A `PackageJsonUpdater` that writes directly to the file-system. */
 export declare class DirectPackageJsonUpdater implements PackageJsonUpdater {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@angular/compiler-cli",
-  "version": "14.0.0-next.7",
+  "version": "14.0.0-rc.0",
   "description": "Angular - the compiler CLI for Node.js",
   "typings": "index.d.ts",
   "bin": {
@@ -65,8 +65,8 @@
     "yargs": "^17.2.1"
   },
   "peerDependencies": {
-    "@angular/compiler": "14.0.0-next.7",
-    "typescript": ">=4.4.2 <4.7"
+    "@angular/compiler": "14.0.0-rc.0",
+    "typescript": ">=4.6.2 <4.8"
   },
   "repository": {
     "type": "git",
@@ -84,7 +84,7 @@
   "bugs": {
     "url": "https://github.com/angular/angular/issues"
   },
-  "homepage": "https://github.com/angular/angular/tree/master/packages/compiler-cli",
+  "homepage": "https://github.com/angular/angular/tree/main/packages/compiler-cli",
   "ng-update": {
     "packageGroup": [
       "@angular/core",

package/src/ngtsc/annotations/common/index.d.ts

@@ -13,4 +13,5 @@ export * from './src/evaluation';
 export * from './src/factory';
 export * from './src/metadata';
 export * from './src/references_registry';
+export * from './src/schema';
 export * from './src/util';

package/src/ngtsc/annotations/common/src/schema.d.ts

@@ -0,0 +1,12 @@
+/**
+ * @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/ngtsc/annotations/common/src/schema" />
+import { SchemaMetadata } from '@angular/compiler';
+import ts from 'typescript';
+import { PartialEvaluator } from '../../../partial_evaluator';
+export declare function extractSchemas(rawExpr: ts.Expression, evaluator: PartialEvaluator, context: string): SchemaMetadata[];

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

@@ -53,7 +53,7 @@ export declare function tryUnwrapForwardRef(node: ts.Expression, reflector: Refl
  * @param args the arguments to the invocation of the forwardRef expression
  * @returns an unwrapped argument if `ref` pointed to forwardRef, or null otherwise
  */
-export declare function forwardRefResolver(ref: Reference<ts.FunctionDeclaration | ts.MethodDeclaration | ts.FunctionExpression>, args: ReadonlyArray<ts.Expression>): ts.Expression | null;
+export declare const forwardRefResolver: ForeignFunctionResolver;
 /**
  * Combines an array of resolver functions into a one.
  * @param resolvers Resolvers to be combined.

package/src/ngtsc/annotations/component/src/metadata.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/component/src/metadata" />
-import { AnimationTriggerNames, R3ClassMetadata, R3ComponentMetadata } from '@angular/compiler';
+import { AnimationTriggerNames, R3ClassMetadata, R3ComponentMetadata, R3TemplateDependencyMetadata, SchemaMetadata } from '@angular/compiler';
 import ts from 'typescript';
 import { Reference } from '../../../imports';
 import { ClassPropertyMapping, ComponentResources, DirectiveTypeCheckMeta } from '../../../metadata';
@@ -19,13 +19,13 @@ import { ParsedTemplateWithSource, StyleUrlMeta } from './resources';
  * The `keyof R3ComponentMetadata &` condition ensures that only fields of `R3ComponentMetadata` can
  * be included here.
  */
-export declare type ComponentMetadataResolvedFields = SubsetOfKeys<R3ComponentMetadata, 'directives' | 'pipes' | 'declarationListEmitMode'>;
+export declare type ComponentMetadataResolvedFields = SubsetOfKeys<R3ComponentMetadata<R3TemplateDependencyMetadata>, 'declarations' | 'declarationListEmitMode'>;
 export interface ComponentAnalysisData {
     /**
      * `meta` includes those fields of `R3ComponentMetadata` which are calculated at `analyze` time
      * (not during resolve).
      */
-    meta: Omit<R3ComponentMetadata, ComponentMetadataResolvedFields>;
+    meta: Omit<R3ComponentMetadata<R3TemplateDependencyMetadata>, ComponentMetadataResolvedFields>;
     baseClass: Reference<ClassDeclaration> | 'dynamic' | null;
     typeCheckMeta: DirectiveTypeCheckMeta;
     template: ParsedTemplateWithSource;
@@ -53,9 +53,8 @@ export interface ComponentAnalysisData {
     inlineStyles: string[] | null;
     isPoisoned: boolean;
     animationTriggerNames: AnimationTriggerNames | null;
-    imports: {
-        resolved: Reference<ClassDeclaration>[];
-        raw: ts.Expression;
-    } | null;
+    rawImports: ts.Expression | null;
+    resolvedImports: Reference<ClassDeclaration>[] | null;
+    schemas: SchemaMetadata[] | null;
 }
-export declare type ComponentResolutionData = Pick<R3ComponentMetadata, ComponentMetadataResolvedFields>;
+export declare type ComponentResolutionData = Pick<R3ComponentMetadata<R3TemplateDependencyMetadata>, ComponentMetadataResolvedFields>;

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

@@ -116,7 +116,7 @@ export declare function makeResourceNotFoundError(file: string, nodeForError: ts
  * Additionally, the references to external resources would require libraries to ship
  * external resources exclusively for the class metadata.
  */
-export declare function transformDecoratorToInlineResources(dec: Decorator, component: Map<string, ts.Expression>, styles: string[], template: ParsedTemplateWithSource): Decorator;
+export declare function transformDecoratorResources(dec: Decorator, component: Map<string, ts.Expression>, styles: string[], template: ParsedTemplateWithSource): Decorator;
 export declare function extractComponentStyleUrls(evaluator: PartialEvaluator, component: Map<string, ts.Expression>): StyleUrlMeta[];
 export declare function extractStyleResources(resourceLoader: ResourceLoader, component: Map<string, ts.Expression>, containingFile: string): ReadonlySet<Resource>;
 export declare function _extractTemplateStyleUrls(template: ParsedTemplateWithSource): StyleUrlMeta[];

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

@@ -20,14 +20,17 @@ import { AnalysisOutput, CompileResult, DecoratorHandler, DetectResult, HandlerP
 import { ReferencesRegistry } from '../../common';
 export interface NgModuleAnalysis {
     mod: R3NgModuleMetadata;
-    inj: R3InjectorMetadata;
+    inj: Omit<R3InjectorMetadata, 'imports'>;
     fac: R3FactoryMetadata;
     classMetadata: R3ClassMetadata | null;
     declarations: Reference<ClassDeclaration>[];
     rawDeclarations: ts.Expression | null;
     schemas: SchemaMetadata[];
-    imports: Reference<ClassDeclaration>[];
+    imports: TopLevelImportedExpression[];
+    importRefs: Reference<ClassDeclaration>[];
+    rawImports: ts.Expression | null;
     exports: Reference<ClassDeclaration>[];
+    rawExports: ts.Expression | null;
     id: Expression | null;
     factorySymbolName: string;
     providersRequiringFactory: Set<Reference<ClassDeclaration>> | null;
@@ -72,11 +75,6 @@ export declare class NgModuleDecoratorHandler implements DecoratorHandler<Decora
     resolve(node: ClassDeclaration, analysis: Readonly<NgModuleAnalysis>): ResolveResult<NgModuleResolution>;
     compileFull(node: ClassDeclaration, { inj, mod, fac, classMetadata, declarations }: Readonly<NgModuleAnalysis>, { injectorImports }: Readonly<NgModuleResolution>): CompileResult[];
     compilePartial(node: ClassDeclaration, { inj, fac, mod, classMetadata }: Readonly<NgModuleAnalysis>, { injectorImports }: Readonly<NgModuleResolution>): CompileResult[];
-    /**
-     *  Merge the injector imports (which are 'exports' that were later found to be NgModules)
-     *  computed during resolution with the ones from analysis.
-     */
-    private mergeInjectorImports;
     /**
      * Add class metadata statements, if provided, to the `ngModuleStatements`.
      */
@@ -112,3 +110,8 @@ export declare class NgModuleDecoratorHandler implements DecoratorHandler<Decora
      */
     private resolveTypeList;
 }
+export interface TopLevelImportedExpression {
+    expression: ts.Expression;
+    resolvedReferences: Array<Reference<ClassDeclaration>>;
+    hasModuleWithProviders: boolean;
+}

package/src/ngtsc/core/api/src/adapter.d.ts

@@ -23,7 +23,7 @@ export declare type ExtendedCompilerHostMethods = 'getCanonicalFileName' | 'reso
  * which is relied upon by `NgCompiler`. A consumer of `NgCompiler` can therefore use the
  * `NgCompilerHost` or implement `NgCompilerAdapter` itself.
  */
-export interface NgCompilerAdapter extends Omit<ts.ModuleResolutionHost, 'getCurrentDirectory'>, Pick<ExtendedTsCompilerHost, 'getCurrentDirectory' | ExtendedCompilerHostMethods> {
+export interface NgCompilerAdapter extends Omit<ts.ModuleResolutionHost, 'getCurrentDirectory'>, Pick<ExtendedTsCompilerHost, 'getCurrentDirectory' | ExtendedCompilerHostMethods>, SourceFileTypeIdentifier {
     /**
      * A path to a single file which represents the entrypoint of an Angular Package Format library,
      * if the current program is one.
@@ -61,6 +61,8 @@ export interface NgCompilerAdapter extends Omit<ts.ModuleResolutionHost, 'getCur
      * Resolved list of root directories explicitly set in, or inferred from, the tsconfig.
      */
     readonly rootDirs: ReadonlyArray<AbsoluteFsPath>;
+}
+export interface SourceFileTypeIdentifier {
     /**
      * Distinguishes between shim files added by Angular to the compilation process (both those
      * intended for output, like ngfactory files, as well as internal shims like ngtypecheck files)
@@ -70,4 +72,13 @@ export interface NgCompilerAdapter extends Omit<ts.ModuleResolutionHost, 'getCur
      * `true` if a file was written by the user, and `false` if a file was added by the compiler.
      */
     isShim(sf: ts.SourceFile): boolean;
+    /**
+     * Distinguishes between resource files added by Angular to the project and original files in the
+     * user's program.
+     *
+     * This is necessary only for the language service because it adds resource files as root files
+     * when they are read. This is done to indicate to TS Server that these resources are part of the
+     * project and ensures that projects are retained properly when navigating around the workspace.
+     */
+    isResource(sf: ts.SourceFile): boolean;
 }

package/src/ngtsc/core/src/host.d.ts

@@ -36,14 +36,14 @@ export declare class DelegatingCompilerHost implements Omit<RequiredDelegations<
     getModifiedResourceFiles: (() => Set<string> | undefined) | undefined;
     getNewLine: () => string;
     getParsedCommandLine: ((fileName: string) => ts.ParsedCommandLine | undefined) | undefined;
-    getSourceFileByPath: ((fileName: string, path: ts.Path, languageVersion: ts.ScriptTarget, onError?: ((message: string) => void) | undefined, shouldCreateNewSourceFile?: boolean | undefined) => ts.SourceFile | undefined) | undefined;
+    getSourceFileByPath: ((fileName: string, path: ts.Path, languageVersionOrOptions: ts.ScriptTarget | ts.CreateSourceFileOptions, onError?: ((message: string) => void) | undefined, shouldCreateNewSourceFile?: boolean | undefined) => ts.SourceFile | undefined) | undefined;
     readDirectory: ((rootDir: string, extensions: readonly string[], excludes: readonly string[] | undefined, includes: readonly string[], depth?: number | undefined) => string[]) | undefined;
     readFile: (fileName: string) => string | undefined;
     readResource: ((fileName: string) => string | Promise<string>) | undefined;
     transformResource: ((data: string, context: import("@angular/compiler-cli/src/ngtsc/core/api/index").ResourceHostContext) => Promise<import("@angular/compiler-cli/src/ngtsc/core/api/index").TransformResourceResult | null>) | undefined;
     realpath: ((path: string) => string) | undefined;
     resolveModuleNames: ((moduleNames: string[], containingFile: string, reusedNames: string[] | undefined, redirectedReference: ts.ResolvedProjectReference | undefined, options: ts.CompilerOptions, containingSourceFile?: ts.SourceFile | undefined) => (ts.ResolvedModule | undefined)[]) | undefined;
-    resolveTypeReferenceDirectives: ((typeReferenceDirectiveNames: string[], containingFile: string, redirectedReference: ts.ResolvedProjectReference | undefined, options: ts.CompilerOptions) => (ts.ResolvedTypeReferenceDirective | undefined)[]) | undefined;
+    resolveTypeReferenceDirectives: ((typeReferenceDirectiveNames: string[] | readonly ts.FileReference[], containingFile: string, redirectedReference: ts.ResolvedProjectReference | undefined, options: ts.CompilerOptions, containingFileMode?: ts.ModuleKind.CommonJS | ts.ModuleKind.ESNext | undefined) => (ts.ResolvedTypeReferenceDirective | undefined)[]) | undefined;
     resourceNameToFileName: ((resourceName: string, containingFilePath: string, fallbackResolve?: ((url: string, fromFile: string) => string | null) | undefined) => string | null) | undefined;
     trace: ((s: string) => void) | undefined;
     useCaseSensitiveFileNames: () => boolean;
@@ -97,6 +97,13 @@ export declare class NgCompilerHost extends DelegatingCompilerHost implements Re
      * If this returns false, the file is user-provided.
      */
     isShim(sf: ts.SourceFile): boolean;
+    /**
+     * Check whether the given `ts.SourceFile` is a resource file.
+     *
+     * This simply returns `false` for the compiler-cli since resource files are not added as root
+     * files to the project.
+     */
+    isResource(sf: ts.SourceFile): boolean;
     getSourceFile(fileName: string, languageVersion: ts.ScriptTarget, onError?: ((message: string) => void) | undefined, shouldCreateNewSourceFile?: boolean | undefined): ts.SourceFile | undefined;
     fileExists(fileName: string): boolean;
     get unifiedModulesHost(): UnifiedModulesHost | null;