refactor(project): Fix stage restore

Stages where not always correctly restored from cache due to a separate
initialization of all current stages (initStages)

Author: RandomByte

packages/project/lib/build/cache/ProjectBuildCache.js

@@ -294,7 +294,10 @@ export default class ProjectBuildCache {
 	 */
 	async #importStages(stageSignatures) {
 		const stageNames = Object.keys(stageSignatures);
-		this.#project.initStages(stageNames);
+		if (this.#project.getStage()?.getId() === "initial") {
+			// Only initialize stages once
+			this.#project.initStages(stageNames);
+		}
 		const importedStages = await Promise.all(stageNames.map(async (stageName) => {
 			const stageSignature = stageSignatures[stageName];
 			const stageCache = await this.#findStageCache(stageName, [stageSignature]);
@@ -416,10 +419,10 @@ export default class ProjectBuildCache {
 		const stageCache = await this.#findStageCache(stageName, stageSignatures);
 		const oldStageSig = this.#currentStageSignatures.get(stageName)?.join("-");
 		if (stageCache) {
+			this.#project.setStage(stageName, stageCache.stage);
+
 			// Check whether the stage actually changed
 			if (stageCache.signature !== oldStageSig) {
-				this.#project.setStage(stageName, stageCache.stage);
-
 				// Store new stage signature for later use in result stage signature calculation
 				this.#currentStageSignatures.set(stageName, stageCache.signature.split("-"));
 

packages/project/lib/specifications/ComponentProject.js

@@ -150,22 +150,22 @@ class ComponentProject extends Project {
 		throw new Error(`_getTestReader must be implemented by subclass ${this.constructor.name}`);
 	}
 
-	_createWriter() {
+	_createWriter(stageId) {
 		// writer is always of style "buildtime"
 		const namespaceWriter = resourceFactory.createAdapter({
-			name: `Namespace writer for project ${this.getName()}`,
+			name: `Namespace writer for project ${this.getName()}, stage ${stageId}`,
 			virBasePath: "/",
 			project: this
 		});
 
 		const generalWriter = resourceFactory.createAdapter({
-			name: `General writer for project ${this.getName()}`,
+			name: `General writer for project ${this.getName()}, stage ${stageId}`,
 			virBasePath: "/",
 			project: this
 		});
 
 		const collection = resourceFactory.createWriterCollection({
-			name: `Writers for project ${this.getName()}`,
+			name: `Writers for project ${this.getName()}, stage ${stageId}`,
 			writerMapping: {
 				[`/resources/${this._namespace}/`]: namespaceWriter,
 				[`/test-resources/${this._namespace}/`]: namespaceWriter,

packages/project/lib/specifications/Project.js

@@ -384,7 +384,7 @@ class Project extends Specification {
 	_initStageMetadata() {
 		this.#stages = [];
 		// Initialize with an empty stage for use without stages (i.e. without build cache)
-		this.#currentStage = new Stage(INITIAL_STAGE_ID, this._createWriter());
+		this.#currentStage = new Stage(INITIAL_STAGE_ID, this._createWriter(INITIAL_STAGE_ID));
 		this.#currentStageId = INITIAL_STAGE_ID;
 		this.#currentStageReadIndex = -1;
 		this.#currentStageReaders = new Map();
@@ -407,7 +407,7 @@ class Project extends Specification {
 		this._initStageMetadata();
 		for (let i = 0; i < stageIds.length; i++) {
 			const stageId = stageIds[i];
-			const newStage = new Stage(stageId, this._createWriter());
+			const newStage = new Stage(stageId, this._createWriter(stageId));
 			this.#stages.push(newStage);
 		}
 	}