Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,7 @@ export abstract class AngularCompilation {
referencedFiles: readonly string[];
externalStylesheets?: ReadonlyMap<string, string>;
templateUpdates?: ReadonlyMap<string, string>;
fileDependencies?: ReadonlyMap<string, readonly string[]>;
}>;

abstract emitAffectedFiles(): Iterable<EmitFileResult> | Promise<Iterable<EmitFileResult>>;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@ export class AotCompilation extends AngularCompilation {
referencedFiles: readonly string[];
externalStylesheets?: ReadonlyMap<string, string>;
templateUpdates?: ReadonlyMap<string, string>;
fileDependencies?: ReadonlyMap<string, readonly string[]>;
}> {
// Dynamically load the Angular compiler CLI package
const { NgtscProgram, OptimizeFor } = await AngularCompilation.loadCompilerCli();
Expand Down Expand Up @@ -175,13 +176,15 @@ export class AotCompilation extends AngularCompilation {
findAffectedFiles(typeScriptProgram, angularCompiler, usingBuildInfo),
);

const fileDependencies = new Map<string, string[]>();

// Get all files referenced in the TypeScript/Angular program including component resources
const referencedFiles = typeScriptProgram
.getSourceFiles()
.filter((sourceFile) => !angularCompiler.ignoreForEmit.has(sourceFile))
.flatMap((sourceFile) => {
const resourceDependencies = angularCompiler.getResourceDependencies(sourceFile);

fileDependencies.set(sourceFile.fileName, resourceDependencies);
// Also invalidate Angular diagnostics for a source file if component resources are modified
if (this.#state && hostOptions.modifiedFiles?.size) {
for (const resourceDependency of resourceDependencies) {
Expand Down Expand Up @@ -212,6 +215,7 @@ export class AotCompilation extends AngularCompilation {
referencedFiles,
externalStylesheets: hostOptions.externalStylesheets,
templateUpdates,
fileDependencies,
};
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -45,58 +45,63 @@ export async function initialize(request: InitRequest) {
}
});

const { compilerOptions, referencedFiles, externalStylesheets, templateUpdates } =
await compilation.initialize(
request.tsconfig,
{
fileReplacements: request.fileReplacements,
sourceFileCache,
modifiedFiles: sourceFileCache.modifiedFiles,
transformStylesheet(data, containingFile, stylesheetFile, order, className) {
const requestId = randomUUID();
const resultPromise = new Promise<string>((resolve, reject) =>
stylesheetRequests.set(requestId, [resolve, reject]),
);

request.stylesheetPort.postMessage({
requestId,
data,
containingFile,
stylesheetFile,
order,
className,
});

return resultPromise;
},
processWebWorker(workerFile, containingFile) {
Atomics.store(request.webWorkerSignal, 0, 0);
request.webWorkerPort.postMessage({ workerFile, containingFile });

Atomics.wait(request.webWorkerSignal, 0, 0);
const result = receiveMessageOnPort(request.webWorkerPort)?.message;

if (result?.error) {
throw result.error;
}

return result?.workerCodeFile ?? workerFile;
},
const {
compilerOptions,
referencedFiles,
externalStylesheets,
templateUpdates,
fileDependencies,
} = await compilation.initialize(
request.tsconfig,
{
fileReplacements: request.fileReplacements,
sourceFileCache,
modifiedFiles: sourceFileCache.modifiedFiles,
transformStylesheet(data, containingFile, stylesheetFile, order, className) {
const requestId = randomUUID();
const resultPromise = new Promise<string>((resolve, reject) =>
stylesheetRequests.set(requestId, [resolve, reject]),
);

request.stylesheetPort.postMessage({
requestId,
data,
containingFile,
stylesheetFile,
order,
className,
});

return resultPromise;
},
(compilerOptions) => {
Atomics.store(request.optionsSignal, 0, 0);
request.optionsPort.postMessage(compilerOptions);
processWebWorker(workerFile, containingFile) {
Atomics.store(request.webWorkerSignal, 0, 0);
request.webWorkerPort.postMessage({ workerFile, containingFile });

Atomics.wait(request.optionsSignal, 0, 0);
const result = receiveMessageOnPort(request.optionsPort)?.message;
Atomics.wait(request.webWorkerSignal, 0, 0);
const result = receiveMessageOnPort(request.webWorkerPort)?.message;

if (result?.error) {
throw result.error;
}

return result?.transformedOptions ?? compilerOptions;
return result?.workerCodeFile ?? workerFile;
},
);
},
(compilerOptions) => {
Atomics.store(request.optionsSignal, 0, 0);
request.optionsPort.postMessage(compilerOptions);

Atomics.wait(request.optionsSignal, 0, 0);
const result = receiveMessageOnPort(request.optionsPort)?.message;

if (result?.error) {
throw result.error;
}

return result?.transformedOptions ?? compilerOptions;
},
);

return {
externalStylesheets,
Expand All @@ -109,6 +114,7 @@ export async function initialize(request: InitRequest) {
sourceMap: compilerOptions.sourceMap,
inlineSourceMap: compilerOptions.inlineSourceMap,
},
fileDependencies,
};
}

Expand Down