@angular/compiler-cli 15.0.0-rc.0 → 15.0.0-rc.2

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 = "15.0.0-rc.0";
+export declare const NGCC_VERSION = "15.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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@angular/compiler-cli",
-  "version": "15.0.0-rc.0",
+  "version": "15.0.0-rc.2",
   "description": "Angular - the compiler CLI for Node.js",
   "typings": "index.d.ts",
   "bin": {
@@ -65,7 +65,7 @@
     "yargs": "^17.2.1"
   },
   "peerDependencies": {
-    "@angular/compiler": "15.0.0-rc.0",
+    "@angular/compiler": "15.0.0-rc.2",
     "typescript": ">=4.8.2 <4.9"
   },
   "repository": {

package/src/ngtsc/program.d.ts

@@ -45,14 +45,7 @@ export declare class NgtscProgram implements api.Program {
     loadNgStructureAsync(): Promise<void>;
     listLazyRoutes(entryRoute?: string | undefined): api.LazyRoute[];
     private emitXi18n;
-    emit(opts?: {
-        emitFlags?: api.EmitFlags | undefined;
-        forceEmit?: boolean;
-        cancellationToken?: ts.CancellationToken | undefined;
-        customTransformers?: api.CustomTransformers | undefined;
-        emitCallback?: api.TsEmitCallback | undefined;
-        mergeEmitResultsCallback?: api.TsMergeEmitResultsCallback | undefined;
-    } | undefined): ts.EmitResult;
+    emit<CbEmitRes extends ts.EmitResult>(opts?: api.EmitOptions<CbEmitRes> | undefined): ts.EmitResult;
     getIndexedComponents(): Map<DeclarationNode, IndexedComponent>;
     getEmittedSourceFiles(): Map<string, ts.SourceFile>;
 }

package/src/perform_compile.d.ts

@@ -31,13 +31,13 @@ export interface PerformCompilationResult {
     emitResult?: ts.EmitResult;
 }
 export declare function exitCodeFromResult(diags: ReadonlyArray<ts.Diagnostic> | undefined): number;
-export declare function performCompilation({ rootNames, options, host, oldProgram, emitCallback, mergeEmitResultsCallback, gatherDiagnostics, customTransformers, emitFlags, forceEmit, modifiedResourceFiles }: {
+export declare function performCompilation<CbEmitRes extends ts.EmitResult = ts.EmitResult>({ rootNames, options, host, oldProgram, emitCallback, mergeEmitResultsCallback, gatherDiagnostics, customTransformers, emitFlags, forceEmit, modifiedResourceFiles }: {
     rootNames: string[];
     options: api.CompilerOptions;
     host?: api.CompilerHost;
     oldProgram?: api.Program;
-    emitCallback?: api.TsEmitCallback;
-    mergeEmitResultsCallback?: api.TsMergeEmitResultsCallback;
+    emitCallback?: api.TsEmitCallback<CbEmitRes>;
+    mergeEmitResultsCallback?: api.TsMergeEmitResultsCallback<CbEmitRes>;
     gatherDiagnostics?: (program: api.Program) => ReadonlyArray<ts.Diagnostic>;
     customTransformers?: api.CustomTransformers;
     emitFlags?: api.EmitFlags;

package/src/perform_watch.d.ts

@@ -14,18 +14,18 @@ export declare enum FileChangeEvent {
     CreateDelete = 1,
     CreateDeleteDir = 2
 }
-export interface PerformWatchHost {
+export interface PerformWatchHost<CbEmitRes extends ts.EmitResult = ts.EmitResult> {
     reportDiagnostics(diagnostics: ReadonlyArray<ts.Diagnostic>): void;
     readConfiguration(): ParsedConfiguration;
     createCompilerHost(options: api.CompilerOptions): api.CompilerHost;
-    createEmitCallback(options: api.CompilerOptions): api.TsEmitCallback | undefined;
+    createEmitCallback(options: api.CompilerOptions): api.TsEmitCallback<CbEmitRes> | undefined;
     onFileChange(options: api.CompilerOptions, listener: (event: FileChangeEvent, fileName: string) => void, ready: () => void): {
         close: () => void;
     };
     setTimeout(callback: () => void, ms: number): any;
     clearTimeout(timeoutId: any): void;
 }
-export declare function createPerformWatchHost(configFileName: string, reportDiagnostics: (diagnostics: ReadonlyArray<ts.Diagnostic>) => void, existingOptions?: ts.CompilerOptions, createEmitCallback?: (options: api.CompilerOptions) => api.TsEmitCallback | undefined): PerformWatchHost;
+export declare function createPerformWatchHost<CbEmitRes extends ts.EmitResult = ts.EmitResult>(configFileName: string, reportDiagnostics: (diagnostics: ReadonlyArray<ts.Diagnostic>) => void, existingOptions?: ts.CompilerOptions, createEmitCallback?: (options: api.CompilerOptions) => api.TsEmitCallback<CbEmitRes> | undefined): PerformWatchHost;
 /**
  * The logic in this function is adapted from `tsc.ts` from TypeScript.
  */

package/src/transformers/api.d.ts

@@ -100,11 +100,11 @@ export interface TsEmitArguments {
     emitOnlyDtsFiles?: boolean;
     customTransformers?: ts.CustomTransformers;
 }
-export interface TsEmitCallback {
-    (args: TsEmitArguments): ts.EmitResult;
+export interface TsEmitCallback<T extends ts.EmitResult> {
+    (args: TsEmitArguments): T;
 }
-export interface TsMergeEmitResultsCallback {
-    (results: ts.EmitResult[]): ts.EmitResult;
+export interface TsMergeEmitResultsCallback<T extends ts.EmitResult> {
+    (results: T[]): T;
 }
 export interface LazyRoute {
     route: string;
@@ -117,6 +117,14 @@ export interface LazyRoute {
         filePath: string;
     };
 }
+export interface EmitOptions<CbEmitRes extends ts.EmitResult> {
+    emitFlags?: EmitFlags;
+    forceEmit?: boolean;
+    cancellationToken?: ts.CancellationToken;
+    customTransformers?: CustomTransformers;
+    emitCallback?: TsEmitCallback<CbEmitRes>;
+    mergeEmitResultsCallback?: TsMergeEmitResultsCallback<CbEmitRes>;
+}
 export interface Program {
     /**
      * Retrieve the TypeScript program used to produce semantic diagnostics and emit the sources.
@@ -179,12 +187,5 @@ export interface Program {
      *
      * Angular structural information is required to emit files.
      */
-    emit({ emitFlags, forceEmit, cancellationToken, customTransformers, emitCallback, mergeEmitResultsCallback, }?: {
-        emitFlags?: EmitFlags;
-        forceEmit?: boolean;
-        cancellationToken?: ts.CancellationToken;
-        customTransformers?: CustomTransformers;
-        emitCallback?: TsEmitCallback;
-        mergeEmitResultsCallback?: TsMergeEmitResultsCallback;
-    }): ts.EmitResult;
+    emit<CbEmitRes extends ts.EmitResult>(opts?: EmitOptions<CbEmitRes> | undefined): ts.EmitResult;
 }